diff --git a/mails/fr/in_transit_dropshipping.html b/mails/fr/in_transit_dropshipping.html index 7a9ca4ab..2555ba4c 100644 --- a/mails/fr/in_transit_dropshipping.html +++ b/mails/fr/in_transit_dropshipping.html @@ -18,7 +18,7 @@   - Vous avez passé commande récemment sur notre site Bébé Boutik. Nous vous informons que le/les produits de la marque {sale} pour votre commande n°{id_order} vient d'être envoyé directement de chez notre fournisseur par le transporteur {carrier}. + Vous avez passé commande récemment sur notre site Bébé Boutik. Nous vous informons que le/les produits de la marque {sale} pour votre commande n°{id_order} vient d'être envoyé directement de chez notre fournisseur par le transporteur {carrier}.   diff --git a/modules/ant_dropshippingtracking/AdminAntDropshippingtracking.php b/modules/ant_dropshippingtracking/AdminAntDropshippingtracking.php index 7e2859d1..e8dc8131 100644 --- a/modules/ant_dropshippingtracking/AdminAntDropshippingtracking.php +++ b/modules/ant_dropshippingtracking/AdminAntDropshippingtracking.php @@ -233,12 +233,12 @@ class AdminAntDropshippingtracking extends AdminTab setcookie('logistics_sales', implode('-', $sales), 0, __PS_BASE_URI__); } if($errors==0){ - $this->_html .= HelperFormBootstrap::displaySuccess($this->l('Fichier importé avec succes !')); + $this->_html .= HelperFormBootstrap::displaySuccess($this->l('Fichier importé avec succès !')); } else { - $this->_html .= HelperFormBootstrap::displayErrors($this->l($errors.' mails n\'ont pas pu être envoyé')); + $this->_html .= HelperFormBootstrap::displayErrors($this->l($errors.' mails n\'ont pas pu être envoyés')); } } else { - $this->_html .= HelperFormBootstrap::displayErrors($this->l('Aucune commande trouvé, verifier votre fichier')); + $this->_html .= HelperFormBootstrap::displayErrors($this->l('Aucune commande trouvée, vérifier votre fichier')); } } else { $this->_html .= HelperFormBootstrap::displayErrors($this->l('Fichier manquant !')); diff --git a/modules/logistics/AdminLogistics.php b/modules/logistics/AdminLogistics.php index 0b651ed5..85e448af 100644 --- a/modules/logistics/AdminLogistics.php +++ b/modules/logistics/AdminLogistics.php @@ -813,17 +813,17 @@ class AdminLogistics extends AdminTab { for(var i=0; i < loaded.logs.length; i++) { content += \'\ \' + loaded.logs[i].date_add + \'\ - \' + loaded.logs[i].firstname + \' \' + loaded.logs[i].lastname + \'\ + \' + (loaded.logs[i].firstname == "Dropshipping"? "Dropshipping" : loaded.logs[i].firstname + \' \' + loaded.logs[i].lastname) + \'\ \' + loaded.logs[i].quantity + \'\ \' + loaded.logs[i].product_name.replace(" - ", "
") + \'\ \' + loaded.logs[i].product_reference + \'\ \' + loaded.logs[i].product_supplier_reference + \'\ \' + loaded.logs[i].shipping_number + \'\ - \' + ((loaded.logs[i].carrier== "laposte" || loaded.logs[i].carrier == "mondialrelay") ? carriers[loaded.logs[i].carrier] : loaded.logs[i].carrier) + \'\ + \' + ((loaded.logs[i].carrier == "laposte" || loaded.logs[i].carrier == "mondialrelay") ? carriers[loaded.logs[i].carrier] : loaded.logs[i].carrier) + \'\ '.(((int) $cookie->profile == 1 || (int) $cookie->profile == 9 || (int) $cookie->profile == 7 || (int) $cookie->profile == 14)? - '\' + ((loaded.logs[i].carrier== "laposte" || loaded.logs[i].carrier == "mondialrelay") ?\'x': '').'\':"") +\'\ + '\' + ((loaded.logs[i].carrier == "laposte" || loaded.logs[i].carrier == "mondialrelay") ?\'x': '').'\':"") +\'\ '.(((int) $cookie->profile == 1 || (int) $cookie->profile == 9 || (int) $cookie->profile == 7 || (int) $cookie->profile == 14)? - '\' + ((loaded.logs[i].carrier== "laposte" || loaded.logs[i].carrier == "mondialrelay") ?\'") + \'" data-weight="\' + loaded.logs[i].weight + \'" data-ref="\' + loaded.logs[i].product_reference + \'" data-id_order="\' + loaded.order.id + \'" data-carrier="\' + loaded.logs[i].carrier + \'" data-id_order_detail="\' + loaded.logs[i].id_order_detail + \'">+': '').'\':"") +\'\ + '\' + ((loaded.logs[i].carrier == "laposte" || loaded.logs[i].carrier == "mondialrelay") ?\'") + \'" data-weight="\' + loaded.logs[i].weight + \'" data-ref="\' + loaded.logs[i].product_reference + \'" data-id_order="\' + loaded.order.id + \'" data-carrier="\' + loaded.logs[i].carrier + \'" data-id_order_detail="\' + loaded.logs[i].id_order_detail + \'">+': '').'\':"") +\'\ \'; } diff --git a/modules/logistics/ajax.php b/modules/logistics/ajax.php index cddf4c6e..0fa4aa81 100644 --- a/modules/logistics/ajax.php +++ b/modules/logistics/ajax.php @@ -418,7 +418,7 @@ if(($id_order = (int) Tools::getValue('id_order')) * @Override Dropshipping */ if($l = Db::getInstance()->ExecuteS(' - SELECT l.*, d.`product_name`, d.`product_reference`, d.`product_supplier_reference`, "Drop" as firstname, "shipping" as lastname + SELECT l.*, d.`product_name`, d.`product_reference`, d.`product_supplier_reference`, "Dropshipping" as firstname FROM `'._DB_PREFIX_.'ant_dropshipping_parcel` l LEFT JOIN `'._DB_PREFIX_.'order_detail` d ON d.`id_order_detail` = l.`id_order_detail` WHERE l.`id_order_detail` IN ('.implode(', ', $id_order_details).')