From 961419be5db71d827e9bc1679bcae09b98c5af3e Mon Sep 17 00:00:00 2001
From: Steve Ireland <stevei@ruledomain.com>
Date: Fri, 7 Apr 2023 08:51:45 -0400
Subject: [PATCH] For #3730. Fix issue raised by @odiea and cleaned up the
 checkboxes on forms so that they render correctly.

---
 app/Views/attributes/item.php        |  2 +-
 app/Views/cashups/form.php           |  8 ++++----
 app/Views/configs/barcode_config.php |  4 ++--
 app/Views/configs/general_config.php | 22 +++++++++++-----------
 app/Views/configs/invoice_config.php |  4 ++--
 app/Views/configs/locale_config.php  |  4 ++--
 app/Views/configs/receipt_config.php | 18 +++++++++---------
 app/Views/configs/reward_config.php  |  2 +-
 app/Views/configs/table_config.php   |  2 +-
 app/Views/configs/tax_config.php     |  4 ++--
 app/Views/employees/form.php         |  4 ++--
 app/Views/expenses/form.php          |  2 +-
 app/Views/items/form.php             |  6 +++---
 app/Views/receivings/receiving.php   |  4 ++--
 14 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/app/Views/attributes/item.php b/app/Views/attributes/item.php
index f0058ed3c..646585a8a 100644
--- a/app/Views/attributes/item.php
+++ b/app/Views/attributes/item.php
@@ -68,7 +68,7 @@ foreach($definition_values as $definition_id => $definition_value)
 						'name' => esc("attribute_links[$definition_id]"),
 						'id' => "attribute_links[$definition_id]",
 						'value' => 1,
-						'checked' => ($value ? 1 : 0),
+						'checked' => $value == 1,
 						'class' => 'checkbox-inline',
 						'data-definition-id' => $definition_id
 					]);
diff --git a/app/Views/cashups/form.php b/app/Views/cashups/form.php
index fd7562f87..6337aa1ca 100644
--- a/app/Views/cashups/form.php
+++ b/app/Views/cashups/form.php
@@ -128,8 +128,8 @@
 					'name' => 'note',
 					'id' => 'note',
 					'value'=>0,
-					'checked'=>($cash_ups_info->note) ? 1 : 0]
-				) ?>
+					'checked'=>$cash_ups_info->note == 1
+				]) ?>
 			</div>
 		</div>
 
@@ -239,8 +239,8 @@
 						'name' => 'deleted',
 						'id' => 'deleted',
 						'value'=>1,
-						'checked'=>($cash_ups_info->deleted) ? 1 : 0]
-					) ?>
+						'checked'=>$cash_ups_info->deleted == 1
+					]) ?>
 				</div>
 			</div>
 		<?php
diff --git a/app/Views/configs/barcode_config.php b/app/Views/configs/barcode_config.php
index 2f370d090..d3b32ad0f 100644
--- a/app/Views/configs/barcode_config.php
+++ b/app/Views/configs/barcode_config.php
@@ -77,7 +77,7 @@
 						'name' => 'allow_duplicate_barcodes',
 						'id' => 'allow_duplicate_barcodes',
 						'value' => 'allow_duplicate_barcodes',
-						'checked' => $config['allow_duplicate_barcodes']
+						'checked' => $config['allow_duplicate_barcodes'] == 1
 					]) ?>
 					&nbsp
 					<label class="control-label">
@@ -110,7 +110,7 @@
 						<?php echo form_checkbox ([
 							'name' => 'barcode_generate_if_empty',
 							'value' => 'barcode_generate_if_empty',
-							'checked' => $config['barcode_generate_if_empty']
+							'checked' => $config['barcode_generate_if_empty'] == 1
 							]) ?>
 						<?php echo lang('Config.barcode_generate_if_empty') ?>
 					</label>
diff --git a/app/Views/configs/general_config.php b/app/Views/configs/general_config.php
index 694d80a4c..3dd79da52 100644
--- a/app/Views/configs/general_config.php
+++ b/app/Views/configs/general_config.php
@@ -40,7 +40,7 @@
 						],
 						esc(@$config['login_form']),
 						['class' => 'form-control input-sm']
-					) ?>s
+					) ?>
 				</div>
 			</div>
 
@@ -67,7 +67,7 @@
 								'data-onstyle' => 'success',
 								'data-on' => '<b>' . esc($config['currency_symbol']).'</b>',
 								'data-off' => '<b>%</b>',
-								'checked' => $config['default_sales_discount_type']
+								'checked' => $config['default_sales_discount_type'] == 1
 								]) ?>
 						</span>
 					</div>
