Permalink
Browse files

[-] INSTALLER : Second fix of bug #PSCFV-8168 loyalty CHANGE id_disco…

…unt to id_cart_rule
  • Loading branch information...
1 parent 06c1b35 commit 0211e83413ad0c056b6235539a8fa1f9c6e96704 @gRoussac gRoussac committed Mar 26, 2013
Showing with 46 additions and 1 deletion.
  1. +43 −0 install-dev/upgrade/php/p1540_add_missing_columns.php
  2. +3 −1 install-dev/upgrade/sql/1.5.4.0.sql
View
43 install-dev/upgrade/php/p1540_add_missing_columns.php
@@ -0,0 +1,43 @@
+<?php
+/*
+* 2007-2013 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+* @author PrestaShop SA <contact@prestashop.com>
+* @copyright 2007-2013 PrestaShop SA
+* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+* International Registered Trademark & Property of PrestaShop SA
+*/
+
+function p1540_add_missing_columns()
+{
+ $errors = array();
+ $id_module = Db::getInstance()->getValue('SELECT id_module FROM `'._DB_PREFIX_.'module` WHERE name="loyalty"');
+ if ($id_module)
+ {
+ $list_fields = Db::getInstance()->executeS('SHOW FIELDS FROM `'._DB_PREFIX_.'loyalty`');
+ foreach ($list_fields as $k => $field)
+ $list_fields[$k] = $field['Field'];
+
+ if (in_array('id_discount', $list_fields))
+ if (!Db::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.'loyalty` CHANGE `id_discount` `id_cart_rule` INT( 10 ) UNSIGNED NULL DEFAULT NULL '))
+ $errors[] = Db::getInstance()->getMsgError();;
+ }
+ if (count($errors))
+ return array('error' => 1, 'msg' => implode(',', $errors)) ;
+}
View
4 install-dev/upgrade/sql/1.5.4.0.sql
@@ -51,4 +51,6 @@ UPDATE `PREFIX_customer` SET `id_gender` = 1 WHERE `email` LIKE 'pub@prestashop.
UPDATE `PREFIX_cart_rule_carrier` crc INNER JOIN `PREFIX_carrier` c ON crc.`id_carrier` = c.`id_carrier` SET crc.`id_carrier` = c.`id_reference`;
-UPDATE `PREFIX_order_payment` SET `order_reference` = LPAD(order_reference, 9 , '0');
+UPDATE `PREFIX_order_payment` SET `order_reference` = LPAD(order_reference, 9 , '0');
+
+/* PHP:p1540_add_missing_columns(); */;

0 comments on commit 0211e83

Please sign in to comment.