Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into development

This commit is contained in:
edmondlang
2022-04-07 22:57:28 +08:00
2 changed files with 20 additions and 9 deletions
@@ -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);
+17 -6
View File
@@ -27,12 +27,22 @@ 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(['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::group(['prefix' => 'last_mile_delivery', 'as' => 'last_mile_delivery.'], 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');
@@ -43,10 +53,11 @@ Route::group(['prefix' => 'last_mile_delivery', 'as' => 'last_mile_delivery.'],
Route::get('/orders/export', 'Delivery\ExportDeliveryOrdersToExcelController@lineClear')->name('order.export');
});
Route::get('', function () {
return view('pages.accounts.login');
})->name('login');
Route::group(['prefix' => 'swagger'], function () {
Route::get('/', function () {