bao/portal-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: standardize invoice number field, refine invoice creation logic, and update module foreign key constraints

Browse Source
This commit is contained in:
pbao9
2026-03-12 10:10:20 +07:00
parent 1e09ccf17b
commit 1934be9a19
10 changed files with 24 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Api/Admin/Invoice/InvoiceController.php
+2 -2
View File
@@ -58,14 +58,14 @@ class InvoiceController extends Controller
);
return DataTables::eloquent($query)
->addColumn('invoice_num', fn($d) => $d->invoice_num)
->addColumn('invoice_number', fn($d) => $d->invoice_number)
->addColumn('date', fn($d) => $d->date)
->addColumn('customer', fn($d) => $d->customer?->fullname)
->addColumn('payment', fn($d) => $d->payment?->name)
->addColumn('total', fn($d) => $d->total)
->addColumn('status', fn($d) => $d->status)
->addColumn('action', fn($d) => $d->id)
->rawColumns(['invoice_num', 'date', 'customer', 'payment', 'total', 'status', 'action'])
->rawColumns(['invoice_number', 'date', 'customer', 'payment', 'total', 'status', 'action'])
->make(true);
}
app/Http/Controllers/Api/Service/OrderController.php
+1 -1
View File
@@ -466,7 +466,7 @@ class OrderController extends Controller
return [
'id' => $invoice->id,
'invoice_number' => $invoice->invoice_number,
'invoice_number' => $invoice->invoice_number,
'invoice_type' => $invoice->invoice_type,
'status' => $invoice->status,
'status_text' => InvoiceStatus::tryFrom((int) $invoice->status)?->label() ?? '-',
app/Http/Controllers/admin/InvoiceController.php
+3 -3
View File
@@ -151,8 +151,8 @@ class InvoiceController extends Controller
);
return DataTables::eloquent($query)
->addColumn('invoice_num', function ($d) {
return view('administrator.pages.invoice.datatable.invoice_num', ['row' => $d])->render();
->addColumn('invoice_number', function ($d) {
return view('administrator.pages.invoice.datatable.invoice_number', ['row' => $d])->render();
})
->addColumn('date', function ($d) {
return view('administrator.pages.invoice.datatable.date', ['row' => $d])->render();
@@ -172,7 +172,7 @@ class InvoiceController extends Controller
->addColumn('action', function ($d) {
return view('administrator.pages.invoice.datatable.action', ['row' => $d])->render();
})
->rawColumns(['invoice_num', 'date', 'customer', 'payment', 'total', 'status', 'action'])
->rawColumns(['invoice_number', 'date', 'customer', 'payment', 'total', 'status', 'action'])
->make(true);
}
}