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

// Fix default carrier selection on backoffice order

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14660 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rGaillard
2012-04-16 14:03:07 +00:00
parent 285becae29
commit 1e1970e13c
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/orders/form.tpl
+1 -1
View File
@@ -60,7 +60,7 @@
$('#id_lang').change(function() { $('#id_lang').change(function() {
updateLang(); updateLang();
}); });
$('#delivery_option,#carrier_recycled_package,#order_gift,#gift_message').change(function() { $('#delivery_option,#carrier_recycled_package,#order_gift,#gift_message,#id_address_delivery').change(function() {
updateDeliveryOption(); updateDeliveryOption();
}); });
$('#shipping_price').change(function() { $('#shipping_price').change(function() {
controllers/admin/AdminCartsController.php
+13 -1
View File
@@ -216,7 +216,7 @@ class AdminCartsControllerCore extends AdminController
$this->context->cart->id_address_delivery = $addresses[0]['id_address']; $this->context->cart->id_address_delivery = $addresses[0]['id_address'];
elseif ($id_address_delivery) elseif ($id_address_delivery)
$this->context->cart->id_address_delivery = (int)$id_address_delivery; $this->context->cart->id_address_delivery = (int)$id_address_delivery;
$this->context->cart->save(); $this->context->cart->save();
$currency = new Currency((int)$this->context->cart->id_currency); $currency = new Currency((int)$this->context->cart->id_currency);
$this->context->currency = $currency; $this->context->currency = $currency;
@@ -482,10 +482,12 @@ class AdminCartsControllerCore extends AdminController
if (!count($delivery_option_list)) if (!count($delivery_option_list))
return array(); return array();
$id_default_carrier = (int)Configuration::get('PS_CARRIER_DEFAULT');
foreach (current($delivery_option_list) as $key => $delivery_option) foreach (current($delivery_option_list) as $key => $delivery_option)
{ {
$name = ''; $name = '';
$first = true; $first = true;
$id_default_carrier_delivery = false;
foreach ($delivery_option['carrier_list'] as $carrier) foreach ($delivery_option['carrier_list'] as $carrier)
{ {
if (!$first) if (!$first)
@@ -497,6 +499,16 @@ class AdminCartsControllerCore extends AdminController
if ($delivery_option['unique_carrier']) if ($delivery_option['unique_carrier'])
$name .= ' - '.$carrier['instance']->delay[$this->context->employee->id_lang]; $name .= ' - '.$carrier['instance']->delay[$this->context->employee->id_lang];
if (!$id_default_carrier_delivery)
$id_default_carrier_delivery = (int)$carrier['instance']->id;
if ($carrier['instance']->id == $id_default_carrier)
$id_default_carrier_delivery = $id_default_carrier;
if (!$this->context->cart->id_carrier)
{
$this->context->cart->setDeliveryOption(array($this->context->cart->id_address_delivery => (int)$carrier['instance']->id.','));
$this->context->cart->save();
}
} }
$delivery_option_list_formated[] = array('name' => $name, 'key' => $key); $delivery_option_list_formated[] = array('name' => $name, 'key' => $key);
} }