dinislage/PrestaShop
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] : FO : fixed bug #PSCFV-5811 Can't choose a carrier when using OPC with tab / smartphone

Browse Source
This commit is contained in:
vAugagneur committed 2012-11-23 15:32:16 +01:00
1 parent 89e207bc4e
commit 67be4309d2
2 files changed
+7 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

themes/default/mobile/js/opc.js
+3 -3
View File
@@ -82,7 +82,7 @@ function initEvent()
data: 'ajax=true&method=updateTOSStatusAndGetPayments&checked=' + checked + '&token=' + static_token, data: 'ajax=true&method=updateTOSStatusAndGetPayments&checked=' + checked + '&token=' + static_token,
success: function(json) success: function(json)
{ {
window.location.href = orderOpcUrl; window.location.href = orderOpcUrl+'#cgv_checkbox';
} }
}); });
}); });
@@ -102,7 +102,7 @@ function updateCarrierSection(elm)
var gift = 0; var gift = 0;
var giftMessage = ''; var giftMessage = '';
var delivery_option_radio = $('.delivery_option_radio'); var delivery_option_radio = $('.delivery_option_radio_carrier');
var delivery_option_params = '&'; var delivery_option_params = '&';
$.each(delivery_option_radio, function(i) { $.each(delivery_option_radio, function(i) {
if ($(this).prop('checked')) if ($(this).prop('checked'))
@@ -129,7 +129,7 @@ function updateCarrierSection(elm)
success: function(jsonData) success: function(jsonData)
{ {
if (!elm.is('#gift')) if (!elm.is('#gift'))
window.location.href = orderOpcUrl; window.location.href = orderOpcUrl+'#delivery_choose';
} }
}); });
} }
themes/default/mobile/order-opc-carrier.tpl
+4 -4
View File
@@ -26,14 +26,14 @@
{capture assign='page_title'}{l s='Shipping'}{/capture} {capture assign='page_title'}{l s='Shipping'}{/capture}
{include file='./page-title.tpl'} {include file='./page-title.tpl'}
<div data-role="content"> <div data-role="content" id="delivery_choose">
<h3 class="bg">{l s='Choose your delivery method'}</h3> <h3 class="bg">{l s='Choose your delivery method'}</h3>
<fieldset data-role="controlgroup"> <fieldset data-role="controlgroup">
{if isset($delivery_option_list)} {if isset($delivery_option_list)}
{foreach $delivery_option_list as $id_address => $option_list} {foreach $delivery_option_list as $id_address => $option_list}
{foreach $option_list as $key => $option} {foreach $option_list as $key => $option}
{foreach $option.carrier_list as $carrier} {foreach $option.carrier_list as $carrier}
<input type="radio" name="delivery_option[{$id_address}]" class="delivery_option_radio" id="opc_carrier_{$carrier.instance->id}" value="{$carrier.instance->id}" {if isset($delivery_option[$id_address]) && $delivery_option[$id_address] == $key}checked="checked"{/if} /> <input type="radio" name="delivery_option[{$id_address}]" class="delivery_option_radio delivery_option_radio_carrier" id="opc_carrier_{$carrier.instance->id}" value="{$carrier.instance->id}" {if isset($delivery_option[$id_address]) && $delivery_option[$id_address] == $key}checked="checked"{/if} />
<label for="opc_carrier_{$carrier.instance->id}">{$carrier.instance->name}</label> <label for="opc_carrier_{$carrier.instance->id}">{$carrier.instance->name}</label>
{/foreach} {/foreach}
{/foreach} {/foreach}
@@ -56,7 +56,7 @@
</p> </p>
<h3 class="bg">{l s='Terms of service'}</h3> <h3 class="bg">{l s='Terms of service'}</h3>
<fieldset data-role="fieldcontain"> <fieldset data-role="fieldcontain" id="cgv_checkbox">
<input type="checkbox" value="1" id="cgv" name="cgv" {if $checkedTOS}checked="checked"{/if} /> <input type="checkbox" value="1" id="cgv" name="cgv" {if $checkedTOS}checked="checked"{/if} />
<label for="cgv">{l s='I agree to the Terms of Service and will adhere to them unconditionally.'}</label> <label for="cgv">{l s='I agree to the Terms of Service and will adhere to them unconditionally.'}</label>
</fieldset> </fieldset>