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

Merge branch 'ticket-filterOrders' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2016-05-13 10:41:38 +02:00
commit e7a93aa24e
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
adm/tabs/AdminOrders.php
View File

@ -83,6 +83,13 @@ class AdminOrders extends AdminTab
'id_country' => array('title' => $this->l('Pays'), 'callback' => 'printCountry', 'orderby' => false, 'type' => 'select', 'select' => $country_array, 'filter_key' => 'x!id_country', 'filter_type' => 'int', 'width' => 35,), 'id_country' => array('title' => $this->l('Pays'), 'callback' => 'printCountry', 'orderby' => false, 'type' => 'select', 'select' => $country_array, 'filter_key' => 'x!id_country', 'filter_type' => 'int', 'width' => 35,),
); );
parent::__construct(); parent::__construct();
if(!isset($_POST['submitFilter']) && !isset($_POST['orderFilter_a!date_add'])) {
$_POST['orderFilter_a!date_add'][0] = date('Y-m-d');
$_POST['orderFilter_a!date_add'][1] = date('Y-m-d');
$_POST['submitFilter'] = 1;
$_POST['submitFilterorder'] = 1;
}
} }
/** /**

13
override/classes/Cart.php
View File

@ -398,13 +398,14 @@ class Cart extends CartCore {
// || $carrier->id == 24 // || $carrier->id == 24
// || $carrier->id == 37 // || $carrier->id == 37
// || $carrier->id == 45) { // || $carrier->id == 45) {
// if ($carrier->id == 28 // if ($carrier->id == 28
// || $carrier->id == 24 // || $carrier->id == 24
// || $carrier->id == 27) // || $carrier->id == 27)
if ($carrier->id == 45 // if ($carrier->id == 45
|| $carrier->id == 46 // || $carrier->id == 46
|| $carrier->id == 47 // || $carrier->id == 47
|| $carrier->id == 48) { // || $carrier->id == 48) {
if($cpt_sales == 2) { if($cpt_sales == 2) {
$shipping_cost += (float) Configuration::get('PS_SHIPPING_HANDLING_PS_1'); $shipping_cost += (float) Configuration::get('PS_SHIPPING_HANDLING_PS_1');
@ -417,7 +418,7 @@ class Cart extends CartCore {
} elseif($cpt_sales >= 6) { } elseif($cpt_sales >= 6) {
$shipping_cost += (float) Configuration::get('PS_SHIPPING_HANDLING_PS_4'); $shipping_cost += (float) Configuration::get('PS_SHIPPING_HANDLING_PS_4');
} }
} // }
} }
@ -458,7 +459,7 @@ class Cart extends CartCore {
// ajout du surcout // ajout du surcout
// $socolissimo_carriers = array(45, 33, 37, 22); // $socolissimo_carriers = array(45, 33, 37, 22);
// $socolissimo_carriers = array(24, 27, 28, 22); // $socolissimo_carriers = array(24, 27, 28, 22);
$socolissimo_carriers = array(45, 46, 47, 48, 22); $socolissimo_carriers = array(87, 88, 89, 22);
$socolissimo_found = false; $socolissimo_found = false;
foreach ($_carriers as $key => $carrier_to_add) { foreach ($_carriers as $key => $carrier_to_add) {
if (in_array($carrier_to_add, $socolissimo_carriers) ) { if (in_array($carrier_to_add, $socolissimo_carriers) ) {