From f1936dbb4d9624d93f9c9969c08f35dce65d5f81 Mon Sep 17 00:00:00 2001 From: FrancescoUK Date: Thu, 3 Aug 2017 21:39:40 +0100 Subject: [PATCH] Fixed rewards foreign key constraint issue (#1436) --- application/controllers/Sales.php | 1 + database/3.0.2_to_3.1.0.sql | 4 ++-- database/constraints.sql | 4 ++-- database/database.sql | 4 ++-- database/migrate_phppos_dist.sql | 4 ++-- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/application/controllers/Sales.php b/application/controllers/Sales.php index 263d718ef..feeafee6c 100644 --- a/application/controllers/Sales.php +++ b/application/controllers/Sales.php @@ -205,6 +205,7 @@ class Sales extends Secure_Controller { $this->form_validation->set_rules('amount_tendered', 'lang:sales_amount_tendered', 'trim|required'); } + if($this->form_validation->run() == FALSE) { if($payment_type == $this->lang->line('sales_giftcard')) diff --git a/database/3.0.2_to_3.1.0.sql b/database/3.0.2_to_3.1.0.sql index 9fb12e233..d0c6bc35c 100644 --- a/database/3.0.2_to_3.1.0.sql +++ b/database/3.0.2_to_3.1.0.sql @@ -286,11 +286,11 @@ ALTER TABLE `ospos_customers_points` ADD KEY `sale_id` (`sale_id`), ADD CONSTRAINT `ospos_customers_points_ibfk_1` FOREIGN KEY (`person_id`) REFERENCES `ospos_customers` (`person_id`), ADD CONSTRAINT `ospos_customers_points_ibfk_2` FOREIGN KEY (`package_id`) REFERENCES `ospos_customers_packages` (`package_id`), - ADD CONSTRAINT `ospos_customers_points_ibfk_3` FOREIGN KEY (`sale_id`) REFERENCES `ospos_sales_items` (`sale_id`); + ADD CONSTRAINT `ospos_customers_points_ibfk_3` FOREIGN KEY (`sale_id`) REFERENCES `ospos_sales` (`sale_id`); ALTER TABLE `ospos_sales_reward_points` ADD KEY `sale_id` (`sale_id`), - ADD CONSTRAINT `ospos_sales_reward_points_ibfk_1` FOREIGN KEY (`sale_id`) REFERENCES `ospos_sales_items` (`sale_id`); + ADD CONSTRAINT `ospos_sales_reward_points_ibfk_1` FOREIGN KEY (`sale_id`) REFERENCES `ospos_sales` (`sale_id`); ALTER TABLE `ospos_customers` ADD KEY `package_id` (`package_id`), diff --git a/database/constraints.sql b/database/constraints.sql index 0b977960b..f0765e849 100644 --- a/database/constraints.sql +++ b/database/constraints.sql @@ -153,10 +153,10 @@ ALTER TABLE `ospos_giftcards` ALTER TABLE `ospos_customers_points` ADD CONSTRAINT `ospos_customers_points_ibfk_1` FOREIGN KEY (`person_id`) REFERENCES `ospos_customers` (`person_id`), ADD CONSTRAINT `ospos_customers_points_ibfk_2` FOREIGN KEY (`package_id`) REFERENCES `ospos_customers_packages` (`package_id`), - ADD CONSTRAINT `ospos_customers_points_ibfk_3` FOREIGN KEY (`sale_id`) REFERENCES `ospos_sales_items` (`sale_id`); + ADD CONSTRAINT `ospos_customers_points_ibfk_3` FOREIGN KEY (`sale_id`) REFERENCES `ospos_sales` (`sale_id`); -- -- Constraints for table `ospos_sales_reward_points` -- ALTER TABLE `ospos_sales_reward_points` - ADD CONSTRAINT `ospos_sales_reward_points_ibfk_1` FOREIGN KEY (`sale_id`) REFERENCES `ospos_sales_items` (`sale_id`); + ADD CONSTRAINT `ospos_sales_reward_points_ibfk_1` FOREIGN KEY (`sale_id`) REFERENCES `ospos_sales` (`sale_id`); diff --git a/database/database.sql b/database/database.sql index daa2980da..a69a508cb 100644 --- a/database/database.sql +++ b/database/database.sql @@ -1104,10 +1104,10 @@ ALTER TABLE `ospos_giftcards` ALTER TABLE `ospos_customers_points` ADD CONSTRAINT `ospos_customers_points_ibfk_1` FOREIGN KEY (`person_id`) REFERENCES `ospos_customers` (`person_id`), ADD CONSTRAINT `ospos_customers_points_ibfk_2` FOREIGN KEY (`package_id`) REFERENCES `ospos_customers_packages` (`package_id`), - ADD CONSTRAINT `ospos_customers_points_ibfk_3` FOREIGN KEY (`sale_id`) REFERENCES `ospos_sales_items` (`sale_id`); + ADD CONSTRAINT `ospos_customers_points_ibfk_3` FOREIGN KEY (`sale_id`) REFERENCES `ospos_sales` (`sale_id`); -- -- Constraints for table `ospos_sales_reward_points` -- ALTER TABLE `ospos_sales_reward_points` - ADD CONSTRAINT `ospos_sales_reward_points_ibfk_1` FOREIGN KEY (`sale_id`) REFERENCES `ospos_sales_items` (`sale_id`); + ADD CONSTRAINT `ospos_sales_reward_points_ibfk_1` FOREIGN KEY (`sale_id`) REFERENCES `ospos_sales` (`sale_id`); diff --git a/database/migrate_phppos_dist.sql b/database/migrate_phppos_dist.sql index 9587252d6..6a93ac9be 100644 --- a/database/migrate_phppos_dist.sql +++ b/database/migrate_phppos_dist.sql @@ -1275,10 +1275,10 @@ ALTER TABLE `ospos_giftcards` ALTER TABLE `ospos_customers_points` ADD CONSTRAINT `ospos_customers_points_ibfk_1` FOREIGN KEY (`person_id`) REFERENCES `ospos_customers` (`person_id`), ADD CONSTRAINT `ospos_customers_points_ibfk_2` FOREIGN KEY (`package_id`) REFERENCES `ospos_customers_packages` (`package_id`), - ADD CONSTRAINT `ospos_customers_points_ibfk_3` FOREIGN KEY (`sale_id`) REFERENCES `ospos_sales_items` (`sale_id`); + ADD CONSTRAINT `ospos_customers_points_ibfk_3` FOREIGN KEY (`sale_id`) REFERENCES `ospos_sales` (`sale_id`); -- -- Constraints for table `ospos_sales_reward_points` -- ALTER TABLE `ospos_sales_reward_points` - ADD CONSTRAINT `ospos_sales_reward_points_ibfk_1` FOREIGN KEY (`sale_id`) REFERENCES `ospos_sales_items` (`sale_id`); + ADD CONSTRAINT `ospos_sales_reward_points_ibfk_1` FOREIGN KEY (`sale_id`) REFERENCES `ospos_sales` (`sale_id`);