cief/shipping-portal
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal.git synced 2026-08-31 10:24:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dillon/90-e-invoice-shipping-portal-a' into vapor/production

Browse Source
This commit is contained in:
Dillon Ngo
2025-06-27 00:26:57 +08:00
parent be9df4afe3 3913d3c738
commit fe18d8bf5a
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
routes/web.php
+10 -10
View File
@@ -215,11 +215,11 @@ Route::get('/orders-table', function () {
Route::get('/order/show/{order_number}', function (Illuminate\Http\Request $request, $orderNumber) {
// return view('pages.orders.profile', ['id' => $orderNumber]);
$order = Order::where('reference', $orderNumber)->first();
$isValid = $order->companyModule->company->e_invoice !== null;
if (!$isValid) {
return redirect()->route('dashboard');
}
// $order = Order::where('reference', $orderNumber)->first();
// $isValid = $order->companyModule->company->e_invoice !== null;
// if (!$isValid) {
// return redirect()->route('dashboard');
// }
return view('pages.orders.profile_v2', [
'id' => $orderNumber,
@@ -280,12 +280,12 @@ Route::get('/customer/{marking}/payment-and-billing', function ($marking) {
Route::get('/customer-invoices/{company_module_id}/payment-and-billing', function ($company_module_id) {
// todo-new: check company_module_id
$companyModule = CompanyModule::where('id', $company_module_id)->first();
$isValid = $companyModule->company->e_invoice !== null;
// $companyModule = CompanyModule::where('id', $company_module_id)->first();
// $isValid = $companyModule->company->e_invoice !== null;
if (!$isValid) {
return redirect()->route('dashboard');
}
// if (!$isValid) {
// return redirect()->route('dashboard');
// }
return view('pages.customers.paymentsBilling', ['company_module_id' => $company_module_id]);
})->name('customer.payment-and-billing-by-company-module-id');