antadis/bebeboutik
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'ticket-newEan' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2016-05-13 16:14:05 +02:00
commit 6a2b2199de
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/eanmanager/ajax.php
View File

@ -15,7 +15,7 @@ if((Tools::getValue('token') === Tools::getAdminToken('AdminEANManager'.(int) Ta
exit;
}
if(!Validate::isEan13($value)) {
if(!Validate::isReference($value)) {
echo json_encode(array('result' => 'FORMAT'));
exit;
}

4
modules/privatesales/AdminPrivateSalesSales.php
View File

@ -391,8 +391,8 @@ class AdminPrivateSalesSales extends AdminTab {
WHERE c.`deleted` != 1
');
// $carriers_default = array(22, 87, 88, 89); // prod
$carriers_default = array(22, 46, 47, 48); // dev
$carriers_default = array(22, 87, 88, 89); // prod
// $carriers_default = array(22, 46, 47, 48); // dev
echo '<label>'.$this->l('Carriers:').'</label>
<div class="margin-form">

4
override/controllers/ParentOrderController.php
View File

@ -165,8 +165,8 @@ class ParentOrderController extends ParentOrderControllerCore {
$carriers_ah = array();
$carriers_ooh = array();
if(_THEME_NAME_ != "site_mobile") {
// $config_carrier_ooh = array(88,89); // prod
$config_carrier_ooh = array(47,48); // dev
$config_carrier_ooh = array(88,89); // prod
// $config_carrier_ooh = array(47,48); // dev
// $config_carrier_ooh = array(40,45); // local
foreach ($carriers as $carrier) {
if (in_array($carrier['id_carrier'], $config_carrier_ooh) ){