Merge branch 'ticket-14285-Dropshipping' into develop

This commit is contained in:
Marion Muszynski 2017-10-11 15:31:02 +02:00
commit 5c27461185

View File

@ -214,9 +214,6 @@ class AdminAntDropshippingtracking extends AdminTab
)
');
$order->shipping_number = $o['tracking_number'];
$order->save();
global $_LANGMAIL;
$subject = 'Package in transit';
if(!Mail::Send(intval($order->id_lang), 'in_transit_dropshipping', ((is_array($_LANGMAIL) && key_exists($subject, $_LANGMAIL)) ? $_LANGMAIL[$subject] : $subject), $templateVars, $customer->email, $customer->firstname.' '.$customer->lastname)){