@@ -97,7 +97,7 @@
 								'data-onstyle' => 'success',
 								'data-on' => '<b>' . esc($config['currency_symbol']) . '</b>',
 								'data-off' => '<b>%</b>',
-								'checked' => $config['default_receivings_discount_type']
+								'checked' => $config['default_receivings_discount_type'] == 1
 								]) ?>
 						</span>
 					</div>
@@ -111,7 +111,7 @@
 						'name' => 'enforce_privacy',
 						'id' => 'enforce_privacy',
 						'value' => 'enforce_privacy',
-						'checked' => $config['enforce_privacy']
+						'checked' => $config['enforce_privacy'] == 1
 					]) ?>
 					&nbsp
 					<label class="control-label">
@@ -127,7 +127,7 @@
 						'name' => 'receiving_calculate_average_price',
 						'id' => 'receiving_calculate_average_price',
 						'value' => 'receiving_calculate_average_price',
-						'checked' => @$config['receiving_calculate_average_price']
+						'checked' => @$config['receiving_calculate_average_price'] == 1
 						]) ?>
 				</div>
 			</div>
@@ -257,7 +257,7 @@
 						'name' => 'gcaptcha_enable',
 						'id' => 'gcaptcha_enable',
 						'value' => 'gcaptcha_enable',
-						'checked' => $config['gcaptcha_enable']
+						'checked' => $config['gcaptcha_enable'] == 1
 					]) ?>
 					<label class="control-label">
 						<a href="https://www.google.com/recaptcha/admin" target="_blank">
@@ -376,7 +376,7 @@
 					'name' => 'derive_sale_quantity',
 					'id' => 'derive_sale_quantity',
 					'value' => 'derive_sale_quantity',
-					'checked' => $config['derive_sale_quantity']
+					'checked' => $config['derive_sale_quantity'] == 1
 					]) ?>
 					&nbsp
 					<label class="control-label">
@@ -392,7 +392,7 @@
 						'name' => 'show_office_group',
 						'id' => 'show_office_group',
 						'value' => 'show_office_group',
-						'checked' => $show_office_group
+						'checked' => $show_office_group == 1
 					]) ?>
 				</div>
 			</div>
@@ -404,7 +404,7 @@
 						'name' => 'multi_pack_enabled',
 						'id' => 'multi_pack_enabled',
 						'value' => 'multi_pack_enabled',
-						'checked' => $config['multi_pack_enabled']
+						'checked' => $config['multi_pack_enabled'] == 1
 					]) ?>
 				</div>
 			</div>
@@ -416,7 +416,7 @@
 						'name' => 'include_hsn',
 						'id' => 'include_hsn',
 						'value' => 'include_hsn',
-						'checked' => $config['include_hsn']
+						'checked' => $config['include_hsn'] == 1
 						]) ?>
 				</div>
 			</div>
@@ -428,7 +428,7 @@
 						'name' => 'category_dropdown',
 						'id' => 'category_dropdown',
 						'value' => 'category_dropdown',
-						'checked' => @$config['category_dropdown']
+						'checked' => @$config['category_dropdown'] == 1
 					]) ?>
 				</div>
 			</div>
diff --git a/app/Views/configs/invoice_config.php b/app/Views/configs/invoice_config.php
index 408293ba4..9214461e7 100644
--- a/app/Views/configs/invoice_config.php
+++ b/app/Views/configs/invoice_config.php
@@ -17,7 +17,7 @@
 						'name' => 'invoice_enable',
 						'value' => 'invoice_enable',
 						'id' => 'invoice_enable',
-						'checked' => $config['invoice_enable']
+						'checked' => $config['invoice_enable'] == 1
 					]) ?>
 				</div>
 			</div>
@@ -141,7 +141,7 @@
 						'name' => 'work_order_enable',
 						'value' => 'work_order_enable',
 						'id' => 'work_order_enable',
-						'checked' => $config['work_order_enable']
+						'checked' => $config['work_order_enable'] == 1
 					]) ?>
 				</div>
 			</div>
diff --git a/app/Views/configs/locale_config.php b/app/Views/configs/locale_config.php
index 8d4f642ab..f26e56cd5 100644
--- a/app/Views/configs/locale_config.php
+++ b/app/Views/configs/locale_config.php
@@ -39,7 +39,7 @@
 						'name' => 'thousands_separator',
 						'id' => 'thousands_separator',
 						'value' => 'thousands_separator',
-						'checked' => $config['thousands_separator']
+						'checked' => $config['thousands_separator'] == 1
 					]) ?>
 				</div>
 			</div>
@@ -226,7 +226,7 @@
 						'name' => 'date_or_time_format',
 						'id' => 'date_or_time_format',
 						'value' => 'date_or_time_format',
