mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-04-30 20:03:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

Decimal changes

Browse Source 
- Format percentage per locale rules
- Format sequence as integer, not per quantity rules
- Minor formatting changes
This commit is contained in:
objecttothis
2024-03-12 18:07:27 +04:00
committed by jekkos
parent 7356500d86
commit 68d6479f0d
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Helpers/locale_helper.php
View File

@@ -435,7 +435,7 @@ function to_decimals(?float $number, string $decimals = null, int $type = Number
{
if(!isset($number))
{
return "";
return '';
}
$config = config(OSPOS::class)->settings;
@@ -481,9 +481,9 @@ function parse_decimals(string $number, int $decimals = null)
{
return $number;
}
$locale_safe_number = prepare_decimal($number);
if ($locale_safe_number > MAX_PRECISION) //TODO: This breaks when the string passed does not use . as the decimal separator.
{
return false;

6
app/Views/item_kits/form.php
View File

@@ -89,7 +89,7 @@
'maxlength' => '5',
'id' => 'kit_discount',
'class' => 'form-control input-sm',
'value' => $item_kit_info->kit_discount
'value' => $item_kit_info->kit_discount_type === FIXED ? to_currency_no_money($item_kit_info->kit_discount) : to_decimals($item_kit_info->kit_discount)
]) ?>
</div>
</div>
@@ -197,7 +197,7 @@
?>
<tr>
<td><a href='#' onclick='return delete_item_kit_row(this);'><span class='glyphicon glyphicon-trash'></span></a></td>
<td><input class='quantity form-control input-sm' id='item_seq_<?= $item_kit_item['item_id'] ?>' name=item_kit_seq[<?= $item_kit_item['item_id'] ?>] value="<?= to_quantity_decimals($item_kit_item['kit_sequence']) ?>"/></td>
<td><input class='quantity form-control input-sm' id='item_seq_<?= $item_kit_item['item_id'] ?>' name=item_kit_seq[<?= $item_kit_item['item_id'] ?>] value="<?= parse_decimals($item_kit_item['kit_sequence'], 0) ?>"/></td>
<td><?= esc($item_kit_item['name']) ?></td>
<td><input class='quantity form-control input-sm' id='item_qty_<?= $item_kit_item['item_id'] ?>' name=item_kit_qty[<?= $item_kit_item['item_id'] ?>] value="<?= to_quantity_decimals($item_kit_item['quantity']) ?>"/></td>
</tr>
@@ -287,7 +287,7 @@ $(document).ready(function()
{
url: '<?= esc("$controller_name/checkItemNumber") ?>',
type: 'POST',
data:
data:
{
'item_kit_id' : "<?= $item_kit_info->item_kit_id ?>",
'item_kit_number' : function()