diff --git a/app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php b/app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php index 0a475411..5e7064b1 100644 --- a/app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php +++ b/app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php @@ -2,6 +2,7 @@ namespace App\Classes\Modules\Orders\ControllersLogic; +use App\Classes\Exceptions\RequestValidationException; use App\Classes\General\Abstracts\AbstractControllerLogic; use App\Classes\Modules\Addresses\Services\FetchesAddress; use App\Classes\Modules\Companies\Services\FetchesCompany; @@ -64,11 +65,14 @@ class CreateOrderLogic extends AbstractControllerLogic $address = $this->fetchesAddress->execute(['id' => $request->input('address_id')]); $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $request->input('warehouse_id')]); - - if($originWarehouse->reference === WarehouseReferences::VT_GUANG_ZHOU){ - $marking = $company->companyModules()->importers()->first()->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference; - if(in_array($marking, ['2192KAA', '2353GFE', '6866DTR', '153DSR', '1291NSC', '8288MIB'])){ - $originWarehouse = $this->fetchesCompanyModule->execute(['reference' => WarehouseReferences::YD_GUANG_ZHOU]); + + $marking = $company->companyModules()->importers()->first()->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference; + + if(!in_array($marking, ['1290CSW', '769SMC', '1200KJH', '1152AAT'])){ + $originWarehouse = $originWarehouse->reference === WarehouseReferences::VT_GUANG_ZHOU ? $this->fetchesCompanyModule->execute(['reference' => WarehouseReferences::YD_GUANG_ZHOU]) : $this->fetchesCompanyModule->execute(['reference' => WarehouseReferences::YD_YIWU]); + + if($originWarehouse->reference === WarehouseReferences::YD_YIWU && in_array($address->state_id, [5, 13, 14])) { + throw new RequestValidationException('Our Yiwu warehouse is unable to ship goods to Sabah & Sarawak at the moment due to the chinese new year\'s holiday. you can select our Guangzhou warehouse as an alternative.'); } } diff --git a/app/Classes/Modules/Orders/Processors/CreateOrderRolesProcessor.php b/app/Classes/Modules/Orders/Processors/CreateOrderRolesProcessor.php index 7ca3603f..82cf1e27 100644 --- a/app/Classes/Modules/Orders/Processors/CreateOrderRolesProcessor.php +++ b/app/Classes/Modules/Orders/Processors/CreateOrderRolesProcessor.php @@ -53,7 +53,7 @@ class CreateOrderRolesProcessor $importer = $order->companyModule; /** @var CompanyModule $destinationWarehouse */ - $destinationWarehouse = $this->fetchesCompanyModule->execute(['reference' => $originWarehouse->reference === WarehouseReferences::YD_GUANG_ZHOU ? WarehouseReferences::YD_DESTINATION_WAREHOUSE : WarehouseReferences::VT_DESTINATION_WAREHOUSE[$address->state_id]]); + $destinationWarehouse = $this->fetchesCompanyModule->execute(['reference' => $originWarehouse->reference === WarehouseReferences::YD_GUANG_ZHOU || $originWarehouse->reference === WarehouseReferences::YD_YIWU ? WarehouseReferences::YD_DESTINATION_WAREHOUSE : WarehouseReferences::VT_DESTINATION_WAREHOUSE[$address->state_id]]); /** @var CompanyModule $freightForwarder */ $freightForwarder = $originWarehouse->company->companyModules()->freightForwarders()->first(); @@ -79,7 +79,6 @@ class CreateOrderRolesProcessor $roleObject = new OrderRoleObject($order, $destinationWarehouse, OrderRoleTypes::DESTINATION_WAREHOUSE); $this->createsOrderRole->execute($roleObject); - $roleObject = new OrderRoleObject($order, $freightForwarder, OrderRoleTypes::LAST_MILE_DELIVERY_DRIVER); $this->createsOrderRole->execute($roleObject); diff --git a/app/Classes/ValueObjects/Constants/WarehouseReferences.php b/app/Classes/ValueObjects/Constants/WarehouseReferences.php index 4ab182e0..66ce67e6 100644 --- a/app/Classes/ValueObjects/Constants/WarehouseReferences.php +++ b/app/Classes/ValueObjects/Constants/WarehouseReferences.php @@ -10,6 +10,8 @@ final class WarehouseReferences { public const VT_YIWU = 'YW-V01'; + public const YD_YIWU = 'YW-V02'; + public const VT_KLANG = 'KL-V01'; public const YD_KLANG = 'KL-V02'; diff --git a/app/Http/Controllers/Orders/DownloadOrderQrPdfController.php b/app/Http/Controllers/Orders/DownloadOrderQrPdfController.php index ae23bae0..91111939 100644 --- a/app/Http/Controllers/Orders/DownloadOrderQrPdfController.php +++ b/app/Http/Controllers/Orders/DownloadOrderQrPdfController.php @@ -5,6 +5,7 @@ namespace App\Http\Controllers\Orders; use App\Classes\ValueObjects\Constants\ApprovalStatus; use App\Classes\ValueObjects\Constants\OrderRoleTypes; +use App\Classes\ValueObjects\Constants\WarehouseReferences; use App\Models\Order; use Illuminate\Http\Request; use Meneses\LaravelMpdf\Facades\LaravelMpdf; @@ -20,9 +21,20 @@ class DownloadOrderQrPdfController $warehouseAddress = $warehouse->addresses()->first(); $warehouseContacts = $warehouse->contacts; + $warehousePrefix = $warehouse->reference === WarehouseReferences::YD_YIWU ? ' KU/': ''; + $deliveryPrefix = ''; + + if(strtolower($deliveryAddress->state->name) === 'sabah' || strtolower($deliveryAddress->state->name) === 'labuan') { + $deliveryPrefix = 'SB/'; + } + + if(strtolower($deliveryAddress->state->name) === 'sarawak') { + $deliveryPrefix = 'SRW/'; + } + $data = [ 'order' => $order, - 'marking' => $order->companyModule->connections()->first()->invitee_reference, + 'marking' => $warehousePrefix.$deliveryPrefix.'CIEF/'.$order->companyModule->connections()->first()->invitee_reference, 'delivery_address' => $deliveryAddress, 'warehouse_address' => $warehouseAddress, 'warehouse_contacts' => $warehouseContacts, diff --git a/database/seeders/ModernWarehouseTableSeeder.php b/database/seeders/ModernWarehouseTableSeeder.php index 62973246..7f76fd2e 100644 --- a/database/seeders/ModernWarehouseTableSeeder.php +++ b/database/seeders/ModernWarehouseTableSeeder.php @@ -112,6 +112,8 @@ class ModernWarehouseTableSeeder extends Seeder $this->createsAddress->execute($companyModule, $address); $this->createsContact->execute($companyModule, $contact); + $this->createsContact->execute($companyModule, $contact); + } } diff --git a/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue b/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue index 055097ed..a9d4b495 100644 --- a/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue +++ b/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue @@ -32,7 +32,7 @@ - +
diff --git a/resources/assets/vue/components/general/elements/chineseNewYearMemoComponent.vue b/resources/assets/vue/components/general/elements/chineseNewYearMemoComponent.vue index 81e4a875..98feff0c 100644 --- a/resources/assets/vue/components/general/elements/chineseNewYearMemoComponent.vue +++ b/resources/assets/vue/components/general/elements/chineseNewYearMemoComponent.vue @@ -3,134 +3,39 @@
-
-
-
-
-
-

2022年农历新春前夕仓库运作通知

-

Chinese New Year Shipping Memo 2022

-
-
+
+
+
-

尊敬的顾客,

-

Dear Valued Customers,

-

为确保您的货物在华人农历新年前收到， 务必提前通知您的供应商安排在以下日期前把货物送到仓库:

-

To ensure your goods received before the Chinese New Year Holidays, we advised the customer to inform their suppliers to arrange their goods earlier beforehand to the schedule below:

-
-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - -
仓库 WAREHOUSE入仓日期 RECEIVED DATE
广州
GUANGHZOU
西马
WEST MALAYSIA		25/12/2021
东马
EAST MALAYSIA		11/12/2021
义乌
YIWU		西马
WEST MALAYSIA		18/12/2021
东马
EAST MALAYSIA		04/12/2021
-
-
-
-
-
-
+
-

我们建议客户尽早安排送货到中国仓库，以确保货物在恶劣天气、运输延误、海关检查等情况下准时到达目的地。

-

Customers are advised to arrange delivery to China warehouse as soon as possible to ensure goods reach their destination on time due to the events of Bad weather, Shipping delay, Custom inspection and etc.

+

好消息！过年前仓库延长收货通知

+

New Year Warehouse Operation Extend Notice

-
仓库运营日期
-
Warehouse Operation Date
-
+

由于今年年前运输需求非常庞大，我们决定投入更多的资源，把仓库收货的日期延长，以便确保更多货可以顺利在过年前把货顺利运出。

+

广州 - 延长至 25/1/2022

+

义乌 - 延长至 23/1/2022

+

仓库地址将会有所更改，请大家务必要在发货之前留意二维码上的新仓库地址。

-
+
-
- - - - - - - - - - - - - - - - - - - - - - - - - -
仓库
WAREHOUSE		仓库截止收货日期
LAST DAY RECEIVE GOODS		仓库復工日期
RESUME OPERATION DATE
义乌
YIWU		18/01/2022
西马 WEST MALAYSIA		16/02/2022
25/12/2021
东马 EAST MALAYSIA
广州
GUANGHZOU		18/01/2022
西马 WEST MALAYSIA		12/02/2022
08/01/2022
东马 EAST MALAYSIA
-
+

Due to large traffic for shipment before Chinese New Year, we have decided to invest more resource to extend our warehouse receiving date,
to ensure goods are sent out before CNY.

+

Guangzhou - extend till 25/1/2022

+

Yiwu - extend till 23/1/2022

+

Changes were made to the warehouse address, please change your delivery address according to the QR code.

-
-
-
-
Click To view {{expanded ? 'less' : 'more'}} details
-
-
- - - \ No newline at end of file diff --git a/resources/assets/vue/components/orders/forms/OrderFormComponent.vue b/resources/assets/vue/components/orders/forms/OrderFormComponent.vue index 84368688..a8949636 100644 --- a/resources/assets/vue/components/orders/forms/OrderFormComponent.vue +++ b/resources/assets/vue/components/orders/forms/OrderFormComponent.vue @@ -41,6 +41,20 @@
+
+
+
+
+

仓库截止收货日期/LAST DAY RECEIVE GOODS:

+
+
+ {{parameters.warehouse_id === 4 ? '23':'25'}}/01/2022 + 18/01/2022 +
+
+
+ +

浙江北仑疫情爆发， 义乌船期非常不稳定，建议发广州仓库
Due to Beilun, Zhejiang pandemic outbreak our Yiwu warehouse might experience unexpected shipping delays, you can select our Guangzhou warehouse as an alternative.

@@ -71,6 +85,11 @@

Please select the address where you want to receive this order

+
+
+ {{error}} +
+
@@ -151,6 +170,7 @@ return { section: 'createOrderForm', step: 1, + error: '', parameters : { warehouse_id: '', address_id: '', @@ -161,7 +181,7 @@ methods:{ createOrder(){ this.step++; - this.submit((this.route('api.order.create')), 'post', 'orderListSection', true, true) + this.submit((this.route('api.order.create')), 'post', 'orderListSection', true, false) }, cancelOrder(){ this.parameters.warehouse_id = ''; @@ -175,7 +195,8 @@ }, 5000); }, - errorHandler(){ + errorHandler(response){ + this.error = response.message; this.step--; } } diff --git a/resources/views/pdfs/qr.blade.php b/resources/views/pdfs/qr.blade.php index 1ee3ed19..d9271960 100644 --- a/resources/views/pdfs/qr.blade.php +++ b/resources/views/pdfs/qr.blade.php @@ -32,7 +32,7 @@ -

{{(strtolower($delivery_address->state->name) === 'sabah' || strtolower($delivery_address->state->name) === 'labuan') ? 'SB/' : (strtolower($delivery_address->state->name) === 'sarawak' ? 'SRW/':'')}}CIEF/{{$marking}}/{{$order->reference}}

+

{{$marking}}/{{$order->reference}}