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

// forgot someting

Browse Source
This commit is contained in:
Rémi Gaillard
2013-07-17 12:06:50 +02:00
parent b41c724e97
commit eaa9ae95bf
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Carrier.php
+3 -4
View File
@@ -469,12 +469,11 @@ class CarrierCore extends ObjectModel
return Db::getInstance()->getValue(' return Db::getInstance()->getValue('
SELECT id_tax_rules_group SELECT id_tax_rules_group
FROM ( FROM (
SELECT COUNT(*) n, carrier_shop.id_tax_rules_group SELECT COUNT(*) n, c.id_tax_rules_group
FROM '._DB_PREFIX_.'carrier c FROM '._DB_PREFIX_.'carrier c
'.Shop::addSqlAssociation('carrier', 'c').' JOIN '._DB_PREFIX_.'tax_rules_group trg ON (c.id_tax_rules_group = trg.id_tax_rules_group)
JOIN '._DB_PREFIX_.'tax_rules_group trg ON (carrier_shop.id_tax_rules_group = trg.id_tax_rules_group)
WHERE trg.active = 1 WHERE trg.active = 1
GROUP BY carrier.id_tax_rules_group GROUP BY c.id_tax_rules_group
ORDER BY n DESC ORDER BY n DESC
LIMIT 1 LIMIT 1
) most_used' ) most_used'
controllers/admin/AdminCarrierWizardController.php
+3 -1
View File
@@ -472,9 +472,11 @@ class AdminCarrierWizardControllerCore extends AdminController
public function getStepThreeFieldsValues($carrier) public function getStepThreeFieldsValues($carrier)
{ {
$id_tax_rules_group = (is_object($this->object) && !$this->object->id) ? Carrier::getIdTaxRulesGroupMostUsed() : $this->getFieldValue($carrier, 'id_tax_rules_group');
return array( return array(
'is_free' => $this->getFieldValue($carrier, 'is_free'), 'is_free' => $this->getFieldValue($carrier, 'is_free'),
'id_tax_rules_group' => $this->getFieldValue($carrier, 'id_tax_rules_group'), 'id_tax_rules_group' => (int)$id_tax_rules_group,
'shipping_handling' => $this->getFieldValue($carrier, 'shipping_handling'), 'shipping_handling' => $this->getFieldValue($carrier, 'shipping_handling'),
'shipping_method' => $this->getFieldValue($carrier, 'shipping_method'), 'shipping_method' => $this->getFieldValue($carrier, 'shipping_method'),
'range_behavior' => $this->getFieldValue($carrier, 'range_behavior'), 'range_behavior' => $this->getFieldValue($carrier, 'range_behavior'),