fix conflict css

modules/soflexibilite/soflexibilite.php

@@ -1739,10 +1739,10 @@ class soflexibilite extends CarrierModule
 //            // car prestashop excluait les transporteurs socolissmo dans sa fonction getPackageShippingCost (//get external shipping cost from module) étant donné que le module retournait false.
 ////            return (false);
 //        }
-        if ($this->isOnlyExpendable($this->context->cart)) {
+        /*if ($this->isOnlyExpendable($this->context->cart)) {
             $shipping_cost = 5;
             return $shipping_cost;
-        }
+        }*/
 
         return ((float)$shipping_cost);
     }

override/classes/Cart.php

@@ -376,7 +376,7 @@ class Cart extends CartCore {
 			$cpt_sales = count($sales);
 
 			// si consommables forcer à 5euros
-			if ($cpt_sales==1) {
+			/*if ($cpt_sales==1) {
 				foreach ($sales as $key => $sale) {
 					if ((int) $sale['id_sale'] == (int) _SHOP_PRIVATESALES_CONSUMABLE) {
 						$sale = new Sale((int)$sale['id_sale']);
@@ -391,7 +391,7 @@ class Cart extends CartCore {
 						unset($sale_carriers);
 					}
 				}
-			}
+			}*/
 
 			// Surcout transporteur classique
 			// if ($carrier->id == 33

override/controllers/ParentOrderController.php

@@ -100,7 +100,7 @@ class ParentOrderController extends ParentOrderControllerCore {
 								break;
 
 							} elseif (count($_sales)==1) {
-								$carrier_shipping_cost = 5;
+								// $carrier_shipping_cost = 5;
 							}
 						}
 					}
@@ -164,9 +164,9 @@ class ParentOrderController extends ParentOrderControllerCore {
 					// distinction "at home" et "out of home"
                     $carriers_ah = 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 
 	                    foreach ($carriers as $carrier) {
 	                        if (in_array($carrier['id_carrier'], $config_carrier_ooh) ){
@@ -177,7 +177,7 @@ class ParentOrderController extends ParentOrderControllerCore {
 	                    }
 	                    unset($carriers);
 	                    $carriers = $carriers_ah;
-	                }
+	                //}
                 }
             }
         }

themes/site/css/style.css

@@ -6217,6 +6217,20 @@ table#carrierTable tbody td {
   color: #fff;
 }
 
+.soflexibiliteStar{
+  color: #e26ea2!important;
+}
+#adresseFinal .so-prez-libelle{
+  color: #514c8c!important;
+}
+#custMail, #sl_phone {
+    min-height: 20px!important;
+    font-size: 14px!important;
+}
+#soflexibilite_speech{
+  display: none!important
+}
+
 
 @keyframes slideInDown {
   0% {

themes/site_mobile/css/style.css

@@ -4473,6 +4473,7 @@ body#index .jqibuttons span.gradient{
 	font-size: 13px;
 	background: #504d8b;
 }
+
 #cookiescontent { padding: 10px; font-size: 12px; }
 
 /** Module loyalty **/
@@ -4625,3 +4626,80 @@ h4.subtitle {
 .table_skin {}
 .table_skin td { font-size: 12px; }
 .table_skin a { color: #666666 }
+
+body#order #form {
+    overflow-y: initial;
+}
+body#order table#carrierTable tr td {
+    height: 45px;
+}
+body#order table#carrierTable, 
+body#order table#carrierTable thead, 
+body#order table#carrierTable tfoot, 
+body#order table#carrierTable tbody {
+    width: 100%;
+    padding: 0px;
+    margin: 0px;
+}
+body#order table#carrierTable tbody tr {
+    background: #fff;
+    font-size: 12px;
+    border: none;
+}
+body#order table#carrierTable thead tr th{
+	color: #ffffff; 
+	background: #565485; 
+	padding: 5px 10px; 
+	font-size: 12px;
+}
+body#order table#carrierTable thead tr th.carrier_price{
+	text-align: right;
+}
+body#order table#carrierTable tbody tr td.carrier_name div {
+    padding: 0px 10px 10px 10px;
+}
+body#order table#carrierTable tbody tr td.carrier_action.radio {
+    min-width: 20px;
+    width: 20px;
+    max-width: 20px;
+    margin: 0px;
+    padding: 0px;
+    text-align: center;
+}
+body#order table#carrierTable tbody tr td.carrier_name {
+    width: 70%;
+    padding: 0px;
+    text-align: left;
+    font-size: 11px;
+}
+body#order table#carrierTable tbody tr td.carrier_infos {
+	width: 40%;
+}
+body#order table#carrierTable tbody tr td.carrier_infos span.price {
+    font-weight: bold;
+    margin-right: 5px;
+    font-size: 14px;
+    text-align: right;
+}
+
+#soflexibilite_description_address {
+    padding: 10px 0;
+}
+.soflexibiliteStar{
+	color: #e26ea2!important;
+}
+#table_so_info tr td{
+	font-size: 12px!important;
+}
+#adresseFinal .so-prez-libelle{
+	color: #514c8c!important;
+    line-height: 1.5em!important;
+    font-size: 12px!important;
+}
+#picFinalColissimo{
+	display: none!important;
+}
+#soflexibilite_speech{
+  display: none!important
+}
+

