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

// BugFix : Problem with delivery otion and opc when user is not connected

Browse Source
This commit is contained in:
mDeflotte
2011-12-13 17:01:40 +00:00
parent d1c9c439fd
commit 41eddbf8f8
5 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/front/ParentOrderController.php
+5
View File
@@ -438,6 +438,11 @@ class ParentOrderControllerCore extends FrontController
'conditions' => (int)(Configuration::get('PS_CONDITIONS')), 'conditions' => (int)(Configuration::get('PS_CONDITIONS')),
'link_conditions' => $this->link_conditions, 'link_conditions' => $this->link_conditions,
'recyclable' => (int)($this->context->cart->recyclable), 'recyclable' => (int)($this->context->cart->recyclable),
'delivery_option_list' => $this->context->cart->getDeliveryOptionList(),
'carriers' => $this->context->cart->simulateCarriersOutput(),
'checked' => $this->context->cart->simulateCarrierSelectedOutput(),
'address_collection' => $this->context->cart->getAddressCollection(),
'delivery_option' => $this->context->cart->getDeliveryOption(),
'gift_wrapping_price' => (float)(Configuration::get('PS_GIFT_WRAPPING_PRICE')), 'gift_wrapping_price' => (float)(Configuration::get('PS_GIFT_WRAPPING_PRICE')),
'total_wrapping_cost' => Tools::convertPrice($wrapping_fees_tax_inc, $this->context->currency), 'total_wrapping_cost' => Tools::convertPrice($wrapping_fees_tax_inc, $this->context->currency),
'total_wrapping_tax_exc_cost' => Tools::convertPrice($wrapping_fees, $this->context->currency))); 'total_wrapping_tax_exc_cost' => Tools::convertPrice($wrapping_fees, $this->context->currency)));
themes/default/js/cart-summary.js
+9 -5
View File
@@ -615,17 +615,21 @@ function updateHookShoppingCartExtra(html)
{ {
$('#HOOK_SHOPPING_CART_EXTRA').html(html); $('#HOOK_SHOPPING_CART_EXTRA').html(html);
} }
$(document).ready(function() { function refreshDeliveryOptions()
{
$.each($('.delivery_option_radio'), function() { $.each($('.delivery_option_radio'), function() {
if ($(this).attr('checked')) if ($(this).attr('checked'))
$(this).parent().find('.delivery_option_carrier').show(); $(this).parent().find('.delivery_option_carrier').show();
else else
$(this).parent().find('.delivery_option_carrier').hide(); $(this).parent().find('.delivery_option_carrier').hide();
}); });
$('.delivery_option_radio').change(function() { }
$(this).parent().parent().find('.delivery_option_carrier').hide(); $(document).ready(function() {
$(this).parent().find('.delivery_option_carrier').show();
refreshDeliveryOptions();
$('.delivery_option_radio').live('change', function() {
refreshDeliveryOptions();
}); });
$('#allow_seperated_package').live('click', function() { $('#allow_seperated_package').live('click', function() {
themes/default/js/order-opc.js
+3 -1
View File
@@ -130,7 +130,8 @@ function updateCarrierSelectionAndGift()
var delivery_option_radio = $('.delivery_option_radio'); var delivery_option_radio = $('.delivery_option_radio');
var delivery_option_params = '&'; var delivery_option_params = '&';
$.each(delivery_option_radio, function(i) { $.each(delivery_option_radio, function(i) {
delivery_option_params += $(delivery_option_radio[i]).attr('name') + '=' + $(delivery_option_radio[i]).val() + '&'; if ($(this).attr('checked'))
delivery_option_params += $(delivery_option_radio[i]).attr('name') + '=' + $(delivery_option_radio[i]).val() + '&';
}); });
if (delivery_option_params == '&') if (delivery_option_params == '&')
delivery_option_params = '&delivery_option=&' delivery_option_params = '&delivery_option=&'
@@ -172,6 +173,7 @@ function updateCarrierSelectionAndGift()
updateCarrierList(jsonData.carrier_data); updateCarrierList(jsonData.carrier_data);
$('#opc_payment_methods-overlay').fadeOut('slow'); $('#opc_payment_methods-overlay').fadeOut('slow');
$('#opc_delivery_methods-overlay').fadeOut('slow'); $('#opc_delivery_methods-overlay').fadeOut('slow');
refreshDeliveryOptions();
} }
}, },
error: function(XMLHttpRequest, textStatus, errorThrown) { error: function(XMLHttpRequest, textStatus, errorThrown) {
themes/default/order-carrier.tpl
+6 -1
View File
@@ -108,7 +108,12 @@
<div class="delivery_options_address"> <div class="delivery_options_address">
{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}
<h3>{$address_collection[$id_address]->alias}</h3> <h3>
{if isset($address_collection[$id_address])}
{$address_collection[$id_address]->alias}
{else}
{/if}
</h3>
<div class="delivery_options"> <div class="delivery_options">
{foreach $option_list as $key => $option} {foreach $option_list as $key => $option}
<div class="delivery_option {if ($option@index % 2)}alternate_{/if}item"> <div class="delivery_option {if ($option@index % 2)}alternate_{/if}item">
themes/default/order-opc-new-account.tpl
+1 -1
View File
@@ -35,7 +35,7 @@
</div> </div>
<div style="margin-left:40px;margin-bottom:5px;float:left;width:40%;"> <div style="margin-left:40px;margin-bottom:5px;float:left;width:40%;">
<label for="passwd">{l s='Password'}</label> <label for="passwd">{l s='Password'}</label>
<span><input type="password" id="passwd" name="passwd" /></span> <span><input type="password" id="login_passwd" name="passwd" /></span>
</div> </div>
<p class="submit"> <p class="submit">
{if isset($back)}<input type="hidden" class="hidden" name="back" value="{$back|escape:'htmlall':'UTF-8'}" />{/if} {if isset($back)}<input type="hidden" class="hidden" name="back" value="{$back|escape:'htmlall':'UTF-8'}" />{/if}