cief/exchange
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange.git synced 2026-08-19 12:24:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

allow empty description in invoice

Browse Source
This commit is contained in:
Edmond Teh
2020-09-14 15:33:04 +08:00
parent 56f9ce4348
commit b53d619434
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/InvoiceController.php
+13 -4
View File
@@ -54,7 +54,7 @@ class InvoiceController extends Controller
'reg_no' => 'required',
'lines.*.order' => 'required|numeric',
'lines.*.stock_code' => 'required',
'lines.*.description' => 'required',
'lines.*.description' => 'max:256',
'lines.*.quantity' => 'required|numeric',
'lines.*.unit_price_rm' => 'required|numeric',
'lines.*.unit_price_rmb' => '',
@@ -160,7 +160,7 @@ class InvoiceController extends Controller
'reg_no' => 'required',
'lines.*.order' => 'required|numeric',
'lines.*.stock_code' => 'required',
'lines.*.description' => 'required',
'lines.*.description' => 'max:256',
'lines.*.quantity' => 'required|numeric',
'lines.*.unit_price_rm' => 'required|numeric',
'lines.*.unit_price_rmb' => '',
@@ -208,7 +208,7 @@ class InvoiceController extends Controller
// Generate PO Number - po20200810-001(PO Format)
$dt = Carbon::now();
$po_number = 'po'.$dt->format('Ymmdd').'-'.$id;
$po_number = 'po'.$dt->format('Ymd').'-'.$id;
$invoice->amount = $total;
$invoice->booking_id = (int)$id;
@@ -273,13 +273,22 @@ class InvoiceController extends Controller
]);
// Save status to database
$status = new InvoiceStatuses;
$status->status = $validatedData['status'];
$status->comment = $validatedData['comment'];
$status->invoice_id = Invoice::where('booking_id', $id)->first()['id'];
$status->save();
$booking = Booking::find($id);
$monthlycount = Invoice::where('ei', 'like', 'EI-'.Carbon::createFromFormat('Y-m-d H:i:s', $booking->created_at)->format('Ym').'%')->count() + 1;
$generatednumber = Carbon::createFromFormat('Y-m-d H:i:s', $booking->created_at)->format('Ym').'-'.sprintf("%05d", $monthlycount);
$invoice = Invoice::where('booking_id', $id)->first();
$invoice->ei = 'EI-'.$generatednumber;
$invoice->edo = 'EDO-'.$generatednumber;
$invoice->save();
if(!$status) {
return response()->json(['message' => 'Unable to Update Status'], 500);
}