sepereate delivery login component and shipping login component

app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php

@@ -67,7 +67,7 @@ class CreateOrderLogic extends AbstractControllerLogic
         $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $request->input('warehouse_id')]);
 
         if(!in_array($company->companyModules()->importers()->first()->id, WarehouseReferences::YD_EXEMPT_LIST)){
-            $originWarehouse = $this->fetchesCompanyModule->execute(['reference' =>  $originWarehouse->reference === WarehouseReferences::VT_GUANG_ZHOU ? WarehouseReferences::YD_GUANG_ZHOU_2 : WarehouseReferences::YD_YIWU]);
+            $originWarehouse = $this->fetchesCompanyModule->execute(['reference' =>  $originWarehouse->reference === WarehouseReferences::VT_GUANG_ZHOU ? WarehouseReferences::YD_GUANG_ZHOU : WarehouseReferences::YD_YIWU]);
         }
 
         if($originWarehouse->reference === WarehouseReferences::YD_YIWU && in_array($address->state_id, [5, 13, 14])) {

app/Classes/Modules/Segments/ControllersLogic/CreateBasePriceLogic.php

@@ -1,121 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Segments\ControllersLogic;
-
-use App\Classes\Exceptions\ResourceNotFoundException;
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Segments\DataTransferObjects\ConstantObject;
-use App\Classes\Modules\Segments\Services\UpdatesBasePriceConstantByDates;
-use App\Classes\Modules\Segments\Services\CreatesConstant;
-use App\Classes\Modules\Segments\Services\FetchesConstant;
-use App\Classes\Modules\Segments\Services\FetchesSegment;
-use App\Classes\Modules\Segments\Standards\Rules\CanCreateConstant;
-use App\Classes\Modules\Segments\Standards\Rules\CanUpdateConstant;
-use App\Classes\Modules\Segments\Services\UpdatesConstant;
-use App\Classes\ValueObjects\Constants\SegmentConstants;
-use App\Http\Resources\ConstantResource;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class CreateBasePriceLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Create Base Price',
-            'message' => 'You have successfully created a Base Price'
-        ];
-    }
-
-    /** @var CanUpdateConstant */
-    private $canUpdateConstant;
-
-    /** @var UpdatesConstant */
-    private $updatesConstant;
-
-    /** @var FetchesSegment */
-    private $fetchesSegment;
-
-    /** @var FetchesConstant */
-    private $fetchesConstant;
-
-    /** @var CanCreateConstant */
-    private $canCreateConstant;
-
-    /** @var CreatesConstant */
-    private $createsConstant;
-
-
-    /** @var UpdatesBasePriceConstantByDates */
-    private $updatesBasePriceConstantByDates;
-
-    /**
-     * UpdateConstantLogic constructor.
-     * @param CanUpdateConstant $canUpdateConstant
-     * @param UpdatesConstant $updatesConstant
-     * @param FetchesSegment $fetchesSegment
-     * @param FetchesConstant $fetchesConstant
-     * @param CanCreateConstant $canCreateConstant
-     * @param CreatesConstant $createsConstant
-     * @param UpdatesBasePriceConstantByDates $updatesBasePriceConstantByDates
-     */
-    public function __construct(
-        CanUpdateConstant $canUpdateConstant, 
-        UpdatesConstant $updatesConstant, 
-        FetchesSegment $fetchesSegment, 
-        FetchesConstant $fetchesConstant, 
-        CanCreateConstant $canCreateConstant, 
-        CreatesConstant $createsConstant,
-        UpdatesBasePriceConstantByDates $updatesBasePriceConstantByDates
-    )
-    {
-        $this->canUpdateConstant = $canUpdateConstant;
-        $this->updatesConstant = $updatesConstant;
-        $this->fetchesSegment = $fetchesSegment;
-        $this->fetchesConstant = $fetchesConstant;
-        $this->canCreateConstant = $canCreateConstant;
-        $this->createsConstant = $createsConstant;
-        $this->updatesBasePriceConstantByDates = $updatesBasePriceConstantByDates;
-    }
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws \App\Classes\Exceptions\AccessForbiddenException
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     * @throws \App\Classes\Exceptions\RequestValidationException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        $segment = $this->fetchesSegment->execute(['id' => $request->route('id')]);
-
-        try {
-
-            $constant = $this->fetchesConstant->execute(['segment_id' => $segment->id, 'reference' => SegmentConstants::BASE_PRICE]);
-
-        } catch (ResourceNotFoundException $exception){
-
-            $constantObject = [];
-
-            $object = new ConstantObject(
-                SegmentConstants::BASE_PRICE,
-                $constantObject
-            );
-
-            $constant = $this->createsConstant->execute($segment, $object);
-        }
-
-        $constantValue = $this->updatesBasePriceConstantByDates->execute($constant->value, $request->input('dateFrom'), $request->input('dateTo'), $request->input('rate'));
-
-        $object = new ConstantObject(SegmentConstants::BASE_PRICE, $constantValue);
-
-        $this->canUpdateConstant->passes($object);
-        
-        $constant = $this->updatesConstant->execute($constant, $object);
-
-        return $this->resourceResponse(new ConstantResource($constant));
-    }
-
-}

app/Classes/Modules/Segments/ControllersLogic/FetchBasePriceLogic.php

@@ -1,68 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Segments\ControllersLogic;
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Segments\Services\FetchesConstant;
-use App\Classes\ValueObjects\Constants\SegmentConstants;
-use App\Http\Resources\ConstantResource;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Carbon\CarbonPeriod;
-
-class FetchBasePriceLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Retrieved Base Price',
-            'message' => 'You have successfully retrieved the Base Price'
-        ];
-    }
-
-
-    /** @var FetchesConstant */
-    private $fetchesConstant;
-
-    /**
-     * FetchConstantLogic constructor.
-     * @param FetchesConstant $fetchesConstant
-     */
-    public function __construct(FetchesConstant $fetchesConstant)
-    {
-        $this->fetchesConstant = $fetchesConstant;
-    }
-
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-
-        $constant = $this->fetchesConstant->execute(['segment_id' => $request->route('id'), 'reference' => SegmentConstants::BASE_PRICE]);
-
-        $constantObject = (array) $constant->value;
-
-        if ($request->input('dateFrom') !== null && $request->input('dateTo') !== null) {
-
-            $period = CarbonPeriod::create($request->input('dateFrom'), $request->input('dateTo'));
-
-            $returnObject = [];
-
-            foreach ($period as $date) {
-                array_key_exists($date->format('Y-m-d'), $constantObject) === true ? $returnObject[$date->format('Y-m-d')] = $constantObject[$date->format('Y-m-d')] : '';
-            }
-
-            $constant->value = json_encode($returnObject);
-
-        }
-
-        return $this->resourceResponse(new ConstantResource($constant));
-    }
-
-}

app/Classes/Modules/Segments/ControllersLogic/UpdateConstantLogic.php

@@ -5,9 +5,7 @@ namespace App\Classes\Modules\Segments\ControllersLogic;
 use App\Classes\Exceptions\ResourceNotFoundException;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Segments\DataTransferObjects\ConstantObject;
-use App\Classes\Modules\Segments\DataTransferObjects\SegmentObject;
 use App\Classes\Modules\Segments\Services\CreatesConstant;
-use App\Classes\Modules\Segments\Services\CreatesSegment;
 use App\Classes\Modules\Segments\Services\FetchesConstant;
 use App\Classes\Modules\Segments\Services\FetchesSegment;
 use App\Classes\Modules\Segments\Standards\Rules\CanCreateConstant;
@@ -17,7 +15,6 @@ use App\Http\Resources\ConstantResource;
 use App\Models\SegmentConstant;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
