From b3651a135a2ca701fa8c7776b4add7558b5af3ea Mon Sep 17 00:00:00 2001 From: rahul shukla Date: Tue, 17 Sep 2019 12:36:36 +0530 Subject: [PATCH] Issue #1461 --- .../Webkul/Sales/src/Repositories/OrderRepository.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/packages/Webkul/Sales/src/Repositories/OrderRepository.php b/packages/Webkul/Sales/src/Repositories/OrderRepository.php index e3941aa84..17497ddfc 100755 --- a/packages/Webkul/Sales/src/Repositories/OrderRepository.php +++ b/packages/Webkul/Sales/src/Repositories/OrderRepository.php @@ -149,6 +149,7 @@ class OrderRepository extends Repository public function generateIncrementId() { $config = new CoreConfig(); + $invoiceNumberPrefix = $config->where('code','=',"sales.invoiceSettings.invoice_number.invoice_number_prefix")->first() ? $config->where('code','=',"sales.invoiceSettings.invoice_number.invoice_number_prefix")->first()->value : false; $invoiceNumberLength = $config->where('code','=',"sales.invoiceSettings.invoice_number.invoice_number_length")->first() @@ -159,11 +160,9 @@ class OrderRepository extends Repository $lastOrder = $this->model->orderBy('id', 'desc')->limit(1)->first(); $lastId = $lastOrder ? $lastOrder->id : 0; - if($invoiceNumberLength && ( $invoiceNumberPrefix || $invoiceNumberSuffix) ){ - - $invoiceNumber = $invoiceNumberPrefix . sprintf("%0{$invoiceNumberLength}d", $lastId + 1) . $invoiceNumberSuffix; - } - else{ + if ($invoiceNumberLength && ( $invoiceNumberPrefix || $invoiceNumberSuffix) ) { + $invoiceNumber = $invoiceNumberPrefix . sprintf("%0{$invoiceNumberLength}d", 0) . ($lastId + 1) . $invoiceNumberSuffix; + } else { $invoiceNumber = $lastId + 1; }