-						'checked' => $config['date_or_time_format']
+						'checked' => $config['date_or_time_format'] == 1
 						]) ?>
 				</div>
 			</div>
diff --git a/app/Views/configs/receipt_config.php b/app/Views/configs/receipt_config.php
index d953cf47b..8c2cca56a 100644
--- a/app/Views/configs/receipt_config.php
+++ b/app/Views/configs/receipt_config.php
@@ -121,7 +121,7 @@
 						'name' => 'receipt_show_company_name',
 						'value' => 'receipt_show_company_name',
 						'id' => 'receipt_show_company_name',
-						'checked' => $config['receipt_show_company_name']
+						'checked' => $config['receipt_show_company_name'] == 1
 					]) ?>
 				</div>
 			</div>
@@ -133,7 +133,7 @@
 						'name' => 'receipt_show_taxes',
 						'value' => 'receipt_show_taxes',
 						'id' => 'receipt_show_taxes',
-						'checked' => $config['receipt_show_taxes']
+						'checked' => $config['receipt_show_taxes'] == 1
 					]) ?>
 				</div>
 			</div>
@@ -145,7 +145,7 @@
 						'name' => 'receipt_show_tax_ind',
 						'value' => 'receipt_show_tax_ind',
 						'id' => 'receipt_show_tax_ind',
-						'checked' => $config['receipt_show_tax_ind']
+						'checked' => $config['receipt_show_tax_ind'] == 1
 					]) ?>
 				</div>
 			</div>
@@ -157,7 +157,7 @@
 						'name' => 'receipt_show_total_discount',
 						'value' => 'receipt_show_total_discount',
 						'id' => 'receipt_show_total_discount',
-						'checked' => $config['receipt_show_total_discount']
+						'checked' => $config['receipt_show_total_discount'] == 1
 					]) ?>
 				</div>
 			</div>
@@ -169,7 +169,7 @@
 						'name' => 'receipt_show_description',
 						'value' => 'receipt_show_description',
 						'id' => 'receipt_show_description',
-						'checked' => $config['receipt_show_description']
+						'checked' => $config['receipt_show_description'] == 1
 					]) ?>
 				</div>
 			</div>
@@ -181,7 +181,7 @@
 						'name' => 'receipt_show_serialnumber',
 						'value' => 'receipt_show_serialnumber',
 						'id' => 'receipt_show_serialnumber',
-						'checked' => $config['receipt_show_serialnumber']
+						'checked' => $config['receipt_show_serialnumber'] == 1
 					]) ?>
 				</div>
 			</div>
@@ -193,7 +193,7 @@
 						'name' => 'print_silently',
 						'id' => 'print_silently',
 						'value' => 'print_silently',
-						'checked' => $config['print_silently']
+						'checked' => $config['print_silently'] == 1
 					]) ?>
 				</div>
 			</div>
@@ -205,7 +205,7 @@
 						'name' => 'print_header',
 						'id' => 'print_header',
 						'value' => 'print_header',
-						'checked' => $config['print_header']
+						'checked' => $config['print_header'] == 1
 					]) ?>
 				</div>
 			</div>
@@ -217,7 +217,7 @@
 						'name' => 'print_footer',
 						'id' => 'print_footer',
 						'value' => 'print_footer',
-						'checked' => $config['print_footer']
+						'checked' => $config['print_footer'] == 1
 					]) ?>
 				</div>
 			</div>
diff --git a/app/Views/configs/reward_config.php b/app/Views/configs/reward_config.php
index 1b1f72f3e..9d48fb44c 100644
--- a/app/Views/configs/reward_config.php
+++ b/app/Views/configs/reward_config.php
@@ -16,7 +16,7 @@
 						'name' => 'customer_reward_enable',
 						'value' => 'customer_reward_enable',
 						'id' => 'customer_reward_enable',
-						'checked' => $config['customer_reward_enable']
+						'checked' => $config['customer_reward_enable'] == 1
 					]) ?>
 				</div>
 			</div>
diff --git a/app/Views/configs/table_config.php b/app/Views/configs/table_config.php
index acf384255..c70b8e5a4 100644
--- a/app/Views/configs/table_config.php
+++ b/app/Views/configs/table_config.php
@@ -16,7 +16,7 @@
 						'name' => 'dinner_table_enable',
 						'value' => 'dinner_table_enable',
 						'id' => 'dinner_table_enable',
-						'checked' => $config['dinner_table_enable']
+						'checked' => $config['dinner_table_enable'] == 1
 					]) ?>
 				</div>
 			</div>
