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

[+] BO: Add a wizard to create and edit your carriers

Browse Source
This commit is contained in:
Rémi Gaillard
2013-07-26 18:27:21 +02:00
parent 42c5335f27
commit c0cf92cbdf
34 changed files with 2589 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install-dev/data/xml/access.xml
+1
View File
@@ -51,6 +51,7 @@
<access id="access_1_45" id_profile="SuperAdmin" id_tab="Outstanding" view="1" add="1" edit="1" delete="1"/>
<access id="access_1_46" id_profile="SuperAdmin" id_tab="Cart_Rules" view="1" add="1" edit="1" delete="1"/>
<access id="access_1_47" id_profile="SuperAdmin" id_tab="Catalog_price_rules" view="1" add="1" edit="1" delete="1"/>
<access id="access_1_49" id_profile="SuperAdmin" id_tab="CarrierWizard" view="1" add="1" edit="1" delete="1"/>
<access id="access_1_49" id_profile="SuperAdmin" id_tab="Carriers" view="1" add="1" edit="1" delete="1"/>
<access id="access_1_50" id_profile="SuperAdmin" id_tab="Price_Ranges" view="1" add="1" edit="1" delete="1"/>
<access id="access_1_51" id_profile="SuperAdmin" id_tab="Weight_Ranges" view="1" add="1" edit="1" delete="1"/>
install-dev/data/xml/tab.xml
+2 -5
View File
@@ -156,11 +156,8 @@
<tab id="Carriers" id_parent="Shipping" active="1">
<class_name>AdminCarriers</class_name>
</tab>
<tab id="Price_Ranges" id_parent="Shipping" active="1">
<class_name>AdminRangePrice</class_name>
</tab>
<tab id="Weight_Ranges" id_parent="Shipping" active="1">
<class_name>AdminRangeWeight</class_name>
<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>
install-dev/langs/br/data/tab.xml
-2
View File
@@ -64,7 +64,6 @@
<tab id="Positions" name="Posi&#xE7;&#xF5;es"/>
<tab id="Preferences_1" name="Prefer&#xEA;ncias"/>
<tab id="Preferences" name="Prefer&#xEA;ncias"/>
<tab id="Price_Ranges" name="Faixas de pre&#xE7;os"/>
<tab id="Price_Rules" name="Regras de Pre&#xE7;os"/>
<tab id="Products_1" name="Produtos"/>
<tab id="Products" name="Produtos"/>
@@ -100,6 +99,5 @@
<tab id="Translations" name="Tradu&#xE7;&#xF5;es"/>
<tab id="Warehouses" name="Armaz&#xE9;ns"/>
<tab id="Webservice" name="Servi&#xE7;o Web"/>
<tab id="Weight_Ranges" name="Faixas de peso"/>
<tab id="Zones" name="Regi&#xF5;es"/>
</entity_tab>
install-dev/langs/de/data/tab.xml
-2
View File
@@ -64,7 +64,6 @@
<tab id="Positions" name="Positionen"/>
<tab id="Preferences_1" name="Voreinstellungen"/>
<tab id="Preferences" name="Voreinstellungen"/>
<tab id="Price_Ranges" name="Preisspannen"/>
<tab id="Price_Rules" name="Preisregeln"/>
<tab id="Products_1" name="Produkte"/>
<tab id="Products" name="Produkte"/>
@@ -100,6 +99,5 @@
<tab id="Translations" name="&#xDC;bersetzungen"/>
<tab id="Warehouses" name="Lagerort"/>
<tab id="Webservice" name="Webdienste"/>
<tab id="Weight_Ranges" name="Gewichtsspannen"/>
<tab id="Zones" name="Zonen"/>
</entity_tab>
install-dev/langs/en/data/tab.xml
-2
View File
@@ -50,8 +50,6 @@
<tab id="Marketing" name="Marketing"/>
<tab id="Shipping_1" name="Shipping"/>
<tab id="Carriers" name="Carriers"/>
<tab id="Price_Ranges" name="Price Ranges"/>
<tab id="Weight_Ranges" name="Weight Ranges"/>
<tab id="Localization_1" name="Localization"/>
<tab id="Languages" name="Languages"/>
<tab id="Zones" name="Zones"/>
install-dev/langs/es/data/tab.xml
-2
View File
@@ -64,7 +64,6 @@
<tab id="Positions" name="Posiciones"/>
<tab id="Preferences_1" name="Preferencias"/>
<tab id="Preferences" name="Preferencias"/>
<tab id="Price_Ranges" name="Rangos de precio"/>
<tab id="Price_Rules" name="Precio de las normas"/>
<tab id="Products_1" name="Productos"/>
<tab id="Products" name="Productos"/>
@@ -100,6 +99,5 @@
<tab id="Translations" name="Traducciones"/>
<tab id="Warehouses" name="Almacenes"/>
<tab id="Webservice" name="Servicio Web"/>
<tab id="Weight_Ranges" name="Rangos de peso"/>
<tab id="Zones" name="Zonas"/>
</entity_tab>
install-dev/langs/fr/data/tab.xml
-2
View File
@@ -64,7 +64,6 @@
<tab id="Positions" name="Positions"/>
<tab id="Preferences_1" name="Pr&#xE9;f&#xE9;rences"/>
<tab id="Preferences" name="Pr&#xE9;f&#xE9;rences"/>
<tab id="Price_Ranges" name="Tranches de prix"/>
<tab id="Price_Rules" name="Promotions"/>
<tab id="Products_1" name="Produits"/>
<tab id="Products" name="Produits"/>
@@ -100,6 +99,5 @@
<tab id="Translations" name="Traductions"/>
<tab id="Warehouses" name="Entrep&#xF4;ts"/>
<tab id="Webservice" name="Service web"/>
<tab id="Weight_Ranges" name="Tranches de poids"/>
<tab id="Zones" name="Zones"/>
</entity_tab>
install-dev/langs/it/data/tab.xml
-2
View File
@@ -64,7 +64,6 @@
<tab id="Positions" name="Posizioni"/>
<tab id="Preferences_1" name="Preferenze"/>
<tab id="Preferences" name="Preferenze"/>
<tab id="Price_Ranges" name="Fasce di prezzi"/>
<tab id="Price_Rules" name="Regole Prezzi"/>
<tab id="Products_1" name="Prodotti"/>
<tab id="Products" name="Prodotti"/>
@@ -100,6 +99,5 @@
<tab id="Translations" name="Traduzioni"/>
<tab id="Warehouses" name="Magazzino"/>
<tab id="Webservice" name="Webservice"/>
<tab id="Weight_Ranges" name="Fasce di pesi"/>
<tab id="Zones" name="Zone"/>
</entity_tab>
install-dev/langs/pl/data/tab.xml
-2
View File
@@ -64,7 +64,6 @@
<tab id="Positions" name="Pozycje"/>
<tab id="Preferences_1" name="Preferencje"/>
<tab id="Preferences" name="Preferencje"/>
<tab id="Price_Ranges" name="Zakresy cen"/>
<tab id="Price_Rules" name="Regu&#x142;y ustalania cen"/>
<tab id="Products_1" name="Produkty"/>
<tab id="Products" name="Produkty"/>
@@ -100,6 +99,5 @@
<tab id="Translations" name="T&#x142;umaczenia"/>
<tab id="Warehouses" name="Hurtownie"/>
<tab id="Webservice" name="Us&#x142;ugi internetowe"/>
<tab id="Weight_Ranges" name="Zakres wag"/>
<tab id="Zones" name="Strefy"/>
</entity_tab>
install-dev/langs/ru/data/tab.xml
-2
View File
@@ -64,7 +64,6 @@
<tab id="Positions" name="&#x420;&#x430;&#x441;&#x43F;&#x43E;&#x43B;&#x43E;&#x436;&#x435;&#x43D;&#x438;&#x435;"/>
<tab id="Preferences_1" name="&#x41D;&#x430;&#x441;&#x442;&#x440;&#x43E;&#x439;&#x43A;&#x438;"/>
<tab id="Preferences" name="&#x41D;&#x430;&#x441;&#x442;&#x440;&#x43E;&#x439;&#x43A;&#x438;"/>
<tab id="Price_Ranges" name="&#x428;&#x43A;&#x430;&#x43B;&#x430; &#x446;&#x435;&#x43D;"/>
<tab id="Price_Rules" name="&#x426;&#x435;&#x43D;&#x43E;&#x432;&#x44B;&#x435; &#x43F;&#x440;&#x430;&#x432;&#x438;&#x43B;&#x430;"/>
<tab id="Products_1" name="&#x442;&#x43E;&#x432;&#x430;&#x440;&#x44B;"/>
<tab id="Products" name="&#x442;&#x43E;&#x432;&#x430;&#x440;&#x44B;"/>
@@ -100,6 +99,5 @@
<tab id="Translations" name="&#x41F;&#x435;&#x440;&#x435;&#x432;&#x43E;&#x434;&#x44B;"/>
<tab id="Warehouses" name="&#x421;&#x43A;&#x43B;&#x430;&#x434;&#x44B;"/>
<tab id="Webservice" name="WEB &#x441;&#x43B;&#x443;&#x436;&#x431;&#x44B;"/>
<tab id="Weight_Ranges" name="&#x428;&#x43A;&#x430;&#x43B;&#x430; &#x432;&#x435;&#x441;&#x430;"/>
<tab id="Zones" name="&#x417;&#x43E;&#x43D;&#x44B;"/>
</entity_tab>
install-dev/upgrade/sql/1.5.5.0.sql
+2
View File
@@ -19,6 +19,8 @@ CHANGE `module_name` `module_name` VARCHAR(64) NULL DEFAULT NULL;
/* PHP:add_module_to_hook(blockmyaccountfooter, actionModuleRegisterHookAfter); */;
/* PHP:add_module_to_hook(blockmyaccount, actionModuleUnRegisterHookAfter); */;
/* PHP:add_module_to_hook(blockmyaccountfooter, actionModuleUnRegisterHookAfter); */;
/* PHP:remove_tab(AdminRangePrice); */;
/* PHP:remove_tab(AdminRangeWeight); */;
ALTER TABLE `PREFIX_log` ADD `id_employee` INT(10) UNSIGNED NULL DEFAULT NULL AFTER `object_id`;