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

Solve conflit with soflexibilite

Browse Source
This commit is contained in:
Michael RICOIS 2017-09-27 14:44:25 +02:00
parent 28f6685178
commit 8b4764918a
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
modules/mondialrelay/js/mondialrelay_widget.js
View File

@ -74,14 +74,16 @@
}; };
// Handle input click of the other input to hide the previous relay point list displayed // Handle input click of the other input to hide the previous relay point list displayed
$('input[name=id_carrier], input.delivery_option_radio').click(function(e){ $('input[name=id_carrier], input.delivery_option_radio').click(function(e){
// Only make action on carrier ID 236
if ( e.isPropagationStopped() ) { if ($(this).data('key') == '236,') {
return false; if ( e.isPropagationStopped() ) {
return false;
}
refreshDeliveryOptions();
overrideUpdateExtraCarrier($(this).val(), id_address);
hideRelaySelectedBox($(this));
e.stopPropagation();
} }
// refreshDeliveryOptions();
overrideUpdateExtraCarrier($(this).val(), id_address);
hideRelaySelectedBox($(this));
e.stopPropagation();
}); });
// 1.5 OPC Validation - Warn user to select a relay point // 1.5 OPC Validation - Warn user to select a relay point

4
modules/mondialrelay/views/templates/front/header_widget.tpl
View File

@ -24,8 +24,8 @@
* International Registered Trademark & Property of PrestaShop SA * International Registered Trademark & Property of PrestaShop SA
*} *}
<!--On charge Google Map API--> <!--On charge Google Map API-->
<script type="text/javascript" src="https://maps.googleapis.com/maps/api/js?sensor=false"></script> <!-- <script type="text/javascript" src="https://maps.googleapis.com/maps/api/js?sensor=false"></script> -->
<!--On charge le widget mondial relay depuis leurs serveurs--> <!--On charge le widget mondial relay depuis leurs serveurs-->
<script type="text/javascript" src="{$new_base_dir|escape:'htmlall':'UTF-8'}js/jquery.plugin.mondialrelay.parcelshoppicker.2.0.0.js"></script> <script type="text/javascript" src="{$new_base_dir|escape:'htmlall':'UTF-8'}js/jquery.plugin.mondialrelay.parcelshoppicker.2.0.0.js"></script>
<script type="text/javascript" src="{$new_base_dir|escape:'htmlall':'UTF-8'}js/mondialrelay_widget.js"></script> <script type="text/javascript" src="{$new_base_dir|escape:'htmlall':'UTF-8'}js/mondialrelay_widget.js"></script>