0 ? $products[$key]['product_quantity_refunded']: $products[$key]['product_quantity_return']) - $products[$key]['product_quantity_sent'] > 0) && (in_array((int)($products[$key]['id_sale']), $sales_list)) ? '' : 'grey')
+ .(max(in_array($products[$key]['product_id'], $locked_products)? 0: ($products[$key]['product_quantity'] - ($products[$key]['product_quantity_refunded'] > 0? $products[$key]['product_quantity_refunded']: $products[$key]['product_quantity_return']) - $products[$key]['product_quantity_sent']), 0) > 1 ? ' blue' : '')
+ .'"';
if(isset($p['items_pack'])){
foreach($p['items_pack'] as $item){
$html_products.='data-pack_'.$item['id_product'].'="'.$item['pack_quantity'].'"';
}
}
$html_products.='
- >
+ >
'.(isset($p['items_pack'])?'LOT':' ').' |
'.str_replace(' - ','
',$products[$key]['product_name']).' |
'.($products[$key]['product_reference']? $products[$key]['product_reference'].'
': '').($products[$key]['product_ean13']? $products[$key]['product_ean13']: '').($products[$key]['location']?'
'.$products[$key]['location'].'': '').' |
@@ -476,7 +483,7 @@ if(($id_order = (int) Tools::getValue('id_order'))
';
if ($products[$key]['id_shipping'] != 2
- || ($products[$key]['id_shipping'] == 2 && ($profile == 1 || $profile == 7))
+ || ($products[$key]['id_shipping'] == 2 && in_array((int)$profile, array(1,7)))
) {
if(isset($p['items_pack'])){
$html_products.='';
@@ -514,7 +521,7 @@ if(($id_order = (int) Tools::getValue('id_order'))
| |
';
if ($products[$key]['id_shipping'] != 2
- || ($products[$key]['id_shipping'] == 2 && ($profile == 1 || $profile == 7))
+ || ($products[$key]['id_shipping'] == 2 && in_array((int)$profile, array(1,7)))
) {
$html_products.='+-';
}
@@ -538,18 +545,18 @@ if(($id_order = (int) Tools::getValue('id_order'))
| '.$logs[$key]['product_supplier_reference'].' |
'.$logs[$key]['shipping_number'].' |
'.(($logs[$key]['carrier'] == "laposte" || $logs[$key]['carrier'] == "mondialrelay") ? $carrier_names[$logs[$key]['carrier']] : $logs[$key]['carrier']) .' |
- '.(((int) $profile == 1 || (int) $profile == 9 || (int) $profile == 7 || (int) $profile == 14)?
- (($logs[$key]['carrier'] == "laposte" || $logs[$key]['carrier'] == "mondialrelay") ?' | ': ' | '):' | ').'
- '.(((int) $profile == 1 || (int) $profile == 9 || (int) $profile == 7 || (int) $profile == 14)?
- (($logs[$key]['carrier'] == "laposte" || $logs[$key]['carrier'] == "mondialrelay") ?'",$logs[$key]['product_name']).'" data-weight="'.((float)$logs[$key]['weight']>0?(float)$logs[$key]['weight']:0.24).'" data-ref="'.$logs[$key]['product_reference'] .'" data-id_order="'.$order->id.'" data-carrier="'.$logs[$key]['carrier'].'" data-id_order_detail="'.$logs[$key]['id_order_detail'].'"> | ': ' | '):' | ').'
+ '.(( in_array((int)$profile, array(1,9,7,13,14)) ) ?
+ (($logs[$key]['carrier'] == "laposte" || $logs[$key]['carrier'] == "mondialrelay") ? ' | ': ' | '):' | ').'
+ '.(( in_array((int)$profile, array(1,9,7,13,14)) )?
+ (($logs[$key]['carrier'] == "laposte" || $logs[$key]['carrier'] == "mondialrelay") ? '",$logs[$key]['product_name']).'" data-weight="'.((float)$logs[$key]['weight']>0?(float)$logs[$key]['weight']:0.24).'" data-ref="'.$logs[$key]['product_reference'] .'" data-id_order="'.$order->id.'" data-carrier="'.$logs[$key]['carrier'].'" data-id_order_detail="'.$logs[$key]['id_order_detail'].'"> | ': ' | '):' | ').'
';
}
$html_form ='';
- if(
- (in_array($order->id_carrier, $laposte_carriers) || in_array($order->id_carrier, $mr_carriers))
- && in_array((int)($delivery_address->id_country), array(1, 2, 3, 6, 8, 10, 12, 13, 15, 17, 26, 40, 148, 245))
- ){
+ if((in_array($order->id_carrier, $laposte_carriers)
+ || in_array($order->id_carrier, $mr_carriers))
+ && in_array((int)($delivery_address->id_country),
+ array(1, 2, 3, 6, 8, 10, 12, 13, 15, 17, 26, 40, 148, 245)) ){
$html_form.=
'
@@ -571,13 +578,13 @@ if(($id_order = (int) Tools::getValue('id_order'))
';
echo json_encode(array(
- 'errors' => FALSE,
- 'html_detail' => (String)$html_detail,
- 'html_invoice_address' => (String)$html_invoice_address,
- 'html_delivery_address' => (String)$html_delivery_address,
- 'html_products' => (String)$html_products,
- 'html_logs' => (String)$html_logs,
- 'html_form' => (String)$html_form,
+ 'errors' => false,
+ 'html_detail' => (string)$html_detail,
+ 'html_invoice_address' => (string)$html_invoice_address,
+ 'html_delivery_address' => (string)$html_delivery_address,
+ 'html_products' => (string)$html_products,
+ 'html_logs' => (string)$html_logs,
+ 'html_form' => (string)$html_form,
'order' => $order,
'products' => $products,
'status' => $status['name'],
diff --git a/modules/ant_logistic/script.js b/modules/ant_logistic/script.js
index ee88e4ca..a8c3a03a 100644
--- a/modules/ant_logistic/script.js
+++ b/modules/ant_logistic/script.js
@@ -234,32 +234,32 @@ function checkEAN() {
clearTimeout(ean_timeout);
ean_timeout = setTimeout(function() {
var eanval = $("#eaninput").val();
- if(eanval != "") {
- var eanval_item = $("#button_form tbody tr").filter(function() {
- if($(this).attr("rel") != eanval) {
+ if (eanval != "") {
+ /* Select simple product */
+ var eanval_item = $("#button_form tbody tr").filter(function() {
+ if ($(this).attr("rel") != eanval) {
return $(this).attr("rel") == '0'+eanval;
}
return $(this).attr("rel") == eanval;
});
-
- if(eanval_item.length > 0) {
+ if (eanval_item.length > 0) {
$(eanval_item).each(function(id, el) {
var current_val = parseInt($(el).find(".shipped input").val());
var max_val = parseInt($(el).find(".toship strong").text());
- if(current_val < max_val) {
+ if (current_val < max_val) {
qtyUp($(el).find(".shipped a")[0], max_val);
} else {
var eanval_item_pack = $("#button_form tbody tr").filter(function() {
- if($(this).attr("rel") != eanval+'_pack') {
+ if ($(this).attr("rel") != eanval+'_pack') {
return $(this).attr("rel") == '0'+eanval+'_pack';
}
return $(this).attr("rel") == eanval+'_pack';
});
- if(eanval_item_pack.length > 0) {
+ if (eanval_item_pack.length > 0) {
$(eanval_item_pack).each(function(id_pack, el_pack) {
var current_val = parseInt($(el_pack).find(".shipped input").val());
var max_val = parseInt($(el_pack).find(".toship strong").text());
- if(current_val < max_val) {
+ if (current_val < max_val) {
qtyUp($(el_pack).find(".shipped a")[0], max_val);
} else {
confirm("Quantité à envoyer déjà atteinte pour ce produit");
@@ -270,18 +270,20 @@ function checkEAN() {
}
}
});
- } else {
+ }
+ /* Select pack product */
+ else {
var eanval_item_pack = $("#button_form tbody tr").filter(function() {
- if($(this).attr("rel") != eanval+'_pack') {
+ if ($(this).attr("rel") != eanval+'_pack') {
return $(this).attr("rel") == '0'+eanval+'_pack';
}
return $(this).attr("rel") == eanval+'_pack';
- });
- if(eanval_item_pack.length > 0) {
+ });
+ if (eanval_item_pack.length > 0) {
$(eanval_item_pack).each(function(id_pack, el_pack) {
var current_val = parseInt($(el_pack).find(".shipped input").val());
var max_val = parseInt($(el_pack).find(".toship strong").text());
- if(current_val < max_val) {
+ if (current_val < max_val) {
qtyUp($(el_pack).find(".shipped a")[0], max_val);
} else {
confirm("Quantité à envoyer déjà atteinte pour ce produit");
diff --git a/modules/logistics/AdminLogistics.php b/modules/logistics/AdminLogistics.php
index 7a69d321..89051286 100644
--- a/modules/logistics/AdminLogistics.php
+++ b/modules/logistics/AdminLogistics.php
@@ -1,22 +1,18 @@
publish(
Configuration::get('LOGISTICS_QUEUE_'.(int) $cookie->id_employee),
json_encode(array('data' => base64_encode(
- /*chr(2).'n'."\n" // Inch mode
- .chr(2).'O0100'."\n" // Start position
- .chr(2).'L'."\n"
- .'C0000'."\n"
- .'D11'."\n"
- .chr(2).'L'."\n"
- .$this->isoreplace($data)
- .'Q0001'."\n" // Number of labels to print
- .'E'."\n" // End*/
- $data
+ $data
)))
);
}
@@ -325,24 +312,12 @@ class AdminLogistics extends AdminTab
$logistics_carriers[$parcel_carrier]->addOrderHistory($result[1], $order, $products_sent);
}
} else {
- $this->html .= '
'.$this->l('An error happened during the label rendering').'
';
+ $this->_html .= '
'.$this->l('An error happened during the label rendering').'
';
}
}
- // elseif($parcel_carrier=='mondialrelay'
- // && (
- // ($id_order_detail = Tools::getValue('id_order_detail_reprint'))
- // && ($weight = Tools::getValue('weight_reprint'))
- // )
- // ){
- // $result = $logistics_carriers['mondialrelay']->_getRegisteredParcel(new Order($id_order), $id_order_detail, $products, $weight);
- // $render = $logistics_carriers['mondialrelay']->renderLabel(new Order($id_order), $weight, $result[1]);
- // $this->printLabel($render,true);
- // }
}
- //$this->printLabel($logistics_carriers['laposte']->renderLabel(new Order((int) $id_order), $weight, $reprint_number));
} elseif(Tools::isSubmit('submitTestLaposte')) {
$this->_html .= '
'.$this->l('Registration complete, label sent to printer').'
';
- //$this->printLabel($logistics_carriers['laposte']->renderLabel(new Order(23336), 0.24, '6A12345123451'));
$this->printLabel($logistics_carriers['laposte']->renderLabel(new Order(223001), 0.24, '6J12345123451'));
} elseif(Tools::isSubmit('submitTestExapaq')) {
$this->_html .= '
'.$this->l('Registration complete, label sent to printer').'
';
@@ -500,10 +475,6 @@ class AdminLogistics extends AdminTab
public function display() {
global $cookie, $logistics_carriers;
- /*if(!in_array($cookie->id_employee, array(1, 2, 3, 10, 68, 70, 89, 91))) {
- echo 'Fonctionnalité indisponible actuellement'; return;
- }*/
-
$unavailable_carriers = array();
foreach($logistics_carriers as $name => $class) {
diff --git a/modules/logistics/ajax.php b/modules/logistics/ajax.php
index ffe20b7a..c4b70cfa 100644
--- a/modules/logistics/ajax.php
+++ b/modules/logistics/ajax.php
@@ -1,5 +1,5 @@
'SO à domicile',
@@ -42,8 +42,9 @@ function stripaccents($str) {
$mr_carriers = array_map('intval',explode(',', Configuration::get('ANT_CARRIERS_MR')));
if(($id_order = (int) Tools::getValue('id_order'))
-&& (Tools::getValue('token') === Tools::getAdminToken('AdminLogistics'.(int) Tab::getIdFromClassName('AdminLogistics').(int) Tools::getValue('id_employee')))) {
- $order = new Order($id_order);
+ && (Tools::getValue('token') === Tools::getAdminToken('AdminLogistics'.(int) Tab::getIdFromClassName('AdminLogistics').(int) Tools::getValue('id_employee')))) {
+
+ $order = new Order($id_order);
if(Validate::isLoadedObject($order)) {
$customer = Db::getInstance()->getRow('
@@ -68,9 +69,7 @@ if(($id_order = (int) Tools::getValue('id_order'))
AND cl.`id_lang` = 2
');
} elseif(in_array((int) $order->id_carrier, $mr_carriers)) {
- /**
- * @Override MondialRelay
- */
+ // MondialRelay
$delivery_infos_mr = Db::getInstance()->getRow('
SELECT mr_s.*, mr_m.*, cl.`name` AS `country_name`
FROM `'._DB_PREFIX_.'mr_selected` mr_s
@@ -88,7 +87,6 @@ if(($id_order = (int) Tools::getValue('id_order'))
WHERE s.`id_cart` = '.(int) $order->id_cart.'
');
}
- // $delivery_infos_laposte = FALSE;
}
$delivery_infos_exapaq = Db::getInstance()->getRow('
@@ -387,7 +385,7 @@ if(($id_order = (int) Tools::getValue('id_order'))
);
echo json_encode(array(
- 'errors' => FALSE,
+ 'errors' => false,
'order' => $order,
'products' => $products,
'status' => $status['name'],