Merge branch 'ticket-newEan' into develop
This commit is contained in:
commit
6a2b2199de
@ -15,7 +15,7 @@ if((Tools::getValue('token') === Tools::getAdminToken('AdminEANManager'.(int) Ta
|
|||||||
exit;
|
exit;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!Validate::isEan13($value)) {
|
if(!Validate::isReference($value)) {
|
||||||
echo json_encode(array('result' => 'FORMAT'));
|
echo json_encode(array('result' => 'FORMAT'));
|
||||||
exit;
|
exit;
|
||||||
}
|
}
|
||||||
|
@ -391,8 +391,8 @@ class AdminPrivateSalesSales extends AdminTab {
|
|||||||
WHERE c.`deleted` != 1
|
WHERE c.`deleted` != 1
|
||||||
');
|
');
|
||||||
|
|
||||||
// $carriers_default = array(22, 87, 88, 89); // prod
|
$carriers_default = array(22, 87, 88, 89); // prod
|
||||||
$carriers_default = array(22, 46, 47, 48); // dev
|
// $carriers_default = array(22, 46, 47, 48); // dev
|
||||||
|
|
||||||
echo '<label>'.$this->l('Carriers:').'</label>
|
echo '<label>'.$this->l('Carriers:').'</label>
|
||||||
<div class="margin-form">
|
<div class="margin-form">
|
||||||
|
@ -165,8 +165,8 @@ class ParentOrderController extends ParentOrderControllerCore {
|
|||||||
$carriers_ah = array();
|
$carriers_ah = array();
|
||||||
$carriers_ooh = array();
|
$carriers_ooh = array();
|
||||||
if(_THEME_NAME_ != "site_mobile") {
|
if(_THEME_NAME_ != "site_mobile") {
|
||||||
// $config_carrier_ooh = array(88,89); // prod
|
$config_carrier_ooh = array(88,89); // prod
|
||||||
$config_carrier_ooh = array(47,48); // dev
|
// $config_carrier_ooh = array(47,48); // dev
|
||||||
// $config_carrier_ooh = array(40,45); // local
|
// $config_carrier_ooh = array(40,45); // local
|
||||||
foreach ($carriers as $carrier) {
|
foreach ($carriers as $carrier) {
|
||||||
if (in_array($carrier['id_carrier'], $config_carrier_ooh) ){
|
if (in_array($carrier['id_carrier'], $config_carrier_ooh) ){
|
||||||
|
Loading…
Reference in New Issue
Block a user