-use App\Classes\Modules\Segments\Services\UpdatesConstantValue;
 
 class UpdateConstantLogic  extends AbstractControllerLogic
 {
@@ -50,11 +47,6 @@ class UpdateConstantLogic  extends AbstractControllerLogic
     /** @var CreatesConstant */
     private $createsConstant;
 
-    /** @var CreatesSegment */
-    private $createsSegment;
-
-    /** @var UpdatesConstantValue */
-    private $updatesConstantValue;
 
     /**
      * UpdateConstantLogic constructor.
@@ -64,19 +56,8 @@ class UpdateConstantLogic  extends AbstractControllerLogic
      * @param FetchesConstant $fetchesConstant
      * @param CanCreateConstant $canCreateConstant
      * @param CreatesConstant $createsConstant
-     * @param UpdatesConstantValueByState $updatesConstantValueByState
-     * @param CreatesSegment $createsSegment
      */
-    public function __construct(
-        CanUpdateConstant $canUpdateConstant, 
-        UpdatesConstant $updatesConstant, 
-        FetchesSegment $fetchesSegment, 
-        FetchesConstant $fetchesConstant, 
-        CanCreateConstant $canCreateConstant, 
-        CreatesConstant $createsConstant,
-        UpdatesConstantValue $updatesConstantValue,
-        CreatesSegment $createsSegment
-    )
+    public function __construct(CanUpdateConstant $canUpdateConstant, UpdatesConstant $updatesConstant, FetchesSegment $fetchesSegment, FetchesConstant $fetchesConstant, CanCreateConstant $canCreateConstant, CreatesConstant $createsConstant)
     {
         $this->canUpdateConstant = $canUpdateConstant;
         $this->updatesConstant = $updatesConstant;
@@ -84,8 +65,6 @@ class UpdateConstantLogic  extends AbstractControllerLogic
         $this->fetchesConstant = $fetchesConstant;
         $this->canCreateConstant = $canCreateConstant;
         $this->createsConstant = $createsConstant;
-        $this->updatesConstantValue = $updatesConstantValue;
-        $this->createsSegment = $createsSegment;
     }
     /**
      * @param Request $request
@@ -96,33 +75,28 @@ class UpdateConstantLogic  extends AbstractControllerLogic
      */
     public function logic(Request $request) : JsonResponse
     {
+
+        $object = new ConstantObject($request->input('reference'), $request->input('value'));
+
         $segment = $this->fetchesSegment->execute(['id' => $request->route('id')]);
 
         try {
 
-            $constant = $this->fetchesConstant->execute(['segment_id' => $segment->id, 'reference' => $request->input('reference')]);
-
-            $constantValue = $this->updatesConstantValue->execute($constant->value, $request->input('id'), $request->input('rate'));
-
-            $object = new ConstantObject($request->input('reference'), $constantValue);
-
+            $constant = $this->fetchesConstant->execute(['segment_id' => $segment->id, 'reference' => $object->getReference()]);
             $this->canUpdateConstant->passes($object);
 
+            /** @var SegmentConstant $constant */
+            $constant = $this->updatesConstant->execute($constant, $object);
+
         } catch (ResourceNotFoundException $exception){
 
-            $constantObject = [];
-
-            $constantObject[$request->input('id')] = $request->input('rate');
-
-            $object = new ConstantObject(
-                $request->input('reference'),
-                $constantObject
-            );
+            $this->canCreateConstant->passes($object);
 
+            /** @var SegmentConstant $constant */
             $constant = $this->createsConstant->execute($segment, $object);
+
         }
-        
-        $constant = $this->updatesConstant->execute($constant, $object);
+
 
         return $this->resourceResponse(new ConstantResource($constant));
     }

app/Classes/Modules/Segments/ControllersLogic/UpdateConstantPostcodeLogic.php

@@ -14,8 +14,6 @@ use App\Classes\Modules\Segments\Standards\Rules\CanUpdateConstant;
 use App\Classes\Modules\Segments\DataTransferObjects\ConstantObject;
 use App\Classes\Modules\Segments\Services\AddItemToConstantValueArray;
 use App\Classes\Modules\Segments\Services\RemoveItemFromConstantValueArray;
-use App\Classes\Exceptions\ResourceNotFoundException;
-use App\Classes\Modules\Segments\Services\CreatesConstant;
 
 class UpdateConstantPostcodeLogic  extends AbstractControllerLogic
 {
@@ -48,8 +46,6 @@ class UpdateConstantPostcodeLogic  extends AbstractControllerLogic
     /** @var RemoveItemFromConstantValueArray */
     private $removeItemFromConstantValueArray;
 
-    /** @var CreatesConstant */
-    private $createsConstant;
 
     /**
      * UpdateConstantLogic constructor.
@@ -58,18 +54,9 @@ class UpdateConstantPostcodeLogic  extends AbstractControllerLogic
      * @param FetchesSegment $fetchesSegment
      * @param FetchesConstant $fetchesConstant
      * @param AddItemToConstantValueArray $addItemToConstantValueArray
-     * @param CreatesConstant $createsConstant
      * @param RemoveItemFromConstantValueArray $removeItemFromConstantValueArray
      */
-    public function __construct(
-        CanUpdateConstant $canUpdateConstant, 
-        UpdatesConstant $updatesConstant, 
-        FetchesSegment $fetchesSegment, 
-        FetchesConstant $fetchesConstant,
-        AddItemToConstantValueArray $addItemToConstantValueArray, 
-        RemoveItemFromConstantValueArray $removeItemFromConstantValueArray,
-        CreatesConstant $createsConstant
-    )
+    public function __construct(CanUpdateConstant $canUpdateConstant, UpdatesConstant $updatesConstant, FetchesSegment $fetchesSegment, FetchesConstant $fetchesConstant,AddItemToConstantValueArray $addItemToConstantValueArray, RemoveItemFromConstantValueArray $removeItemFromConstantValueArray)
     {
         $this->canUpdateConstant = $canUpdateConstant;
         $this->updatesConstant = $updatesConstant;
@@ -77,7 +64,6 @@ class UpdateConstantPostcodeLogic  extends AbstractControllerLogic
         $this->fetchesConstant = $fetchesConstant;
         $this->addItemToConstantValueArray = $addItemToConstantValueArray;
         $this->removeItemFromConstantValueArray = $removeItemFromConstantValueArray;
-        $this->createsConstant = $createsConstant;
     }
     /**
      * @param Request $request
@@ -90,42 +76,24 @@ class UpdateConstantPostcodeLogic  extends AbstractControllerLogic
     {
         $segment = $this->fetchesSegment->execute(['id' => $request->route('id')]);
 
-        try {
-            $constant = $this->fetchesConstant->execute(['segment_id' => $segment->id, 'reference' => $request->input('reference')]);
+        $constant = $this->fetchesConstant->execute(['segment_id' => $segment->id, 'reference' => $request->input('reference')]);
 
-            $constantValue = $this->addItemToConstantValueArray->execute($constant->value, $request->input('postcode'));
-
-            $object = new ConstantObject($request->input('reference'), $constantValue);
-
-        } catch (ResourceNotFoundException $exception){
-
-            $constantObject = [$request->input('postcode')];
-
-            $object = new ConstantObject(
-                $request->input('reference'),
-                $constantObject
-            );
-
-            $constant = $this->createsConstant->execute($segment, $object);
-        }
-
-        try {
-            // check if postcode exist in the opposite constant, and delete it
-            $oppositeConstant = $this->fetchesConstant->execute(['segment_id' => $segment->id, 'reference' => $request->input('reference') == SegmentConstants::CENTER_POSTCODE ? SegmentConstants::OUTSTATION_POSTCODE : SegmentConstants::CENTER_POSTCODE]);
-
-            $oppositeConstantValue = $this->removeItemFromConstantValueArray->execute($oppositeConstant->value, $request->input('postcode'));
-
-            $oppositeObject = new ConstantObject($request->input('reference') == SegmentConstants::CENTER_POSTCODE ? SegmentConstants::OUTSTATION_POSTCODE : SegmentConstants::CENTER_POSTCODE, $oppositeConstantValue);
-
-            $this->updatesConstant->execute($oppositeConstant, $oppositeObject);
-
-        } catch (ResourceNotFoundException $exception){
-            // if opposite constant does not exist, do nothing
-        }
+        $object = new ConstantObject($constant->reference, $this->addItemToConstantValueArray->execute($constant->value, $request->input('postcode')));
+        $this->canUpdateConstant->passes($object);
 
         $constant = $this->updatesConstant->execute($constant, $object);
 
-        return $this->resourceResponse(new ConstantResource($constant));
+        $oppositeConstant = $this->fetchesConstant->execute(['segment_id' => $segment->id, 'reference' => $request->input('reference') == SegmentConstants::CENTER_POSTCODE ? SegmentConstants::OUTSTATION_POSTCODE : SegmentConstants::CENTER_POSTCODE]);
+
+        $oppositeObject = new ConstantObject($request->input('reference') == SegmentConstants::CENTER_POSTCODE ? SegmentConstants::OUTSTATION_POSTCODE : SegmentConstants::CENTER_POSTCODE, $this->removeItemFromConstantValueArray->execute($oppositeConstant->value, $request->input('postcode')));
+
+        $oppositeConstant = $this->updatesConstant->execute($oppositeConstant, $oppositeObject);
+
+
+        return $this->response([
+            'CENTER_POSTCODE' => $constant->reference == SegmentConstants::CENTER_POSTCODE ? new ConstantResource($constant) : New ConstantResource($oppositeConstant),
+            'OUTSTATION_POSTCODE' => $constant->reference == SegmentConstants::OUTSTATION_POSTCODE ? new ConstantResource($constant) : New ConstantResource($oppositeConstant),
+        ]);
     }
 
 }

app/Classes/Modules/Segments/ControllersLogic/UpdateConstantStateLogic.php

@@ -0,0 +1,87 @@
+<?php
+
+namespace App\Classes\Modules\Segments\ControllersLogic;
+
+use Illuminate\Http\Request;
+use App\Models\SegmentConstant;
+use Illuminate\Http\JsonResponse;
+use App\Http\Resources\ConstantResource;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+use App\Classes\Modules\Segments\Services\FetchesSegment;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Segments\Services\FetchesConstant;
+use App\Classes\Modules\Segments\Services\UpdatesConstant;
+use App\Classes\Modules\Segments\Standards\Rules\CanUpdateConstant;
+use App\Classes\Modules\Segments\DataTransferObjects\ConstantObject;
+use App\Classes\Modules\Segments\Services\UpdatesConstantValueByState;
+
+class UpdateConstantStateLogic  extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Updated Segment Constant',
+            'message' => 'You have successfully updated the Segment Constant'
+        ];
+    }
+
+    /** @var CanUpdateConstant */
+    private $canUpdateConstant;
+
+    /** @var UpdatesConstant */
+    private $updatesConstant;
+
+    /** @var FetchesSegment */
+    private $fetchesSegment;
+
+    /** @var FetchesConstant */
+    private $fetchesConstant;
+
+    /** @var UpdatesConstantValueByState */
+    private $updatesConstantValueByState;
+
+
+    /**
+     * UpdateConstantLogic constructor.
+     * @param CanUpdateConstant $canUpdateConstant
+     * @param UpdatesConstant $updatesConstant
+     * @param FetchesSegment $fetchesSegment
+     * @param FetchesConstant $fetchesConstant
+     * @param UpdatesConstantValueByState $updatesConstantValueByState
+     */
+    public function __construct(CanUpdateConstant $canUpdateConstant, UpdatesConstant $updatesConstant, FetchesSegment $fetchesSegment, FetchesConstant $fetchesConstant,UpdatesConstantValueByState $updatesConstantValueByState)
+    {
+        $this->canUpdateConstant = $canUpdateConstant;
+        $this->updatesConstant = $updatesConstant;
+        $this->fetchesSegment = $fetchesSegment;
+        $this->fetchesConstant = $fetchesConstant;
+        $this->updatesConstantValueByState = $updatesConstantValueByState;
+    }
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $segment = $this->fetchesSegment->execute(['id' => $request->route('id')]);
+
+        $constant = $this->fetchesConstant->execute(['segment_id' => $segment->id, 'reference' => SegmentConstants::STATE_RATE]);
+        
+        $constantValue = $this->updatesConstantValueByState->execute($constant->value, $request->input('status_id'), $request->input('rate'));
+
+        $object = new ConstantObject(SegmentConstants::STATE_RATE, (array) $constantValue);
+        $this->canUpdateConstant->passes($object);
+        
+        $constant = $this->updatesConstant->execute($constant, $object);
+
+
+        return $this->resourceResponse(new ConstantResource($constant));
+    }
+
+}

