From 4d11a550915bb4d2a26edfe35f01a95979599400 Mon Sep 17 00:00:00 2001 From: FrancescoUK Date: Tue, 4 Sep 2018 22:16:57 +0100 Subject: [PATCH] Amend database upgrade script (#2061) --- application/migrations/sqlscripts/3.2.1_to_3.3.0.sql | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/application/migrations/sqlscripts/3.2.1_to_3.3.0.sql b/application/migrations/sqlscripts/3.2.1_to_3.3.0.sql index 8f32dbb51..5deeec224 100644 --- a/application/migrations/sqlscripts/3.2.1_to_3.3.0.sql +++ b/application/migrations/sqlscripts/3.2.1_to_3.3.0.sql @@ -3,8 +3,7 @@ -- INSERT INTO `ospos_app_config` (`key`, `value`) VALUES -('multi_pack_enabled', '0'), -('default_sales_discount_type', '0'); +('multi_pack_enabled', '0'); ALTER TABLE `ospos_items` ADD COLUMN `qty_per_pack` decimal(15,3) NOT NULL DEFAULT 1, @@ -19,6 +18,9 @@ UPDATE `ospos_items` -- Add support for Discount on Sales Fixed -- +INSERT INTO `ospos_app_config` (`key`, `value`) VALUES +('default_sales_discount_type', '0'); + ALTER TABLE `ospos_item_kits` CHANGE COLUMN `kit_discount_percent` `kit_discount` DECIMAL(15,2) NOT NULL DEFAULT 0 AFTER `item_id`, ADD COLUMN `kit_discount_type` TINYINT(2) NOT NULL DEFAULT '0' AFTER `kit_discount`;