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

//revert reorganization of shipping menus & options

Browse Source
This commit is contained in:
Vincent Augagneur
2013-08-12 15:15:17 +02:00
parent 136586830d
commit bae9df61dc
2 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
install-dev/data/xml/tab.xml
View File

@@ -42,6 +42,9 @@
<tab id="Price_Rules" id_parent="" active="1">
<class_name>AdminPriceRule</class_name>
</tab>
<tab id="Shipping" id_parent="" active="1">
<class_name>AdminParentShipping</class_name>
</tab>
<tab id="Localization" id_parent="" active="1">
<class_name>AdminParentLocalization</class_name>
</tab>
@@ -147,6 +150,15 @@
<tab id="Marketing" id_parent="Price_Rules" active="1">
<class_name>AdminMarketing</class_name>
</tab>
<tab id="Shipping_1" id_parent="Shipping" active="1">
<class_name>AdminShipping</class_name>
</tab>
<tab id="Carriers" id_parent="Shipping" active="1">
<class_name>AdminCarriers</class_name>
</tab>
<tab id="CarrierWizard" id_parent="Shipping" active="1">
<class_name>AdminCarrierWizard</class_name>
</tab>
<tab id="Localization_1" id_parent="Localization" active="1">
<class_name>AdminLocalization</class_name>
</tab>
@@ -186,12 +198,6 @@
<tab id="Payment" id_parent="Modules" active="1">
<class_name>AdminPayment</class_name>
</tab>
<tab id="Carriers" id_parent="Modules" active="1">
<class_name>AdminCarriers</class_name>
</tab>
<tab id="CarrierWizard_1" id_parent="Modules" active="1">
<class_name>AdminCarrierWizard</class_name>
</tab>
<tab id="General" id_parent="Preferences" active="1">
<class_name>AdminPreferences</class_name>
</tab>
@@ -204,9 +210,6 @@
<tab id="Customers_2" id_parent="Preferences" active="1">
<class_name>AdminCustomerPreferences</class_name>
</tab>
<tab id="Shipping" id_parent="Preferences" active="1">
<class_name>AdminShipping</class_name>
</tab>
<tab id="Themes" id_parent="Preferences" active="1">
<class_name>AdminThemes</class_name>
</tab>

7
install-dev/upgrade/sql/1.5.5.0.sql
View File

@@ -22,13 +22,6 @@ CHANGE `module_name` `module_name` VARCHAR(64) NULL DEFAULT NULL;
/* PHP:remove_tab(AdminRangePrice); */;
/* PHP:remove_tab(AdminRangeWeight); */;
/* PHP:remove_tab(AdminShipping); */;
/* PHP:remove_tab(AdminParentShipping); */;
/* PHP:remove_tab(AdminCarriers); */;
/* PHP:add_new_tab(AdminShipping, es:Shipping|it:Shipping|en:Shipping|de:Shipping|fr:Transport, 0, false, AdminParentPreferences); */;
/* PHP:add_new_tab(AdminCarriers, es:Carriers|it:Carriers|en:Carriers|de:Carriers|fr:Tarsporteurs, 0, false, AdminParentModules); */;
ALTER TABLE `PREFIX_log` ADD `id_employee` INT(10) UNSIGNED NULL DEFAULT NULL AFTER `object_id`;