app/Classes/Modules/Segments/Services/UpdatesBasePriceConstantByDates.php

@@ -1,29 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Segments\Services;
-
-use Carbon\CarbonPeriod;
-
-class UpdatesBasePriceConstantByDates
-{
-
-    /**
-     * @param $json
-     * @param int $status_id
-     * @param Array $rate
-     * @return Array
-     */
-    public function execute($json, String $date_from,  String $date_to, String $rate) {
-
-        $objectArray = (array) $json;
-
-        $period = CarbonPeriod::create($date_from, $date_to);
-
-        foreach ($period as $date) {
-            $objectArray[$date->format('Y-m-d')] = $rate;
-        }
-
-        return $objectArray;
-    }
-
-}

app/Classes/Modules/Segments/Services/UpdatesConstantValue.php

@@ -1,23 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Segments\Services;
-
-class UpdatesConstantValue
-{
-
-    /**
-     * @param $json
-     * @param int $status_id
-     * @param Array $rate
-     * @return Array
-     */
-    public function execute($json, int $state_id, Array $rate) {
-
-        $objectArray = (array) $json;
-
-        $objectArray[$state_id] = $rate;
-
-        return $objectArray;
-    }
-
-}

app/Classes/Modules/Segments/Services/UpdatesConstantValueByState.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Classes\Modules\Segments\Services;
+
+class UpdatesConstantValueByState
+{
+
+    /**
+     * @param $json
+     * @param int $status_id
+     * @param int $rate
+     * @return string
+     */
+    public function execute($json, int $status_id, int $rate) {
+
+        $newArray = $json;
+        foreach($json->config as $key => $object){
+            if($object->status_id == $status_id){
+                $newArray->config[$key] = (object) [
+                    'rate' => $rate,
+                    'status_id' => $object->status_id,
+                    'outstation_rate' => $object->outstation_rate,
+                ];
+            }else{
+                $newArray->config[$key] = $object;
+            }
+        }
+        return $newArray;
+
+    }
+
+}

app/Http/Controllers/Segments/CreateBasePriceController.php

@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Segments;
-
-use App\Classes\Modules\Segments\ControllersLogic\CreateBasePriceLogic;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class CreateBasePriceController
-{
-    /**
-     * @param Request $request
-     * @param CreateBasePriceLogic $logic
-     * @return JsonResponse
-     */
-    public function create(Request $request, CreateBasePriceLogic $logic): JsonResponse {
-        return $logic->execute($request);
-    }
-
-}

app/Http/Controllers/Segments/FetchBasePriceController.php

@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Segments;
-
-use App\Classes\Modules\Segments\ControllersLogic\FetchBasePriceLogic;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class FetchBasePriceController
-{
-    /**
-     * @param Request $request
-     * @param FetchSegmentLogic $logic
-     * @return JsonResponse
-     */
-    public function fetch(Request $request, FetchBasePriceLogic $logic): JsonResponse {
-        return $logic->execute($request);
-    }
-
-}

app/Http/Controllers/Segments/UpdateConstantStateController.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Segments;
+
+use App\Classes\Modules\Segments\ControllersLogic\UpdateConstantStateLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateConstantStateController
+{
+    /**
+     * @param Request $request
+     * @param UpdateConstantStateLogic $logic
+     * @return JsonResponse
+     */
+    public function update(Request $request, UpdateConstantStateLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}

app/Http/Resources/AddressResource.php

@@ -5,8 +5,6 @@ namespace App\Http\Resources;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Models\Order;
 use Illuminate\Http\Resources\Json\JsonResource;
-use App\Models\SegmentConstant;
-use App\Classes\ValueObjects\Constants\SegmentConstants;
 
 class AddressResource extends JsonResource
 {
@@ -19,14 +17,6 @@ class AddressResource extends JsonResource
     public function toArray($request)
     {
 
-        $centerPostcodeConstantObject = SegmentConstant::where('reference', SegmentConstants::CENTER_POSTCODE)->get();
-        $centerPostcodeConstant = $centerPostcodeConstantObject->isEmpty() ? [] : (array)$centerPostcodeConstantObject->first()->value;
-        $postcodeArea = in_array($this->postcode, $centerPostcodeConstant) ? 'CENTER_POSTCODE' : '';
-        
-        $outstationPostcodeConstantObject = SegmentConstant::where('reference', SegmentConstants::OUTSTATION_POSTCODE)->get();
-        $outstationPostcodeConstant = $outstationPostcodeConstantObject->isEmpty() ? [] : (array)$outstationPostcodeConstantObject->first()->value;
-        in_array($this->postcode, $outstationPostcodeConstant) ? $postcodeArea = 'OUTSTATION_POSTCODE' : '';
-
         return [
             'id' => $this->id,
             'reference' => $this->reference,
@@ -35,7 +25,6 @@ class AddressResource extends JsonResource
             'district' => $this->district,
             'state' => $this->state,
             'post_code' => $this->postcode,
-            'post_code_area' => $postcodeArea,
             'country' => $this->country,
             'default' => (int) $this->default,
             'status' => (int) $this->status,

app/Http/Resources/CompanyModuleResource.php

@@ -32,9 +32,6 @@ class CompanyModuleResource extends JsonResource
         $connection = $this->inviters()->withPivot('invitee_reference')->first();
         $marking = $connection ? $connection->pivot->invitee_reference:'';
 
-        $segmentConstantObject = SegmentConstant::where('reference', SegmentConstants::WAREHOUSE_RATE)->get();
-        $segmentConstant = $segmentConstantObject->isEmpty() ? [] : (array)$segmentConstantObject->first()->value;
-
         return [
             'id' => $this->id,
             'type' => $this->type,
@@ -43,8 +40,7 @@ class CompanyModuleResource extends JsonResource
             'address' => new AddressResource($defaultAddress),
             'company' => new CompanyResource($this->whenLoaded('company')),
             'remarks' => RemarkResource::collection($this->remarks),
-            'marking' => $marking,
-            'warehouseCharges' => array_key_exists($this->id, $segmentConstant) ? $segmentConstant[$this->id] : null,
+            'marking' => $marking
         ];
 
     }

app/Http/Resources/DistrictResource.php

@@ -20,7 +20,6 @@ class DistrictResource extends JsonResource
             'state' => $this->state,
             'country' => $this->country,
             'postcode' => $this->postcode,
-            'postcodeArray' => PostcodeResource::collection(json_decode($this->postcode)),
         ];
     }
 }