themes/site_mobile/order-carrier.tpl

@@ -120,14 +120,14 @@
 	{/if}
 	<p class="warning" id="noCarrierWarning" {if isset($carriers) && $carriers && count($carriers)}style="display:none;"{/if}>{l s='There are no carriers available that deliver to this address.'}</p>
 	<table id="carrierTable" class="std" {if !isset($carriers) || !$carriers || !count($carriers)}style="display:none;"{/if}>
-		{*<thead>
+		<thead>
 			<tr>
-				<th class="carrier_action first_item"></th>
+				<th class="carrier_action first_item" colspan="2">{l s='At home'}</th>
-				<th class="carrier_name item">{l s='Carrier'}</th>
+				{*<th class="carrier_name item">{l s='Carrier'}</th>
-				<th class="carrier_infos item">{l s='Information'}</th>
+				<th class="carrier_infos item">{l s='Information'}</th>*}
 				<th class="carrier_price last_item">{l s='Price'}</th>
 			</tr>
-		</thead>*}
+		</thead>
 		<tbody>
 		{if isset($carriers)}
 			{foreach from=$carriers item=carrier name=myLoop}
@@ -135,13 +135,13 @@
 					<td class="carrier_action radio">
 						<input type="radio" name="id_carrier" value="{$carrier.id_carrier|intval}" id="id_carrier{$carrier.id_carrier|intval}"  {if $opc}onclick="updateCarrierSelectionAndGift();"{/if} {if !($carrier.is_module AND $opc AND !$isLogged)}{if $carrier.id_carrier == $checked}checked="checked"{/if}{else}disabled="disabled"{/if} />
 					</td>
-					<td class="carrier_name">
+					{*<td class="carrier_name">
 						<label for="id_carrier{$carrier.id_carrier|intval}">
 							{if $carrier.img}<img src="{$carrier.img|escape:'htmlall':'UTF-8'}" alt="{$carrier.name|escape:'htmlall':'UTF-8'}" />{else}{$carrier.name|escape:'htmlall':'UTF-8'}{/if}
 						</label>
-					</td>
+					</td>*}
+					<td class="carrier_name"><div>{$carrier.delay|escape:'htmlall':'UTF-8'}</div></td>
 					<td class="carrier_infos">
-						{$carrier.delay|escape:'htmlall':'UTF-8'}
 						<span class="price">
 							{if $carrier.price}
 								{if $priceDisplay == 1}
@@ -168,6 +168,51 @@
 			<tr id="HOOK_EXTRACARRIER">{$HOOK_EXTRACARRIER}</tr>
 		{/if}
 		</tbody>
+		{if count($carriers_ooh) > 0}
+		<thead style="display: table-header-group; border-top: 20px solid #f1f1f1;">
+			<tr>
+				<th class="carrier_action first_item" colspan="2" >{l s='At a relay point'}</th>
+				<th class="carrier_price last_item" >{l s='Price'}</th>
+			</tr>
+		</thead>
+		<tbody>
+			{foreach from=$carriers_ooh item=carrier name=myLoop}
+				<tr class="{if $smarty.foreach.myLoop.first}first_item{elseif $smarty.foreach.myLoop.last}last_item{/if} {if $smarty.foreach.myLoop.index % 2}alternate_item{else}item{/if}">
+					<td class="carrier_action radio">
+						<input type="radio" name="id_carrier" value="{$carrier.id_carrier|intval}" id="id_carrier{$carrier.id_carrier|intval}"  {if $opc}onclick="updateCarrierSelectionAndGift();"{/if} {if !($carrier.is_module AND $opc AND !$isLogged)}{if $carrier.id_carrier == $checked}checked="checked"{/if}{else}disabled="disabled"{/if} />
+					</td>
+					{*<td class="carrier_name">
+						<label for="id_carrier{$carrier.id_carrier|intval}">
+							{if $carrier.img}<img src="{$carrier.img|escape:'htmlall':'UTF-8'}" alt="{$carrier.name|escape:'htmlall':'UTF-8'}" />{else}{$carrier.name|escape:'htmlall':'UTF-8'}{/if}
+						</label>
+					</td>*}
+					<td class="carrier_name"><div>{$carrier.delay|escape:'htmlall':'UTF-8'}</div></td>
+					<td class="carrier_infos">
+						<span class="price">
+							{if $carrier.price}
+								{if $priceDisplay == 1}
+									{convertPrice price=$carrier.price_tax_exc}
+								{else}
+									{convertPrice price=$carrier.price}
+								{/if}
+								{if $use_taxes}
+									<span class="taxes">
+									{if $priceDisplay == 1}
+										{l s='(tax excl.)'}
+									{else}
+										{l s='(tax incl.)'}
+									{/if}
+									</span>
+								{/if}
+							{else}
+								{l s='Free!'}
+							{/if}
+						</span>
+					</td>
+				</tr>
+			{/foreach}
+		</tbody>
+		{/if}
 	</table>
 	<div style="display: none;" id="extra_carrier"></div>