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

Porting over 96c5924

Browse Source
This commit is contained in:
objecttothis
2022-11-18 16:10:04 +04:00
committed by Steve Ireland
parent c37a140248
commit df6fe58652
2 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/Controllers/Sales.php
View File

@@ -1209,14 +1209,15 @@ class Sales extends Secure_Controller
$data['items_module_allowed'] = $this->employee->has_grant('items', $this->employee->get_logged_in_employee_info()->person_id);
$data['change_price'] = $this->employee->has_grant('sales_change_price', $this->employee->get_logged_in_employee_info()->person_id);
$invoice_number = $this->sale_lib->get_invoice_number();
$temp_invoice_number = $this->sale_lib->get_invoice_number();
$invoice_format = config('OSPOS')->sales_invoice_format;
if ($this->sale_lib->get_invoice_number() == NULL)
if ($temp_invoice_number == NULL || $temp_invoice_number == '')
{
$invoice_number = config('OSPOS')->sales_invoice_format;
$temp_invoice_number = $this->token_lib->render($invoice_format, [], FALSE);
}
$data['invoice_number'] = $invoice_number;
$data['invoice_number'] = $temp_invoice_number;
$data['print_after_sale'] = $this->sale_lib->is_print_after_sale();
$data['price_work_orders'] = $this->sale_lib->is_price_work_orders();

24
app/Models/Appconfig.php
View File

@@ -100,10 +100,14 @@ class Appconfig extends Model
/**
* @throws ReflectionException
*/
public function acquire_save_next_invoice_sequence(): string
public function acquire_next_invoice_sequence(bool $save = true): string
{
$last_used = (int)config('OSPOS')->last_used_invoice_number + 1;
$this->save(['last_used_invoice_number' => $last_used]);
if($save)
{
$this->save('last_used_invoice_number', $last_used);
}
return $last_used;
}
@@ -111,10 +115,14 @@ class Appconfig extends Model
/**
* @throws ReflectionException
*/
public function acquire_save_next_quote_sequence(): string
public function acquire_next_quote_sequence(bool $save = true): string
{
$last_used = (int)config('OSPOS')->last_used_quote_number + 1;
$this->save(['last_used_quote_number' => $last_used]);
if($save)
{
$this->save('last_used_quote_number', $last_used);
}
return $last_used;
}
@@ -122,10 +130,14 @@ class Appconfig extends Model
/**
* @throws ReflectionException
*/
public function acquire_save_next_work_order_sequence(): string
public function acquire_next_work_order_sequence(bool $save = true): string
{
$last_used = (int)config('OSPOS')->last_used_work_order_number + 1;
$this->save(['last_used_work_order_number' => $last_used]);
if($save)
{
$this->save('last_used_work_order_number', $last_used);
}
return $last_used;
}