app/Http/Resources/PostcodeResource.php

@@ -1,33 +0,0 @@
-<?php
-
-namespace App\Http\Resources;
-
-use Illuminate\Http\Resources\Json\JsonResource;
-use App\Models\SegmentConstant;
-use App\Classes\ValueObjects\Constants\SegmentConstants;
-
-
-class PostcodeResource extends JsonResource
-{
-    /**
-     * Transform the resource into an array.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        $centerPostcodeConstantObject = SegmentConstant::where('reference', SegmentConstants::CENTER_POSTCODE)->get();
-        $centerPostcodeConstant = $centerPostcodeConstantObject->isEmpty() ? [] : (array)$centerPostcodeConstantObject->first()->value;
-        $postcodeArea = in_array($this->resource, $centerPostcodeConstant) ? 'CENTER_POSTCODE' : '';
-        
-        $outstationPostcodeConstantObject = SegmentConstant::where('reference', SegmentConstants::OUTSTATION_POSTCODE)->get();
-        $outstationPostcodeConstant = $outstationPostcodeConstantObject->isEmpty() ? [] : (array)$outstationPostcodeConstantObject->first()->value;
-        in_array($this->resource, $outstationPostcodeConstant) ? $postcodeArea = 'OUTSTATION_POSTCODE' : '';
-
-        return [
-            'postcode' => $this->resource,
-            'postcodeArea' => $postcodeArea,
-        ];
-    }
-}

app/Http/Resources/StateResource.php

@@ -1,9 +1,8 @@
 <?php
 
 namespace App\Http\Resources;
-use App\Models\SegmentConstant;
+
 use Illuminate\Http\Resources\Json\JsonResource;
-use App\Classes\ValueObjects\Constants\SegmentConstants;
 
 class StateResource extends JsonResource
 {
@@ -15,15 +14,10 @@ class StateResource extends JsonResource
      */
     public function toArray($request)
     {
-
-        $segmentConstantObject = SegmentConstant::where('reference', SegmentConstants::STATE_RATE)->get();
-        $segmentConstant = $segmentConstantObject->isEmpty() ? [] : (array)$segmentConstantObject->first()->value;
-
         return [
             'id' => $this->id,
             'name' => $this->name,
             'country' => $this->country,
-            'stateCharges' => array_key_exists($this->id, $segmentConstant) ? $segmentConstant[$this->id] : null,
         ];
     }
 }

resources/assets/vue/components/accounts/forms/DeliveryLoginFormComponent.vue

@@ -0,0 +1,70 @@
+<template>
+    <div class="row" @keyup.enter="submitForm">
+        <div class="col">
+            <error-message-component class="m-b-20" :error="error"></error-message-component>
+            <div class="row">
+                <div class="col">
+                    <validation-wrapper-component class="m-b-15" :validator="$v.parameters.email">
+                        <label class="text-primary">Email Address</label>
+                        <input type="text" class="form-control fs-12" v-model.trim="parameters.email">
+                    </validation-wrapper-component>
+                    <validation-wrapper-component :validator="$v.parameters.password">
+                        <label class="text-primary">Password</label>
+                        <input type="password" class="form-control fs-12" v-model="parameters.password">
+                    </validation-wrapper-component>
+                    <div class="row m-t-15 align-items-center justify-content-center">
+                        <div class="col-auto">
+                            <div class="checkbox check-complete no-margin">
+                                <input type="checkbox" checked="checked" value="1" id="checkbox2">
+                                <label for="checkbox2 bold no-margin">Remember Me</label>
+                            </div>
+                        </div>
+                        <div class="col text-right">
+                            <p class="muted fs-11 font-arial m-b-0 pointer bold" @click="$store.dispatch('toggleSection', {name: 'forgetPassword', status: true})">Forgot password?</p>
+                        </div>
+                    </div>
+                    <div class="row m-t-15 align-items-center justify-content-center">
+                        <div class="col">
+                            <div class="btn btn-block btn-lg b-rad-none no-border" :class="[{'btn-primary': currentUrl.indexOf('last_mile_delivery') === -1 }, {'btn-info': currentUrl.indexOf('last_mile_delivery') > -1 }]" @click="submitForm">Sign In</div>
+                        </div>
+                    </div>
+                    <div class="row m-t-15">
+                        <div class="col text-center">
+                            <div class="col">
+                                <p>New Customer? <strong class=" m-b-0 pointer" @click="$store.dispatch('toggleSection', {name: 'registrationForm', status: true})">Create Account</strong></p>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import loginFormValidation from '../../../general/mixins/accounts/validation/loginFormValidation'
+    export default {
+        props: {
+            section:{
+                type: String,
+                required: true
+            }
+        },
+        data() {
+            return {
+                error: '',
+                parameters: {
+                    email: this.email,
+                    password: ''
+                },
+                currentUrl: window.location.href,
+            };
+        },
+        methods: {
+          submitForm(){
+              this.submit(this.route('api.account.authentication.authenticate.attempt'), 'post', this.section, false, false)
+          }
+        },
+        mixins: [loginFormValidation]
+    }
+
+</script>

resources/assets/vue/components/accounts/forms/LoginFormComponent.vue

@@ -31,7 +31,7 @@
                     <div class="row m-t-15">
                         <div class="col text-center">
                             <div class="col">
-                                <p>New Customer? <strong class=" m-b-0 pointer" @click="$store.dispatch('toggleSection', {name: 'registrationForm', status: true})">Create Account</strong></p>
+                                <p>New Customer? <strong class=" m-b-0 pointer"><a class="text-master" :href="route('signup')">Create Account</a></strong></p>
                             </div>
                         </div>
                     </div>

resources/assets/vue/components/accounts/forms/RegistrationFormComponent.vue

@@ -156,14 +156,14 @@
                                             </div>
                                             <div class="row">
                                                 <div class="col-auto">
-                                                    <button type="button" class="btn btn-sm p-t-10 p-b-10 btn-default bg-master-lighter b-rad-none" @click="$store.dispatch('toggleSection', {name: 'registrationForm', status: false})">
+                                                    <a :href="route('login')" class="btn btn-sm p-t-10 p-b-10 btn-default bg-master-lighter b-rad-none">
                                                         <div class="row align-items-center">
                                                             <div class="col-auto p-r-10">
                                                                 <i class="fa fa-angle-left fs-16" style="margin-top: 1px;"></i>
                                                             </div>
                                                             <div class="col p-l-5">I already have an account</div>
                                                         </div>
-                                                    </button>
+                                                    </a>
                                                 </div>
                                                 <div class="col text-right">
                                                     <button type="button" class="btn btn-sm btn-block p-t-10 p-b-10 p-r-35 p-l-35 btn-primary b-rad-none p-r-30" @click="changeStep('next')">

resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue

@@ -11,6 +11,11 @@
                     <on-boarding-section-component v-if="!company.last_order"></on-boarding-section-component>
                     <div class="row" v-if="company.last_order">
                         <div class="col">
+                            <div class="row m-b-20">
+                                <div class="col text-center no-padding">
+                                    <img src="/images/raya-announcement.jpg" class="w-75">
+                                </div>
+                            </div>
                             <div class="row m-b-30 relative">
                                 <div class="col">
                                     <div class="row">

resources/assets/vue/components/containers/elements/ContainerComponent.vue

@@ -64,19 +64,13 @@
                     </div>
                 </div>
             </div>
