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

// Fix admin carriers multishop bug #PSCFV-2380

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15397 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2012-05-18 15:44:46 +00:00
parent de2aedaa89
commit b635abaf30
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminCarriersController.php
+2 -2
View File
@@ -177,7 +177,7 @@ class AdminCarriersControllerCore extends AdminController
</ul>'
);
$this->_select = 'b.*';
$this->_join = 'LEFT JOIN `'._DB_PREFIX_.'carrier_lang` b ON a.id_carrier = b.id_carrier
$this->_join = 'LEFT JOIN `'._DB_PREFIX_.'carrier_lang` b ON a.id_carrier = b.id_carrier'.Shop::addSqlRestrictionOnLang('b').'
LEFT JOIN `'._DB_PREFIX_.'carrier_tax_rules_group_shop` ctrgs ON (a.`id_carrier` = ctrgs.`id_carrier`
AND ctrgs.id_shop='.(int)$this->context->shop->id.')';
$this->_where = 'AND b.id_lang = '.$this->context->language->id;
@@ -476,7 +476,7 @@ class AdminCarriersControllerCore extends AdminController
$new_carrier->position = $current_carrier->position;
if ($new_carrier->add())
{
$this->updateAssoShop($current_carrier->id, $new_carrier->id);
$this->updateAssoShop($new_carrier->id);
$new_carrier->copyCarrierData((int)$current_carrier->id);
$this->changeGroups($new_carrier->id);
// Call of hooks