diff --git a/app/Views/configs/tax_config.php b/app/Views/configs/tax_config.php
index bf15d485f..777103acd 100644
--- a/app/Views/configs/tax_config.php
+++ b/app/Views/configs/tax_config.php
@@ -31,7 +31,7 @@
 						'name' => 'tax_included',
 						'id' => 'tax_included',
 						'value' => 'tax_included',
-						'checked' => $config['tax_included']
+						'checked' => $config['tax_included'] == 1
 					]) ?>
 				</div>
 			</div>
@@ -84,7 +84,7 @@
 						'name' => 'use_destination_based_tax',
 						'id' => 'use_destination_based_tax',
 						'value' => 'use_destination_based_tax',
-						'checked' => $config['use_destination_based_tax']
+						'checked' => $config['use_destination_based_tax'] == 1
 					]) ?>
 				</div>
 			</div>
diff --git a/app/Views/employees/form.php b/app/Views/employees/form.php
index 17ba45825..715cd2792 100644
--- a/app/Views/employees/form.php
+++ b/app/Views/employees/form.php
@@ -118,7 +118,7 @@
 					{
 					?>
 						<li>	
-							<?php echo form_checkbox("grant_$module->module_id", $module->module_id, $module->grant, "class=\'module\'") ?>
+							<?php echo form_checkbox("grant_$module->module_id", $module->module_id, $module->grant == 1, "class=\'module\'") ?>
 							<?php echo form_dropdown(
 								"menu_group_$module->module_id", [
 									'home' => lang('Module.home'),
@@ -145,7 +145,7 @@
 							?>
 											<ul>
 												<li>
-													<?php echo form_checkbox("grant_$permission->permission_id", $permission->permission_id, $permission->grant) ?>
+													<?php echo form_checkbox("grant_$permission->permission_id", $permission->permission_id, $permission->grant == 1) ?>
 													<?php echo form_hidden("menu_group_$permission->permission_id", "--") ?>
 													<span class="medium"><?php echo $lang_line ?></span>
 												</li>
diff --git a/app/Views/expenses/form.php b/app/Views/expenses/form.php
index e4487af79..aad3f0f33 100644
--- a/app/Views/expenses/form.php
+++ b/app/Views/expenses/form.php
@@ -152,7 +152,7 @@
 						'name' => 'deleted',
 						'id' => 'deleted',
 						'value' => 1,
-						'checked' => ($expenses_info->deleted) ? 1 : 0
+						'checked' => $expenses_info->deleted == 1
 					]) ?>
 				</div>
 			</div>
diff --git a/app/Views/items/form.php b/app/Views/items/form.php
index 3d5ce50dc..5ca3277f5 100644
--- a/app/Views/items/form.php
+++ b/app/Views/items/form.php
@@ -402,7 +402,7 @@
 					'name' => 'allow_alt_description',
 					'id' => 'allow_alt_description',
 					'value' => 1,
-					'checked' => ($item_info->allow_alt_description == 1) ? TRUE : FALSE
+					'checked' => $item_info->allow_alt_description == 1
 				]) ?>
 			</div>
 		</div>
@@ -414,7 +414,7 @@
 					'name' => 'is_serialized',
 					'id' => 'is_serialized',
 					'value' => 1,
-					'checked' => ($item_info->is_serialized == 1) ? TRUE : FALSE
+					'checked' => $item_info->is_serialized == 1
 				]) ?>
 			</div>
 		</div>
@@ -469,7 +469,7 @@
 					'name' => 'is_deleted',
 					'id' => 'is_deleted',
 					'value'=>1,
-					'checked' => ($item_info->deleted == 1) ? TRUE : FALSE
+					'checked' => $item_info->deleted == 1
 				]) ?>
 			</div>
 		</div>
diff --git a/app/Views/receivings/receiving.php b/app/Views/receivings/receiving.php
index 7bb3d3a53..1789f4616 100644
--- a/app/Views/receivings/receiving.php
+++ b/app/Views/receivings/receiving.php
@@ -207,7 +207,7 @@ if (isset($success))
 											'data-on' => '<b>' . esc($config['currency_symbol']) .'</b>',
 											'data-off' => '<b>%</b>',
 											'data-line' => esc($line),
-											'checked' => $item['discount_type']
+											'checked' => $item['discount_type'] == 1
 										]) ?>
 									</span>
 								</div> 
@@ -424,7 +424,7 @@ if (isset($success))
 												'id' => 'recv_print_after_sale',
 												'class' => 'checkbox',
 												'value' => 1,
-												'checked' => $print_after_sale
+												'checked' => $print_after_sale == 1
 											]) ?>
 										</td>
 									</tr>