-            <packing-list-section-component :section="section" :data="item" v-if="expanded"></packing-list-section-component>
+            <packing-list-section-component :data="item" v-if="expanded"></packing-list-section-component>
         </div>
     </div>
 </template>
 <script>
     import componentHandler from '../../../general/mixins/componentHandler';
     export default {
-        props: {
-            section:{
-                type: String,
-                default: ''
-            }
-        },
         data(){
             return {
                 expanded: false,

resources/assets/vue/components/containers/elements/PackingListComponent.vue

@@ -18,7 +18,7 @@
                 {{item.order.address.street_one+' '+(item.order.address.street_two ? item.order.address.street_two : '')+', '+ item.order.address.district.name+', '+item.order.address.post_code+' '+item.order.address.state.name+', '+item.order.address.country.name}}<br>{{item.order.address.remark ? item.order.address.remark.content: ''}}
                 <div class="btn btn-xs btn-primary pointer m-t-10 requestModal" data-type="defineLocation">Define Location</div>
                 <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="defineLocation">
-                    <declare-postcode-area-form-component :section="section" :data="{postcode: item.order.address.post_code, postcodeArea: item.order.address.post_code_area}"></declare-postcode-area-form-component>
+                    <declare-postcode-area-form-component :data="item.order.address.post_code"></declare-postcode-area-form-component>
                 </modal-component>
             </div>
         </div>
@@ -59,12 +59,6 @@
 <script>
     import componentHandler from '../../../general/mixins/componentHandler';
     export default {
-        props: {
-            section:{
-                type: String,
-                default: ''
-            }
-        },
         data(){
             return {
                 parameters: {

resources/assets/vue/components/containers/forms/DeclarePostcodeAreaFormComponent.vue

@@ -1,27 +1,27 @@
 <template>
-    <div class="row" style="width: 450px; margin: auto;">
+    <div class="row" style="width: 450px; margin: auto;" @keyup.enter="submitForm">
         <div class="col bg-white padding-40 b-rad-lg">
             <div class="row m-b-10">
                 <div class="col">
-                    <h2 class="text-center text-complete bold">{{data.postcode}}</h2>
-                    <p class="text-center" v-show="parameters.reference=== ''">This postcode is yet to be declare. Plase choose the area.</p>
+                    <h2 class="text-center text-complete bold">{{data}}</h2>
+                    <p class="text-center" v-show="postcodeArea=== ''">This postcode is yet to be declare. Plase choose the area.</p>
                 </div>
             </div>
             <div class="row text-center justify-content-center">
                 <div class="col p-r-5">
-                    <div class="b-a b-thick p-t-15 p-b-15 p-l-35 p-r-35 pointer" :class="{ 'b-primary': parameters.reference === 'CENTER_POSTCODE', 'b-grey': parameters.reference !== 'CENTER_POSTCODE' }"  @click="parameters.reference = 'CENTER_POSTCODE'">
+                    <div class="b-a b-thick p-t-15 p-b-15 p-l-35 p-r-35 pointer" :class="{ 'b-primary': postcodeArea === 'city_center', 'b-grey': postcodeArea !== 'city_center' }"  @click="postcodeArea = 'city_center'">
                         <div class="row">
                             <div class="col">
-                                <h5 class="no-margin" :class="{ 'text-primary': parameters.reference === 'CENTER_POSTCODE', 'semi-bold': parameters.reference === 'CENTER_POSTCODE' }">City Center</h5>
+                                <h5 class="no-margin" :class="{ 'text-primary': postcodeArea === 'city_center', 'semi-bold': postcodeArea === 'city_center' }">City Center</h5>
                             </div>
                         </div>
                     </div>
                 </div>
                 <div class="col p-l-5">
-                    <div class="b-a b-thick p-t-15 p-b-15 p-l-35 p-r-35 pointer" :class="{ 'b-primary': parameters.reference === 'OUTSTATION_POSTCODE', 'b-grey': parameters.reference !== 'OUTSTATION_POSTCODE' }"  @click="parameters.reference = 'OUTSTATION_POSTCODE'">
+                    <div class="b-a b-thick p-t-15 p-b-15 p-l-35 p-r-35 pointer" :class="{ 'b-primary': postcodeArea === 'outskirt', 'b-grey': postcodeArea !== 'outskirt' }"  @click="postcodeArea = 'outskirt'">
                         <div class="row">
                             <div class="col">
-                                <h5 class="no-margin" :class="{ 'text-primary': parameters.reference === 'OUTSTATION_POSTCODE', 'semi-bold': parameters.reference === 'OUTSTATION_POSTCODE'}">Outskirt</h5>
+                                <h5 class="no-margin" :class="{ 'text-primary': postcodeArea === 'outskirt', 'semi-bold': postcodeArea === 'outskirt'}">Outskirt</h5>
                             </div>
                         </div>
                     </div>
@@ -32,7 +32,8 @@
                     <div class="btn btn-lg btn-default b-rad-none" data-dismiss="modal">Cancel</div>
                 </div>
                 <div class="col p-l-5">
-                    <div class="btn btn-primary w-100 btn-lg" @click="submit(route('api.segment.constant.update.postcode', 1), 'put', section, true, true)">Confirm</div>
+                    <!-- <div class="btn btn-primary w-100 btn-lg" @click="submit(route('api.packing_list.assign.order', data, orderNo), 'put', section, true, true)">Confirm</div> -->
+                    <div class="btn btn-primary w-100 btn-lg">Confirm</div>
                 </div>
             </div>
         </div>
@@ -45,7 +46,7 @@
     export default {
         props: {
             data: {
-                type: Object,
+                type: String,
                 required: false
             },
             section: {
@@ -54,12 +55,13 @@
         },
         data() {
             return {
-                parameters: {
-                    reference: this.data.postcodeArea,
-                    postcode: this.data.postcode
-                } 
+                postcodeArea: '', 
             };
         },
+        validations: {
+            orderNo: '', 
+
+        },
         mixins: [modalFormHandler]
     }
 

resources/assets/vue/components/containers/sections/PackingListSectionComponent.vue

@@ -24,7 +24,7 @@
                                 <div class="col">
                                     <div class="row align-items-center p-t-10 p-b-10 b-t b-grey" v-for="packingList in packingLists">
                                         <div class="col">
-                                            <packing-list-component :section="section" :data="packingList"></packing-list-component>
+                                            <packing-list-component :data="packingList"></packing-list-component>
                                         </div>
                                     </div>
                                 </div>
@@ -42,12 +42,6 @@
     import PackingListComponent from "../elements/PackingListComponent";
     export default {
         components: {PackingListComponent, LoadingComponent},
-        props: {
-            section:{
-                type: String,
-                default: ''
-            }
-        },
         data(){
             return {
                 isLoading: true,

resources/assets/vue/components/orders/forms/OrderFormComponent.vue

@@ -45,6 +45,7 @@
                                 <div class="col-6">
                                     <div class="row m-t-20">
                                         <div class="col">
+                                            <p class="text-center bold">仓库复工 ： 2022年5月3日 | Warehouse Receiving  : 03 May 2022</p>
                                             <p class="text-center">最新运费价格 <a href="https://www.cief-malaysia.com/services-sea-shipping/" class="text-underline" target="_blank">点击 “这里 </a><br>For the latest shipping prices <a href="https://www.cief-malaysia.com/services-sea-shipping/" class="text-underline"  target="_blank">click here</a></p>
                                         </div>
                                     </div>

resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue

@@ -274,7 +274,7 @@
                                                                          style=" fill:#000000;"><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g fill="#000000"><path d="M8.6,23.65c-2.37676,0 -4.3,1.92324 -4.3,4.3c0,2.37676 1.92324,4.3 4.3,4.3c2.37676,0 4.3,-1.92324 4.3,-4.3c4.77031,0 8.6,3.82969 8.6,8.6v85.10137c0,8.28926 6.76074,15.05 15.05,15.05h0.50391c0.99941,2.98145 3.72051,5.19863 7.02109,5.19863h4.43438c-0.74746,1.26816 -1.20938,2.72949 -1.20938,4.3c0,4.72832 3.87168,8.6 8.6,8.6c4.72832,0 8.6,-3.87168 8.6,-8.6c0,-1.57051 -0.46191,-3.03184 -1.20938,-4.3h66.91875c-0.74746,1.26816 -1.20937,2.72949 -1.20937,4.3c0,4.72832 3.87168,8.6 8.6,8.6c4.72832,0 8.6,-3.87168 8.6,-8.6c0,-1.57051 -0.46191,-3.03184 -1.20937,-4.3h4.43437c3.36777,0 6.13926,-2.30117 7.08828,-5.375h0.43672v-2.15c0,-3.90527 -3.04863,-7.12188 -6.87832,-7.45781c0.26035,-0.69707 0.42832,-1.43613 0.42832,-2.21719v-40.85c0,-1.67129 -0.73066,-3.14941 -1.78887,-4.3c1.0582,-1.15059 1.78887,-2.62871 1.78887,-4.3v-43c0,-3.53574 -2.91426,-6.45 -6.45,-6.45h-94.6c-3.53574,0 -6.45,2.91426 -6.45,6.45v43c0,1.67129 0.73066,3.14941 1.78887,4.3c-1.0582,1.15059 -1.78887,2.62871 -1.78887,4.3v40.85c0,0.78105 0.16797,1.52012 0.42832,2.21719c-3.15781,0.27715 -5.75293,2.51953 -6.57598,5.48418h-0.30234c-5.96289,0 -10.75,-4.78711 -10.75,-10.75v-85.10137c0,-7.09668 -5.80332,-12.9 -12.9,-12.9zM49.45,30.1h94.6c1.21777,0 2.15,0.93223 2.15,2.15v43c0,1.21777 -0.93223,2.15 -2.15,2.15c-1.17578,0.0168 -2.11641,0.97422 -2.11641,2.15c0,1.17578 0.94062,2.1332 2.11641,2.15c1.21777,0 2.15,0.93223 2.15,2.15v40.85c0,1.21777 -0.93223,2.15 -2.15,2.15h-94.6c-1.21777,0 -2.15,-0.93223 -2.15,-2.15v-40.85c0,-1.21777 0.93223,-2.15 2.15,-2.15c1.17578,-0.0168 2.11641,-0.97422 2.11641,-2.15c0,-1.17578 -0.94063,-2.1332 -2.11641,-2.15c-1.21777,0 -2.15,-0.93223 -2.15,-2.15v-43c0,-1.21777 0.93223,-2.15 2.15,-2.15zM88.15,38.7c-0.77266,-0.0084 -1.49492,0.39473 -1.88965,1.0666c-0.38633,0.67188 -0.38633,1.49492 0,2.1668c0.39473,0.67188 1.11699,1.075 1.88965,1.0666h17.2c0.77266,0.0084 1.49492,-0.39473 1.88965,-1.0666c0.38633,-0.67187 0.38633,-1.49492 0,-2.1668c-0.39472,-0.67187 -1.11699,-1.075 -1.88965,-1.0666zM58.05,77.4c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM66.65,77.4c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM75.25,77.4c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM83.85,77.4c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM92.45,77.4c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM101.05,77.4c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM109.65,77.4c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM118.25,77.4c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM126.85,77.4c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM135.45,77.4c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM88.15,90.3c-0.77266,-0.0084 -1.49492,0.39473 -1.88965,1.0666c-0.38633,0.67188 -0.38633,1.49492 0,2.1668c0.39473,0.67188 1.11699,1.075 1.88965,1.0666h17.2c0.77266,0.0084 1.49492,-0.39473 1.88965,-1.0666c0.38633,-0.67187 0.38633,-1.49492 0,-2.1668c-0.39472,-0.67187 -1.11699,-1.075 -1.88965,-1.0666zM44.075,131.15h105.35c1.80566,0 3.225,1.41934 3.225,3.225c0,1.80566 -1.41934,3.225 -3.225,3.225h-105.35c-1.80566,0 -3.225,-1.41934 -3.225,-3.225c0,-1.80566 1.41934,-3.225 3.225,-3.225zM55.9,141.9c2.40195,0 4.3,1.89805 4.3,4.3c0,2.40195 -1.89805,4.3 -4.3,4.3c-2.40195,0 -4.3,-1.89805 -4.3,-4.3c0,-2.40195 1.89805,-4.3 4.3,-4.3zM137.6,141.9c2.40195,0 4.3,1.89805 4.3,4.3c0,2.40195 -1.89805,4.3 -4.3,4.3c-2.40195,0 -4.3,-1.89805 -4.3,-4.3c0,-2.40195 1.89805,-4.3 4.3,-4.3z"></path></g></g></svg>
                                                                 </div>
                                                             </div>
-                                                            <div class="row" v-if="$store.getters.isSuperAdmin">
+                                                            <div class="row" v-if="$store.getters.isAdmin">
                                                                 <div class="col">
                                                                     <div data-type="createWarehousePackageList" class="text-complete pointer requestModal fs-11 all-caps text-underline">Add Arrived Parcel</div>
                                                                     <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="stick-up" type="createWarehousePackageList" >

resources/assets/vue/components/settings/elements/ListPostcodeComponent.vue

@@ -15,19 +15,7 @@
                     </div>
                     <div class="row">
                         <div class="col">
-                            <div class="font-heading all-caps">{{data.postcode}}</div>
-                        </div>
-                    </div>
-                </div>
-                <div class="col">
-                    <div class="row">
-                        <div class="col-auto p-r-10">
-                            <div class="font-heading all-caps fs-8 muted">Location</div>
-                        </div>
-                    </div>
-                    <div class="row">
-                        <div class="col">
-                            <div class="font-heading all-caps">{{data.postcodeArea == '' ? '-' : data.postcodeArea.replaceAll('_', ' ') }}</div>
+                            <div class="font-heading all-caps">{{data}}</div>
                         </div>
                     </div>
                 </div>
@@ -36,7 +24,7 @@
                         <div class="col">
                             <div class="btn btn-xs btn-primary pointer m-t-10 requestModal" data-type="defineLocation">Define Location</div>
                             <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="defineLocation">
-                                <declare-postcode-area-form-component :data="data" section="allPostcodesSection"></declare-postcode-area-form-component>
+                                <declare-postcode-area-form-component :data="data"></declare-postcode-area-form-component>
                             </modal-component>
                         </div>
                     </div>
@@ -52,7 +40,7 @@
     export default {
         props: {
             data: {
-                type: Object,
+                type: String,
                 required: false
             },
             section: {

resources/assets/vue/components/settings/elements/StatesChargesComponent.vue

@@ -27,7 +27,7 @@
                     </div>
                     <div class="row">
                         <div class="col">
-                            <div class="font-heading all-caps">MYR {{ data.stateCharges === null ? '0.00' : data.stateCharges.center }}</div>
+                            <div class="font-heading all-caps">MYR 0.00</div>
                         </div>
                     </div>
                 </div>
@@ -39,7 +39,7 @@
                     </div>
                     <div class="row">
                         <div class="col">
-                            <div class="font-heading all-caps">MYR {{ data.stateCharges === null ? '0.00' : data.stateCharges.outstation }}</div>
+                            <div class="font-heading all-caps">MYR 0.00</div>
                         </div>
                     </div>
                 </div>
@@ -48,7 +48,7 @@
                         <div class="col">
                             <div class="btn btn-xs btn-primary pointer m-t-10 requestModal" data-type="editCharges">Edit</div>
                             <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="editCharges">
-                                <edit-state-charges-form-component :data="data" :section="section"></edit-state-charges-form-component>
+                                <edit-state-charges-form-component :data="data"></edit-state-charges-form-component>
                             </modal-component>
                         </div>
                     </div>

resources/assets/vue/components/settings/elements/WarehouseChargesComponent.vue

@@ -27,9 +27,9 @@
                     </div>
                     <div class="row">
                         <div class="col">
-                            <div class="font-heading all-caps">MYR {{ data.warehouseCharges === null ? '0.00' : data.warehouseCharges.amount }} <i class="fa fa-edit pointer fa-fw m-l-5 requestModal text-primary" data-type="editWarehouseCharges"></i></div>
+                            <div class="font-heading all-caps">MYR 0.00 <i class="fa fa-edit pointer fa-fw m-l-5 requestModal text-primary" data-type="editWarehouseCharges"></i></div>
                             <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="editWarehouseCharges">
-                                <edit-warehouse-charges-form-component :data="data" section="warhouseListSection"></edit-warehouse-charges-form-component>
+                                <edit-warehouse-charges-form-component :data="data"></edit-warehouse-charges-form-component>
                             </modal-component>
                         </div>
                     </div>
@@ -54,7 +54,7 @@
                         <modal-component class="animate__animated animate__fast animate__fadeIn" type="warehouseRemark">
                             <remark-form-component module_type="CompanyModule" :data="data" section="warhouseListSection"></remark-form-component>
                         </modal-component>
-                        <modal-component class="animate__animated animate__fast animate__fadeIn" type="deleteWarehouseRemark">
+                          <modal-component class="animate__animated animate__fast animate__fadeIn" type="deleteWarehouseRemark">
                             <delete-remark-form-component :section="section" :data="data.remarks[0]"></delete-remark-form-component>
                         </modal-component>
                     </div>

resources/assets/vue/components/settings/forms/BasePriceFormComponent.vue

@@ -1,80 +0,0 @@
-<template>
-    <div class="row" style="width: 450px; margin: auto;" @keyup.enter="submitForm">
-        <div class="col bg-white b-rad-lg">
-             <div class="row m-b-10">
-                <div class="col text-center">
-                    <p>Plese set the approximate of base price and dates of below.</p>
-                </div>
-            </div>
-            <div class="row">
-                <div class="col">
-                    <div class="row m-auto mt-10 mb-10">
-                        <div class="col p-l-0 p-r-10">
-                            <validation-wrapper-component class="m-b-15" :validator="$v.parameters.dateFrom">
-                                <label class="text-primary">Date From</label>
-                                <date-picker-component v-model="parameters.dateFrom"></date-picker-component>
-                            </validation-wrapper-component>
-                        </div>
-                    </div>
-                    <div class="row m-auto mt-10 mb-10">
-                        <div class="col p-l-0 p-r-10">
-                            <validation-wrapper-component class="m-b-15" :validator="$v.parameters.dateTo">
-                                <label class="text-primary">Date To</label>
-                                <date-picker-component v-model="parameters.dateTo"></date-picker-component>
-                            </validation-wrapper-component>
-                        </div>
-                    </div>
-                    <validation-wrapper-component class="m-b-15" :validator="$v.parameters.rate">
-                        <label class="text-primary">Extra Charges (MYR)</label>
-                        <div class="controls">
-                            <input type="text" class="form-control fs-12" v-model.trim="parameters.rate" v-money="money">
-                        </div>
-                    </validation-wrapper-component>
-                </div>
-            </div>
-            <div class="row m-t-15">
-                <div class="col p-r-5">
-                    <div class="btn btn-sm btn-default b-rad-none w-100" data-dismiss="modal">Cancel</div>
-                </div>
-                <div class="col p-l-5">
-                    <div class="btn btn-sm btn-primary w-100" @click="submitForm()">Confirm</div>
-                </div>
-            </div>
-        </div>
-    </div>
-</template>
-<script>
-    import modalFormHandler from '../../../general/mixins/modalFormHandler';
-    import { required } from "vuelidate/lib/validators";
-
-    export default {
-        props: {
-            section: {
-                default: ''
-            },
-        },
-        data() {
-            return {
-                parameters: {
-                    dateFrom: '', 
-                    dateTo: '', 
-                    rate: ''
-                },
-            };
-        },
-        validations: {
-            parameters: {
-                dateFrom: { required },
-                dateTo: { required },
-                rate: { required },
-            }
-        },
-        methods: {
-            submitForm(){
-                this.submit(this.route('api.segment.constant.basePrice.create', 1), 'post', this.section, true, true)
-            },
-        },
-        mixins: [modalFormHandler]
-    }
-
-</script>

resources/assets/vue/components/settings/forms/EditBasePriceFormComponent.vue

@@ -1,60 +0,0 @@
-<template>
-    <div class="row parentContainer padding-40 bg-white b-rad-lg" style="width: 450px; margin: auto;" @keyup.enter="submitForm">
-        <div class="col">
-            <div class="row m-b-10">
-                <div class="col">
-                    <h2 class="text-center">Edit Base Price</h2>
-                    <p class="text-center">{{ parameters.dateFrom }}</p>
-                </div>
-            </div>
-            <validation-wrapper-component class="m-b-15" :validator="$v.parameters.rate">
-                <label class="text-primary">Base Price (MYR)</label>
-                <div class="controls">
-                    <input type="text" class="form-control fs-12" v-model.trim="parameters.rate" v-money="money">
-                </div>
-            </validation-wrapper-component>
-            <div class="row m-t-15">
-                <div class="col-auto p-r-5">
-                    <div class="btn btn-lg btn-default b-rad-none" data-dismiss="modal">Cancel</div>
-                </div>
-                <div class="col p-l-5">
-                    <div class="btn btn-primary w-100 btn-lg" @click="submit(route('api.segment.constant.basePrice.create', 1), 'post', section, true, true)">Confirm</div>
-                </div>
-            </div>
-        </div>
-    </div>
-</template>
-<script>
-    import modalFormHandler from '../../../general/mixins/modalFormHandler';
-    import { required } from "vuelidate/lib/validators";
-
-    export default {
-        props: {
-            data: {
-                type: Object,
-                required: false
-            },
-            section: {
-                default: ''
-            },
-        },
-        data() {
-            return {
-                parameters: {
-                    dateFrom: this.data.date, 
-                    dateTo: this.data.date, 
-                    rate: this.data.rate
-                },
-            };
-        },
-        validations: {
-            parameters: {
-                dateFrom: { required },
-                dateTo: { required },
-                rate: { required },
-            }
-        },
-        mixins: [modalFormHandler]
-    }
-
-</script>

resources/assets/vue/components/settings/forms/EditSegmentPriceFormComponent.vue

@@ -1,60 +0,0 @@
-<template>
-    <div class="row" style="width: 450px; margin: auto;" @keyup.enter="submitForm">
-        <div class="col bg-white b-rad-lg">
-            <div class="row m-b-10">
-                <div class="col">
-                    <h3 class="text-center">Edit {{data.name}} Price</h3>
-                </div>
-            </div>
-            <validation-wrapper-component class="m-b-15" :validator="$v.parameters.value.amount">
-                <label class="text-primary">Segment Price (MYR)</label>
-                <div class="controls">
-                    <input type="text" class="form-control fs-12" v-model.trim="parameters.value.amount" v-money="money">
-                </div>
-            </validation-wrapper-component>
-            <div class="row m-t-15">
-                <div class="col-auto p-r-5">
-                    <div class="btn btn-lg btn-default b-rad-none" data-dismiss="modal">Cancel</div>
-                </div>
-                <div class="col p-l-5">
-                    <div class="btn btn-primary w-100 btn-lg" @click="submit(route('api.segment.constant.update', data.id), 'put', section, true, true)">Confirm</div>
-                </div>
-            </div>
-        </div>
-    </div>
-</template>
-<script>
-    import modalFormHandler from '../../../general/mixins/modalFormHandler';
-    import { required } from "vuelidate/lib/validators";
-
-    export default {
-        props: {
-            data: {
-                type: Object,
-                required: false
-            },
-            section: {
-                default: ''
-            },
-        },
-        data() {
-            return {
-                parameters: {
-                    reference: 'CUSTOM_PRICE',
-                    value : {
-                        amount: 0
-                    }
-                }
-            };
-        },
-        validations: {
-            parameters: {
-                value: {
-                    amount: { required }
-                }
-            }
-        },
-        mixins: [modalFormHandler]
-    }
-
-</script>

resources/assets/vue/components/settings/forms/EditStateChargesFormComponent.vue

@@ -6,16 +6,16 @@
                     <h2 class="text-center bold">{{data.name}}</h2>
                 </div>
             </div>
-            <validation-wrapper-component class="m-b-15" :validator="$v.parameters.rate.center">
+            <validation-wrapper-component class="m-b-15" :validator="$v.parameters.cityCenterCharges">
                 <label class="text-primary">City Center Charges (MYR)</label>
                 <div class="controls">
-                    <input type="text" class="form-control fs-12" v-model.trim="parameters.rate.center" v-money="money">
+                    <input type="text" class="form-control fs-12" v-model="cityCenterCharges">
                 </div>
             </validation-wrapper-component>
-            <validation-wrapper-component class="m-b-15" :validator="$v.parameters.rate.outstation">
+            <validation-wrapper-component class="m-b-15" :validator="$v.parameters.outskirtCharges">
                 <label class="text-primary">Outskirt Charges (MYR)</label>
                 <div class="controls">
-                    <input type="text" class="form-control fs-12" v-model.trim="parameters.rate.outstation" v-money="money">
+                    <input type="text" class="form-control fs-12" v-model="outskirtCharges">
                 </div>
             </validation-wrapper-component>
             <div class="row m-t-15">
@@ -23,7 +23,8 @@
                     <div class="btn btn-lg btn-default b-rad-none" data-dismiss="modal">Cancel</div>
                 </div>
                 <div class="col p-l-5">
-                    <div class="btn btn-primary w-100 btn-lg" @click="submitForm()">Confirm</div>
+                    <!-- <div class="btn btn-primary w-100 btn-lg" @click="submit(route('api.packing_list.assign.order', data, orderNo), 'put', section, true, true)">Confirm</div> -->
+                    <div class="btn btn-primary w-100 btn-lg">Confirm</div>
                 </div>
             </div>
         </div>
@@ -45,31 +46,16 @@
         },
         data() {
             return {
-                cityCenterCharges: '',  
-                outskirtCharges : '',
-                parameters: {
-                    reference: 'STATE_RATE',
-                    id: this.data.id,
-                    rate: {
-                        center: this.data.stateCharges == null ? 0 : this.data.stateCharges.center,
-                        outstation: this.data.stateCharges == null ? 0 : this.data.stateCharges.outstation,
-                    }
-                } 
+                cityCenterCharges: '', 
+                outskirtCharges : '', 
             };
         },
         validations: {
             parameters: {
-                rate: {
-                    center: { required },
-                    outstation: { required }
-                }
+                cityCenterCharges: { required },
+                outskirtCharges: { required },
             }
         },
-        methods: {
-            submitForm(){
-                this.submit(this.route('api.segment.constant.update', 1), 'put', this.section, true, true)
-            },
-        },
         mixins: [modalFormHandler]
     }
 

resources/assets/vue/components/settings/forms/EditWarehouseChargesFormComponent.vue

@@ -6,10 +6,10 @@
                     <h2 class="text-center">{{data.name}}</h2>
                 </div>
             </div>
-            <validation-wrapper-component class="m-b-15" :validator="$v.parameters.rate.amount">
+            <validation-wrapper-component class="m-b-15" :validator="$v.parameters.extraCharges">
                 <label class="text-primary">Extra Charges (MYR)</label>
                 <div class="controls">
-                    <input type="text" class="form-control fs-12" v-model.trim="parameters.rate.amount" v-money="money">
+                    <input type="text" class="form-control fs-12" v-model="extraCharges">
                 </div>
             </validation-wrapper-component>
             <div class="row m-t-15">
@@ -17,7 +17,8 @@
                     <div class="btn btn-lg btn-default b-rad-none" data-dismiss="modal">Cancel</div>
                 </div>
                 <div class="col p-l-5">
-                    <div class="btn btn-primary w-100 btn-lg" @click="submitForm()">Confirm</div>
+                    <!-- <div class="btn btn-primary w-100 btn-lg" @click="submit(route('api.packing_list.assign.order', data, orderNo), 'put', section, true, true)">Confirm</div> -->
+                    <div class="btn btn-primary w-100 btn-lg">Confirm</div>
                 </div>
             </div>
         </div>
@@ -39,27 +40,14 @@
         },
         data() {
             return {
-                parameters: {
-                    reference: 'WAREHOUSE_RATE',
-                    id: this.data.id,
-                    rate : {
-                        amount: this.data.warehouseCharges == null ? 0 : this.data.warehouseCharges.amount,
-                    }
-                }
+                extraCharges: '', 
             };
         },
         validations: {
             parameters: {
-                rate: {
-                    amount: { required }
-                }
+                extraCharges: { required },
             }
         },
-        methods: {
-            submitForm(){
-                this.submit(this.route('api.segment.constant.update', 1), 'put', this.section, true, true)
-            },
-        },
         mixins: [modalFormHandler]
     }
 

resources/assets/vue/general/mixins/guards.js

@@ -5,7 +5,7 @@ export default {
             (this.$store.getters.isAuthenticated && !this.isProtectedRoute()&& this.isWithTokenRoute()) ? window.location.href = [7, 8].includes(this.$store.getters.getCompanyModuleType) ? this.route('last_mile_delivery.dashboard') : this.route('dashboard') : '';
         },
         isProtectedRoute(){
-            const unprotectedRoutes = [this.route('login'), this.route('account.email.verification'), this.route('company.claim'), this.route('last_mile_delivery.login')];
+            const unprotectedRoutes = [this.route('login'), this.route('signup'), this.route('account.email.verification'), this.route('company.claim'), this.route('last_mile_delivery.login')];
             if(window.location.href.indexOf(this.route('company.claim')) === 0) {
                 return false;
             }

resources/assets/vue/vuex/modules/authentication.js

@@ -29,7 +29,8 @@ export default {
                     $crisp.push(["set", "user:nickname", getters.getDecodedAccessToken.user.company_marking]);
                     $crisp.push(["set", "session:data", [
                         [
-                            ["company name", getters.getDecodedAccessToken.user.company_name],
+                            ["izyim-marking", getters.getDecodedAccessToken.user.company_marking],
+                            ["company-name", getters.getDecodedAccessToken.user.company_name]
                         ]
                     ]]);
                 }

resources/views/pages/accounts/sign_up.blade.php

@@ -0,0 +1,24 @@
+{{-- seperate signup page form login page for marketing crm --}}
+@extends('layouts.base_login')
+
+@section('inner_content')
+    <div class="row h-100 no-margin align-items-center justify-content-center">
+        <div class="col col-md-10">
+            <div class="row m-b-50">
+                <div class="col-8 col-md-6">
+                    <img class="w-100" src="{{asset('images/cief-izyim-logo.png')}}" alt="">
+                </div>
+            </div>
+            <div class="row">
+                <div class="col">
+                    <loading-component style="height: 350px;" key="1" color="primary" v-show="$store.getters.isLoading('loginSection')"></loading-component>
+                    <div class="row justify-content-center">
+                        <div class="col">
+                            <registration-form-component section="loginSection"></registration-form-component>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+@endsection

resources/views/pages/accounts/signup.blade.php

@@ -59,7 +59,7 @@
                                                                             </div>
                                                                             <div class="row">
                                                                                 <div class="col">
-                                                                                    <login-form-component section="loginSection"></login-form-component>
+                                                                                    <delivery-login-form-component section="loginSection"></delivery-login-form-component>
                                                                                 </div>
                                                                             </div>
                                                                         </div>

resources/views/pages/containers.blade.php

@@ -82,7 +82,7 @@
                     <div class="col">
                         <list-component section="activeContainerListSection" :endpoint="route('api.packing_list.container.list')" :options="{'per_page': 5, 'status_in': [1], order_by: {column: 'loading_date', DESC: true}}">
                             <template slot="list" slot-scope="{data}">
-                                <container-component section="activeContainerListSection" :data="data"></container-component>
+                                <container-component :data="data"></container-component>
                             </template>
                         </list-component>
                     </div>
@@ -91,7 +91,7 @@
                     <div class="col">
                         <list-component section="arrivedContainerListSection" :endpoint="route('api.packing_list.container.list')" :options="{'per_page': 5, 'status_in': [3], 'has_pending_delivery': true, order_by: {column: 'loading_date', DESC: true}}">
                             <template slot="list" slot-scope="{data}">
-                                <container-component section="arrivedContainerListSection" :data="data"></container-component>
+                                <container-component :data="data"></container-component>
                             </template>
                         </list-component>
                     </div>
@@ -100,7 +100,7 @@
                     <div class="col">
                         <list-component section="completeContainerListSection" :endpoint="route('api.packing_list.container.list')" :options="{'per_page': 5, 'status_in': [3], 'has_pending_delivery': false, order_by: {column: 'loading_date', DESC: true}}">
                             <template slot="list" slot-scope="{data}">
-                                <container-component section="completeContainerListSection" :data="data"></container-component>
+                                <container-component :data="data"></container-component>
                             </template>
                         </list-component>
                     </div>

routes/segment.php

@@ -13,9 +13,7 @@ Route::group(['prefix' => 'segment', 'as' => 'segment.', 'namespace' => 'Segment
         Route::put('/service/update', 'UpdateCustomServiceConstantController@update')->name('service.update');
         Route::put('/update', 'UpdateConstantController@update')->name('update');
         Route::get('/show/{reference}', 'FetchConstantController@fetch')->name('show');
+        Route::put('/update/state', 'UpdateConstantStateController@update')->name('update.state');
         Route::put('/update/postcode', 'UpdateConstantPostcodeController@update')->name('update.postcode');
-
-        Route::post('base-price/create', 'CreateBasePriceController@create')->name('basePrice.create');
-        Route::get('base-price/show', 'FetchBasePriceController@fetch')->name('basePrice.show');
     });
 });

routes/web.php

@@ -59,6 +59,11 @@ Route::get('', function () {
     return view('pages.accounts.login');
 })->name('login');
 
+Route::get('/signup', function () {
+    return view('pages.accounts.sign_up');
+})->name('signup');
+
+
 Route::group(['prefix' => 'swagger'], function () {
     Route::get('/', function () {
         return view('swagger.index');