From 327bd75cc9f149d50efc232e2997da7c329da92d Mon Sep 17 00:00:00 2001 From: omair saleh Date: Thu, 7 Apr 2022 22:20:47 +0800 Subject: [PATCH 1/6] update final touch up for last delivery integration --- routes/web.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/routes/web.php b/routes/web.php index 956aa7b2..0e5a374b 100644 --- a/routes/web.php +++ b/routes/web.php @@ -32,7 +32,7 @@ Route::get('', function () { })->name('login'); -Route::group(['prefix' => 'last_mile_delivery', 'as' => 'last_mile_delivery.'], function () { +Route::domain('hywave.izyim.com')->prefix('last_mile_delivery')->as('last_mile_delivery.')->group(function () { Route::get('/', function () { return view('pages.accounts.signup'); })->name('login'); @@ -43,7 +43,6 @@ Route::group(['prefix' => 'last_mile_delivery', 'as' => 'last_mile_delivery.'], Route::get('/orders/export', 'Delivery\ExportDeliveryOrdersToExcelController@lineClear')->name('order.export'); - }); From 6940290570ade870d3fef4ee221620bb370b4ec1 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Thu, 7 Apr 2022 22:21:21 +0800 Subject: [PATCH 2/6] update final touch up for last delivery integration --- routes/web.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routes/web.php b/routes/web.php index 0e5a374b..e855bcc9 100644 --- a/routes/web.php +++ b/routes/web.php @@ -32,7 +32,7 @@ Route::get('', function () { })->name('login'); -Route::domain('hywave.izyim.com')->prefix('last_mile_delivery')->as('last_mile_delivery.')->group(function () { +Route::domain('hywave.izyim.com')->as('last_mile_delivery.')->group(function () { Route::get('/', function () { return view('pages.accounts.signup'); })->name('login'); From edd6b0d6ff8664b770c959b0c74875922a0fb8de Mon Sep 17 00:00:00 2001 From: omair saleh Date: Thu, 7 Apr 2022 22:22:22 +0800 Subject: [PATCH 3/6] update final touch up for last delivery integration --- routes/web.php | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/routes/web.php b/routes/web.php index e855bcc9..452d0f5a 100644 --- a/routes/web.php +++ b/routes/web.php @@ -32,17 +32,20 @@ Route::get('', function () { })->name('login'); -Route::domain('hywave.izyim.com')->as('last_mile_delivery.')->group(function () { - Route::get('/', function () { - return view('pages.accounts.signup'); - })->name('login'); +Route::domain('hywave.izyim.com')->group(function () { + Route::group(['prefix' => 'last_mile_delivery', 'as' => 'last_mile_delivery.'], function () { + Route::get('/', function () { + return view('pages.accounts.signup'); + })->name('login'); - Route::get('/dashboard', function () { - return view('pages.delivery.dashboard'); - })->name('dashboard'); + Route::get('/dashboard', function () { + return view('pages.delivery.dashboard'); + })->name('dashboard'); - Route::get('/orders/export', 'Delivery\ExportDeliveryOrdersToExcelController@lineClear')->name('order.export'); + Route::get('/orders/export', 'Delivery\ExportDeliveryOrdersToExcelController@lineClear')->name('order.export'); + + }); }); From 8c29fcda1f95a54a7fd3f30c10e0529200724ead Mon Sep 17 00:00:00 2001 From: omair saleh Date: Thu, 7 Apr 2022 22:28:51 +0800 Subject: [PATCH 4/6] update final touch up for last delivery integration --- routes/web.php | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/routes/web.php b/routes/web.php index 452d0f5a..5b086c48 100644 --- a/routes/web.php +++ b/routes/web.php @@ -27,13 +27,8 @@ use Illuminate\Support\Facades\Route; require __DIR__ . '/template.php'; -Route::get('', function () { - return view('pages.accounts.login'); -})->name('login'); - - Route::domain('hywave.izyim.com')->group(function () { - Route::group(['prefix' => 'last_mile_delivery', 'as' => 'last_mile_delivery.'], function () { + Route::group(['as' => 'last_mile_delivery.'], function () { Route::get('/', function () { return view('pages.accounts.signup'); })->name('login'); @@ -48,7 +43,9 @@ Route::domain('hywave.izyim.com')->group(function () { }); }); - +Route::get('', function () { + return view('pages.accounts.login'); +})->name('login'); Route::group(['prefix' => 'swagger'], function () { Route::get('/', function () { From 5dabc88fa9a692ced051e1b89bdf5594a910de5d Mon Sep 17 00:00:00 2001 From: omair saleh Date: Thu, 7 Apr 2022 22:40:01 +0800 Subject: [PATCH 5/6] update final touch up for last delivery integration --- database/seeders/LastMileDeliveryTableSeeder.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/database/seeders/LastMileDeliveryTableSeeder.php b/database/seeders/LastMileDeliveryTableSeeder.php index 4a79803b..0b279b4f 100644 --- a/database/seeders/LastMileDeliveryTableSeeder.php +++ b/database/seeders/LastMileDeliveryTableSeeder.php @@ -126,13 +126,13 @@ class LastMileDeliveryTableSeeder extends Seeder /** @var CompanyModule $companyModule */ $companyModule = $this->createCompanyModuleProcessor->execute($company, BusinessType::LAST_MILE_DELIVERY_AGENT); - $address = new AddressObject('Malaysian Global Innovation & Creativity Center Level 1 CWS', 'Block 3730,Persiaran APEC', 1, 15, 402, 63000, AddressType::BILLING, ApprovalStatus::APPROVED); + $address = new AddressObject('B-39-13, Menara Simfoni, Jalan Simfoni 2, Balakong', 'Block 3730,Persiaran APEC', 1, 15, 432, 43300, AddressType::BILLING, ApprovalStatus::APPROVED); $this->createsAddress->execute($companyModule, $address); - $contact = new ContactObject('Office Number', '0182909252', '', ''); + $contact = new ContactObject('Office Number', '01155543194', '', ''); $this->createsContact->execute($companyModule, $contact); - $user_object = new RegistrationObject('Winson', 'admin@last-mile-delivery.com', '1234567abcabc', '1234567abcabc', RoleTypes::USER, ApprovalStatus::APPROVED); + $user_object = new RegistrationObject('CQ', 'hywavetech168@gmail.com', 'FIzxqcZFFob7btVLEfWC', 'FIzxqcZFFob7btVLEfWC', RoleTypes::USER, ApprovalStatus::APPROVED); /** @var User $user */ $user = $this->createsUser->execute($user_object); From d9eeaf4befd79e430405eb93fcd4bda2f85fe706 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Thu, 7 Apr 2022 22:47:30 +0800 Subject: [PATCH 6/6] update final touch up for last delivery integration --- routes/web.php | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/routes/web.php b/routes/web.php index 5b086c48..b20eb873 100644 --- a/routes/web.php +++ b/routes/web.php @@ -39,10 +39,22 @@ Route::domain('hywave.izyim.com')->group(function () { Route::get('/orders/export', 'Delivery\ExportDeliveryOrdersToExcelController@lineClear')->name('order.export'); - }); }); +Route::group(['prefix'=> '/last_mile_delivery', 'as' => 'last_mile_delivery.'], function () { + Route::get('/', function () { + return view('pages.accounts.signup'); + })->name('login'); + + Route::get('/dashboard', function () { + return view('pages.delivery.dashboard'); + })->name('dashboard'); + + Route::get('/orders/export', 'Delivery\ExportDeliveryOrdersToExcelController@lineClear')->name('order.export'); + +}); + Route::get('', function () { return view('pages.accounts.login'); })->name('login');