mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-05-18 21:40:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

Supplementing issue #3997, this change allows the discount amount to be deleted by the user (instead of needing to enter a zero).

Browse Source
This commit is contained in:
Steve Ireland
2024-07-17 15:56:19 -04:00
committed by jekkos
parent 82aac4ec79
commit 05538570ec
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Controllers/Sales.php
View File

@@ -635,7 +635,7 @@ class Sales extends Secure_Controller
$rules = [
'price' => 'trim|required|numeric',
'quantity' => 'trim|required|numeric',
'discount' => 'trim|required|numeric',
'discount' => 'trim|permit_empty|numeric',
];
if($this->validate($rules))

22
app/Helpers/locale_helper.php
View File

@@ -362,28 +362,28 @@ function to_datetime(int $datetime = DEFAULT_DATETIME): string
}
/**
* @param float|null $number
* @param string|null $number
* @return string
*/
function to_currency(?float $number): string
function to_currency(?string $number): string
{
return to_decimals($number, 'currency_decimals', NumberFormatter::CURRENCY);
}
/**
* @param float|null $number
* @param string|null $number
* @return string
*/
function to_currency_no_money(?float $number): string
function to_currency_no_money(?string $number): string
{
return to_decimals($number, 'currency_decimals');
}
/**
* @param float|null $number
* @param string|null $number
* @return string
*/
function to_currency_tax(?float $number): string
function to_currency_tax(?string $number): string
{
$config = config(OSPOS::class)->settings;
@@ -419,21 +419,21 @@ function to_tax_decimals($number): string
}
/**
* @param float|null $number
* @param string|null $number
* @return string
*/
function to_quantity_decimals(?float $number): string
function to_quantity_decimals(?string $number): string
{
return to_decimals($number, 'quantity_decimals');
}
/**
* @param float|null $number
* @param string|null $number
* @param string|null $decimals
* @param int $type
* @return string
*/
function to_decimals(?float $number, string $decimals = null, int $type = NumberFormatter::DECIMAL): string
function to_decimals(?string $number, string $decimals = null, int $type = NumberFormatter::DECIMAL): string
{
if(!isset($number))
{
@@ -451,7 +451,7 @@ function to_decimals(?float $number, string $decimals = null, int $type = Number
}
$fmt->setSymbol(NumberFormatter::CURRENCY_SYMBOL, $config['currency_symbol']);
return $fmt->format($number);
return $fmt->format((float) $number);
}
/**