mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-04-04 23:24:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Minor fixes.

Browse Source 
- Correct capitalization.
- Revert assignment to an invalid language code.
- Correct dynamic assignment in config singleton.

Signed-off-by: objecttothis <objecttothis@gmail.com>
This commit is contained in:
objecttothis
2024-05-20 15:43:06 +04:00
committed by jekkos
parent c39b733c90
commit c942f53bf1
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Events/Load_config.php
View File

@@ -43,8 +43,8 @@ class Load_config
if(current_language_code() == null || current_language() == null || !$language_exists) //TODO: current_language() is undefined
{
$config->language = 'english';
$config->language_code = 'en';
$config->settings['language'] = 'english';
$config->settings['language_code'] = 'en-US';
}
$language = Services::language();

9
app/Models/Sale.php
View File

@@ -1103,11 +1103,10 @@ class Sale extends Model
$sale_cost = 'SUM(sales_items.item_cost_price * sales_items.quantity_purchased)';
$tax = 'IFnull(SUM(sales_items_taxes.tax), 0)';
$sales_tax = 'IFnull(SUM(sales_items_taxes.sales_tax), 0)';
$internal_tax = 'IFnull(SUM(sales_items_taxes.internal_tax), 0)';
$cash_adjustment = 'IFnull(SUM(payments.sale_cash_adjustment), 0)';
$tax = 'IFNULL(SUM(sales_items_taxes.tax), 0)';
$sales_tax = 'IFNULL(SUM(sales_items_taxes.sales_tax), 0)';
$internal_tax = 'IFNULL(SUM(sales_items_taxes.internal_tax), 0)';
$cash_adjustment = 'IFNULL(SUM(payments.sale_cash_adjustment), 0)';
if($config['tax_included'])
{