For #3730. Fix issue raised by @odiea and cleaned up the checkboxes on forms so that they render correctly.

This commit is contained in:
Steve Ireland
2023-04-07 08:51:45 -04:00
parent ee21f2a6aa
commit 961419be5d
14 changed files with 43 additions and 43 deletions

View File

@@ -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
]);

View File

@@ -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

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -152,7 +152,7 @@
'name' => 'deleted',
'id' => 'deleted',
'value' => 1,
'checked' => ($expenses_info->deleted) ? 1 : 0
'checked' => $expenses_info->deleted == 1
]) ?>
</div>
</div>

View File

@@ -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>

View File

@@ -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>