From df6fe58652bace19468bca5b407759963280f7ed Mon Sep 17 00:00:00 2001
From: objecttothis <objecttothis@gmail.com>
Date: Fri, 18 Nov 2022 16:10:04 +0400
Subject: [PATCH] Porting over 96c5924

---
 app/Controllers/Sales.php |  9 +++++----
 app/Models/Appconfig.php  | 24 ++++++++++++++++++------
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/app/Controllers/Sales.php b/app/Controllers/Sales.php
index 33d7b93f1..c3a492354 100644
--- a/app/Controllers/Sales.php
+++ b/app/Controllers/Sales.php
@@ -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();
diff --git a/app/Models/Appconfig.php b/app/Models/Appconfig.php
index ad8c4fff8..bbdd5b2d9 100644
--- a/app/Models/Appconfig.php
+++ b/app/Models/Appconfig.php
@@ -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;
 	}