From d996ff29cbd5df0af7856619d2405f8d1dc3ce15 Mon Sep 17 00:00:00 2001 From: FrancescoUK Date: Tue, 29 Mar 2016 09:21:43 +0100 Subject: [PATCH] Regenerate invoice number on sale unsuspend if no custom format is used (#423) --- application/controllers/Sales.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/application/controllers/Sales.php b/application/controllers/Sales.php index 350b595a3..40cc230a0 100644 --- a/application/controllers/Sales.php +++ b/application/controllers/Sales.php @@ -511,6 +511,13 @@ class Sales extends Secure_area return $text; } + + private function _is_custom_invoice_number($cust_info) + { + $invoice_number = $this->config->config['sales_invoice_format']; + $invoice_number = $this->_substitute_variables($invoice_number, $cust_info); + return $this->sale_lib->get_invoice_number() != $invoice_number; + } private function _substitute_variables($text, $cust_info) { @@ -791,6 +798,7 @@ class Sales extends Secure_area $data['amount_change'] = to_currency($this->sale_lib->get_amount_due() * -1); $data['employee'] = $emp_info->first_name.' '.$emp_info->last_name; + $cust_info = ''; if($customer_id != -1) { $cust_info = $this->Customer->get_info($customer_id); @@ -804,6 +812,9 @@ class Sales extends Secure_area } } + $is_set = $this->_is_custom_invoice_number($cust_info); + $invoice_number = $is_set ? $invoice_number : NULL; + $total_payments = 0; foreach($data['payments'] as $payment)