Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision db5b8526

Von Werner Hahn vor mehr als 6 Jahren hinzugefügt

  • ID db5b852636d1fa76d79b00b3393de82726e04f8d
  • Vorgänger fec7f504
  • Nachfolger 447f25cc

Shopmodul: Perlsyntax und locales

Unterschiede anzeigen:

SL/DB/ShopOrder.pm
47 47
  my @items = map{
48 48

  
49 49
  # TODO Flash and exit if part not found
50
    my $part = SL::DB::Manager::Part->get_first( query => [ partnumber => $_->partnumber, ], );
50
    my $part = SL::DB::Manager::Part->find_by(partnumber => $_->partnumber);
51 51

  
52 52
    unless($part){
53
      push @error_report, t8('Part with Partnumber: ') . $_->partnumber . t8(' not found');
53
      push @error_report, t8('Part with partnumber: #1 not found', $_->partnumber);
54 54
    }else{
55 55
      my $shop_part = SL::DB::Manager::ShopPart->get_all( where => [ shop_id => $self->shop_id, part_id => $part->id] )->[0];
56 56

  
......
70 70
  if(!scalar(@error_report)){
71 71

  
72 72
    my $shipto_id;
73
    if ($self->{billing_firstname} ne $self->{delivery_firstname} || $self->{billing_lastname} ne $self->{delivery_lastname} || $self->{billing_city} ne $self->{delivery_city} || $self->{billing_street} ne $self->{delivery_street}) {
74
      if(my $address = SL::DB::Manager::Shipto->find_by( shiptoname          => $self->{delivery_firstname} . " " . $self->{delivery_lastname},
75
                                                          shiptostreet        => $self->{delivery_street},
76
                                                          shiptocity          => $self->{delivery_city},
73
    if ($self->billing_firstname ne $self->delivery_firstname || $self->billing_lastname ne $self->delivery_lastname || $self->billing_city ne $self->delivery_city || $self->billing_street ne $self->delivery_street) {
74
      if(my $address = SL::DB::Manager::Shipto->find_by( shiptoname          => $self->delivery_firstname . " " . $self->delivery_lastname,
75
                                                          shiptostreet        => $self->delivery_street,
76
                                                          shiptocity          => $self->delivery_city,
77 77
                                                        )) {
78 78
        $shipto_id = $address->{shipto_id};
79 79
      } else {
80 80
        my $deliveryaddress = SL::DB::Shipto->new;
81 81
        $deliveryaddress->assign_attributes(
82
          shiptoname          => $self->{delivery_firstname} . " " . $self->{delivery_lastname},
83
          shiptodepartment_1  => $self->{delivery_company},
84
          shiptodepartment_2  => $self->{delivery_department},
85
          shiptostreet        => $self->{delivery_street},
86
          shiptozipcode       => $self->{delivery_zipcode},
87
          shiptocity          => $self->{delivery_city},
88
          shiptocountry       => $self->{delivery_country},
82
          shiptoname          => $self->delivery_firstname . " " . $self->delivery_lastname,
83
          shiptodepartment_1  => $self->delivery_company,
84
          shiptodepartment_2  => $self->delivery_department,
85
          shiptostreet        => $self->delivery_street,
86
          shiptozipcode       => $self->delivery_zipcode,
87
          shiptocity          => $self->delivery_city,
88
          shiptocountry       => $self->delivery_country,
89 89
          trans_id            => $customer->id,
90 90
          module              => "CT",
91 91
        );
locale/de/all
13 13
  ' Date missing!'              => ' Datum fehlt!',
14 14
  ' bytes, max='                => ' Bytes, Maximum=',
15 15
  ' missing!'                   => ' fehlt!',
16
  ' not found'                  => ' nicht gefunden',
17 16
  '#1 (custom variable)'        => '#1 (benutzerdefinierte Variable)',
18 17
  '#1 CB transactions and #1 OB transactions generated.' => '#1 Schluss- und #1 Eröffnungsbuchungen wurden erstellt.',
19 18
  '#1 MD'                       => '#1 PT',
......
2123 2122
  'Part Unit'                   => 'Einheit',
2124 2123
  'Part classifications'        => 'Artikel-Klassifizierungen',
2125 2124
  'Part picker'                 => 'Artikelauswahl',
2126
  'Part with Partnumber: '      => 'Artikel mit Artikelnummer',
2125
  'Part with partnumber: #1 not found' => 'Artikel mit Artikelnummer #1 wurde nicht gefunden',
2127 2126
  'PartClassAbbreviation'       => 'Abkürzung der Artikel-Klassifizierung',
2128 2127
  'Part_br_Description'         => 'Beschreibung',
2129 2128
  'Partdescriptipion'           => 'Beschreibung',
......
2747 2746
  'Shoporder deleted -- '       => 'ungültig',
2748 2747
  'Shoporder not found'         => 'Shopbestellung nicht gefunden',
2749 2748
  'Shoporderlock'               => 'Shopauftragssperre',
2749
  'Shoporders'                  => 'Shopbestellungen',
2750 2750
  'Shops'                       => 'Webshops',
2751 2751
  'Short'                       => 'Knapp',
2752 2752
  'Should ap transactions be and when should they be changeable or deleteable after posting?' => 'Sollen Kreditorenbuchungen nach der Buchung zu ändern oder zu löschen sein?',

Auch abrufbar als: Unified diff