diff --git a/app/Http/Controllers/EstimatesController.php b/app/Http/Controllers/EstimatesController.php
index 1dec2420..19524a46 100644
--- a/app/Http/Controllers/EstimatesController.php
+++ b/app/Http/Controllers/EstimatesController.php
@@ -60,9 +60,10 @@ class EstimatesController extends Controller
$estimate_num_auto_generate = CompanySetting::getSetting('estimate_auto_generate', $request->header('company'));
$nextEstimateNumberAttribute = null;
+ $nextEstimateNumber = Estimate::getNextEstimateNumber($estimate_prefix);
if ($estimate_num_auto_generate == "YES") {
- $nextEstimateNumberAttribute = Estimate::getNextEstimateNumber($estimate_prefix);
+ $nextEstimateNumberAttribute = $nextEstimateNumber;
}
$tax_per_item = CompanySetting::getSetting('tax_per_item', $request->header('company'));
@@ -71,7 +72,8 @@ class EstimatesController extends Controller
return response()->json([
'customers' => $customers,
- 'nextEstimateNumber' => $nextEstimateNumberAttribute,
+ 'nextEstimateNumberAttribute' => $nextEstimateNumberAttribute,
+ 'nextEstimateNumber' => $estimate_prefix.'-'.$nextEstimateNumber,
'taxes' => Tax::whereCompany($request->header('company'))->latest()->get(),
'items' => Item::whereCompany($request->header('company'))->get(),
'tax_per_item' => $tax_per_item,
diff --git a/app/Http/Controllers/InvoicesController.php b/app/Http/Controllers/InvoicesController.php
index b22eb111..6edf7460 100644
--- a/app/Http/Controllers/InvoicesController.php
+++ b/app/Http/Controllers/InvoicesController.php
@@ -70,13 +70,15 @@ class InvoicesController extends Controller
$invoice_num_auto_generate = CompanySetting::getSetting('invoice_auto_generate', $request->header('company'));
$nextInvoiceNumberAttribute = null;
+ $nextInvoiceNumber = Invoice::getNextInvoiceNumber($invoice_prefix);
if ($invoice_num_auto_generate == "YES") {
- $nextInvoiceNumberAttribute = Invoice::getNextInvoiceNumber($invoice_prefix);
+ $nextInvoiceNumberAttribute = $nextInvoiceNumber;
}
return response()->json([
- 'nextInvoiceNumber' => $nextInvoiceNumberAttribute,
+ 'nextInvoiceNumberAttribute' => $nextInvoiceNumberAttribute,
+ 'nextInvoiceNumber' => $invoice_prefix.'-'.$nextInvoiceNumber,
'items' => Item::with('taxes')->whereCompany($request->header('company'))->get(),
'invoiceTemplates' => InvoiceTemplate::all(),
'tax_per_item' => $tax_per_item,
diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php
index ffe3582c..7f1697b9 100644
--- a/app/Http/Controllers/PaymentController.php
+++ b/app/Http/Controllers/PaymentController.php
@@ -56,16 +56,18 @@ class PaymentController extends Controller
$nextPaymentNumberAttribute = null;
+ $nextPaymentNumber = Payment::getNextPaymentNumber($payment_prefix);
if ($payment_num_auto_generate == "YES") {
- $nextPaymentNumberAttribute = Payment::getNextPaymentNumber($payment_prefix);
+ $nextPaymentNumberAttribute = $nextPaymentNumber;
}
return response()->json([
'customers' => User::where('role', 'customer')
->whereCompany($request->header('company'))
->get(),
- 'nextPaymentNumber' => $nextPaymentNumberAttribute,
+ 'nextPaymentNumberAttribute' => $nextPaymentNumberAttribute,
+ 'nextPaymentNumber' => $payment_prefix.'-'.$nextPaymentNumber,
'payment_prefix' => $payment_prefix
]);
}
diff --git a/resources/assets/js/views/estimates/Create.vue b/resources/assets/js/views/estimates/Create.vue
index a8cbfddf..62988de3 100644
--- a/resources/assets/js/views/estimates/Create.vue
+++ b/resources/assets/js/views/estimates/Create.vue
@@ -582,7 +582,7 @@ export default {
this.newEstimate.expiry_date = moment(today).add(7, 'days').toString()
this.itemList = response.data.items
this.estimatePrefix = response.data.estimate_prefix
- this.estimateNumAttribute = response.data.nextEstimateNumber
+ this.estimateNumAttribute = response.data.nextEstimateNumberAttribute
}
this.initLoading = false
},
diff --git a/resources/assets/js/views/invoices/Create.vue b/resources/assets/js/views/invoices/Create.vue
index 05368043..7c13fb2c 100644
--- a/resources/assets/js/views/invoices/Create.vue
+++ b/resources/assets/js/views/invoices/Create.vue
@@ -582,7 +582,7 @@ export default {
this.newInvoice.due_date = moment(today).add(7, 'days').toString()
this.itemList = response.data.items
this.invoicePrefix = response.data.invoice_prefix
- this.invoiceNumAttribute = response.data.nextInvoiceNumber
+ this.invoiceNumAttribute = response.data.nextInvoiceNumberAttribute
}
this.initLoading = false
},
diff --git a/resources/assets/js/views/layouts/LayoutBasic.vue b/resources/assets/js/views/layouts/LayoutBasic.vue
index cc0cf34c..a26bb996 100644
--- a/resources/assets/js/views/layouts/LayoutBasic.vue
+++ b/resources/assets/js/views/layouts/LayoutBasic.vue
@@ -50,7 +50,7 @@ export default {
Layout.set('layout-default')
},
- created() {
+ created () {
this.bootstrap().then((res) => {
this.setInitialCompany()
})
@@ -59,7 +59,7 @@ export default {
methods: {
...mapActions(['bootstrap']),
...mapActions('company', ['setSelectedCompany']),
- setInitialCompany() {
+ setInitialCompany () {
let selectedCompany = Ls.get('selectedCompany') !== null
if (selectedCompany) {
diff --git a/resources/assets/js/views/payments/Create.vue b/resources/assets/js/views/payments/Create.vue
index 8140ea23..bdb35061 100644
--- a/resources/assets/js/views/payments/Create.vue
+++ b/resources/assets/js/views/payments/Create.vue
@@ -309,7 +309,7 @@ export default {
} else {
let response = await this.fetchCreatePayment()
this.customerList = response.data.customers
- this.paymentNumAttribute = response.data.nextPaymentNumber
+ this.paymentNumAttribute = response.data.nextPaymentNumberAttribute
this.paymentPrefix = response.data.payment_prefix
this.formData.payment_date = moment(new Date()).toString()
}
diff --git a/resources/views/app/pdf/estimate/estimate1.blade.php b/resources/views/app/pdf/estimate/estimate1.blade.php
index 7fc1668a..eea1228f 100644
--- a/resources/views/app/pdf/estimate/estimate1.blade.php
+++ b/resources/views/app/pdf/estimate/estimate1.blade.php
@@ -3,9 +3,11 @@
Estimate
{{-- --}}
+
+