From 8e86fbdc2a579fb48589992ab4f2530fd1a84cf9 Mon Sep 17 00:00:00 2001
From: FrancescoUK <francesco.lodolo.uk@gmail.com>
Date: Mon, 7 Aug 2017 20:10:45 +0100
Subject: [PATCH] Fix comparisons in constant substitution of magic numbers
 (#1450)

---
 application/models/Sale.php                      |  4 ++--
 application/models/reports/Specific_discount.php |  2 +-
 application/models/reports/Summary_report.php    |  4 ++--
 application/views/item_kits/form.php             | 14 +++++++-------
 application/views/items/form.php                 |  8 ++++----
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/application/models/Sale.php b/application/models/Sale.php
index 3f374e8fd..a4e4f0260 100644
--- a/application/models/Sale.php
+++ b/application/models/Sale.php
@@ -610,7 +610,7 @@ class Sale extends CI_Model
 
 			$this->db->insert('sales_items', $sales_items_data);
 
-			if($cur_item_info->stock_type === HAS_STOCK && $sale_status === COMPLETED)
+			if($cur_item_info->stock_type == HAS_STOCK && $sale_status == COMPLETED)
 			{
 				// Update stock quantity if item type is a standard stock item and the sale is a standard sale
 				$item_quantity = $this->Item_quantity->get_item_quantity($item['item_id'], $item['item_location']);
@@ -811,7 +811,7 @@ class Sale extends CI_Model
 			{
 				$cur_item_info = $this->Item->get_info($item['item_id']);
 
-				if($cur_item_info->stock_type === HAS_STOCK) {
+				if($cur_item_info->stock_type == HAS_STOCK) {
 					// create query to update inventory tracking
 					$inv_data = array(
 						'trans_date' => date('Y-m-d H:i:s'),
diff --git a/application/models/reports/Specific_discount.php b/application/models/reports/Specific_discount.php
index 5c67ef061..d42ba8055 100755
--- a/application/models/reports/Specific_discount.php
+++ b/application/models/reports/Specific_discount.php
@@ -67,7 +67,7 @@ class Specific_discount extends Report
 		}
 		elseif($inputs['sale_type'] == 'quotes')
 		{
-			$this->db->where('sale_status = '. SUSPENDED .' and quote_number IS NOT NULL');
+			$this->db->where('sale_status = ' . SUSPENDED . ' and quote_number IS NOT NULL');
 		}
 		elseif($inputs['sale_type'] == 'returns')
 		{
diff --git a/application/models/reports/Summary_report.php b/application/models/reports/Summary_report.php
index 02ae835d9..1dd464edd 100644
--- a/application/models/reports/Summary_report.php
+++ b/application/models/reports/Summary_report.php
@@ -92,11 +92,11 @@ abstract class Summary_report extends Report
 
 		if($inputs['sale_type'] == 'sales')
 		{
-			$this->db->where('sale_status = '. COMPLETED . ' and quantity_purchased > 0');
+			$this->db->where('sale_status = ' . COMPLETED . ' and quantity_purchased > 0');
 		}
 		elseif($inputs['sale_type'] == 'all')
 		{
-			$this->db->where('sale_status = '. COMPLETED);
+			$this->db->where('sale_status = ' . COMPLETED);
 		}
 		elseif($inputs['sale_type'] == 'quotes')
 		{
diff --git a/application/views/item_kits/form.php b/application/views/item_kits/form.php
index 9269dbb99..262725321 100644
--- a/application/views/item_kits/form.php
+++ b/application/views/item_kits/form.php
@@ -59,7 +59,7 @@
                             'type'=>'radio',
                             'id'=>'price_option',
                             'value'=>0,
-                            'checked'=>$item_kit_info->price_option === PRICE_ALL)
+                            'checked'=>$item_kit_info->price_option == PRICE_ALL)
                     ); ?> <?php echo $this->lang->line('item_kits_kit_and_components'); ?>
                 </label>
                 <label class="radio-inline">
@@ -68,7 +68,7 @@
                             'type'=>'radio',
                             'id'=>'price_option',
                             'value'=>1,
-                            'checked'=>$item_kit_info->price_option === PRICE_KIT)
+                            'checked'=>$item_kit_info->price_option == PRICE_KIT)
                     ); ?> <?php echo $this->lang->line('item_kits_kit_only'); ?>
                 </label>
                 <label class="radio-inline">
@@ -77,7 +77,7 @@
                             'type'=>'radio',
                             'id'=>'price_option',
                             'value'=>2,
-                            'checked'=>$item_kit_info->price_option === PRICE_ITEMS)
+                            'checked'=>$item_kit_info->price_option == PRICE_ITEMS)
                     ); ?> <?php echo $this->lang->line('item_kits_kit_and_stock'); ?>
                 </label>
 
