// Fix carriers and product tax rules group import on shop creation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13876 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
1 parent
e5d681e3df
commit
27d177bd9c
1 file changed
+8
@@ -95,6 +95,8 @@ class ShopCore extends ObjectModel
|
|||||||
'webservice_account' => array('type' => 'shop'),
|
'webservice_account' => array('type' => 'shop'),
|
||||||
'warehouse' => array('type' => 'shop'),
|
'warehouse' => array('type' => 'shop'),
|
||||||
'stock_available' => array('type' => 'fk_shop'),
|
'stock_available' => array('type' => 'fk_shop'),
|
||||||
|
'product_tax_rules_group_shop' => array('type' => 'fk_shop'),
|
||||||
|
'carrier_tax_rules_group_shop' => array('type' => 'fk_shop'),
|
||||||
);
|
);
|
||||||
|
|
||||||
protected $webserviceParameters = array(
|
protected $webserviceParameters = array(
|
||||||
@@ -785,6 +787,12 @@ class ShopCore extends ObjectModel
|
|||||||
|
|
||||||
public function copyShopData($old_id, $tables_import = false, $deleted = false)
|
public function copyShopData($old_id, $tables_import = false, $deleted = false)
|
||||||
{
|
{
|
||||||
|
if (isset($tables_import['product']))
|
||||||
|
$tables_import['product_tax_rules_group_shop'] = true;
|
||||||
|
|
||||||
|
if (isset($tables_import['carrier']))
|
||||||
|
$tables_import['carrier_tax_rules_group_shop'] = true;
|
||||||
|
|
||||||
foreach (Shop::getAssoTables() as $table_name => $row)
|
foreach (Shop::getAssoTables() as $table_name => $row)
|
||||||
{
|
{
|
||||||
if ($tables_import && !isset($tables_import[$table_name]))
|
if ($tables_import && !isset($tables_import[$table_name]))
|
||||||
|
|||||||
Reference in new issue
Block a user