Merge branch 'ticket-modifAddress' into develop

modules/cheque/cheque.php

@@ -174,7 +174,7 @@ class Cheque extends PaymentModule
 
 	public function hookPayment($params)
 	{
-		if($_SERVER['REMOTE_ADDR'] == '109.190.18.166' || $_SERVER['REMOTE_ADDR'] == '88.163.25.248' || $_SERVER['REMOTE_ADDR'] == '90.55.156.233' || $_SERVER['REMOTE_ADDR'] == '86.217.193.9' || $_SERVER['REMOTE_ADDR'] == '86.199.91.29' || $_SERVER['REMOTE_ADDR'] == '109.190.53.175') {
+		if($_SERVER['REMOTE_ADDR'] == '90.63.178.63' || $_SERVER['REMOTE_ADDR'] == '88.163.22.99' || $_SERVER['REMOTE_ADDR'] == '109.190.18.166' || $_SERVER['REMOTE_ADDR'] == '88.163.25.248' || $_SERVER['REMOTE_ADDR'] == '90.55.156.233' || $_SERVER['REMOTE_ADDR'] == '86.217.193.9' || $_SERVER['REMOTE_ADDR'] == '86.199.91.29' || $_SERVER['REMOTE_ADDR'] == '109.190.53.175') {
 		if (!$this->active)
 			return ;
 		if (!$this->_checkCurrency($params['cart']))

override/controllers/ParentOrderController.php

@@ -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) ){