@@ -93,7 +93,7 @@
                             'type'=>'radio',
                             'id'=>'print_option',
                             'value'=>0,
-                            'checked'=>$item_kit_info->print_option === PRINT_ALL)
+                            'checked'=>$item_kit_info->print_option == PRINT_ALL)
                     ); ?> <?php echo $this->lang->line('item_kits_all'); ?>
                 </label>
                 <label class="radio-inline">
@@ -102,7 +102,7 @@
                             'type'=>'radio',
                             'id'=>'print_option',
                             'value'=>1,
-                            'checked'=>$item_kit_info->print_option === PRINT_PRICED)
+                            'checked'=>$item_kit_info->print_option == PRINT_PRICED)
                     ); ?> <?php echo $this->lang->line('item_kits_priced_only'); ?>
                 </label>
                 <label class="radio-inline">
@@ -111,7 +111,7 @@
                             'type'=>'radio',
                             'id'=>'print_option',
                             'value'=>2,
-                            'checked'=>$item_kit_info->print_option === PRINT_KIT)
+                            'checked'=>$item_kit_info->print_option == PRINT_KIT)
                     ); ?> <?php echo $this->lang->line('item_kits_kit_only'); ?>
                 </label>
 
@@ -258,4 +258,4 @@ function delete_item_kit_row(link)
 	return false;
 }
 
-</script>
\ No newline at end of file
+</script>
diff --git a/application/views/items/form.php b/application/views/items/form.php
index 97724726b..a44309a8c 100644
--- a/application/views/items/form.php
+++ b/application/views/items/form.php
@@ -56,7 +56,7 @@
 							'type'=>'radio',
 							'id'=>'stock_type',
 							'value'=>0,
-							'checked'=>$item_info->stock_type === HAS_STOCK)
+							'checked'=>$item_info->stock_type == HAS_STOCK)
 					); ?> <?php echo $this->lang->line('items_stock'); ?>
 				</label>
 				<label class="radio-inline">
@@ -65,7 +65,7 @@
 							'type'=>'radio',
 							'id'=>'stock_type',
 							'value'=>1,
-							'checked'=>$item_info->stock_type === HAS_NO_STOCK)
+							'checked'=>$item_info->stock_type == HAS_NO_STOCK)
 					); ?> <?php echo $this->lang->line('items_nonstock'); ?>
 				</label>
 			</div>
@@ -80,7 +80,7 @@
 							'type'=>'radio',
 							'id'=>'item_type',
 							'value'=>0,
-							'checked'=>$item_info->item_type === ITEM)
+							'checked'=>$item_info->item_type == ITEM)
 					); ?> <?php echo $this->lang->line('items_standard'); ?>
 				</label>
 				<label class="radio-inline">
@@ -89,7 +89,7 @@
 							'type'=>'radio',
 							'id'=>'item_type',
 							'value'=>1,
-							'checked'=>$item_info->item_type === ITEM_KIT)
+							'checked'=>$item_info->item_type == ITEM_KIT)
 					); ?> <?php echo $this->lang->line('items_kit'); ?>
 				</label>
 			</div>