Merge pull request #5353 from maximebiloe/dev/feat/display-tax-shoppi…

…ng-cart // Display tax in shopping cart by default
PrestaShop · Apr 12, 2016 · 6d01d6c · 6d01d6c
2 parents c9b19d1 + 9294bc9
commit 6d01d6c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/install-dev/data/xml/configuration.xml b/install-dev/data/xml/configuration.xml
@@ -249,7 +249,7 @@
     <value>id_shop;id_currency;id_country;id_group</value>
   </configuration>
   <configuration id="PS_TAX_DISPLAY" name="PS_TAX_DISPLAY">
-    <value>0</value>
+    <value>1</value>
   </configuration>
   <configuration id="PS_SMARTY_FORCE_COMPILE" name="PS_SMARTY_FORCE_COMPILE">
     <value>1</value>

diff --git a/install-dev/upgrade/sql/1.7.0.0.sql b/install-dev/upgrade/sql/1.7.0.0.sql
@@ -95,3 +95,5 @@ DROP TABLE `PREFIX_scene_products`;
 DROP TABLE `PREFIX_scene_shop`;
 ALTER TABLE `PREFIX_image_type` DROP `scenes`;
 DELETE FROM `PREFIX_configuration` WHERE `name` = 'PS_SCENE_FEATURE_ACTIVE';
+
+UPDATE `PREFIX_configuration` SET `PS_TAX_DISPLAY` = '1';