Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision fec7f504

Von Werner Hahn vor mehr als 7 Jahren hinzugefügt

  • ID fec7f50485fe5eae469a0918a5c29a4a1eeffa5d
  • Vorgänger 60a44450
  • Nachfolger db5b8526

Shopmodul: Fehler nache merge behoben

Unterschiede anzeigen:

SL/Controller/ShopOrder.pm
116 116
                                                )";
117 117
  my @values = ($lastname, $company, $shop_order->billing_zipcode, $street, $shop_order->billing_zipcode, $shop_order->billing_email);
118 118
  my @c_ids = selectall_array_query($::form, $dbh, $fs_query, @values);
119
$main::lxdebug->dump(0, 'WH:C_IDs ',\@c_ids);
120 119

  
121 120
  my $proposals = SL::DB::Manager::Customer->get_all(
122
       query => [ id => [ @c_ids ],
123
#                   or => [
124
#                            and => [ # when matching names also match zipcode
125
#                                     or => [ 'name' => { ilike => "%$lastname%"},
126
#                                             'name' => { ilike => $shop_order->customer_company },
127
#                                           ],
128
#                                     'zipcode' => { ilike => $shop_order->customer_zipcode },
129
#                                   ],
130
#                            and => [ # check for street and zipcode
131
#                                     and => [ 'street'  => { ilike => "%".$shop_order->customer_street."%" },
132
#                                              'zipcode' => { ilike => $shop_order->customer_zipcode },
133
#                                            ],
134
#                                   ],
135
#                            or  => [ 'email' => { ilike => $shop_order->customer_email } ],
136
#                         ],
137
                ],
121
       query => [ id => [ @c_ids ], ],
138 122
  );
139 123

  
140 124
  $self->render('shop_order/show',
141 125
                title       => t8('Shoporder'),
142 126
                IMPORT      => $shop_order,
143 127
                PROPOSALS   => $proposals,
144
#                C_ADDRESS   => $c_address,
145
#                B_ADDRESS   => $b_address,
146
#                D_ADDRESS   => $d_address,
147 128
              );
148 129

  
149 130
}
SL/ShopConnector/Shopware.pm
194 194
                                                                  city    => $shop_order->billing_city,
195 195
                                                                  name    => $name,
196 196
                                                                ]);
197
        $main::lxdebug->dump(0, 'WH:CUS ',\$customer);
198 197

  
199 198
        if(ref $customer){
200 199
          $shop_order->{kivi_customer_id} = $customer->id;
......
208 207
                                                                        email   => $shop_order->billing_email,
209 208
                                                                      ]
210 209
                                                           );
211
        $main::lxdebug->dump(0, 'WH:CUS ',\$customer);
212

  
213
        if(ref $customer){
214
          $shop_order->{kivi_customer_id} = $customer->id;
215
          $shop_order->save;
216
        }
217
      }
218
      # DF Versandkosten als Position am ende einfügen Dreschflegelspezifisch event. konfigurierbar machen
219 210

  
220 211
        if(ref $customer){
221 212
          $shop_order->{kivi_customer_id} = $customer->id;

Auch abrufbar als: Unified diff