remove spaces on Export warehouse service

# Conflicts:
#   config/app.php

.gitignore

@@ -2,6 +2,8 @@
 /public/hot
 /public/storage
 /storage/*.key
+/tests/_output
+/tests/_support
 /vendor
 **/.idea/
 .env

.gitlab-ci.yml

@@ -0,0 +1,39 @@
+image: php:7.4
+stages:
+  - build
+  - test
+
+before_script:
+- apt-get update -yqq
+- apt-get install -yqq
+- apt-get install -y  libonig-dev
+- apt-get install -y libxml2-dev
+- apt-get install -y libzip-dev
+- apt-get install -y libgd-dev
+
+#install php depandancies
+- docker-php-ext-install mbstring xml zip gd
+
+#  Install composer package manager
+- curl --location --output /usr/local/bin/composer https://getcomposer.org/download/latest-stable/composer.phar
+- chmod +x /usr/local/bin/composer
+
+#jobs
+build_job:
+  stage: build
+  script:
+    - composer install
+  rules:
+    - if: '$CI_COMMIT_BRANCH =~ /.*/'
+
+test_job:
+  stage: test
+  script:
+    - composer install
+    - cp .env.example .env
+    - php artisan key:generate
+   # - php artisan migrate
+    #- php artisan db:seed
+    - php artisan test
+  rules:
+    - if: '$CI_COMMIT_BRANCH =~ /.*/'

app/Classes/General/Eloquent/Filters/OrderMarkingIn.php

@@ -1,21 +0,0 @@
-<?php
-
-namespace App\Classes\General\Eloquent\Filters;
-
-use App\Models\Order;
-use Illuminate\Database\Eloquent\Builder;
-
-class OrderMarkingIn implements Filter
-{
-    /**
-     * @param Builder $builder
-     * @param $value
-     * @return mixed
-     */
-    public static function apply(Builder $builder, $value)
-    {
-        return $builder->whereHas('owner', function($query) use ($value) {
-            $query->where('reference', 'LIKE', '%' . $value . '%');
-        });
-    }
-}

app/Classes/Jobs/FetchOrdersFromYDPortalJob.php

@@ -2,12 +2,8 @@
 
 namespace App\Classes\Jobs;
 
-use App\Classes\Modules\PackingLists\Processors\FetchContainersFromYdPortalProcessor;
-use App\Classes\Modules\PackingLists\Processors\FetchContainersUpdatesFromYdPortalProcessor;
-use App\Classes\Modules\PackingLists\Processors\FetchDeliveryUpdatesFromYdPortalProcessor;
 use App\Classes\Modules\PackingLists\Processors\FetchOrderListsFromYdPortalProcessor;
 
-use App\Classes\Modules\PackingLists\Processors\FetchPackingListsFromYdPortalProcessor;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
@@ -29,12 +25,8 @@ class FetchOrdersFromYDPortalJob implements ShouldQueue
      */
     public function handle()
     {
-        (App()->make(FetchPackingListsFromYdPortalProcessor::class))->execute();
-        (App()->make(FetchContainersFromYdPortalProcessor::class))->execute();
-        (App()->make(FetchContainersUpdatesFromYdPortalProcessor::class))->execute();
-        (App()->make(FetchDeliveryUpdatesFromYdPortalProcessor::class))->execute();
 
-//        (App()->make(FetchOrderListsFromYdPortalProcessor::class))->execute();
+        (App()->make(FetchOrderListsFromYdPortalProcessor::class))->execute();
     }
 
 }

app/Classes/Modules/Exports/Services/ExportsOrderSummaryByMarking.php

@@ -1,108 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Exports\Services;
-
-use App\Models\CompanyConnection;
-use App\Models\Container;
-use App\Models\Order;
-use App\Models\Package;
-use Maatwebsite\Excel\Concerns\Exportable;
-use Maatwebsite\Excel\Concerns\FromCollection;
-use Maatwebsite\Excel\Concerns\WithHeadingRow;
-use Maatwebsite\Excel\Concerns\WithMapping;
-use Maatwebsite\Excel\Concerns\WithHeadings;
-use Maatwebsite\Excel\Concerns\ShouldAutoSize;
-use Carbon\Carbon;
-
-class ExportsOrderSummaryByMarking implements FromCollection, WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize
-{
-
-    use Exportable;
-
-    protected $customerMarking;
-    protected $dateFrom;
-    protected $dateTo;
-
-    public function headings(): array
-    {
-        return [
-            'Date',
-            'Container',
-            'Order Marking',
-            'Packing List Reference',
-            'Description',
-            'Quantity',
-            'L (cm)',
-            'H (cm)',
-            'W (cm)',
-            'CBM'
-        ];
-    }
-    
-    public function setParameters($customerMarking, $dateFrom, $dateTo)
-    {
-        $this->customerMarking = $customerMarking;
-        $this->dateFrom = $dateFrom;
-        $this->dateTo = $dateTo;
-    }
-
-    /**
-     * @return \Illuminate\Support\Collection|mixed
-     */
-    public function collection()
-    {
-        $connection = CompanyConnection::where('invitee_reference', $this->customerMarking)->first();
-
-        $company_id = $connection->invitee->company->id;
-        $company_module_id = $connection->invitee->id;
-        $packagesArray = collect();
-        $orders = Order::where('company_module_id', $company_module_id);
-
-        if (isset($this->dateFrom) && isset($this->dateTo)) {
-            $from = Carbon::createFromFormat('d-m-Y', $this->dateFrom);
-            $to = Carbon::createFromFormat('d-m-Y', $this->dateTo);
-            $orders = $orders->whereBetween('created_at', [$from, $to]);
-        }
-
-        $orders = $orders->get();
-
-        foreach ($orders as $order){
-            $packingLists = $order->packingLists;
-            foreach ($packingLists as $packingList){
-                if($packingList->packingLists->first()){
-                    $packingList = $packingList->packingLists->first();
-                }
-                $packages = $packingList->packages;
-                foreach ($packages as $package){
-                    $packagesArray->push($package);
-                }
-            }
-        }
-
-        return $packagesArray;
-    }
-
-    /**
-     * @param Package $package
-     *
-     * @return array
-     */
-    public function map($package): array
-    {
-        $packinglist = ($package->packingList()->first()->owner->owner_type == Order::class) ? $package->packingList()->first(): $package->packingList->owner;
-        $order = $packinglist->owner;
-
-        return [
-            Carbon::parse($package->created_at)->format('d-m-Y'),
-            '',
-            $order->reference,
-            $package->packingList->reference,
-            $package->description,
-            $package->quantity,
-            $package->length,
-            $package->height,
-            $package->width,
-            ((($package->length / 100) * ($package->height / 100) * ($package->width / 100)) *  $package->quantity)
-        ];
-    }
-}

app/Classes/Modules/Exports/Services/ExportsWarehousePackingList.php

@@ -5,7 +5,6 @@ namespace App\Classes\Modules\Exports\Services;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\PackingListType;
 use App\Models\Order;
-use App\Models\State;
 use Maatwebsite\Excel\Concerns\Exportable;
 use Maatwebsite\Excel\Concerns\FromQuery;
 use Maatwebsite\Excel\Concerns\WithHeadingRow;
@@ -32,10 +31,8 @@ class ExportsWarehousePackingList implements FromQuery, WithHeadings, WithHeadin
      */
     public function query()
     {
-        $johor_state_id = State::where('name', 'johor')->first()->id;
-
-        return Order::whereHas('addresses', function($address) use ($johor_state_id){
-            $address->where('status', ApprovalStatus::APPROVED)->where('state_id', $johor_state_id);
+        return Order::whereHas('addresses', function($address) {
+            $address->where('status', ApprovalStatus::APPROVED);
         })->whereHas('packingLists', function($packingLists) {
             $packingLists->where('type', PackingListType::SHIPPING_PACKING_LIST)->whereDoesntHave('transports');
         });

app/Classes/Modules/Orders/Services/FetchesDataFromYDPortal.php

@@ -14,11 +14,12 @@ class FetchesDataFromYDPortal
      * @return \Psr\Http\Message\ResponseInterface
      */
     public function clientRequest(string $url, string $method, $body){
-
+        
         $client = new \GuzzleHttp\Client();
+
         $body['apicode'] = env('YD_API_CODE');
 
-        $request = $client->requestAsync($method, $url, ['query' => $body, 'timeout' => 15]);
+        $request = $client->requestAsync($method, $url, ['query' => $body]);
 
         return $request->wait();
     }
@@ -31,7 +32,6 @@ class FetchesDataFromYDPortal
         $content = $request->getBody()->getContents();
         $content =  str_replace("\r",'', $content);
         $content =  str_replace("\n",'', $content);
-        $content =  str_replace("\t",'', $content);
         return json_decode($content);
     }
-}
+}

app/Classes/Modules/PackingLists/Processors/CreatePackingListProcessor.php

@@ -51,15 +51,15 @@ class CreatePackingListProcessor
         /** @var PackingList $packingList */
         $packingList = $this->createsPackingList->execute($object, $packable);
 
-        $appointee_id = $packingList->owner_id == 1 ? 2307 : $packingList->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id;
+        $appointee_id = $packingList->owner_id == 1 ? 2037 : $packingList->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id;
 
         $type = $object->getType() === PackingListType::SHIPPING_PACKING_LIST ? PackingListType::SHIPPING_PACKING_LIST_REPLICA : PackingListType::WAREHOUSE_RECEIVE_LIST_REPLICA;
 
         /** create packing list replica */
         $object = new PackingListObject($object->getReference().'_01', $appointee_id, $type, ApprovalStatus::PENDING_SUBMISSION);
         $this->createsPackingList->execute($object, $packingList);
-
+        
         return $packingList;
     }
 
-}
+}

app/Classes/Modules/PackingLists/Processors/FetchContainersFromYdPortalProcessor.php

@@ -1,213 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PackingLists\Processors;
-
-use App\Classes\Exceptions\MalformedRequestException;
-use App\Classes\Exceptions\ResourceNotFoundException;
-use App\Classes\Modules\Companies\Services\FetchesCompanyModule;
-use App\Classes\Modules\Orders\Services\FetchesDataFromYDPortal;
-
-use App\Classes\Modules\Orders\Services\FetchesOrder;
-use App\Classes\Modules\PackingLists\DataTransferObjects\ContainerObject;
-use App\Classes\Modules\PackingLists\DataTransferObjects\PackageObject;
-use App\Classes\Modules\PackingLists\DataTransferObjects\PackingListObject;
-use App\Classes\Modules\PackingLists\Services\Containers\FetchesContainer;
-use App\Classes\Modules\PackingLists\Services\FetchesPackingList;
-use App\Classes\Modules\Schedules\DataTransferObjects\ScheduleObject;
-use App\Classes\Modules\Schedules\Services\CreatesSchedule;
-use App\Classes\Modules\Steps\DataTransferObjects\StepsObject;
-use App\Classes\Modules\Steps\Services\CreatesStep;
-use App\Classes\Modules\Transports\DataTransferObjects\TransportObject;
-use App\Classes\Modules\Transports\Services\CreatesTransport;
-use App\Classes\Modules\Unity\Processors\ActivateContractProcessor;
-use App\Classes\Modules\Unity\Processors\AssignContractEntityProcessor;
-use App\Classes\Modules\Unity\Processors\CreateContractEntityProcessor;
-use App\Classes\Modules\Unity\Services\CreatesContract;
-use App\Classes\Modules\Unity\Services\UpdatesContractObligation;
-use App\Classes\Notifications\ShipmentDepartureEmail;
-use App\Classes\Notifications\ShipmentRescheduleEmail;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\ContainerTypes;
-use App\Classes\ValueObjects\Constants\OrderRoleTypes;
-use App\Classes\ValueObjects\Constants\PackageType;
-use App\Classes\ValueObjects\Constants\PackingListType;
-use App\Classes\ValueObjects\Constants\TransportType;
-use App\Classes\ValueObjects\Constants\WarehouseReferences;
-use App\Models\Container;
-use App\Models\Order;
-use App\Models\PackingList;
-use App\Models\Transport;
-use Carbon\Carbon;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Log;
-use Illuminate\Support\Str;
-
-class FetchContainersFromYdPortalProcessor
-{
-    /** @var FetchesDataFromYDPortal */
-    private $fetchesDataFRomYDPortal;
-
-    /** @var FetchesOrder */
-    private $fetchesOrder;
-
-    /** @var UpdatesContractObligation */
-    private $updatesContractObligations;
-
-    /** @var CreatePackingListProcessor */
-    private $createPackingListProcessor;
-
-    /** @var CreatePackageProcessor */
-    private $createPackageProcessor;
-
-    /** @var CreatesTransport */
-    private $createsTransport;
-
-    /** @var CreatesSchedule */
-    private $createsSchedule;
-
-    /** @var FetchesContainer */
-    private $fetchesContainer;
-
-    /** @var FetchesPackingList */
-    private $fetchesPackingList;
-
-    /** @var FetchesCompanyModule */
-    private $fetchesCompanyModule;
-
-    /** @var CreateContainerProcessor */
-    private $createContainerProcessor;
-
-    /** @var CreatesContract */
-    private $unityCreateContract;
-
-    /** @var AssignContractEntityProcessor */
-    private $unityAssignContractEntity;
-
-    /** @var CreateContractEntityProcessor */
-    private $unityCreateContractEntity;
-
-    /** @var CreatesStep */
-    private $createsStep;
-
-    /** @var ActivateContractProcessor */
-    private $unityActivateContract;
-
-    /**
-     * FetchOrderListsFromYdPortalProcessor constructor.
-     * @param FetchesDataFromYDPortal $fetchesDataFRomYDPortal
-     * @param FetchesOrder $fetchesOrder
-     * @param UpdatesContractObligation $updatesContractObligations
-     * @param CreatePackingListProcessor $createPackingListProcessor
-     * @param CreatePackageProcessor $createPackageProcessor
-     * @param CreatesTransport $createsTransport
-     * @param CreatesSchedule $createsSchedule
-     * @param FetchesContainer $fetchesContainer
-     * @param FetchesPackingList $fetchesPackingList
-     * @param FetchesCompanyModule $fetchesCompanyModule
-     * @param CreateContainerProcessor $createContainerProcessor
-     * @param CreatesContract $unityCreateContract
-     * @param AssignContractEntityProcessor $unityAssignContractEntity
-     * @param CreateContractEntityProcessor $unityCreateContractEntity
-     * @param CreatesStep $createsStep
-     * @param ActivateContractProcessor $unityActivateContract
-     */
-    public function __construct(FetchesDataFromYDPortal $fetchesDataFRomYDPortal, FetchesOrder $fetchesOrder, UpdatesContractObligation $updatesContractObligations, CreatePackingListProcessor $createPackingListProcessor, CreatePackageProcessor $createPackageProcessor, CreatesTransport $createsTransport, CreatesSchedule $createsSchedule, FetchesContainer $fetchesContainer, FetchesPackingList $fetchesPackingList, FetchesCompanyModule $fetchesCompanyModule, CreateContainerProcessor $createContainerProcessor, CreatesContract $unityCreateContract, AssignContractEntityProcessor $unityAssignContractEntity, CreateContractEntityProcessor $unityCreateContractEntity, CreatesStep $createsStep, ActivateContractProcessor $unityActivateContract)
-    {
-        $this->fetchesDataFRomYDPortal = $fetchesDataFRomYDPortal;
-        $this->fetchesOrder = $fetchesOrder;
-        $this->updatesContractObligations = $updatesContractObligations;
-        $this->createPackingListProcessor = $createPackingListProcessor;
-        $this->createPackageProcessor = $createPackageProcessor;
-        $this->createsTransport = $createsTransport;
-        $this->createsSchedule = $createsSchedule;
-        $this->fetchesContainer = $fetchesContainer;
-        $this->fetchesPackingList = $fetchesPackingList;
-        $this->fetchesCompanyModule = $fetchesCompanyModule;
-        $this->createContainerProcessor = $createContainerProcessor;
-        $this->unityCreateContract = $unityCreateContract;
-        $this->unityAssignContractEntity = $unityAssignContractEntity;
-        $this->unityCreateContractEntity = $unityCreateContractEntity;
-        $this->createsStep = $createsStep;
-        $this->unityActivateContract = $unityActivateContract;
-    }
-
-
-    /**
-     * @param Carbon|null $start
-     * @param Carbon|null $end
-     * @return void
-     * @throws \GuzzleHttp\Exception\GuzzleException
-     */
-    public function execute()
-    {
-        $packingLists = PackingList::where('type', PackingListType::SHIPPING_PACKING_LIST)->doesntHave('containers')->get();
-
-        foreach ($packingLists as $packingList) {
-            $time_start = microtime(true);
-
-            $containerReference = null;
-            $loadingDate = null;
-            $etd = null;
-            $eta = null;
-
-            $trackingRequest = $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/ApiTracking.ashx', 'GET', [
-                'trakingno' => $packingList->reference
-            ]);
-
-            $rows = $this->fetchesDataFRomYDPortal->getResponseBody($trackingRequest);
-
-            if(!$rows->data){
-                continue;
-            }
-
-            foreach (array_reverse($rows->data) as $trackingRow) {
-                if (strpos($trackingRow->tracking, '货物装柜完成。') !== false) {
-                    $tracking = explode(':', $trackingRow->tracking);
-                    $containerReference = explode('预计到港时间', $tracking[1])[0];
-                    $loadingDate = Carbon::parse($trackingRow->trackingtime);
-                    $etd = Carbon::parse($tracking[2])->subDays(5);
-                    $eta = Carbon::parse($tracking[2])->addDays(2);
-                }
-            }
-
-            if($containerReference) {
-                try {
-                    $container = $this->fetchesContainer->execute(['reference' => $containerReference]);
-                    $container->packingLists()->detach($packingList);
-                    $container->packingLists()->attach($packingList);
-                } catch (ResourceNotFoundException $exception){
-
-                    if(!($packingList->owner instanceof Order)) continue;
-
-                    $originWarehouse = $packingList->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee;
-
-
-                    $containerObject = new ContainerObject($containerReference, '', '', ContainerTypes::FORTY_FEET_DRY_CONTAINER, $loadingDate, ApprovalStatus::PENDING_VERIFICATION);
-
-                    /** @var Container $container */
-                    $container = $this->createContainerProcessor->execute($containerObject, $originWarehouse);
-
-                    $container->packingLists()->detach($packingList);
-                    $container->packingLists()->attach($packingList);
-
-                    $transport = $container->transports()->first();
-
-                    if(!$transport){
-                        $transportObject = new TransportObject(TransportType::SEA, null, null,  $etd, null, ApprovalStatus::APPROVED);
-                        /** @var Transport $transport */
-                        $transport = $this->createsTransport->execute($transportObject, $container);
-                        $this->createsSchedule->execute($transport, new ScheduleObject($etd, $eta, ApprovalStatus::APPROVED));
-                    }
-                }
-            }
-
-            $time_end = microtime(true);
-
-            $execution_time = ($time_end - $time_start)/60;
-
-            echo 'successful => <b>Total Execution Time:</b> '.$execution_time.' Mins<br>';
-        }
-
-    }
-}
-

app/Classes/Modules/PackingLists/Processors/FetchContainersUpdatesFromYdPortalProcessor.php

@@ -1,162 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PackingLists\Processors;
-
-use App\Classes\Exceptions\MalformedRequestException;
-use App\Classes\Modules\Orders\Services\FetchesDataFromYDPortal;
-
-use App\Classes\Modules\Schedules\DataTransferObjects\ScheduleObject;
-use App\Classes\Modules\Schedules\Services\CreatesSchedule;
-use App\Classes\Modules\Unity\Services\UpdatesContractObligation;
-use App\Classes\Notifications\ShipmentRescheduleEmail;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\OrderRoleTypes;
-use App\Models\Container;
-use App\Models\Order;
-use App\Models\PackingList;
-use Carbon\Carbon;
-
-class FetchContainersUpdatesFromYdPortalProcessor
-{
-    /** @var FetchesDataFromYDPortal */
-    private $fetchesDataFRomYDPortal;
-
-    /** @var UpdatesContractObligation */
-    private $updatesContractObligations;
-
-    /** @var CreatesSchedule */
-    private $createsSchedule;
-
-    /**
-     * @param FetchesDataFromYDPortal $fetchesDataFRomYDPortal
-     * @param UpdatesContractObligation $updatesContractObligations
-     * @param CreatesSchedule $createsSchedule
-     */
-    public function __construct(FetchesDataFromYDPortal $fetchesDataFRomYDPortal, UpdatesContractObligation $updatesContractObligations, CreatesSchedule $createsSchedule)
-    {
-        $this->fetchesDataFRomYDPortal = $fetchesDataFRomYDPortal;
-        $this->updatesContractObligations = $updatesContractObligations;
-        $this->createsSchedule = $createsSchedule;
-    }
-
-
-    /**
-     * @return void
-     * @throws MalformedRequestException
-     */
-    public function execute()
-    {
-        $containers = Container::where('status', ApprovalStatus::PENDING_VERIFICATION)->get();
-
-        foreach ($containers as $container) {
-            $time_start = microtime(true);
-
-            $packingList = $container->packingLists()->first();
-
-            $trackingRequest = $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/ApiTracking.ashx', 'GET', [
-                'trakingno' => $packingList->reference
-            ]);
-
-            $rows = $this->fetchesDataFRomYDPortal->getResponseBody($trackingRequest);
-
-            if(!$rows->data){
-                continue;
-            }
-
-            $unstuffingDate = null;
-            $delayDate = null;
-
-            foreach (array_reverse($rows->data) as $trackingRow) {
-                $rescheduleETD = strpos($trackingRow->remark, '开') || strpos($trackingRow->remark, '到港');
-                $rescheduleETA = strpos($trackingRow->remark, '到港');
-                if (($rescheduleETD !== false || $rescheduleETA !== false) && strpos($trackingRow->tracking, '货物装柜完成。') === false) {
-                    preg_match_all('/([0-9]+.{3})/', $trackingRow->remark, $matches);
-                    $dates = collect();
-
-                    foreach($matches[0] as $date){
-                        try {
-                            $dates->push(Carbon::parse(str_replace('.', '/', $date).Carbon::now()->format('Y')));
-                        } catch (\Exception $exception) {
-                            continue;
-                        }
-
-                    }
-
-                    $rescheduleDate = $dates->sortDesc()->first();
-
-                    if(!$delayDate || $rescheduleDate > $delayDate){
-                        /** @var Carbon $delayDate */
-                        $delayDate = $rescheduleDate;
-
-                        if($rescheduleETA === false && $delayDate) {
-                            $delayDate = $delayDate->addDays('5');
-                        }
-                    }
-
-                }
-
-                if ($trackingRow->tracking === '到港') {
-                    $delayDate = Carbon::parse($trackingRow->trackingtime);
-                }
-
-                if ($trackingRow->tracking === '已开船') {
-                    $delayDate = Carbon::parse($trackingRow->trackingtime)->addDays('5');
-                }
-
-                if ($trackingRow->tracking === '货物已进目的港仓库') {
-                    $unstuffingDate = Carbon::parse($trackingRow->trackingtime);
-                }
-            }
-
-            if($delayDate){
-                $delayDate = $delayDate->addDays(2);
-                $transport = $container->transports()->first();
-
-                if(!$transport->schedules()->whereDate('eta', '>=', $delayDate)->first()) {
-                    $etd = $transport->schedules()->where('status', '=', ApprovalStatus::APPROVED)->first()->etd;
-                    $transport->schedules()->update(['status' => ApprovalStatus::EXPIRED]);
-                    $this->createsSchedule->execute($transport, new ScheduleObject($etd, $delayDate, ApprovalStatus::APPROVED));
-                    foreach ($container->packingLists as $packingList){
-                        if(!($packingList->owner instanceof Order)) continue;
-                        $user = $packingList->owner->companyModule->employees()->first();
-                        if(app()->environment(['production'])) {
-                            $user->notify(new ShipmentRescheduleEmail($user, $packingList));
-                        }
-                    }
-                }
-
-            }
-
-            if($unstuffingDate){
-                $container->update(['status' => ApprovalStatus::COMPLETED]);
-                $container->transports()->first()->update(['drop_date' => $unstuffingDate, 'status' => ApprovalStatus::COMPLETED]);
-
-                /** @var PackingList $packingList */
-                foreach($container->packingLists as $packingList){
-
-                    if($packingList->status === ApprovalStatus::PENDING_VERIFICATION){
-                        $packingList->status = ApprovalStatus::APPROVED;
-                        $packingList->save();
-                    }
-
-                    if(!($packingList->owner instanceof Order)) continue;
-
-                    $signature = $packingList->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->entity_sigiture;
-                    foreach($packingList->steps()->where('reference', '!=', 'DELIVERY')->get() as $step){
-                        $this->updatesContractObligations->execute($signature, $step->obligation_hash_id);
-                        $step->update(['status' => ApprovalStatus::COMPLETED]);
-                    }
-
-                }
-            }
-
-            $time_end = microtime(true);
-
-            $execution_time = ($time_end - $time_start)/60;
-
-            echo 'successful => <b>Total Execution Time:</b> '.$execution_time.' Mins<br>';
-        }
-
-    }
-}
-

app/Classes/Modules/PackingLists/Processors/FetchDeliveryUpdatesFromYdPortalProcessor.php

@@ -1,115 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PackingLists\Processors;
-
-use App\Classes\Exceptions\MalformedRequestException;
-use App\Classes\Modules\Schedules\DataTransferObjects\ScheduleObject;
-use App\Classes\Modules\Schedules\Services\CreatesSchedule;
-use App\Classes\Modules\Transports\DataTransferObjects\TransportObject;
-use App\Classes\Modules\Transports\Services\CreatesTransport;
-use App\Classes\Modules\Unity\Services\UpdatesContractObligation;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\OrderRoleTypes;
-use App\Classes\ValueObjects\Constants\PackingListType;
-use App\Classes\ValueObjects\Constants\TransportType;
-use App\Classes\ValueObjects\Constants\WarehouseReferences;
-use App\Models\CompanyModule;
-use App\Models\Order;
-use App\Models\PackingList;
-use App\Models\Transport;
-use Carbon\Carbon;
-use GuzzleHttp\Exception\GuzzleException;
-use Illuminate\Support\Facades\Log;
-use Illuminate\Support\Str;
-
-class FetchDeliveryUpdatesFromYdPortalProcessor
-{
-
-    /** @var UpdatesContractObligation */
-    private $updatesContractObligations;
-
-    /** @var CreatesTransport */
-    private $createsTransport;
-
-    /** @var CreatesSchedule */
-    private $createsSchedule;
-
-    /**
-     * @param UpdatesContractObligation $updatesContractObligations
-     * @param CreatesTransport $createsTransport
-     * @param CreatesSchedule $createsSchedule
-     */
-    public function __construct(UpdatesContractObligation $updatesContractObligations, CreatesTransport $createsTransport, CreatesSchedule $createsSchedule)
-    {
-        $this->updatesContractObligations = $updatesContractObligations;
-        $this->createsTransport = $createsTransport;
-        $this->createsSchedule = $createsSchedule;
-    }
-
-
-    /**
-     * @return void
-     * @throws MalformedRequestException
-     * @throws GuzzleException
-     */
-    public function execute()
-    {
-        $packingLists = PackingList::where('type', PackingListType::SHIPPING_PACKING_LIST)->whereRaw('LENGTH(reference) > 12')->whereHas('containers', function ($container){
-            return $container->where('status', 3);
-        })->doesntHave('transports')->get()->reverse();
-        foreach ($packingLists->chunk(50) as $chunk) {
-
-
-            foreach ($chunk as $packingList){
-                if(!$packingList->reference) continue;
-                $time_start = microtime(true);
-
-                $deliveryDate = null;
-
-                try {
-                    $client = new \GuzzleHttp\Client(['cookies' => true, 'headers' => ['Cookie' => 'utc_offset=480']]);
-
-                    $request = $client->request('get', 'https://main.universe.com.my/Tracking/User/Paging?sEcho=1&sTrackingNo='.$packingList->reference.'&sOrgId=sti', ['timeout' => 3]);
-                    $deliveryTracking = json_decode($request->getBody()->getContents());
-                    foreach (array_reverse($deliveryTracking->aaData) as $trackingRow) {
-                        $trackingDate = Carbon::createFromFormat('d/m/y H:i', $trackingRow->LocalDateTime);
-                        if (Str::contains($trackingRow->PublicDescription, ['delivered'])) {
-                            $deliveryDate = $trackingDate;
-                        }
-                    }
-                } catch (\Exception $exception){
-                    dump($exception);
-                    Log::debug('failed to fetch delivery tracking');
-                }
-
-                if($deliveryDate){
-                    $packingList->status = ApprovalStatus::COMPLETED;
-                    $packingList->save();
-
-                    $deliveryDate = Carbon::parse($deliveryDate);
-                    $transportObject = new TransportObject(TransportType::LAND, null, null,  $deliveryDate, $deliveryDate, ApprovalStatus::APPROVED);
-                    /** @var Transport $transport */
-                    $transport = $this->createsTransport->execute($transportObject, $packingList);
-                    $this->createsSchedule->execute($transport, new ScheduleObject($deliveryDate, $deliveryDate, ApprovalStatus::APPROVED));
-
-                    if(!($packingList->owner instanceof Order)) continue;
-
-                    $deliveryStep = $packingList->steps()->where('reference', '=', 'LAST_MILE_DELIVERY')->first();
-                    $signature = $packingList->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->entity_sigiture;
-                    $this->updatesContractObligations->execute($signature, $deliveryStep->obligation_hash_id);
-                    $deliveryStep->update(['status' => ApprovalStatus::COMPLETED]);
-
-                }
-
-                $time_end = microtime(true);
-
-                $execution_time = ($time_end - $time_start)/60;
-
-                echo 'successful => <b>Total Execution Time:</b> '.$execution_time.' Mins<br>';
-            }
-
-        }
-
-    }
-}
-

app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php

@@ -264,7 +264,7 @@ class FetchLoadedContainersFromVTPortalProcessor
 //
 //                            $this->unityAssignContractEntity->execute($supervisorContractEntity->hash_id, $contractObligations);
                         } else {
-                            $appointee_id = 2307;
+                            $appointee_id = 2037;
                         }
 
                         $packingListObject = new PackingListObject($packingListReference, $appointee_id, PackingListType::SHIPPING_PACKING_LIST, ApprovalStatus::SUSPENDED, null);

app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php

@@ -139,360 +139,336 @@ class FetchOrderListsFromYdPortalProcessor
      */
     public function execute(?Carbon $start = null, ?Carbon $end = null)
     {
-        ini_set('max_execution_time', '900');
-//        $missingOrders = ['M202302161513122', 'YW202302161027442', 'YW202302151637022', 'M202302151605025', 'M202302151527103', 'M202302151527356', 'M202302151556019', 'YW202302151520241', 'YW202302151445068', 'M202302151359169', 'YW202302151349223', 'YW202302151336520', 'M202302151334316', 'YW202302151148129', 'M202302151145379', 'M202302151142411', 'M202302151037036', 'M202302151036398', 'M202302150919406', 'M202302141535009', 'YW202302141532318', 'M202302141319463', 'M202302141319045', 'YW202302141405471', 'M202302141334494', 'YW202302141321569', 'YW202302141323005', 'M202302141309053', 'M202302140905116', 'M202302141039558', 'M202302141022333', 'YW202302140943182', 'YW202302140923485', 'YW202302131728233', 'YW202302131702040', 'M202302131649417', 'M202302131638056', 'YW202302131601110', 'YW202302131530436', 'YW202302131411338', 'YW202302131355161', 'YW202302131312526', 'M202302130859076', 'M202302111708070', 'M202302111455134', 'M202302111457501', 'M202302111444041', 'M202302111506514', 'M202302111440286', 'M202302111354585', 'M202302111055551', 'M202302110900216', 'YW202302101743112', 'M202302091559443', 'M202302101716374', 'M202302101700402', 'M202302101633570', 'M202302101612095', 'M202302101611408', 'M202302101542340', 'M202302101408370', 'M202302101323341', 'M202302101129532', 'M202302101025109', 'M202302101006595', 'M202302091706357', 'YW202302091255022', 'YW202302091448196', 'YW202302091446431', 'M202302091138154', 'M202302091129396', 'YW202302091028175', 'M202302091006545', 'YW202302090942033', 'YW202302081743094', 'M202302081530599', 'M202302081531210', 'M202302081508571', 'YW202302081530492', 'M202302081500361', 'M202302081253105', 'M202302081303370', 'M202302071636303', 'M202302071741187', 'YW202302071735407', 'M202302071706323', 'M202302071537501', 'M202302071538092', 'YW202302071516453', 'M202302071311314', 'M202302071148154', 'YW202302071136018', 'M202302071036027', 'M202302071008010', 'M202302061742178', 'M202302061615198', 'M202302061502093', 'M202302061458532', 'M202302061552141', 'M202302061548431', 'M202302061555033', 'YW202302061404567', 'M202302061322463', 'M202302061042556', 'M202302061021277', 'M202302060917276', 'M202302041551570', 'M202302041552382', 'YW202302041515257', 'M202302041405502', 'M202302041030185', 'YW202302041215576', 'YW202302041058469', 'YW202302041024459', 'YW202302040939568', 'M202302031701053', 'M202302031700316', 'M202302031430562', 'M202302031431535', 'M202302031147213', 'YW202302031406529', 'YW202302031322256', 'M202302021718554', 'M202302021417415', 'YW202302021404542', 'M202302021055324', 'YW202302021037462', 'M202302011613381', 'M202302011347586', 'M202302011348245', 'M202301151635132', 'M202301141803516', 'YW202301141653536', 'M202301131504477', 'M202301131538220', 'M202301121327453', 'YW202301111153183', 'M202301091649543', 'M202212311641071', 'YW202212211532191', 'YW202212191605226'];
+        try {
+            $start = $start ? $start : Carbon::today()->subDays(30);
 
-        $from = $end ? Carbon::today()->diff($end)->days : 0;
-        $to = $start ? Carbon::today()->diff($start)->days : 10;
+            $startLimit = Carbon::parse('01-12-2021');
 
-        for ($x = $from; $x <= $to; $x++) {
-            try {
-                $startDate = Carbon::today()->subDays($x);
+            if($start->isBefore($startLimit)){
+                $start = $startLimit;
+            }
 
-                $startLimit = Carbon::parse('01-12-2021');
+            $end = $end ? $end : Carbon::today()->addDay();
 
-                if($startDate->isBefore($startLimit)){
-                    $startDate = $startLimit;
-                }
+            $orderRequest = $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/GetOrderList.ashx', 'GET', [
+                'begintime' => $start->timestamp,
+                'endtime' => $end->timestamp,
+            ]);
 
-                $endDate = Carbon::today()->subDays($x - 1);
+            $rows = $this->fetchesDataFRomYDPortal->getResponseBody($orderRequest);
 
-                $orderRequest = $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/GetOrderList.ashx', 'GET', [
-                    'begintime' => $startDate->timestamp,
-                    'endtime' => $endDate->timestamp,
+            foreach($rows->data as $row){
+
+                $containerReference = null;
+                $loadingDate = null;
+                $unstuffingDate = null;
+                $deliveryDate = null;
+                $etd = null;
+                $eta = null;
+                $delayDate = null;
+
+                $trackingRequest = $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/ApiTracking.ashx', 'GET', [
+                    'trakingno' => $row->expressno
                 ]);
 
-                $rows = $this->fetchesDataFRomYDPortal->getResponseBody($orderRequest);
+                $rows = $this->fetchesDataFRomYDPortal->getResponseBody($trackingRequest);
 
-                if(!$rows->data) continue;
+                if(!$rows){
+                    continue;
+                }
 
-                foreach($rows->data as $row){
-                    $time_start = microtime(true);
-
-                    $containerReference = null;
-                    $loadingDate = null;
-                    $unstuffingDate = null;
-                    $deliveryDate = null;
-                    $etd = null;
-                    $eta = null;
-                    $delayDate = null;
-                    $status = $row->status;
-
-                    if($status >= 3){
-                        $trackingRequest = $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/ApiTracking.ashx', 'GET', [
-                            'trakingno' => $row->expressno
-                        ]);
-
-                        $rows = $this->fetchesDataFRomYDPortal->getResponseBody($trackingRequest);
-
-                        if(!$rows){
-                            continue;
-                        }
-
-                        foreach (array_reverse($rows->data) as $trackingRow) {
-                            if ($trackingRow->tracking === '货物已送达仓库准备入库中') {
-                                $receiveDate = Carbon::parse($trackingRow->trackingtime);
-                            }
-
-                            if (strpos($trackingRow->tracking, '货物装柜完成。') !== false) {
-                                $tracking = explode(':', $trackingRow->tracking);
-                                $containerReference = explode('预计到港时间', $tracking[1])[0];
-                                $loadingDate = Carbon::parse($trackingRow->trackingtime);
-                                $etd = Carbon::parse($tracking[2])->subDays(5);
-                                $eta = Carbon::parse($tracking[2])->addDays(2);
-                            }
-
-                            $rescheduleETD = strpos($trackingRow->remark, '开') || strpos($trackingRow->remark, '到港');
-                            $rescheduleETA = strpos($trackingRow->remark, '到港');
-                            if (($rescheduleETD !== false || $rescheduleETA !== false) && strpos($trackingRow->tracking, '货物装柜完成。') === false) {
-                                preg_match_all('/([0-9]+.{3})/', $trackingRow->remark, $matches);
-                                $dates = collect();
-
-                                foreach($matches[0] as $date){
-                                    try {
-                                        $dates->push(Carbon::parse(str_replace('.', '/', $date).Carbon::now()->format('Y')));
-                                    } catch (\Exception $exception) {
-                                        continue;
-                                    }
-
-                                }
-
-                                $rescheduleDate = $dates->sortDesc()->first();
-
-                                if(!$delayDate || $rescheduleDate > $delayDate){
-                                    /** @var Carbon $delayDate */
-                                    $delayDate = $rescheduleDate;
-
-                                    if($rescheduleETA === false && $delayDate) {
-                                        $delayDate = $delayDate->addDays('5');
-                                    }
-                                }
-
-                            }
-
-                            if ($trackingRow->tracking === '到港') {
-                                $delayDate = Carbon::parse($trackingRow->trackingtime);
-                            }
-
-                            if ($trackingRow->tracking === '已开船') {
-                                $delayDate = Carbon::parse($trackingRow->trackingtime)->addDays('5');
-                            }
-
-                            if ($trackingRow->tracking === '货物已进目的港仓库') {
-                                $unstuffingDate = Carbon::parse($trackingRow->trackingtime);
-                            }
-
-                            if (Str::contains($trackingRow->tracking, ['派送中', '已签收', '签收完成', ' 第三方提货', '货物已派送完成', '派送', 'delivery', 'delivered'])) {
-                                $deliveryDate = Carbon::parse($trackingRow->trackingtime);
-                            }
-                        }
+                foreach (array_reverse($rows->data) as $trackingRow) {
+                    if ($trackingRow->tracking === '货物已送达仓库准备入库中') {
+                        $receiveDate = Carbon::parse($trackingRow->trackingtime);
                     }
 
-                    if($status >= 5){
-                        $client = new \GuzzleHttp\Client(['cookies' => true, 'headers' => ['Cookie' => 'utc_offset=480']]);
-
-                        try {
-                            $request = $client->request('get', 'https://main.universe.com.my/Tracking/User/Paging?sEcho=1&sTrackingNo='.$row->expressno.'&sOrgId=sti');
-                            $deliveryTracking = json_decode($request->getBody()->getContents());
-                            foreach (array_reverse($deliveryTracking->aaData) as $trackingRow) {
-                                $trackingDate = Carbon::createFromFormat('d/m/y H:i', $trackingRow->LocalDateTime);
-                                if (Str::contains($trackingRow->PublicDescription, ['accepted/picked'])){
-                                    $unstuffingDate = $trackingDate;
-                                }
-
-                                if (Str::contains($trackingRow->PublicDescription, ['delivered'])) {
-                                    $deliveryDate = $trackingDate;
-                                }
-                            }
-                        } catch (\Exception $exception){
-                            Log::debug('failed to fetch delivery tracking');
-                        }
+                    if (strpos($trackingRow->tracking, '货物装柜完成。') !== false) {
+                        $tracking = explode(':', $trackingRow->tracking);
+                        $containerReference = explode('预计到港时间', $tracking[1])[0];
+                        $loadingDate = Carbon::parse($trackingRow->trackingtime);
+                        $etd = Carbon::parse($tracking[2])->subDays(5);
+                        $eta = Carbon::parse($tracking[2])->addDays(2);
                     }
 
-                    $customerno = preg_split('(-|\(|\)|\/)', $row->customerno);
+                    $rescheduleETD = strpos($trackingRow->remark, '开') || strpos($trackingRow->remark, '到港');
+                    $rescheduleETA = strpos($trackingRow->remark, '到港');
+                    if (($rescheduleETD !== false || $rescheduleETA !== false) && strpos($trackingRow->tracking, '货物装柜完成。') === false) {
+                        preg_match_all('/([0-9]+.{3})/', $trackingRow->remark, $matches);
+                        $dates = collect();
 
-                    $orderNumber = $customerno[array_key_last($customerno)];
-                    $allow_contract = true;
+                        foreach($matches[0] as $date){
+                            try {
+                                $dates->push(Carbon::parse(str_replace('.', '/', $date).Carbon::now()->format('Y')));
+                            } catch (\Exception $exception) {
+                                continue;
+                            }
 
+                        }
+
+                        $rescheduleDate = $dates->sortDesc()->first();
+
+                        if(!$delayDate || $rescheduleDate > $delayDate){
+                            /** @var Carbon $delayDate */
+                            $delayDate = $rescheduleDate;
+
+                            if($rescheduleETA === false && $delayDate) {
+                                $delayDate = $delayDate->addDays('5');
+                            }
+                        }
+
+                    }
+
+                    if ($trackingRow->tracking === '到港') {
+                        $delayDate = Carbon::parse($trackingRow->trackingtime);
+                    }
+
+                    if ($trackingRow->tracking === '已开船') {
+                        $delayDate = Carbon::parse($trackingRow->trackingtime)->addDays('5');
+                    }
+
+                    if ($trackingRow->tracking === '货物已进目的港仓库') {
+                        $unstuffingDate = Carbon::parse($trackingRow->trackingtime);
+                    }
+
+                    if (Str::contains($trackingRow->tracking, ['派送中', '已签收', '签收完成', ' 第三方提货', '货物已派送完成', '派送', 'delivery', 'delivered'])) {
+                        $deliveryDate = Carbon::parse($trackingRow->trackingtime);
+                    }
+                }
+
+                $client = new \GuzzleHttp\Client(['cookies' => true, 'headers' => ['Cookie' => 'utc_offset=480']]);
+
+                try {
+                    $request = $client->request('get', 'https://main.universe.com.my/Tracking/User/Paging?sEcho=1&sTrackingNo='.$row->expressno.'&sOrgId=sti');
+                    $deliveryTracking = json_decode($request->getBody()->getContents());
+                    foreach (array_reverse($deliveryTracking->aaData) as $trackingRow) {
+                        $trackingDate = Carbon::createFromFormat('d/m/y H:i', $trackingRow->LocalDateTime);
+                        if (Str::contains($trackingRow->PublicDescription, ['accepted/picked'])){
+                            $unstuffingDate = $trackingDate;
+                        }
+
+                        if (Str::contains($trackingRow->PublicDescription, ['delivered'])) {
+                            $deliveryDate = $trackingDate;
+                        }
+                    }
+                } catch (\Exception $exception){
+                    Log::debug('failed to fetch delivery tracking');
+                }
+
+                $customerno = preg_split('(-|\(|\)|\/)', $row->customerno);
+
+                $orderNumber = $customerno[array_key_last($customerno)];
+                $allow_contract = true;
+
+                try {
+                    $order = $this->fetchesOrder->execute(['reference' => $orderNumber]);
+                } catch (ResourceNotFoundException $exception) {
                     try {
-                        $order = $this->fetchesOrder->execute(['reference' => $orderNumber]);
+                        $order = $this->fetchesOrder->execute(['reference' => substr($orderNumber, -9)]);
                     } catch (ResourceNotFoundException $exception) {
-                        try {
-                            $order = $this->fetchesOrder->execute(['reference' => substr($orderNumber, -9)]);
-                        } catch (ResourceNotFoundException $exception) {
-                            $order = $this->fetchesCompanyModule->execute(['id' => 1]);
-                            $allow_contract = false;
-                        }
-
+                        $order = $this->fetchesCompanyModule->execute(['id' => 1]);
+                        $allow_contract = false;
                     }
 
-                    $packingListReference = $row->expressno;
-
-                    try{
-                        $packingList = $this->fetchesPackingList->execute(['reference' => $row->expressno, 'type' => PackingListType::SHIPPING_PACKING_LIST]);
-
-                        $packingList->packages()->delete();
-                        $replica = $packingList->packingLists()->where('type', PackingListType::SHIPPING_PACKING_LIST_REPLICA)->first();
-                        if($replica) $replica->packages()->delete();
-
-                        $warehouseReceiveList = $this->fetchesPackingList->execute(['reference' => $row->expressno, 'type' => PackingListType::WAREHOUSE_RECEIVE_LIST]);
-                        $warehouseReceiveList->packages()->delete();
-                        $replica = $warehouseReceiveList->packingLists()->where('type', PackingListType::WAREHOUSE_RECEIVE_LIST_REPLICA)->first();
-                        if($replica) $replica->packages()->delete();
-
-                    } catch (ResourceNotFoundException $exception) {
-
-                        if (!$allow_contract) {
-                            $appointee_id = 2307;
-                        } else {
-                            $appointee_id = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id;
-                        }
-
-                        $warehouseReceiveObject = new PackingListObject($packingListReference, $appointee_id, PackingListType::WAREHOUSE_RECEIVE_LIST, $allow_contract ? ApprovalStatus::APPROVED : ApprovalStatus::REJECTED);
-
-                        /** @var PackingList $warehouseReceiveList */
-                        $warehouseReceiveList = $this->createPackingListProcessor->execute($warehouseReceiveObject, $order);
-
-                        $transportObject = new TransportObject(TransportType::LAND, null, $row->kuaidilist, Carbon::parse($receiveDate), Carbon::parse($receiveDate), $allow_contract ? ApprovalStatus::APPROVED : ApprovalStatus::REJECTED);
-                        $transport = $this->createsTransport->execute($transportObject, $warehouseReceiveList);
-
-                        if ($allow_contract) {
-
-                            $contract = $this->unityCreateContract->execute();
-
-                            $contractReference = $contract->hash_id;
-                            $contractObligations = $contract->contract_obligation_list;
-
-                            $this->unityActivateContract->execute($contractReference);
-
-                            $supervisorHashId = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->unity_hash_id;
-
-                            $supervisorContractEntity = $this->unityCreateContractEntity->execute($contractReference, $supervisorHashId);
-                            $order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->update(['entity_hash_id' => $supervisorContractEntity->hash_id, 'entity_signature' => $supervisorContractEntity->entity_signature_hash_id]);
-
-                            $importerContractEntity = $this->unityCreateContractEntity->execute($contractReference, $order->orderRoles()->where('role_id', '=', OrderRoleTypes::IMPORTER)->first()->appointee->unity_hash_id);
-                            $order->orderRoles()->where('role_id', '=', OrderRoleTypes::IMPORTER)->first()->update(['entity_hash_id' => $importerContractEntity->hash_id, 'entity_signature' => $importerContractEntity->entity_signature_hash_id]);
-
-                            $this->unityAssignContractEntity->execute($supervisorContractEntity->hash_id, $contractObligations);
-                        }
-
-                        $packingListObject = new PackingListObject($packingListReference, $appointee_id, PackingListType::SHIPPING_PACKING_LIST, ApprovalStatus::SUSPENDED, !$allow_contract ? null : $contractReference);
-
-                        /** @var PackingList $packingList */
-                        $packingList = $this->createPackingListProcessor->execute($packingListObject, $order);
-
-                        if ($allow_contract) {
-                            foreach ($contractObligations as $obligation) {
-                                $stepObject = new StepsObject($order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->id, $obligation->reference, $obligation->sequence, $obligation->hash_id);
-                                $this->createsStep->execute($packingList, $stepObject);
-                            }
-                        }
-                    }
-
-                    foreach($row->deliverysize as $package) {
-                        $packageObject = new PackageObject(PackageType::CARTON, $row->goodname, (float) $package->width, (float) $package->height, (float) $package->length, 0, (float) $package->num, ApprovalStatus::APPROVED);
-                        $this->createPackageProcessor->execute($packageObject, $warehouseReceiveList);
-                        $this->createPackageProcessor->execute($packageObject, $packingList);
-                    }
-
-                    if(!count($row->deliverysize)){
-                        $measurement = round(((float) $row->volume / (float) $row->goodcount) ** (1/3) * 100, 2);
-                        $packageObject = new PackageObject(PackageType::CARTON, $row->goodname, (float) $measurement, (float) $measurement, (float) $measurement, 0, (float) $row->goodcount, ApprovalStatus::APPROVED);
-                        $this->createPackageProcessor->execute($packageObject, $warehouseReceiveList);
-                        $this->createPackageProcessor->execute($packageObject, $packingList);
-                    }
-
-                    $weightCbm = (float) $row->weight / 500;
-                    $overWeightCbm = $weightCbm - $packingList->packages()->sum(DB::raw('(width/100) * (height/100) * (length/100) * quantity'));
-
-                    if($overWeightCbm > 0){
-                        $measurement = round($overWeightCbm ** (1/3) * 100, 2);
-                        $packageObject = new PackageObject(PackageType::OVER_WEIGHT, 'Overweight CBM', (float) $measurement, (float) $measurement, (float) $measurement, 0, 1, ApprovalStatus::APPROVED);
-                        $this->createPackageProcessor->execute($packageObject, $packingList);
-                    }
-
-                    if($order instanceof Order){
-                        $marking = $order->companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
-                        if(!in_array($marking, ['1290CSW', '8997ITB', '3992WHE', '962LOW', '1152AAT'])){
-                            $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/confirmsendorder.ashx', 'GET', [
-                                'expressno' => $row->expressno
-                            ]);
-                        }
-                    }
-
-
-                    if($containerReference) {
-                        try {
-                            $container = $this->fetchesContainer->execute(['reference' => $containerReference]);
-                            $container->packingLists()->detach($packingList);
-                            $container->packingLists()->attach($packingList);
-                        } catch (ResourceNotFoundException $exception){
-
-                            if (!$allow_contract) {
-                                $appointee_id = 2307;
-                            }
-                            else {
-                                $appointee_id = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee->id;
-                            }
-
-                            $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $appointee_id]);
-
-                            $containerObject = new ContainerObject($containerReference, '', '', ContainerTypes::FORTY_FEET_DRY_CONTAINER, $loadingDate, ApprovalStatus::PENDING_VERIFICATION);
-                            /** @var Container $container */
-                            $container = $this->createContainerProcessor->execute($containerObject, $originWarehouse);
-
-                            $container->packingLists()->detach($packingList);
-                            $container->packingLists()->attach($packingList);
-
-                            $transport = $container->transports()->first();
-
-                            if(!$transport){
-                                $transportObject = new TransportObject(TransportType::SEA, null, null,  $etd, null, ApprovalStatus::APPROVED);
-                                /** @var Transport $transport */
-                                $transport = $this->createsTransport->execute($transportObject, $container);
-                                $this->createsSchedule->execute($transport, new ScheduleObject($etd, $eta, ApprovalStatus::APPROVED));
-                            }
-                        }
-
-                        if($delayDate){
-                            $delayDate = $delayDate->addDays(2);
-                            $transport = $container->transports()->first();
-
-                            if(!$transport->schedules()->whereDate('eta', '>=', $delayDate)->first()) {
-                                $etd = $transport->schedules()->where('status', '=', ApprovalStatus::APPROVED)->first()->etd;
-                                $transport->schedules()->update(['status' => ApprovalStatus::EXPIRED]);
-                                $this->createsSchedule->execute($transport, new ScheduleObject($etd, $delayDate, ApprovalStatus::APPROVED));
-                                foreach ($container->packingLists as $packingList){
-                                    if(!($packingList->owner instanceof Order)) continue;
-                                    $user = $packingList->owner->companyModule->employees()->first();
-                                    if(app()->environment(['production'])) {
-                                        $user->notify(new ShipmentRescheduleEmail($user, $packingList));
-                                    }
-                                }
-                            }
-
-                        }
-
-                        if($unstuffingDate && $container->status !== ApprovalStatus::COMPLETED){
-                            $container->update(['status' => ApprovalStatus::COMPLETED]);
-                            $container->transports()->first()->update(['drop_date' => $unstuffingDate, 'status' => ApprovalStatus::COMPLETED]);
-
-                            /** @var PackingList $packingList */
-                            foreach($container->packingLists as $packingList){
-
-                                if($packingList->status === ApprovalStatus::PENDING_VERIFICATION){
-                                    $packingList->status = ApprovalStatus::APPROVED;
-                                    $packingList->save();
-                                }
-
-                                if ($allow_contract) {
-                                    $signature = $packingList->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->entity_sigiture;
-                                    foreach($packingList->steps()->where('reference', '!=', 'DELIVERY')->get() as $step){
-                                        $this->updatesContractObligations->execute($signature, $step->obligation_hash_id);
-                                        $step->update(['status' => ApprovalStatus::COMPLETED]);
-                                    }
-                                }
-
-                            }
-                        }
-                    }
-
-                    if($deliveryDate && !$packingList->transports()->exists()){
-                        $packingList->status = ApprovalStatus::COMPLETED;
-                        $packingList->save();
-
-                        $deliveryDate = Carbon::parse($deliveryDate);
-                        $transportObject = new TransportObject(TransportType::LAND, null, null,  $deliveryDate, $deliveryDate, ApprovalStatus::APPROVED);
-                        /** @var Transport $transport */
-                        $transport = $this->createsTransport->execute($transportObject, $packingList);
-                        $this->createsSchedule->execute($transport, new ScheduleObject($deliveryDate, $deliveryDate, ApprovalStatus::APPROVED));
-
-
-                        if ($allow_contract) {
-                            $deliveryStep = $packingList->steps()->where('reference', '=', 'LAST_MILE_DELIVERY')->first();
-                            $signature = $packingList->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->entity_sigiture;
-                            $this->updatesContractObligations->execute($signature, $deliveryStep->obligation_hash_id);
-                            $deliveryStep->update(['status' => ApprovalStatus::COMPLETED]);
-                        }
-
-                    }
-
-                    $time_end = microtime(true);
-
-                    $execution_time = ($time_end - $time_start)/60;
-
-                    echo '<b>Total Execution Time:</b> '.$execution_time.' Mins';
-                    echo 'successful';
-
                 }
 
-            } catch (\Exception $exception) {
-                Log::debug($exception);
-            }
-        }
+                $packingListReference = $row->expressno;
 
+                try{
+                    $packingList = $this->fetchesPackingList->execute(['reference' => $row->expressno, 'type' => PackingListType::SHIPPING_PACKING_LIST]);
+
+                    $packingList->packages()->delete();
+                    $replica = $packingList->packingLists()->where('type', PackingListType::SHIPPING_PACKING_LIST_REPLICA)->first();
+                    if($replica) $replica->packages()->delete();
+
+                    $warehouseReceiveList = $this->fetchesPackingList->execute(['reference' => $row->expressno, 'type' => PackingListType::WAREHOUSE_RECEIVE_LIST]);
+                    $warehouseReceiveList->packages()->delete();
+                    $replica = $warehouseReceiveList->packingLists()->where('type', PackingListType::WAREHOUSE_RECEIVE_LIST_REPLICA)->first();
+                    if($replica) $replica->packages()->delete();
+
+                } catch (ResourceNotFoundException $exception) {
+
+                    if (!$allow_contract) {
+                        $appointee_id = 2037;
+                    } else {
+                        $appointee_id = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id;
+                    }
+
+                    $warehouseReceiveObject = new PackingListObject($packingListReference, $appointee_id, PackingListType::WAREHOUSE_RECEIVE_LIST, $allow_contract ? ApprovalStatus::APPROVED : ApprovalStatus::REJECTED);
+
+                    /** @var PackingList $warehouseReceiveList */
+                    $warehouseReceiveList = $this->createPackingListProcessor->execute($warehouseReceiveObject, $order);
+
+                    $transportObject = new TransportObject(TransportType::LAND, null, $row->kuaidilist, Carbon::parse($receiveDate), Carbon::parse($receiveDate), $allow_contract ? ApprovalStatus::APPROVED : ApprovalStatus::REJECTED);
+                    $transport = $this->createsTransport->execute($transportObject, $warehouseReceiveList);
+
+                    if ($allow_contract) {
+
+                        $contract = $this->unityCreateContract->execute();
+
+                        $contractReference = $contract->hash_id;
+                        $contractObligations = $contract->contract_obligation_list;
+
+                        $this->unityActivateContract->execute($contractReference);
+
+                        $supervisorHashId = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->unity_hash_id;
+
+                        $supervisorContractEntity = $this->unityCreateContractEntity->execute($contractReference, $supervisorHashId);
+                        $order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->update(['entity_hash_id' => $supervisorContractEntity->hash_id, 'entity_signature' => $supervisorContractEntity->entity_signature_hash_id]);
+
+                        $importerContractEntity = $this->unityCreateContractEntity->execute($contractReference, $order->orderRoles()->where('role_id', '=', OrderRoleTypes::IMPORTER)->first()->appointee->unity_hash_id);
+                        $order->orderRoles()->where('role_id', '=', OrderRoleTypes::IMPORTER)->first()->update(['entity_hash_id' => $importerContractEntity->hash_id, 'entity_signature' => $importerContractEntity->entity_signature_hash_id]);
+
+                        $this->unityAssignContractEntity->execute($supervisorContractEntity->hash_id, $contractObligations);
+                    }
+
+                    $packingListObject = new PackingListObject($packingListReference, $appointee_id, PackingListType::SHIPPING_PACKING_LIST, ApprovalStatus::SUSPENDED, !$allow_contract ? null : $contractReference);
+
+                    /** @var PackingList $packingList */
+                    $packingList = $this->createPackingListProcessor->execute($packingListObject, $order);
+
+                    if ($allow_contract) {
+                        foreach ($contractObligations as $obligation) {
+                            $stepObject = new StepsObject($order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->id, $obligation->reference, $obligation->sequence, $obligation->hash_id);
+                            $this->createsStep->execute($packingList, $stepObject);
+                        }
+                    }
+                }
+
+                foreach($row->deliverysize as $package) {
+                    $packageObject = new PackageObject(PackageType::CARTON, $row->goodname, (float) $package->width, (float) $package->height, (float) $package->length, 0, (float) $package->num, ApprovalStatus::APPROVED);
+                    $this->createPackageProcessor->execute($packageObject, $warehouseReceiveList);
+                    $this->createPackageProcessor->execute($packageObject, $packingList);
+                }
+
+                if(!count($row->deliverysize)){
+                    $measurement = round(((float) $row->volume / (float) $row->goodcount) ** (1/3) * 100, 2);
+                    $packageObject = new PackageObject(PackageType::CARTON, $row->goodname, (float) $measurement, (float) $measurement, (float) $measurement, 0, (float) $row->goodcount, ApprovalStatus::APPROVED);
+                    $this->createPackageProcessor->execute($packageObject, $warehouseReceiveList);
+                    $this->createPackageProcessor->execute($packageObject, $packingList);
+                }
+
+                $weightCbm = (float) $row->weight / 500;
+                $overWeightCbm = $weightCbm - $packingList->packages()->sum(DB::raw('(width/100) * (height/100) * (length/100) * quantity'));
+
+                if($overWeightCbm > 0){
+                    $measurement = round($overWeightCbm ** (1/3) * 100, 2);
+                    $packageObject = new PackageObject(PackageType::OVER_WEIGHT, 'Overweight CBM', (float) $measurement, (float) $measurement, (float) $measurement, 0, 1, ApprovalStatus::APPROVED);
+                    $this->createPackageProcessor->execute($packageObject, $packingList);
+                }
+
+                if($order instanceof Order){
+                    $marking = $order->companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
+                    if(!in_array($marking, ['1290CSW', '8997ITB', '3992WHE', '962LOW', '1152AAT'])){
+                        $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/confirmsendorder.ashx', 'GET', [
+                            'expressno' => $row->expressno
+                        ]);
+                    }
+                }
+
+
+                if($containerReference) {
+                    try {
+                        $container = $this->fetchesContainer->execute(['reference' => $containerReference]);
+                        $container->packingLists()->detach($packingList);
+                        $container->packingLists()->attach($packingList);
+                    } catch (ResourceNotFoundException $exception){
+
+                        if (!$allow_contract) {
+                            $appointee_id = 2037;
+                        }
+                        else {
+                            $appointee_id = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee->id;
+                        }
+
+                        $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $appointee_id]);
+
+                        $containerObject = new ContainerObject($containerReference, '', '', ContainerTypes::FORTY_FEET_DRY_CONTAINER, $loadingDate, ApprovalStatus::PENDING_VERIFICATION);
+                        /** @var Container $container */
+                        $container = $this->createContainerProcessor->execute($containerObject, $originWarehouse);
+
+                        $container->packingLists()->detach($packingList);
+                        $container->packingLists()->attach($packingList);
+
+                        $transport = $container->transports()->first();
+
+                        if(!$transport){
+                            $transportObject = new TransportObject(TransportType::SEA, null, null,  $etd, null, ApprovalStatus::APPROVED);
+                            /** @var Transport $transport */
+                            $transport = $this->createsTransport->execute($transportObject, $container);
+                            $this->createsSchedule->execute($transport, new ScheduleObject($etd, $eta, ApprovalStatus::APPROVED));
+                        }
+                    }
+
+                    if($delayDate){
+                        $delayDate = $delayDate->addDays(2);
+                        $transport = $container->transports()->first();
+
+                        if(!$transport->schedules()->whereDate('eta', '>=', $delayDate)->first()) {
+                            $etd = $transport->schedules()->where('status', '=', ApprovalStatus::APPROVED)->first()->etd;
+                            $transport->schedules()->update(['status' => ApprovalStatus::EXPIRED]);
+                            $this->createsSchedule->execute($transport, new ScheduleObject($etd, $delayDate, ApprovalStatus::APPROVED));
+                            foreach ($container->packingLists as $packingList){
+                                if(!($packingList->owner instanceof Order)) continue;
+                                $user = $packingList->owner->companyModule->employees()->first();
+                                if(app()->environment(['production'])) {
+                                    $user->notify(new ShipmentRescheduleEmail($user, $packingList));
+                                }
+                            }
+                        }
+
+                    }
+
+                    if($unstuffingDate && $container->status !== ApprovalStatus::COMPLETED){
+                        $container->update(['status' => ApprovalStatus::COMPLETED]);
+                        $container->transports()->first()->update(['drop_date' => $unstuffingDate, 'status' => ApprovalStatus::COMPLETED]);
+
+                        /** @var PackingList $packingList */
+                        foreach($container->packingLists as $packingList){
+
+                            if($packingList->status === ApprovalStatus::PENDING_VERIFICATION){
+                                $packingList->status = ApprovalStatus::APPROVED;
+                                $packingList->save();
+                            }
+
+                            if ($allow_contract) {
+                                $signature = $packingList->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->entity_sigiture;
+                                foreach($packingList->steps()->where('reference', '!=', 'DELIVERY')->get() as $step){
+                                    $this->updatesContractObligations->execute($signature, $step->obligation_hash_id);
+                                    $step->update(['status' => ApprovalStatus::COMPLETED]);
+                                }
+                            }
+
+                        }
+                    }
+                }
+
+                if($deliveryDate && !$packingList->transports()->exists()){
+                    $packingList->status = ApprovalStatus::COMPLETED;
+                    $packingList->save();
+
+                    $deliveryDate = Carbon::parse($deliveryDate);
+                    $transportObject = new TransportObject(TransportType::LAND, null, null,  $deliveryDate, $deliveryDate, ApprovalStatus::APPROVED);
+                    /** @var Transport $transport */
+                    $transport = $this->createsTransport->execute($transportObject, $packingList);
+                    $this->createsSchedule->execute($transport, new ScheduleObject($deliveryDate, $deliveryDate, ApprovalStatus::APPROVED));
+
+
+                    if ($allow_contract) {
+                        $deliveryStep = $packingList->steps()->where('reference', '=', 'LAST_MILE_DELIVERY')->first();
+                        $signature = $packingList->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->entity_sigiture;
+                        $this->updatesContractObligations->execute($signature, $deliveryStep->obligation_hash_id);
+                        $deliveryStep->update(['status' => ApprovalStatus::COMPLETED]);
+                    }
+
+                }
+
+                echo 'successful';
+
+            }
+        } catch (\Exception $exception) {
+            Log::debug($exception);
+        }
 
 
     }
 }
-

app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php

@@ -66,6 +66,7 @@ class FetchPackingListFromVTPortalProcessor
                 }
 
             } catch (GuzzleException $exception) {
+                dd($exception);
                 Log::error($exception);
                 continue;
             }

app/Classes/Modules/PackingLists/Processors/FetchPackingListsFromYdPortalProcessor.php

@@ -1,267 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PackingLists\Processors;
-
-use App\Classes\Exceptions\ResourceNotFoundException;
-use App\Classes\Modules\Companies\Services\FetchesCompanyModule;
-use App\Classes\Modules\Orders\Services\FetchesDataFromYDPortal;
-
-use App\Classes\Modules\Orders\Services\FetchesOrder;
-use App\Classes\Modules\PackingLists\DataTransferObjects\PackageObject;
-use App\Classes\Modules\PackingLists\DataTransferObjects\PackingListObject;
-use App\Classes\Modules\PackingLists\Services\FetchesPackingList;
-use App\Classes\Modules\Steps\DataTransferObjects\StepsObject;
-use App\Classes\Modules\Steps\Services\CreatesStep;
-use App\Classes\Modules\Transports\DataTransferObjects\TransportObject;
-use App\Classes\Modules\Transports\Services\CreatesTransport;
-use App\Classes\Modules\Unity\Processors\ActivateContractProcessor;
-use App\Classes\Modules\Unity\Processors\AssignContractEntityProcessor;
-use App\Classes\Modules\Unity\Processors\CreateContractEntityProcessor;
-use App\Classes\Modules\Unity\Services\CreatesContract;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\OrderRoleTypes;
-use App\Classes\ValueObjects\Constants\PackageType;
-use App\Classes\ValueObjects\Constants\PackingListType;
-use App\Classes\ValueObjects\Constants\TransportType;
-use App\Models\Order;
-use App\Models\PackingList;
-use Carbon\Carbon;
-use GuzzleHttp\Exception\GuzzleException;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Log;
-
-class FetchPackingListsFromYdPortalProcessor
-{
-    /** @var FetchesDataFromYDPortal */
-    private $fetchesDataFRomYDPortal;
-
-    /** @var FetchesOrder */
-    private $fetchesOrder;
-
-    /** @var CreatePackingListProcessor */
-    private $createPackingListProcessor;
-
-    /** @var CreatePackageProcessor */
-    private $createPackageProcessor;
-
-    /** @var CreatesTransport */
-    private $createsTransport;
-
-    /** @var FetchesPackingList */
-    private $fetchesPackingList;
-
-    /** @var FetchesCompanyModule */
-
-    private $fetchesCompanyModule;
-    /** @var CreatesContract */
-    private $unityCreateContract;
-
-    /** @var AssignContractEntityProcessor */
-    private $unityAssignContractEntity;
-
-    /** @var CreateContractEntityProcessor */
-    private $unityCreateContractEntity;
-
-    /** @var CreatesStep */
-    private $createsStep;
-
-    /** @var ActivateContractProcessor */
-    private $unityActivateContract;
-
-    /**
-     * @param FetchesDataFromYDPortal $fetchesDataFRomYDPortal
-     * @param FetchesOrder $fetchesOrder
-     * @param CreatePackingListProcessor $createPackingListProcessor
-     * @param CreatePackageProcessor $createPackageProcessor
-     * @param CreatesTransport $createsTransport
-     * @param FetchesPackingList $fetchesPackingList
-     * @param FetchesCompanyModule $fetchesCompanyModule
-     * @param CreatesContract $unityCreateContract
-     * @param AssignContractEntityProcessor $unityAssignContractEntity
-     * @param CreateContractEntityProcessor $unityCreateContractEntity
-     * @param CreatesStep $createsStep
-     * @param ActivateContractProcessor $unityActivateContract
-     */
-    public function __construct(FetchesDataFromYDPortal $fetchesDataFRomYDPortal, FetchesOrder $fetchesOrder, CreatePackingListProcessor $createPackingListProcessor, CreatePackageProcessor $createPackageProcessor, CreatesTransport $createsTransport, FetchesPackingList $fetchesPackingList, FetchesCompanyModule $fetchesCompanyModule, CreatesContract $unityCreateContract, AssignContractEntityProcessor $unityAssignContractEntity, CreateContractEntityProcessor $unityCreateContractEntity, CreatesStep $createsStep, ActivateContractProcessor $unityActivateContract)
-    {
-        $this->fetchesDataFRomYDPortal = $fetchesDataFRomYDPortal;
-        $this->fetchesOrder = $fetchesOrder;
-        $this->createPackingListProcessor = $createPackingListProcessor;
-        $this->createPackageProcessor = $createPackageProcessor;
-        $this->createsTransport = $createsTransport;
-        $this->fetchesPackingList = $fetchesPackingList;
-        $this->fetchesCompanyModule = $fetchesCompanyModule;
-        $this->unityCreateContract = $unityCreateContract;
-        $this->unityAssignContractEntity = $unityAssignContractEntity;
-        $this->unityCreateContractEntity = $unityCreateContractEntity;
-        $this->createsStep = $createsStep;
-        $this->unityActivateContract = $unityActivateContract;
-    }
-
-
-    /**
-     * @param Carbon|null $start
-     * @param Carbon|null $end
-     * @return void
-     * @throws GuzzleException
-     */
-    public function execute(?Carbon $start = null, ?Carbon $end = null)
-    {
-        $from = $end ? Carbon::today()->diff($end)->days : 0;
-        $to = $start ? Carbon::today()->diff($start)->days : 10;
-
-        for ($x = $from; $x <= $to; $x++) {
-            try {
-                $startDate = Carbon::today()->subDays($x);
-
-                $startLimit = Carbon::parse('01-12-2021');
-
-                if($startDate->isBefore($startLimit)){
-                    $startDate = $startLimit;
-                }
-
-                $endDate = Carbon::today()->subDays($x - 1);
-                $orderRequest = $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/GetOrderList.ashx', 'GET', [
-                    'begintime' => $startDate->timestamp,
-                    'endtime' => $endDate->timestamp,
-                ]);
-
-                $rows = $this->fetchesDataFRomYDPortal->getResponseBody($orderRequest);
-
-                if(!$rows->data) continue;
-
-                foreach($rows->data as $row){
-
-                    $time_start = microtime(true);
-
-                    $receiveDate = Carbon::parse(substr(preg_replace("/[^0-9]/", "", $row->expressno), 0, 8));
-
-                    $customerno = preg_split('(-|\(|\)|\/)', $row->customerno);
-
-                    $orderNumber = $customerno[array_key_last($customerno)];
-                    $allow_contract = true;
-
-                    try {
-                        $order = $this->fetchesOrder->execute(['reference' => $orderNumber]);
-                    } catch (ResourceNotFoundException $exception) {
-                        try {
-                            $order = $this->fetchesOrder->execute(['reference' => substr($orderNumber, -9)]);
-                        } catch (ResourceNotFoundException $exception) {
-                            $order = $this->fetchesCompanyModule->execute(['id' => 1]);
-                            $allow_contract = false;
-                        }
-
-                    }
-
-                    $packingListReference = $row->expressno;
-
-                    try{
-                        $packingList = $this->fetchesPackingList->execute(['reference' => $row->expressno, 'type' => PackingListType::SHIPPING_PACKING_LIST]);
-
-                        $packingList->packages()->delete();
-                        $replica = $packingList->packingLists()->where('type', PackingListType::SHIPPING_PACKING_LIST_REPLICA)->first();
-                        if($replica) $replica->packages()->delete();
-
-                        $warehouseReceiveList = $this->fetchesPackingList->execute(['reference' => $row->expressno, 'type' => PackingListType::WAREHOUSE_RECEIVE_LIST]);
-                        $warehouseReceiveList->packages()->delete();
-                        $replica = $warehouseReceiveList->packingLists()->where('type', PackingListType::WAREHOUSE_RECEIVE_LIST_REPLICA)->first();
-                        if($replica) $replica->packages()->delete();
-
-                    } catch (ResourceNotFoundException $exception) {
-
-                        if (!$allow_contract) {
-                            $appointee_id = 2307;
-                        } else {
-                            $appointee_id = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id;
-                        }
-
-                        $warehouseReceiveObject = new PackingListObject($packingListReference, $appointee_id, PackingListType::WAREHOUSE_RECEIVE_LIST, $allow_contract ? ApprovalStatus::APPROVED : ApprovalStatus::REJECTED);
-
-                        /** @var PackingList $warehouseReceiveList */
-                        $warehouseReceiveList = $this->createPackingListProcessor->execute($warehouseReceiveObject, $order);
-
-                        $transportObject = new TransportObject(TransportType::LAND, null, $row->kuaidilist, Carbon::parse($receiveDate), Carbon::parse($receiveDate), $allow_contract ? ApprovalStatus::APPROVED : ApprovalStatus::REJECTED);
-                        $transport = $this->createsTransport->execute($transportObject, $warehouseReceiveList);
-
-                        if ($allow_contract) {
-
-                            $contract = $this->unityCreateContract->execute();
-
-                            $contractReference = $contract->hash_id;
-                            $contractObligations = $contract->contract_obligation_list;
-
-                            $this->unityActivateContract->execute($contractReference);
-
-                            $supervisorHashId = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->unity_hash_id;
-
-                            $supervisorContractEntity = $this->unityCreateContractEntity->execute($contractReference, $supervisorHashId);
-                            $order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->update(['entity_hash_id' => $supervisorContractEntity->hash_id, 'entity_signature' => $supervisorContractEntity->entity_signature_hash_id]);
-
-                            $importerContractEntity = $this->unityCreateContractEntity->execute($contractReference, $order->orderRoles()->where('role_id', '=', OrderRoleTypes::IMPORTER)->first()->appointee->unity_hash_id);
-                            $order->orderRoles()->where('role_id', '=', OrderRoleTypes::IMPORTER)->first()->update(['entity_hash_id' => $importerContractEntity->hash_id, 'entity_signature' => $importerContractEntity->entity_signature_hash_id]);
-
-                            $this->unityAssignContractEntity->execute($supervisorContractEntity->hash_id, $contractObligations);
-                        }
-
-                        $packingListObject = new PackingListObject($packingListReference, $appointee_id, PackingListType::SHIPPING_PACKING_LIST, ApprovalStatus::SUSPENDED, !$allow_contract ? null : $contractReference);
-
-                        /** @var PackingList $packingList */
-                        $packingList = $this->createPackingListProcessor->execute($packingListObject, $order);
-
-                        if ($allow_contract) {
-                            foreach ($contractObligations as $obligation) {
-                                $stepObject = new StepsObject($order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->id, $obligation->reference, $obligation->sequence, $obligation->hash_id);
-                                $this->createsStep->execute($packingList, $stepObject);
-                            }
-                        }
-                    }
-
-                    foreach($row->deliverysize as $package) {
-                        $packageObject = new PackageObject(PackageType::CARTON, $row->goodname, (float) $package->width, (float) $package->height, (float) $package->length, 0, (float) $package->num, ApprovalStatus::APPROVED);
-                        $this->createPackageProcessor->execute($packageObject, $warehouseReceiveList);
-                        $this->createPackageProcessor->execute($packageObject, $packingList);
-                    }
-
-                    if(!count($row->deliverysize)){
-                        $measurement = round(((float) $row->volume / (float) $row->goodcount) ** (1/3) * 100, 2);
-                        $packageObject = new PackageObject(PackageType::CARTON, $row->goodname, (float) $measurement, (float) $measurement, (float) $measurement, 0, (float) $row->goodcount, ApprovalStatus::APPROVED);
-                        $this->createPackageProcessor->execute($packageObject, $warehouseReceiveList);
-                        $this->createPackageProcessor->execute($packageObject, $packingList);
-                    }
-
-                    $weightCbm = (float) $row->weight / 500;
-                    $overWeightCbm = $weightCbm - $packingList->packages()->sum(DB::raw('(width/100) * (height/100) * (length/100) * quantity'));
-
-                    if($overWeightCbm > 0){
-                        $measurement = round($overWeightCbm ** (1/3) * 100, 2);
-                        $packageObject = new PackageObject(PackageType::OVER_WEIGHT, 'Overweight CBM', (float) $measurement, (float) $measurement, (float) $measurement, 0, 1, ApprovalStatus::APPROVED);
-                        $this->createPackageProcessor->execute($packageObject, $packingList);
-                    }
-
-                    if($order instanceof Order){
-                        $marking = $order->companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
-                        if(!in_array($marking, ['1290CSW', '8997ITB', '3992WHE', '962LOW', '1152AAT'])){
-                            $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/confirmsendorder.ashx', 'GET', [
-                                'expressno' => $row->expressno
-                            ]);
-                        }
-                    }
-
-                    $time_end = microtime(true);
-
-                    $execution_time = ($time_end - $time_start)/60;
-
-                    echo 'successful => <b>Total Execution Time:</b> '.$execution_time.' Mins<br>';
-
-                }
-
-            } catch (\Exception $exception) {
-                Log::debug($exception);
-            }
-        }
-
-
-
-    }
-}
-

app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php

@@ -152,7 +152,7 @@ class FetchWarehouseReceiveListFromVTPortalProcessor
                 } catch (ResourceNotFoundException $exception) {
                     $allow_contract = false;
                     $order = $this->fetchesCompanyModule->execute(['id' => 1]);
-                    $appointee_id = 2307;
+                    $appointee_id = 2037;
                 }
 
                 $packingListReference = $parcel[0];

app/Classes/Modules/Transactions/ControllersLogic/ApproveShippingInvoiceTransactionLogic.php

@@ -3,7 +3,6 @@
 namespace App\Classes\Modules\Transactions\ControllersLogic;
 
 
-use App\Classes\Modules\Transactions\Processors\ApproveShippingInvoiceTransactionProcessor;
 use App\Classes\Notifications\InvoiceIssuedEmail;
 use Illuminate\Http\Request;
 
@@ -37,17 +36,29 @@ class ApproveShippingInvoiceTransactionLogic extends AbstractControllerLogic
     /** @var FetchesPackingList */
     private $fetchesPackingList;
 
-    /** @var ApproveShippingInvoiceTransactionProcessor */
-    private $approveShippingInvoiceTransactionProcessor;
+    /** @var UpdatesTransactionStatus */
+    private $updatesTransactionStatus;
+
+    /** @var CreatesDocument */
+    private $createsDocument;
+
+    /** @var CreatesFiles */
+    private $createsFiles;
 
     /**
+     * ApprovePaymentVerificationLogic constructor.
      * @param FetchesPackingList $fetchesPackingList
-     * @param ApproveShippingInvoiceTransactionProcessor $approveShippingInvoiceTransactionProcessor
+     * @param UpdatesTransactionStatus $updatesTransactionStatus
+     * @param CreatesDocument $createsDocument
+     * @param CreatesFiles $createsFiles
+     * @param CreateInvoiceTransactionProcessor $createInvoiceTransactionProcessor
      */
-    public function __construct(FetchesPackingList $fetchesPackingList, ApproveShippingInvoiceTransactionProcessor $approveShippingInvoiceTransactionProcessor)
+    public function __construct(FetchesPackingList $fetchesPackingList, UpdatesTransactionStatus $updatesTransactionStatus, CreatesDocument $createsDocument, CreatesFiles $createsFiles)
     {
         $this->fetchesPackingList = $fetchesPackingList;
-        $this->approveShippingInvoiceTransactionProcessor = $approveShippingInvoiceTransactionProcessor;
+        $this->updatesTransactionStatus = $updatesTransactionStatus;
+        $this->createsDocument = $createsDocument;
+        $this->createsFiles = $createsFiles;
     }
 
     /**
@@ -58,8 +69,29 @@ class ApproveShippingInvoiceTransactionLogic extends AbstractControllerLogic
     public function logic(Request $request) : JsonResponse
     {
         $packing_list = $this->fetchesPackingList->execute(['id' => $request->route('id')]);
-        $this->approveShippingInvoiceTransactionProcessor->execute($packing_list);
 
+        $invoice_transaction = $packing_list->transactions()->where('transactions.type', TransactionType::SHIPPING_INVOICE)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::PENDING_SUBMISSION])->first();
+
+        $this->updatesTransactionStatus->execute($invoice_transaction, ApprovalStatus::APPROVED);
+
+        $transaction_invoice_pdf = LaravelMpdf::loadView('pages.pdfs.shipping_invoice', ['invoice_transaction' => $invoice_transaction]);
+
+        $document_object = new DocumentObject(
+            DocumentType::SHIPPING_INVOICE,
+            [chunk_split('data:application/pdf;base64,'.base64_encode($transaction_invoice_pdf->output()))],
+            '',
+            ApprovalStatus::COMPLETED,
+            'shipping_invoice'
+        );
+
+        /** @var Document $document */
+        $document = $this->createsDocument->execute($invoice_transaction, $document_object);
+
+        $this->createsFiles->execute($document, $document_object);
+        $user = $packing_list->owner->companyModule->employees()->first();
+        if(app()->environment(['production'])) {
+            $user->notify(new InvoiceIssuedEmail($user, $packing_list));
+        }
         return $this->response([]);
     }
 

app/Classes/Modules/Transactions/ControllersLogic/CreateShippingInvoiceTransactionLogic.php

@@ -5,15 +5,41 @@ namespace App\Classes\Modules\Transactions\ControllersLogic;
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\PackingLists\Services\FetchesPackingList;
-use App\Classes\Modules\Transactions\Processors\CreateInvoiceTransactionProcessor;
+use App\Classes\Modules\SegmentConstants\Services\FetchesSegmentConstant;
+use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
+use App\Classes\Modules\Transactions\Services\CreatesTransaction;
+use App\Classes\Modules\Transactions\Services\CreatesTransactionDetail;
+use App\Classes\Modules\Documents\Services\CreatesDocument;
+use App\Classes\Modules\Documents\Services\CreatesFiles;
+use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
+use App\Classes\Modules\Transactions\DataTransferObjects\TransactionDetailObject;
+use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
+
+use App\Classes\ValueObjects\Constants\OrderRoleTypes;
+use App\Classes\ValueObjects\Constants\PackingListType;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\DocumentType;
+use App\Classes\ValueObjects\Constants\PackageType;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+use App\Classes\ValueObjects\Constants\TransactionDetailType;
+
+use App\Models\CompanyModule;
+use App\Models\Document;
+use App\Models\PackingList;
+use App\Models\Transaction;
+use Carbon\Carbon;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Str;
+use Mccarlosen\LaravelMpdf\Facades\LaravelMpdf;
 
 class CreateShippingInvoiceTransactionLogic extends AbstractControllerLogic
 {
 
 
-
     /**
      * @return array
      */
@@ -27,26 +53,214 @@ class CreateShippingInvoiceTransactionLogic extends AbstractControllerLogic
     /** @var FetchesPackingList */
     private $fetchesPackingList;
 
-    /** @var CreateInvoiceTransactionProcessor */
-    private $createInvoiceTransactionProcessor;
+    /** @var FetchesSegmentConstant */
+    private $fetchesSegmentConstant;
 
-    /**
-     * @param FetchesPackingList $fetchesPackingList
-     * @param CreateInvoiceTransactionProcessor $createInvoiceTransactionProcessor
-     */
-    public function __construct(FetchesPackingList $fetchesPackingList, CreateInvoiceTransactionProcessor $createInvoiceTransactionProcessor)
+    /** @var GeneratesTransactionBillNumber */
+    private $generatesTransactionBillNumber;
+
+    /** @var CreatesTransaction */
+    private $createsTransaction;
+
+    /** @var CreatesTransactionDetail */
+    private $createsTransactionDetail;
+
+    /** @var CreatesDocument */
+    private $createsDocument;
+
+    /** @var CreatesFiles */
+    private $createsFile;
+
+    public function __construct(
+        FetchesPackingList $fetchesPackingList,
+        FetchesSegmentConstant $fetchesSegmentConstant,
+        GeneratesTransactionBillNumber $generatesTransactionBillNumber,
+        CreatesTransaction $createsTransaction,
+        CreatesTransactionDetail $createsTransactionDetail,
+        CreatesDocument $createsDocument,
+        CreatesFiles $createsFile
+    )
     {
+
         $this->fetchesPackingList = $fetchesPackingList;
-        $this->createInvoiceTransactionProcessor = $createInvoiceTransactionProcessor;
+        $this->fetchesSegmentConstant = $fetchesSegmentConstant;
+        $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
+        $this->createsTransaction = $createsTransaction;
+        $this->createsTransactionDetail = $createsTransactionDetail;
+        $this->createsDocument = $createsDocument;
+        $this->createsFile = $createsFile;
     }
 
     public function logic(Request $request) : JsonResponse
     {
-
         $packing_list = $this->fetchesPackingList->execute(['id' => $request->input('packing_list_id')]);
-        $this->createInvoiceTransactionProcessor->execute($packing_list);
+        $packing_list = PackingList::where('reference', $packing_list->reference)->where('type', PackingListType::SHIPPING_PACKING_LIST)->first();
+
+        $billable_packing_list = $packing_list->packingLists()->first();
+
+        $billable_packing_list = $billable_packing_list ? $billable_packing_list : $packing_list;
+
+        $cbm = round($billable_packing_list->packages->where('type', '!=', PackageType::OVER_WEIGHT)->sum(function($package) {
+            return ($package->width / 100) * ($package->height / 100) *($package->length / 100) * ($package->quantity);
+        }), 3);
+
+        $over_weight_cbm = round($billable_packing_list->packages->where('type', PackageType::OVER_WEIGHT)->sum(function($package) {
+            return ($package->width / 100) * ($package->height / 100) *($package->length / 100) * ($package->quantity);
+        }), 3);
+
+        $order =  $packing_list->owner;
+        $companyModule = $order->companyModule;
+        $connection = $companyModule->connections()->first();
+        $address = $order->addresses()->first();
+
+        $base_price_constant = $this->fetchesSegmentConstant->execute(['segment_id' => 1, 'reference' => SegmentConstants::BASE_PRICE]);
+        $warehouse_rate_constant = $this->fetchesSegmentConstant->execute(['segment_id' => 1, 'reference' => SegmentConstants::WAREHOUSE_RATE]);
+        $state_rate_constant = $this->fetchesSegmentConstant->execute(['segment_id' => 1, 'reference' => SegmentConstants::STATE_RATE]);
+        $center_postcode_constant = $this->fetchesSegmentConstant->execute(['segment_id' => 1, 'reference' => SegmentConstants::CENTER_POSTCODE]);
+        $outstation_postcode_constant = $this->fetchesSegmentConstant->execute(['segment_id' => 1, 'reference' => SegmentConstants::OUTSTATION_POSTCODE]);
+
+        $noMinimumCharge = $connection->segments()->where('segments.id', 2)->first();
+
+        $minimum_cbm = 0.3;
+        $state_select = '';
+
+        $segment_price = $connection->segments()->whereHas('constants', function($query){
+            return $query->where('reference', SegmentConstants::CUSTOM_PRICE);
+        })->get()->map(function($segment){
+            return (float) $segment->constants()->first()->value[0];
+        })->sort()->first();
+        $segment_price = $segment_price ? $segment_price : 0;
+
+        $packing_list_drop_date = PackingList::where('reference', $packing_list->reference)->where('type', 1)->first()->transports->first()->drop_date->format('Y-m-d');
+        $base_price = $this->getConstantByKey($base_price_constant, $packing_list_drop_date);
+
+        $warehouseId = $order->orderRoles()->where('role_id', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->company_module_id;
+        $selected_warehouse_rate = $this->getConstantByKey($warehouse_rate_constant, $warehouseId);
+        $warehouse_rate = is_object($selected_warehouse_rate) ? $selected_warehouse_rate->amount : 0;
+
+        $stateId = $address->state_id;
+        $state_rate_constant = $this->getConstantByKey($state_rate_constant, $stateId);
+
+        // get $state_rate
+        $postcode = $address->postcode;
+        $this->checkPostcodeExistInConstant($center_postcode_constant, $postcode) === true ? $state_select = 'center' : '' ;
+        $this->checkPostcodeExistInConstant($outstation_postcode_constant, $postcode) === true ? $state_select = 'outstation' : '' ;
+        $state_rate_constant = (array)$state_rate_constant;
+        $state_rate = $state_select == '' ? 0 : $state_rate_constant[$state_select];
+
+        $container = $packing_list->containers()->first();
+        $containerPackingLists = collect();
+        $hasMinimumCharge = null;
+
+        foreach ($container->packingLists as $packingList){
+            if($packingList->owner instanceof CompanyModule) continue;
+            if($packingList->owner->companyModule->id !== $companyModule->id) continue;
+            $containerPackingLists->push($packingList);
+
+            if(!$hasMinimumCharge) {
+                $hasMinimumCharge = $packingList->transactions()->whereHas('transactionDetails', function ($query){
+                    $query->where('reference', 'MIN_CBM_CHARGES');
+                })->first();
+            }
+
+        }
+
+        $totalContainerCbm = $containerPackingLists->sum(function($packingList){
+            $billable_packing_list = $packingList->packingLists()->first();
+            $billable_packing_list = $billable_packing_list ? $billable_packing_list : $packingList;
+            return $billable_packing_list->packages->sum(function($package) {
+                return ($package->width / 100) * ($package->height / 100) *($package->length / 100) * ($package->quantity);
+            });
+        });
+
+        $minimum_charge = $minimum_cbm - $totalContainerCbm;
+        $minimum_charge = ($minimum_charge < 0) ? 0 : $minimum_charge;
+        $minimum_charge = $noMinimumCharge ? 0 : $minimum_charge;
+
+        $minimum_charge = $noMinimumCharge ? 0 : round($minimum_charge, 3);
+
+
+        if($hasMinimumCharge) {
+            $minimum_charge = 0;
+        }
+
+        $price_cbm = $base_price + $segment_price + $warehouse_rate + $state_rate;
+
+        $total_cbm = $price_cbm * ($cbm + $minimum_charge + $over_weight_cbm);
+
+        $billNumber = $this->generatesTransactionBillNumber->execute('SHIP-');
+
+        $object = new TransactionObject(
+            $billNumber,
+            TransactionType::SHIPPING_INVOICE,
+            1,
+            $order->company_module_id,
+            1,
+            PaymentMethodType::CASH,
+            $total_cbm,
+            $total_cbm,
+            1,
+            1,
+            0,
+            0,
+            0,
+            null,
+            ApprovalStatus::PENDING_SUBMISSION
+        );
+
+        /** @var Transaction $invoice_transaction */
+        $invoice_transaction = $this->createsTransaction->execute($packing_list, $object);
+
+        $object_detail = new TransactionDetailObject(
+            'SHIPPING_FEE',
+            TransactionDetailType::SHIPPING_FEE.'<br>'.round($packing_list->packages->where('type', '!=', PackageType::OVER_WEIGHT)->sum('quantity'), 3).' CTNS - '.round($cbm, 3).' CBM',
+            $cbm,
+            $price_cbm
+        );
+
+        $this->createsTransactionDetail->execute($invoice_transaction, $object_detail);
+
+        if ($over_weight_cbm > 0) {
+            $object_detail = new TransactionDetailObject(
+                'OVER_WEIGHT_CHARGES',
+                TransactionDetailType::OVER_WEIGHT_CHARGES,
+                $over_weight_cbm,
+                $price_cbm
+            );
+
+            $this->createsTransactionDetail->execute($invoice_transaction, $object_detail);
+        }
+
+        if ($minimum_charge > 0) {
+            $object_detail = new TransactionDetailObject(
+                'MIN_CBM_CHARGES',
+                TransactionDetailType::MIN_CBM_CHARGES,
+                $minimum_charge,
+                $price_cbm
+            );
+
+            $this->createsTransactionDetail->execute($invoice_transaction, $object_detail);
+        }
 
         return $this->response([]);
     }
 
+    function getConstantByKey($segmentConstantObject, $key) {
+        if ($segmentConstantObject) {
+            $base_rate = (array) $segmentConstantObject->value;
+            $base_rate = array_key_exists($key, $base_rate) === true ? $base_rate[$key] : 0;
+
+            return $base_rate;
+        }
+    }
+
+    function checkPostcodeExistInConstant($segmentConstantObject, $postcode) {
+        $segmentConstantObject = $segmentConstantObject->value;
+        if (!empty($segmentConstantObject)) {
+            return in_array($postcode, $segmentConstantObject);
+        } else {
+            return false;
+        }
+    }
+
 }

app/Classes/Modules/Transactions/Processors/ApproveShippingInvoiceTransactionProcessor.php

@@ -1,78 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Transactions\Processors;
-
-
-use App\Classes\Exceptions\MalformedRequestException;
-use App\Classes\Notifications\InvoiceIssuedEmail;
-use App\Models\Document;
-use App\Models\PackingList;
-use App\Models\Transaction;
-use Mccarlosen\LaravelMpdf\Facades\LaravelMpdf;
-use App\Classes\ValueObjects\Constants\DocumentType;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Classes\Modules\Documents\Services\CreatesFiles;
-use App\Classes\Modules\Documents\Services\CreatesDocument;
-use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
-use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
-
-class ApproveShippingInvoiceTransactionProcessor
-{
-
-    /** @var UpdatesTransactionStatus */
-    private $updatesTransactionStatus;
-
-    /** @var CreatesDocument */
-    private $createsDocument;
-
-    /** @var CreatesFiles */
-    private $createsFiles;
-
-    /**
-     * @param UpdatesTransactionStatus $updatesTransactionStatus
-     * @param CreatesDocument $createsDocument
-     * @param CreatesFiles $createsFiles
-     */
-    public function __construct(UpdatesTransactionStatus $updatesTransactionStatus, CreatesDocument $createsDocument, CreatesFiles $createsFiles)
-    {
-        $this->updatesTransactionStatus = $updatesTransactionStatus;
-        $this->createsDocument = $createsDocument;
-        $this->createsFiles = $createsFiles;
-    }
-
-
-    /**
-     * @param PackingList $packingList
-     * @throws MalformedRequestException
-     */
-    public function execute(PackingList $packingList)
-    {
-
-        /** @var Transaction $invoice_transaction */
-        $invoice_transaction = $packingList->transactions()->where('transactions.type', TransactionType::SHIPPING_INVOICE)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::PENDING_SUBMISSION])->first();
-
-        $this->updatesTransactionStatus->execute($invoice_transaction, ApprovalStatus::APPROVED);
-
-        $transaction_invoice_pdf = LaravelMpdf::loadView('pages.pdfs.shipping_invoice', ['invoice_transaction' => $invoice_transaction]);
-
-        $document_object = new DocumentObject(
-            DocumentType::SHIPPING_INVOICE,
-            [chunk_split('data:application/pdf;base64,'.base64_encode($transaction_invoice_pdf->output()))],
-            '',
-            ApprovalStatus::COMPLETED,
-            'shipping_invoice'
-        );
-
-        /** @var Document $document */
-        $document = $this->createsDocument->execute($invoice_transaction, $document_object);
-
-        $this->createsFiles->execute($document, $document_object);
-        $user = $packingList->owner->companyModule->employees()->first();
-        if(app()->environment(['production'])) {
-            $user->notify(new InvoiceIssuedEmail($user, $packingList));
-        }
-        return;
-    }
-
-}

app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php

@@ -1,247 +1,229 @@
 <?php
 
-
 namespace App\Classes\Modules\Transactions\Processors;
 
-use App\Classes\Exceptions\MalformedRequestException;
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\PackingLists\Services\FetchesPackingList;
-use App\Classes\Modules\SegmentConstants\Services\FetchesSegmentConstant;
-use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
+use App\Classes\Modules\Bookings\Services\CalculatesBookingTransferredAmount;
+use App\Classes\Modules\ServiceTypes\Services\FetchesServiceConfigurations;
+use App\Classes\Modules\Transactions\Services\ListsTransactions;
 use App\Classes\Modules\Transactions\Services\CreatesTransaction;
-use App\Classes\Modules\Transactions\Services\CreatesTransactionDetail;
+use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
+use App\Classes\Modules\Bookings\Services\CalculatesBookingPaidAmount;
+use App\Classes\Modules\Bookings\Services\CalculatesBookingCurrencyAverageRate;
+use App\Classes\Modules\Companies\Services\FetchesCompany;
 use App\Classes\Modules\Documents\Services\CreatesDocument;
 use App\Classes\Modules\Documents\Services\CreatesFiles;
+use App\Classes\Modules\Bookings\Services\UpdatesBookingStatus;
+
 use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
-use App\Classes\Modules\Transactions\DataTransferObjects\TransactionDetailObject;
-
-use App\Classes\ValueObjects\Constants\OrderRoleTypes;
-use App\Classes\ValueObjects\Constants\PackingListType;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\PackageType;
 use App\Classes\ValueObjects\Constants\SegmentConstants;
-use App\Classes\ValueObjects\Constants\TransactionDetailType;
-
-use App\Models\CompanyModule;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Classes\ValueObjects\Constants\DocumentType;
+use App\Models\Booking;
 use App\Models\Document;
-use App\Models\PackingList;
-use App\Models\Transaction;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
+use App\Models\SegmentConstant;
 use Mccarlosen\LaravelMpdf\Facades\LaravelMpdf;
 
 class CreateInvoiceTransactionProcessor
 {
-
-    /** @var FetchesPackingList */
-    private $fetchesPackingList;
-
-    /** @var FetchesSegmentConstant */
-    private $fetchesSegmentConstant;
-
-    /** @var GeneratesTransactionBillNumber */
-    private $generatesTransactionBillNumber;
+    /** @var ListsTransactions */
+    private $listsTransactions;
 
     /** @var CreatesTransaction */
     private $createsTransaction;
 
-    /** @var CreatesTransactionDetail */
-    private $createsTransactionDetail;
+    /** @var GeneratesTransactionBillNumber */
+    private $generatesTransactionBillNumber;
+
+    /** @var CalculatesBookingPaidAmount */
+    private $calculatesBookingPaidAmount;
+
+    /** @var CalculatesBookingTransferredAmount */
+    private $calculatesBookingTransferredAmount;
+
+    /** @var FetchesServiceConfigurations */
+    private $fetchesServiceConfigurations;
+
+    /** @var CalculatesBookingCurrencyAverageRate */
+    private $calculatesBookingCurrencyAverageRate;
+
+    /** @var FetchesCompany */
+    private $fetchesCompany;
+
+    /** @var CreatesDocument */
+    private $createsDocument;
+
+    /** @var CreatesFiles */
+    private $createsFile;
+
+    /** @var UpdatesBookingStatus */
+    private $updatesBookingStatus;
 
     /**
-     * @param FetchesPackingList $fetchesPackingList
-     * @param FetchesSegmentConstant $fetchesSegmentConstant
-     * @param GeneratesTransactionBillNumber $generatesTransactionBillNumber
+     * CreateInvoiceTransactionProcessor constructor.
+     * @param ListsTransactions $listsTransactions
      * @param CreatesTransaction $createsTransaction
-     * @param CreatesTransactionDetail $createsTransactionDetail
+     * @param GeneratesTransactionBillNumber $generatesTransactionBillNumber
+     * @param CalculatesBookingPaidAmount $calculatesBookingPaidAmount
+     * @param CalculatesBookingTransferredAmount $calculatesBookingTransferredAmount
+     * @param FetchesServiceConfigurations $fetchesServiceConfigurations
+     * @param CalculatesBookingCurrencyAverageRate $calculatesBookingCurrencyAverageRate
+     * @param FetchesCompany $fetchesCompany
+     * @param CreatesDocument $createsDocument
+     * @param CreatesFiles $createsFile
+     * @param UpdatesBookingStatus $updatesBookingStatus
      */
-    public function __construct(FetchesPackingList $fetchesPackingList, FetchesSegmentConstant $fetchesSegmentConstant, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CreatesTransaction $createsTransaction, CreatesTransactionDetail $createsTransactionDetail)
+    public function __construct(ListsTransactions $listsTransactions, CreatesTransaction $createsTransaction, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CalculatesBookingPaidAmount $calculatesBookingPaidAmount, CalculatesBookingTransferredAmount $calculatesBookingTransferredAmount, FetchesServiceConfigurations $fetchesServiceConfigurations, CalculatesBookingCurrencyAverageRate $calculatesBookingCurrencyAverageRate, FetchesCompany $fetchesCompany, CreatesDocument $createsDocument, CreatesFiles $createsFile, UpdatesBookingStatus $updatesBookingStatus)
     {
-        $this->fetchesPackingList = $fetchesPackingList;
-        $this->fetchesSegmentConstant = $fetchesSegmentConstant;
-        $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
+        $this->listsTransactions = $listsTransactions;
         $this->createsTransaction = $createsTransaction;
-        $this->createsTransactionDetail = $createsTransactionDetail;
+        $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
+        $this->calculatesBookingPaidAmount = $calculatesBookingPaidAmount;
+        $this->calculatesBookingTransferredAmount = $calculatesBookingTransferredAmount;
+        $this->fetchesServiceConfigurations = $fetchesServiceConfigurations;
+        $this->calculatesBookingCurrencyAverageRate = $calculatesBookingCurrencyAverageRate;
+        $this->fetchesCompany = $fetchesCompany;
+        $this->createsDocument = $createsDocument;
+        $this->createsFile = $createsFile;
+        $this->updatesBookingStatus = $updatesBookingStatus;
     }
 
+
     /**
-     * @throws MalformedRequestException
+     * @param Booking $booking
+     * @return void
+     * @throws \App\Classes\Exceptions\MalformedRequestException
      */
-    public function execute(PackingList $packingList)
+    public function execute(Booking $booking) 
     {
-        $packing_list = PackingList::where('reference', $packingList->reference)->where('type', PackingListType::SHIPPING_PACKING_LIST)->first();
-
-        $billable_packing_list = $packing_list->packingLists()->first();
-
-        $billable_packing_list = $billable_packing_list ? $billable_packing_list : $packing_list;
-
-        $cbm = round($billable_packing_list->packages->where('type', '!=', PackageType::OVER_WEIGHT)->sum(function($package) {
-            return ($package->width / 100) * ($package->height / 100) *($package->length / 100) * ($package->quantity);
-        }), 3);
-
-        $over_weight_cbm = round($billable_packing_list->packages->where('type', PackageType::OVER_WEIGHT)->sum(function($package) {
-            return ($package->width / 100) * ($package->height / 100) *($package->length / 100) * ($package->quantity);
-        }), 3);
-
-        $order =  $packing_list->owner;
-        $companyModule = $order->companyModule;
-        $connection = $companyModule->connections()->first();
-        $address = $order->addresses()->first();
-
-        $base_price_constant = $this->fetchesSegmentConstant->execute(['segment_id' => 1, 'reference' => SegmentConstants::BASE_PRICE]);
-        $warehouse_rate_constant = $this->fetchesSegmentConstant->execute(['segment_id' => 1, 'reference' => SegmentConstants::WAREHOUSE_RATE]);
-        $state_rate_constant = $this->fetchesSegmentConstant->execute(['segment_id' => 1, 'reference' => SegmentConstants::STATE_RATE]);
-        $center_postcode_constant = $this->fetchesSegmentConstant->execute(['segment_id' => 1, 'reference' => SegmentConstants::CENTER_POSTCODE]);
-        $outstation_postcode_constant = $this->fetchesSegmentConstant->execute(['segment_id' => 1, 'reference' => SegmentConstants::OUTSTATION_POSTCODE]);
-
-        $noMinimumCharge = $connection->segments()->where('segments.id', 2)->first();
-
-        $minimum_cbm = 0.3;
-        $state_select = '';
-
-        $segment_price = $connection->segments()->whereHas('constants', function($query){
-            return $query->where('reference', SegmentConstants::CUSTOM_PRICE);
-        })->get()->map(function($segment){
-            return (float) $segment->constants()->first()->value[0];
-        })->sort()->first();
-        $segment_price = $segment_price ? $segment_price : 0;
-
-        $arrivalTransport = PackingList::where('reference', $packing_list->reference)->where('type', 1)->first()->transports->first();
-        if(!$arrivalTransport) {
-            throw new MalformedRequestException('Arrival date is unknow can\'t generate invoice');
-        }
-        $packing_list_drop_date = $arrivalTransport->drop_date->format('Y-m-d');
-        $base_price = $this->getConstantByKey($base_price_constant, $packing_list_drop_date);
-
-        $warehouseId = $order->orderRoles()->where('role_id', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->company_module_id;
-        $selected_warehouse_rate = $this->getConstantByKey($warehouse_rate_constant, $warehouseId);
-        $warehouse_rate = is_object($selected_warehouse_rate) ? $selected_warehouse_rate->amount : 0;
-
-        $stateId = $address->state_id;
-        $state_rate_constant = $this->getConstantByKey($state_rate_constant, $stateId);
-
-        // get $state_rate
-        $postcode = $address->postcode;
-        $this->checkPostcodeExistInConstant($center_postcode_constant, $postcode) === true ? $state_select = 'center' : '' ;
-        $this->checkPostcodeExistInConstant($outstation_postcode_constant, $postcode) === true ? $state_select = 'outstation' : '' ;
-        $state_rate_constant = (array)$state_rate_constant;
-        $state_rate = $state_select == '' ? 0 : $state_rate_constant[$state_select];
-
-        $container = $packing_list->containers()->first();
-        $containerPackingLists = collect();
-        $hasMinimumCharge = null;
-
-        foreach ($container->packingLists as $packingList){
-            if($packingList->owner instanceof CompanyModule) continue;
-            if($packingList->owner->companyModule->id !== $companyModule->id) continue;
-            $containerPackingLists->push($packingList);
-
-            if(!$hasMinimumCharge) {
-                $hasMinimumCharge = $packingList->transactions()->whereHas('transactionDetails', function ($query){
-                    $query->where('reference', 'MIN_CBM_CHARGES');
-                })->first();
-            }
+        $payment_amount = $this->calculatesBookingTransferredAmount->execute($booking, $booking->fix_currency_id);
+        $booking_amount = $booking->fix_amount;
 
+        if ((float) $booking_amount !== (float) $payment_amount) {
+            return;
         }
 
-        $totalContainerCbm = $containerPackingLists->sum(function($packingList){
-            $billable_packing_list = $packingList->packingLists()->first();
-            $billable_packing_list = $billable_packing_list ? $billable_packing_list : $packingList;
-            return $billable_packing_list->packages->sum(function($package) {
-                return ($package->width / 100) * ($package->height / 100) *($package->length / 100) * ($package->quantity);
-            });
-        });
+        $po_order_transaction = $booking->transactions()
+            ->where('type', TransactionType::PURCHASE_ORDER)
+            ->complete()
+            ->first();
 
-        $minimum_charge = $minimum_cbm - $totalContainerCbm;
-        $minimum_charge = ($minimum_charge < 0) ? 0 : $minimum_charge;
-        $minimum_charge = $noMinimumCharge ? 0 : $minimum_charge;
+        $constants = SegmentConstant::where('reference', SegmentConstants::SERVICE_TYPE)->where('detail->id', $booking->service->id)->first();
 
-        $minimum_charge = $noMinimumCharge ? 0 : round($minimum_charge, 3);
-
-
-        if($hasMinimumCharge) {
-            $minimum_charge = 0;
+        if($constants->detail->is_billable && !$po_order_transaction) {
+            return;
         }
 
-        $price_cbm = $base_price + $segment_price + $warehouse_rate + $state_rate;
+        $transaction = $booking->transactions()
+            ->where('type', TransactionType::PAYMENT)
+            ->first();
 
-        $total_cbm = $price_cbm * ($cbm + $minimum_charge + $over_weight_cbm);
+        $billNumber = $this->generatesTransactionBillNumber->execute('INV-');
 
-        $billNumber = $this->generatesTransactionBillNumber->execute('SHIP-');
+        $booking_currency_average_rate = $this->calculatesBookingCurrencyAverageRate->execute($booking, TransactionType::PAYMENT);
 
-        $object = new TransactionObject(
+        $total_service_charge = $booking->transactions()
+            ->where('type', TransactionType::PAYMENT)
+            ->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])
+            ->sum('service_charge');
+
+        $total_tax = $booking->transactions()
+            ->where('type', TransactionType::PAYMENT)
+            ->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])
+            ->sum('tax');
+
+        $transaction_object = new TransactionObject(
             $billNumber,
-            TransactionType::SHIPPING_INVOICE,
-            1,
-            $order->company_module_id,
-            1,
-            PaymentMethodType::CASH,
-            $total_cbm,
-            $total_cbm,
-            1,
-            1,
-            0,
-            0,
-            0,
+            TransactionType::INVOICE,
+            $transaction->issuer,
+            $transaction->receiver,
+            $transaction->recipient_bank_account_id,
+            $transaction->payment_method,
+            $payment_amount,
+            $booking_amount,
+            $transaction->currency_id,
+            $transaction->original_currency_id,
+            $booking_currency_average_rate,
+            $total_tax,
+            $total_service_charge,
             null,
-            ApprovalStatus::PENDING_SUBMISSION
+            ApprovalStatus::APPROVED
+        );
+        $invoice_transaction = $this->createsTransaction->execute($po_order_transaction->booking, $transaction_object);
+
+        $supplier = $this->fetchesCompany->execute(['id' => $transaction->receiver]);
+
+        $purchase_order_pdf = LaravelMpdf::loadView('pages.pdfs.purchase_order', ['invoice_transaction' => $invoice_transaction, 'po_order_transaction' => $po_order_transaction, 'supplier' => $supplier]);
+        $document_object = new DocumentObject(
+            DocumentType::PURCHASE_ORDER,
+            [chunk_split('data:application/pdf;base64,'.base64_encode($purchase_order_pdf->output()))],
+            '',
+            ApprovalStatus::COMPLETED,
+            'purchase_orders'
+        );
+        $document = $this->createsDocument->execute($po_order_transaction->booking, $document_object);
+        $this->createsFile->execute($document, $document_object);
+
+        $deliver_order_pdf = LaravelMpdf::loadView('pages.pdfs.deliver_order', ['invoice_transaction' => $invoice_transaction, 'po_order_transaction' => $po_order_transaction, 'supplier' => $supplier]);
+        $document_object = new DocumentObject(
+            DocumentType::DELIVER_ORDER,
+            [chunk_split('data:application/pdf;base64,'.base64_encode($deliver_order_pdf->output()))],
+            '',
+            ApprovalStatus::COMPLETED,
+            'delivery_orders'
         );
 
-        /** @var Transaction $invoice_transaction */
-        $invoice_transaction = $this->createsTransaction->execute($packing_list, $object);
+        /** @var Document $document */
+        $document = $this->createsDocument->execute($po_order_transaction->booking, $document_object);
+        $this->createsFile->execute($document, $document_object);
 
-        $object_detail = new TransactionDetailObject(
-            'SHIPPING_FEE',
-            TransactionDetailType::SHIPPING_FEE.'<br>'.round($packing_list->packages->where('type', '!=', PackageType::OVER_WEIGHT)->sum('quantity'), 3).' CTNS - '.round($cbm, 3).' CBM',
-            $cbm,
-            $price_cbm
+
+        $invoice_pdf = LaravelMpdf::loadView('pages.pdfs.invoice', ['invoice_transaction' => $invoice_transaction, 'po_order_transaction' => $po_order_transaction, 'supplier' => $supplier]);
+        $document_object = new DocumentObject(
+            DocumentType::INVOICE,
+            [chunk_split('data:application/pdf;base64,'.base64_encode($invoice_pdf->output()))],
+            '',
+            ApprovalStatus::COMPLETED,
+            'invoices'
         );
+        $document = $this->createsDocument->execute($po_order_transaction->booking, $document_object);
+        $this->createsFile->execute($document, $document_object);
 
-        $this->createsTransactionDetail->execute($invoice_transaction, $object_detail);
+        $billNumber = $this->generatesTransactionBillNumber->execute('SPDO-');
 
-        if ($over_weight_cbm > 0) {
-            $object_detail = new TransactionDetailObject(
-                'OVER_WEIGHT_CHARGES',
-                TransactionDetailType::OVER_WEIGHT_CHARGES,
-                $over_weight_cbm,
-                $price_cbm
-            );
+        $booking_currency_average_rate = $this->calculatesBookingCurrencyAverageRate->execute($booking, TransactionType::BILL);
 
-            $this->createsTransactionDetail->execute($invoice_transaction, $object_detail);
-        }
+        $transaction_object = new TransactionObject(
+            $billNumber,
+            TransactionType::SUPPLIER_DELIVER,
+            $transaction->issuer,
+            $transaction->receiver,
+            $transaction->recipient_bank_account_id,
+            $transaction->payment_method,
+            $payment_amount,
+            $booking_amount,
+            $transaction->currency_id,
+            $transaction->original_currency_id,
+            $booking_currency_average_rate,
+            $total_tax,
+            $total_service_charge,
+            null,
+            ApprovalStatus::APPROVED
+        );
+        $supplier_deliver_order_transaction = $this->createsTransaction->execute($po_order_transaction->booking, $transaction_object);
 
-        if ($minimum_charge > 0) {
-            $object_detail = new TransactionDetailObject(
-                'MIN_CBM_CHARGES',
-                TransactionDetailType::MIN_CBM_CHARGES,
-                $minimum_charge,
-                $price_cbm
-            );
+        $supplier_order_pdf = LaravelMpdf::loadView('pages.pdfs.supplier_deliver_order', ['supplier_deliver_order_transaction' => $supplier_deliver_order_transaction, 'po_order_transaction' => $po_order_transaction, 'supplier' => $supplier]);
+        $document_object = new DocumentObject(
+            DocumentType::SUPPLIER_DELIVER_ORDER,
+            [chunk_split('data:application/pdf;base64,'.base64_encode($supplier_order_pdf->output()))],
+            '',
+            ApprovalStatus::COMPLETED,
+            'supplier_delivery_orders'
+        );
+        $document = $this->createsDocument->execute($po_order_transaction->booking, $document_object);
+        $this->createsFile->execute($document, $document_object);
 
-            $this->createsTransactionDetail->execute($invoice_transaction, $object_detail);
-        }
-
-        return;
+        $this->updatesBookingStatus->execute($booking, ApprovalStatus::COMPLETED);
     }
-
-    function getConstantByKey($segmentConstantObject, $key) {
-        if ($segmentConstantObject) {
-            $base_rate = (array) $segmentConstantObject->value;
-            $base_rate = array_key_exists($key, $base_rate) === true ? $base_rate[$key] : 0;
-
-            return $base_rate;
-        }
-    }
-
-    function checkPostcodeExistInConstant($segmentConstantObject, $postcode) {
-        $segmentConstantObject = $segmentConstantObject->value;
-        if (!empty($segmentConstantObject)) {
-            return in_array($postcode, $segmentConstantObject);
-        } else {
-            return false;
-        }
-    }
-
 }

app/Http/Controllers/Exports/ExportCompanyModuleSummaryController.php

@@ -3,7 +3,6 @@
 namespace App\Http\Controllers\Exports;
 
 use App\Classes\Modules\Exports\Services\ExportsCompanyModuleSummary;
-use App\Classes\Modules\Exports\Services\ExportsOrderSummaryByMarking;
 use App\Models\User;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
@@ -28,13 +27,4 @@ class ExportCompanyModuleSummaryController
         ob_end_clean();
         return $response;
     }
-
-    public function exportOrderSummaryByMarking(Request $request) {
-        $exportsOrderSummaryByMarking = new ExportsOrderSummaryByMarking($request);
-        $customer_marking = $request->route('marking');
-        $exportsOrderSummaryByMarking->setParameters($customer_marking, $request->input('dateFrom'), $request->input('dateTo'));
-        $response = $exportsOrderSummaryByMarking->download($customer_marking . '_order_summary.xls', Excel::XLS, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']);
-        ob_end_clean();
-        return $response;
-    }
 }

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

@@ -208,12 +208,12 @@
                                                 <input class="form-control" v-model="parameters.email">
                                             </validation-wrapper-component>
                                         </div>
-                                        <!-- <div class="col-4 p-l-5">
+                                        <div class="col-4 p-l-5">
                                             <validation-wrapper-component :validator="$v.parameters.wechat_id">
                                                 <label>WeChat ID</label>
                                                 <input class="form-control" v-model="parameters.wechat_id">
                                             </validation-wrapper-component>
-                                        </div> -->
+                                        </div>
                                     </div>
 
                                     <div class="row m-b-15">

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

@@ -20,15 +20,15 @@
                         </div>
                         <div class="col-auto">
                             <p class="no-margin fs-10 all-caps">ETD</p>
-                            <p class="no-margin">{{item.transport ? (item.transport.current_schedule ? item.transport.current_schedule.etd : 'n/a') : 'n/a'}}</p>
+                            <p class="no-margin">{{item.transport ? item.transport.current_schedule.etd : 'n/a'}}</p>
                         </div>
                         <div class="col-auto">
                             <p class="no-margin fs-10 all-caps">ETA</p>
-                            <p class="no-margin">{{item.transport ? (item.transport.current_schedule ? item.transport.current_schedule.eta : 'n/a') : 'n/a'}}</p>
+                            <p class="no-margin">{{item.transport ? item.transport.current_schedule.eta : 'n/a'}}</p>
                         </div>
                         <div class="col">
                             <div class="row hide" v-if="item.transport">
-                                <div class="col" v-if="item.transport.current_schedule">
+                                <div class="col">
                                     <p class="no-margin fs-10 all-caps">Days Ago</p>
                                     <p class="no-margin" :class="[{'text-success': item.transport.current_schedule.billing_days_left.value === '+'}, {'text-danger': item.transport.current_schedule.billing_days_left.value === '-'}]">
                                         {{item.transport.current_schedule.billing_days_left.value}}

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

@@ -53,7 +53,7 @@
             parameters: {
                 name: { 
                     required,
-                    // minLength: minLength(8)
+                    minLength: minLength(8)
                 },
                 debtor: { 
                 },

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

@@ -51,9 +51,11 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="row text-center justify-content-center d-none">
+                            <div class="row text-center justify-content-center">
                                 <div class="col-8">
-                                    <!-- set warning text here -->
+                                    <p class="m-b-0 text-danger m-t-15" v-if="parameters.warehouse_id === 3">疫情因管控松动飙升，其中几位仓库人员也不幸感染，整个操作可能会受到影响，我们会尽快跟进并恢复。<br>The pandemic spread due to the loosening of movement controls. Some warehouse employees were unfortunately infected and the entire operation may be disrupted. We will do our best to follow up and revert as soon as possible.</p>
+                                    <p class="m-b-0 text-danger m-t-15" v-if="false">由于义乌船期不稳定，建议发广州仓库。<br>Due to unexpected shipping delays for Yiwu warehouse, you may select an alternative warehouse.</p>
+                                    <p class="m-b-0 text-danger m-t-15" v-if="parameters.warehouse_id === 4">由于义乌船期不稳定，建议发广州仓库。<br>Due to unexpected shipping delays for Yiwu warehouse, you may select an alternative warehouse.</p>
                                 </div>
                             </div>
                         </div>

resources/assets/vue/components/paymentsBilling/elements/AdminPaymentsBillingComponent.vue

@@ -120,7 +120,7 @@
                                             <modal-component class="animate__animated animate__fast animate__fadeIn" size="extra-large" styleType="fill-in" type="editBillingAddress">
                                                 <div class="row">
                                                     <div class="col bg-white">
-                                                        <address-form-component :id="item.order.company_module.id"  :data="item.order.company_module.billingAddress" section="editBillingAddress"></address-form-component>
+                                                        <address-form-component :data="item.order.company_module.billingAddress" section="editBillingAddress"></address-form-component>
                                                     </div>
                                                 </div>
                                             </modal-component>

resources/assets/vue/components/paymentsBilling/elements/AdminPaymentsBillingWithSearchComponent.vue

@@ -1,69 +0,0 @@
-<template>
-    <div class="row">
-        <div class="col">
-            <div class="row m-b-15">
-                <div class="col-md-6 col-7 p-r-0">
-                    <div class="row">
-                        <div class="col p-r-0">
-                            <div class="form-group no-margin form-group-default b-rad-none">
-                                <label class="text-primary">Order Number Like</label>
-                                <input type="text" class="form-control" v-model="marking" />
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="col-auto p-l-0 p-r-0">
-                    <div class="btn btn-primary b-rad-none" @click="search">
-                        <i class="fa fa-search lh-40"></i>
-                    </div>
-                </div>
-                <div class="col-auto p-l-0">
-                    <div class="btn btn-secondary b-rad-none" @click="reset">
-                        <i class="fa fa-remove lh-40"></i>
-                    </div>
-                </div>
-            </div>
-            <list-component :key="currentKey" :section="section" :endpoint="route('api.packing_list.list')" :options="options">
-                <template slot="list" slot-scope="{data}">
-                    <admin-payments-billing-component :data="data" :invoice_status="invoice_status" :section="section" ></admin-payments-billing-component>
-                </template>
-            </list-component>
-        </div>
-    </div>
-</template>
-<script>
-    export default {
-        props: {
-            invoice_status: {
-                type: String,
-                required: true
-            },
-            options: {
-                default () {
-                    return {}
-                }
-            },
-            section:{
-                type: String,
-                required: true
-            }
-        },
-        data(){
-            return {
-                marking: '',
-                currentKey: 1,
-            }
-        },
-        methods: {
-            search() {
-                this.options['order_marking_in'] = this.marking;
-                this.currentKey+=1;
-            },
-            reset() {
-                this.marking = '';
-                delete(this.options['order_marking_in']);
-                this.currentKey+=1;
-            },
-        },
-    }
-</script>

resources/assets/vue/components/paymentsBilling/sections/AdminPaymentsBillingSectionComponent.vue

@@ -102,18 +102,30 @@
                 <div class="col bg-master-lightest p-1 p-sm-4">
                     <div class="row tabsContainer tabContent" tab-name="pendingInvoice">
                         <div class="col">
-                            <admin-payments-billing-with-search-component :options="{does_not_have_transaction_type: 1, type: 2}" section="pendingInvoiceSection" invoice_status="Pending Invoice"></admin-payments-billing-with-search-component>
+                            <list-component section="pendingInvoiceSection" :endpoint="route('api.packing_list.list')" :options="{does_not_have_transaction_type: 1, type: 2}">
+                                <template slot="list" slot-scope="{data}">
+                                    <admin-payments-billing-component :data="data" invoice_status="Pending Invoice" section="pendingInvoiceSection" ></admin-payments-billing-component>
+                                </template>
+                            </list-component>
                         </div>
                     </div>
                     <div class="row tabsContainer tabContent hide" tab-name="pendingApproval">
                         <div class="col">
-                            <admin-payments-billing-with-search-component :options="{has_invoice_status_in: [0, 1]}" section="pendingApprovalSection" invoice_status="Pending Approval"></admin-payments-billing-with-search-component>
+                            <list-component section="pendingApprovalSection" :endpoint="route('api.packing_list.list')" :options="{has_invoice_status_in: [0, 1]}">
+                                <template slot="list" slot-scope="{data}">
+                                    <admin-payments-billing-component :data="data" invoice_status="Pending Approval" section="pendingApprovalSection" ></admin-payments-billing-component>
+                                </template>
+                            </list-component>
                         </div>
                     </div>
                     <div class="row tabsContainer tabContent hide" tab-name="pendingPayment">
                         <div class="col">
                             <payment-filter-component :endpoint="route('api.packing_list.list')" :data="data"></payment-filter-component>
-                            <admin-payments-billing-with-search-component :options="{has_invoice_status_in: [2], packing_list_ordered_by_invoice_date: true}" section="pendingPaymentSection" invoice_status="Pending Payment"></admin-payments-billing-with-search-component>
+                            <list-component section="pendingPaymentSection" :endpoint="route('api.packing_list.list')" :options="{has_invoice_status_in: [2], packing_list_ordered_by_invoice_date: true}">
+                                <template slot="list" slot-scope="{data}">
+                                    <admin-payments-billing-component :data="data" invoice_status="Pending Payment" section="pendingPaymentSection" ></admin-payments-billing-component>
+                                </template>
+                            </list-component>
                         </div>
                     </div>
                     <div class="row tabsContainer tabContent hide" tab-name="paidInvoice">
@@ -123,7 +135,11 @@
                                     <download-billing-with-dates-component section="paymentsReportSection" ></download-billing-with-dates-component>
                                 </div>
                             </div>
-                            <admin-payments-billing-with-search-component :options="{has_invoice_status_in: [3]}" section="paidInvoiceSection" invoice_status="Paid Invoice"></admin-payments-billing-with-search-component>
+                            <list-component section="paidInvoiceSection" :endpoint="route('api.packing_list.list')" :options="{has_invoice_status_in: [3]}">
+                                <template slot="list" slot-scope="{data}">
+                                    <admin-payments-billing-component :data="data" invoice_status="Paid Invoice" section="paidInvoiceSection" ></admin-payments-billing-component>
+                                </template>
+                            </list-component>
                         </div>
                     </div>
                 </div>

resources/assets/vue/general/mixins/accounts/validation/registrationFormValidation.js

@@ -17,9 +17,9 @@ export default {
                 required: requiredIf(function () { return this.step === 2 }),
                 numeric
             },
-            // wechat_id: {
-            //     required: requiredIf(function () { return this.step === 2 }),
-            // },
+            wechat_id: {
+                required: requiredIf(function () { return this.step === 2 }),
+            },
             password: {
                 required: requiredIf(function () { return this.step === 2 }),
             },

resources/views/pages/admin/dashboard.blade.php

@@ -51,7 +51,7 @@
                                 <h6>Unclaimed Packing Lists</h6>
                             </div>
                         </div>
-                        <list-component section="unclaimedPackingListSection" :endpoint="route('api.packing_list.list')" :options="{claimant_id: 2307, owner_id: 1}">
+                        <list-component section="unclaimedPackingListSection" :endpoint="route('api.packing_list.list')" :options="{claimant_id: 2037, owner_id: 1}">
                             <template slot="list" slot-scope="{data}">
                                 <unclaimed-packinglist-component :data="data"></unclaimed-packinglist-component>
                             </template>
@@ -62,4 +62,4 @@
             </div>
         </div>
     </div>
-</div>
+</div>

routes/web.php

@@ -8,35 +8,18 @@ use App\Classes\Jobs\FetchOrdersFromYDPortalJob;
 use App\Classes\Jobs\FetchPackingListFromVTPortalJob;
 use App\Classes\Jobs\FetchWarehouseReceiveListFromVTPortalJob;
 use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
-use App\Classes\Modules\Documents\Services\CreatesDocument;
-use App\Classes\Modules\Documents\Services\CreatesFiles;
 use App\Classes\Modules\Orders\Processors\UpdateDoFromVTPortalProcessor;
 use App\Classes\Modules\Orders\Processors\UpdateDoFromYDPortalProcessor;
-use App\Classes\Modules\PackingLists\Processors\FetchContainersFromYdPortalProcessor;
-use App\Classes\Modules\PackingLists\Processors\FetchContainersUpdatesFromYdPortalProcessor;
-use App\Classes\Modules\PackingLists\Processors\FetchDeliveryUpdatesFromYdPortalProcessor;
-use App\Classes\Modules\PackingLists\Processors\FetchLoadedContainersFromVTPortalProcessor;
 use App\Classes\Modules\PackingLists\Processors\FetchOrderListsFromYdPortalProcessor;
 use App\Classes\Modules\PackingLists\Processors\FetchPackingListFromVTPortalProcessor;
-use App\Classes\Modules\PackingLists\Processors\FetchPackingListsFromYdPortalProcessor;
-use App\Classes\Modules\PackingLists\Services\ListsPackingLists;
-use App\Classes\Modules\Transactions\Processors\ApproveShippingInvoiceTransactionProcessor;
-use App\Classes\Modules\Transactions\Processors\CreateInvoiceTransactionProcessor;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\BusinessType;
 use App\Classes\ValueObjects\Constants\DocumentType;
 use App\Classes\ValueObjects\Constants\OrderRoleTypes;
 use App\Classes\ValueObjects\Constants\PackageType;
-use App\Classes\ValueObjects\Constants\PackingListType;
-use App\Classes\ValueObjects\Constants\PaymentMethodType;
-use App\Classes\ValueObjects\Constants\TransactionType;
 use App\Models\CompanyConnection;
 use App\Models\CompanyModule;
 use App\Models\Document;
-use App\Models\Order;
 use App\Models\PackingList;
-use Carbon\Carbon;
-use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Crypt;
 use App\Models\Container;
 use App\Models\Transaction;
@@ -189,10 +172,10 @@ Route::get('/customer/{marking}/payment-and-billing', function ($marking) {
     return view('pages.customers.paymentsBilling', ['company_module_id' => $company_module_id]);
 })->name('customer.payment-and-billing');
 
-Route::get('/orders/refresh', function(Request $request){
-    $packingLists = PackingList::where('type', PackingListType::WAREHOUSE_RECEIVE_LIST)->has('containers')->get();
+Route::get('/orders/refresh', function(\Illuminate\Http\Request $request){
+    $packingLists = \App\Models\PackingList::where('type', \App\Classes\ValueObjects\Constants\PackingListType::WAREHOUSE_RECEIVE_LIST)->has('containers')->get();
     dd($packingLists);
-    $packingLists->each(function (PackingList $packingList) {
+    $packingLists->each(function (\App\Models\PackingList $packingList) {
         $packingList->containers()->detach();
     });
     FetchWarehouseReceiveListFromVTPortalJob::withChain([
@@ -206,7 +189,7 @@ Route::get('/orders/refresh', function(Request $request){
 
 Route::get('/containers/refresh', function(){
 
-    dd((App()->make(FetchLoadedContainersFromVTPortalProcessor::class))->execute());
+    dd((App()->make(\App\Classes\Modules\PackingLists\Processors\FetchLoadedContainersFromVTPortalProcessor::class))->execute());
 //    FetchLoadedContainersFromVTPortalJob::dispatch();
 //    FetchContainersStatusUpdateFromVTPortalJob::dispatch();
 
@@ -237,8 +220,8 @@ Route::group(['prefix' => 'template', 'as' => 'template.'], function () {
 });
 
 Route::get('/yiwu', function () {
-    $orders = Order::whereHas('OrderRoles', function($query){
-        return $query->where('role_id', OrderRoleTypes::ORIGIN_WAREHOUSE)->where('company_module_id', 2358);
+    $orders = \App\Models\Order::whereHas('OrderRoles', function($query){
+        return $query->where('role_id', \App\Classes\ValueObjects\Constants\OrderRoleTypes::ORIGIN_WAREHOUSE)->where('company_module_id', 2358);
     })->get();
 
     foreach ($orders as $order){
@@ -248,10 +231,10 @@ Route::get('/yiwu', function () {
 });
 
 Route::get('/guangzhou', function () {
-    $orders = Order::whereHas('OrderRoles', function($query){
-        return $query->where('role_id', OrderRoleTypes::ORIGIN_WAREHOUSE)->where('company_module_id', 3);
+    $orders = \App\Models\Order::whereHas('OrderRoles', function($query){
+        return $query->where('role_id', \App\Classes\ValueObjects\Constants\OrderRoleTypes::ORIGIN_WAREHOUSE)->where('company_module_id', 3);
     })->whereHas('addresses', function($query){
-        return $query->where('status', ApprovalStatus::APPROVED)->whereIn('state_id', [5, 13, 14]);
+        return $query->where('status', \App\Classes\ValueObjects\Constants\ApprovalStatus::APPROVED)->whereIn('state_id', [5, 13, 14]);
     })->get();
 
     foreach ($orders as $order){
@@ -261,7 +244,7 @@ Route::get('/guangzhou', function () {
 });
 
 Route::get('/debug', function (){
-    $orders = Order::all();
+    $orders = \App\Models\Order::all();
 
     $issues = [];
     foreach ($orders as $order){
@@ -279,39 +262,18 @@ Route::get('/debug', function (){
     dd($issues);
 });
 
-Route::group(['prefix' => 'yd', 'as' => 'yd.'], function () {
-    Route::get('/packingLists', function (Request $request){
-        $start = $request->input('start_date') ? Carbon::parse($request->input('start_date')): null;
-        $end = $request->input('end_date') ? Carbon::parse($request->input('end_date')): null;
-        (App()->make(FetchPackingListsFromYdPortalProcessor::class))->execute($start, $end);
-    });
-
-    Route::get('/containers', function (){
-        (App()->make(FetchContainersFromYdPortalProcessor::class))->execute();
-        (App()->make(FetchContainersUpdatesFromYdPortalProcessor::class))->execute();
-    });
-
-    Route::get('/deliveries', function (){
-        (App()->make(FetchDeliveryUpdatesFromYdPortalProcessor::class))->execute();
-    });
-
-});
-Route::get('/yd', function (Request $request){
-//    $start = $request->input('start_date') ? Carbon::parse($request->input('start_date')): null;
-//    $end = $request->input('end_date') ? Carbon::parse($request->input('end_date')): null;
-//    (App()->make(FetchOrderListsFromYdPortalProcessor::class))->execute($start, $end);
-//    (App()->make(\App\Classes\Modules\PackingLists\Processors\FetchPackingListsFromYdPortalProcessor::class))->execute($start, $end);
-//    (App()->make(\App\Classes\Modules\PackingLists\Processors\FetchContainersFromYdPortalProcessor::class))->execute();
-//    (App()->make(\App\Classes\Modules\PackingLists\Processors\FetchContainersUpdatesFromYdPortalProcessor::class))->execute();
-//    (App()->make(FetchDeliveryUpdatesFromYdPortalProcessor::class))->execute();
-//    (App()->make(FetchPackingListFromVTPortalProcessor::class))->execute();
+Route::get('/yd', function (\Illuminate\Http\Request $request){
+    $start = $request->input('start_date') ? \Carbon\Carbon::parse($request->input('start_date')): null;
+    $end = $request->input('end_date') ? \Carbon\Carbon::parse($request->input('end_date')): null;
+    (App()->make(FetchOrderListsFromYdPortalProcessor::class))->execute($start, $end);
+    (App()->make(FetchPackingListFromVTPortalProcessor::class))->execute();
 })->name('yd.refresh');
 
 Route::get('/container/{reference}/refresh/', function (string $reference){
     $container = Container::where('reference', $reference)->first();
     $supplier = in_array($container->owner_id, [3, 4]) ? 'VT' : 'YD';
 
-    $arrivalDates = PackingList::whereIn('reference', $container->packingLists->pluck('reference'))->where('type', PackingListType::WAREHOUSE_RECEIVE_LIST)->get()->map(function($packingList){
+    $arrivalDates = \App\Models\PackingList::whereIn('reference', $container->packingLists->pluck('reference'))->where('type', \App\Classes\ValueObjects\Constants\PackingListType::WAREHOUSE_RECEIVE_LIST)->get()->map(function($packingList){
         return $packingList->transports()->first()->drop_date;
     })->sortBy(function($date){
         return $date;
@@ -321,7 +283,7 @@ Route::get('/container/{reference}/refresh/', function (string $reference){
     $endDate = $arrivalDates->last()->addDay()->format('d-m-Y');
 
     if($supplier === 'VT'){
-        return (App()->make(FetchLoadedContainersFromVTPortalProcessor::class))->execute(Carbon::parse($endDate), Carbon::parse($endDate)->addDays(5));
+        return (App()->make(\App\Classes\Modules\PackingLists\Processors\FetchLoadedContainersFromVTPortalProcessor::class))->execute(\Carbon\Carbon::parse($endDate), \Carbon\Carbon::parse($endDate)->addDays(5));
     }
 
     if($supplier === 'YD'){
@@ -331,10 +293,10 @@ Route::get('/container/{reference}/refresh/', function (string $reference){
 })->name('container.refresh');
 
 Route::get('/min_cbm', function (){
-    $companies = CompanyModule::where('type', BusinessType::IMPORTER)->whereHas('orders', function ($query){
+    $companies = CompanyModule::where('type', \App\Classes\ValueObjects\Constants\BusinessType::IMPORTER)->whereHas('orders', function ($query){
         return $query->whereHas('packingLists')->whereDoesntHave('packingLists', function($query){
             return $query->whereHas('packages', function($query){
-                return $query->selectRaw('sum((width/100) * (height/100) * (length/100) * quantity) as cbm')->where('type', PackingListType::SHIPPING_PACKING_LIST)->where('status', '!=', 5)->having('cbm', '>', 0.3);
+                return $query->selectRaw('sum((width/100) * (height/100) * (length/100) * quantity) as cbm')->where('type', \App\Classes\ValueObjects\Constants\PackingListType::SHIPPING_PACKING_LIST)->where('status', '!=', 5)->having('cbm', '>', 0.3);
             });
         });
     })->limit(1)->get();
@@ -373,17 +335,12 @@ Route::get('/settings', function () {
 })->name('settings');
 
 Route::get('/customer/{company_module_id}/summary', 'Exports\ExportCompanyModuleSummaryController@export')->name('customer.summary.export');
-Route::get('/export-customer-order/{marking}', 'Exports\ExportCompanyModuleSummaryController@exportorderSummaryByMarking')->name('customer.orderSummary.export');
 
 Route::get('/customer/summary/monthly', function () {
-    // $containers = Container::whereMonth('loading_date', '>=', ((float)Carbon::now()->format('m') - 2))->whereYear('loading_date', (float)Carbon::now()->format('Y'))->get();
-    $containers = Container::whereMonth('loading_date', '>=', 9)->whereYear('loading_date', 2022)->get();
-    $marking = '769SMC';
-    $connection = CompanyConnection::where('invitee_reference', $marking)->first();
-    $companyModuleId = $connection->invitee->id;
+    $containers = Container::whereMonth('loading_date', '>=', ((float)\Carbon\Carbon::now()->format('m') - 2))->whereYear('loading_date', (float)\Carbon\Carbon::now()->format('Y'))->get();
     foreach ($containers as $container){
-        $packingLists = $container->packingLists()->get()->filter(function ($packingList) use ($companyModuleId){
-            return $packingList->owner->company_module_id === $companyModuleId;
+        $packingLists = $container->packingLists()->get()->filter(function ($packingList) {
+            return $packingList->owner->company_module_id === 248;
         });
 
         if (!count($packingLists)) continue;
@@ -408,7 +365,7 @@ Route::get('/customer/summary/monthly', function () {
             foreach ($packages as $package){
                 echo '<tr>
                         <td>'.$container->loading_date->format('d-m-Y').'</td>
-                        <td>MS/CIEF/769SMC/'.$packingList->owner->owner->reference.'</td>
+                        <td>MS/CIEF/769SMC/'.$packingList->owner->reference.'</td>
                         <td>'.$container->reference.'</td>
                         <td>'.$package->description.'</td>
                         <td>'.$package->quantity.'</td>
@@ -427,19 +384,19 @@ Route::get('/customer/summary/monthly', function () {
 });
 
 Route::get('/customers/active/{active_start}/{active_end}/{inactive_start?}/{inactive_end?}/{with_cbm?}', function ($active_start, $active_end, $inactive_start=null, $inactive_end=null, $with_cbm = false) {
-    $activeCompanies = CompanyModule::where('type', BusinessType::IMPORTER)->whereHas('orderPackingLists', function($query) use($inactive_start, $inactive_end) {
-        return $query->where('packing_lists.type', PackingListType::WAREHOUSE_RECEIVE_LIST)->whereHas('transports', function ($query) use ($inactive_start, $inactive_end) {
-            return $query->where('drop_date', '>=', Carbon::parse($inactive_start))->where('drop_date', '<=', Carbon::parse($inactive_end)->addDay());
+    $activeCompanies = CompanyModule::where('type', \App\Classes\ValueObjects\Constants\BusinessType::IMPORTER)->whereHas('orderPackingLists', function($query) use($inactive_start, $inactive_end) {
+        return $query->where('packing_lists.type', \App\Classes\ValueObjects\Constants\PackingListType::WAREHOUSE_RECEIVE_LIST)->whereHas('transports', function ($query) use ($inactive_start, $inactive_end) {
+            return $query->where('drop_date', '>=', \Carbon\Carbon::parse($inactive_start))->where('drop_date', '<=', \Carbon\Carbon::parse($inactive_end)->addDay());
         });
     })->pluck('id');
 
-    $companies = CompanyModule::where('type', BusinessType::IMPORTER)->whereHas('orderPackingLists', function($query) use($active_start, $active_end) {
-        return $query->where('packing_lists.type', PackingListType::WAREHOUSE_RECEIVE_LIST)->whereHas('transports', function ($query) use ($active_start, $active_end) {
-            return $query->whereDate('drop_date', '>=', Carbon::parse($active_start))->whereDate('drop_date', '<=', Carbon::parse($active_end)->addDay());
+    $companies = CompanyModule::where('type', \App\Classes\ValueObjects\Constants\BusinessType::IMPORTER)->whereHas('orderPackingLists', function($query) use($active_start, $active_end) {
+        return $query->where('packing_lists.type', \App\Classes\ValueObjects\Constants\PackingListType::WAREHOUSE_RECEIVE_LIST)->whereHas('transports', function ($query) use ($active_start, $active_end) {
+            return $query->whereDate('drop_date', '>=', \Carbon\Carbon::parse($active_start))->whereDate('drop_date', '<=', \Carbon\Carbon::parse($active_end)->addDay());
         });
     })->whereNotIn('id', $activeCompanies)->get();
 
-    echo '<h4>List of customers active between <span style="color: green; font-weight: bold">'. Carbon::parse($active_start)->format('d/m/Y'). ' - '. Carbon::parse($active_end)->format('d/m/Y').'</span> & inactive between <span style="color: red; font-weight: bold">'. Carbon::parse($inactive_start)->format('d/m/Y'). ' - '. Carbon::parse($inactive_end)->format('d/m/Y').'</span></h4>';
+    echo '<h4>List of customers active between <span style="color: green; font-weight: bold">'.\Carbon\Carbon::parse($active_start)->format('d/m/Y'). ' - '.\Carbon\Carbon::parse($active_end)->format('d/m/Y').'</span> & inactive between <span style="color: red; font-weight: bold">'.\Carbon\Carbon::parse($inactive_start)->format('d/m/Y'). ' - '.\Carbon\Carbon::parse($inactive_end)->format('d/m/Y').'</span></h4>';
     echo '<table>
           <tr>
             <th>#</th>
@@ -453,7 +410,7 @@ Route::get('/customers/active/{active_start}/{active_end}/{inactive_start?}/{ina
         $packingList = collect();
         $totalCbm = 0;
         if($with_cbm){
-            $packingList = $company->orderPackingLists()->where('packing_lists.type', PackingListType::SHIPPING_PACKING_LIST)->get();
+            $packingList = $company->orderPackingLists()->where('packing_lists.type', \App\Classes\ValueObjects\Constants\PackingListType::SHIPPING_PACKING_LIST)->get();
             $totalCbm = $packingList->flatMap(function ($packingList) {
                 return $packingList->packages;
             })->sum(function($package){
@@ -493,7 +450,7 @@ Route::get('/export/payment-transactions/f614e339d7058904a831aad742e24d55', 'Exp
 Route::get('/delayed_container/customers', function(){
     $containers = Container::whereHas('transports', function($query){
         return $query->whereHas('Schedules', function($query){
-            return $query->where('etd', '>', Carbon::parse('15-10-2022'));
+            return $query->where('etd', '>', \Carbon\Carbon::parse('15-10-2022'));
         });
     })->get();
 
@@ -515,7 +472,7 @@ Route::get('/delayed_container/customers', function(){
 
 
 Route::get('/container/billing/{month}/{year}', function($month, $year){
-    $containers = Container::whereDate('loading_date', '>=', Carbon::parse('01-'.$month.'-'.$year))->whereDate('loading_date', '<', Carbon::parse('01-'.$month.'-'.$year)->addMonth())->get();
+    $containers = Container::whereDate('loading_date', '>=', \Carbon\Carbon::parse('01-'.$month.'-'.$year))->whereDate('loading_date', '<', \Carbon\Carbon::parse('01-'.$month.'-'.$year)->addMonth())->get();
 
     $totalBillable = 0;
     $billed = 0;
@@ -548,7 +505,7 @@ Route::get('/container/billing/{month}/{year}', function($month, $year){
 
         foreach ($packingLists as $packingList) {
             $invoice = $packingList->transactions()
-                ->where('type', TransactionType::SHIPPING_INVOICE)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])
+                ->where('type', \App\Classes\ValueObjects\Constants\TransactionType::SHIPPING_INVOICE)->whereIn('status', [\App\Classes\ValueObjects\Constants\ApprovalStatus::APPROVED, \App\Classes\ValueObjects\Constants\ApprovalStatus::COMPLETED])
                 ->first();
 
 
@@ -560,7 +517,7 @@ Route::get('/container/billing/{month}/{year}', function($month, $year){
             }
 
             $order = $packingList->owner;
-            $address = $order->addresses()->where('status', ApprovalStatus::APPROVED)->first();
+            $address = $order->addresses()->where('status', \App\Classes\ValueObjects\Constants\ApprovalStatus::APPROVED)->first();
             $warehouseId = $order->orderRoles()->where('role_id', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->company_module_id;
 
             $cbm = round($packingList->packages->where('type', '!=', PackageType::OVER_WEIGHT)->sum(function($package) {
@@ -574,14 +531,14 @@ Route::get('/container/billing/{month}/{year}', function($month, $year){
 
             if($warehouseId === 2358){
                 $price += $yiwuCost;
-                if($packing_list_drop_date >= Carbon::parse('19-9-2022')){
+                if($packing_list_drop_date >= \Carbon\Carbon::parse('19-9-2022')){
                     $price += $yiwuDiscount;
                 }
             } else {
                 if($cbm >= 2 && in_array($address->state_id, [4, 15])){
                     $price += $bigParcelDiscount;
                 }
-                if($packing_list_drop_date >= Carbon::parse('19-9-2022')){
+                if($packing_list_drop_date >= \Carbon\Carbon::parse('19-9-2022')){
                     $price += $discount;
                 }
             }
@@ -607,7 +564,7 @@ Route::get('/container/billing/{month}/{year}', function($month, $year){
             }
 
             $payments = $invoice->transactions()
-                ->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])
+                ->where('type', \App\Classes\ValueObjects\Constants\TransactionType::PAYMENT)->whereIn('status', [\App\Classes\ValueObjects\Constants\ApprovalStatus::APPROVED, \App\Classes\ValueObjects\Constants\ApprovalStatus::COMPLETED])
                 ->get();
 
             $billed += 1;
@@ -640,14 +597,14 @@ Route::get('/container/billing/{month}/{year}', function($month, $year){
 });
 
 Route::get('/yd/fix', function(){
-    $packingLists = PackingList::where('type', PackingListType::SHIPPING_PACKING_LIST)->where('status', ApprovalStatus::APPROVED)->where('claimant_id', 2307)->get();
+    $packingLists = \App\Models\PackingList::where('type', \App\Classes\ValueObjects\Constants\PackingListType::SHIPPING_PACKING_LIST)->where('status', \App\Classes\ValueObjects\Constants\ApprovalStatus::APPROVED)->where('claimant_id', 2307)->get();
     $i = 0;
     echo count($packingLists).'<br><br>';
     foreach ($packingLists as $packingList){
         try {
             (App()->make(UpdateDoFromYDPortalProcessor::class))->execute($packingList);
             echo 'success'.'<br>';
-        } catch (Exception $exception){
+        } catch (\Exception $exception){
             echo '<span style="color:red;">'.$packingList->reference.'</span>';
         }
 
@@ -655,7 +612,7 @@ Route::get('/yd/fix', function(){
 });
 
 Route::get('/billplz/fix', function(){
-    $payments = Transaction::where('type', TransactionType::PAYMENT)->where('payment_method', PaymentMethodType::PAYMENT_GATEWAY)->get();
+    $payments = \App\Models\Transaction::where('type', \App\Classes\ValueObjects\Constants\TransactionType::PAYMENT)->where('payment_method',\App\Classes\ValueObjects\Constants\PaymentMethodType::PAYMENT_GATEWAY)->get();
     echo '<h3>fixed orders</h3>';
     foreach ($payments as $payment){
         $response = Http::withBasicAuth(config('billplz.api_key').':', '')->get(config('billplz.base_url').'/api/v3/bills/'.$payment->payment_reference);
@@ -670,19 +627,19 @@ Route::get('/billplz/fix', function(){
             $order  = $packingList->owner;
 
             $orderNumber = $order->reference;
-            if(!$data['paid'] && $payment->status === ApprovalStatus::APPROVED) {
+            if(!$data['paid'] && $payment->status === \App\Classes\ValueObjects\Constants\ApprovalStatus::APPROVED) {
                 echo '<br><span style="color: red">Fraude: <a href="'.route('order.show', $orderNumber).'" target="_blank">'.$orderNumber.'</a></span><br>';
                 continue;
             }
 
             if($data['paid']){
-                if($payment->status !== ApprovalStatus::APPROVED){
+                if($payment->status !== \App\Classes\ValueObjects\Constants\ApprovalStatus::APPROVED){
                     echo '<a href="'.route('order.show', $orderNumber).'" target="_blank">'.$orderNumber.'</a><br>';
                 }
-                $payment->status = ApprovalStatus::APPROVED;
+                $payment->status = \App\Classes\ValueObjects\Constants\ApprovalStatus::APPROVED;
                 $payment->save();
 
-                $invoice->status = ApprovalStatus::COMPLETED;
+                $invoice->status = \App\Classes\ValueObjects\Constants\ApprovalStatus::COMPLETED;
                 $invoice->save();
 
                 $packingList = $payment->owner->owner;
@@ -690,7 +647,7 @@ Route::get('/billplz/fix', function(){
                     try {
                         (App()->make(UpdateDoFromVTPortalProcessor::class))->execute($packingList);
                         (App()->make(UpdateDoFromYDPortalProcessor::class))->execute($packingList);
-                    } catch (Exception $exception){
+                    } catch (\Exception $exception){
                         echo '<br><span style="color: red">Malformed Address: <a href="'.route('order.show', $orderNumber).'" target="_blank">'.$orderNumber.'</a></span><br>';
                     }
                 }
@@ -703,12 +660,12 @@ Route::get('/billplz/fix', function(){
 });
 
 
-Route::get('/invoices/fix/{company_module_id}', function($company_module_id) {
+Route::get('/invoices/fix', function(){
 
-    $orders = Order::whereIn('company_module_id', json_decode($company_module_id))->get();
+    $orders = \App\Models\Order::whereIn('company_module_id', [294, 2703])->get();
 
     foreach ($orders as $order){
-        $invoices = $order->transactions()->where('transactions.type', TransactionType::SHIPPING_INVOICE)->get();
+        $invoices = $order->transactions()->where('transactions.type', \App\Classes\ValueObjects\Constants\TransactionType::SHIPPING_INVOICE)->get();
         foreach ($invoices as $invoice){
 
             $invoice->documents()->delete();
@@ -724,9 +681,9 @@ Route::get('/invoices/fix/{company_module_id}', function($company_module_id) {
             );
 
             /** @var Document $document */
-            $document = (App()->make(CreatesDocument::class))->execute($invoice, $document_object);
+            $document = (App()->make(\App\Classes\Modules\Documents\Services\CreatesDocument::class))->execute($invoice, $document_object);
 
-            (App()->make(CreatesFiles::class))->execute($document, $document_object);
+            (App()->make(\App\Classes\Modules\Documents\Services\CreatesFiles::class))->execute($document, $document_object);
         }
     }
 
@@ -742,57 +699,4 @@ Route::get('/invoices/combine/{ids}', function($ids){
     return $pdf->download('combined_invoice_.pdf');
 })->name('invoice.combined_summary');
 
-Route::get('/generate/invoices', function(){
-    $packingLists = (App()->make(ListsPackingLists::class))->execute(['does_not_have_transaction_type' => 1, 'type' => 2]);
-    foreach ($packingLists as $packingList){
-        $order = $packingList->owner;
-        if(!($order instanceof Order)) {
-            echo '<span style="color: red;">failed to generate...</span><br>';
-            continue;
-        }
-
-        $companyModule = $order->companyModule;
-        $billingAddress = $companyModule->addresses()->where('type', \App\Classes\ValueObjects\Constants\AddressType::BILLING)->first();
-        $deliveryAddress = $order->addresses()->where('status', ApprovalStatus::APPROVED)->first();
-
-        $postCodes = \App\Models\SegmentConstant::whereIn('reference', ['CENTER_POSTCODE', 'OUTSTATION_POSTCODE'])->get()->pluck('value')->flatten();
-
-        if(!!$billingAddress && in_array($deliveryAddress->postcode, $postCodes->toArray())){
-            try {
-                (App()->make(CreateInvoiceTransactionProcessor::class))->execute($packingList);
-                echo '<span style="color: green;">Invoice Generated...</span><br>';
-
-            } catch (Exception $exception){
-                echo '<span style="color: red;">failed to generate...</span><br>';
-            }
-        }
-        echo '<span style="color: red;">failed to generate...</span><br>';
-    }
-})->name('generate.invoices');
-
-Route::get('/invoices/approve', function(Request $request){
-//    whereDoesntHave
-    $invoices = Transaction::where('type', TransactionType::SHIPPING_INVOICE)->where('status', ApprovalStatus::PENDING_SUBMISSION)->get();
-
-    foreach ($invoices as $invoice) {
-        $packingList = $invoice->owner;
-        $order = $packingList->owner;
-
-        if(in_array($order->reference, json_decode($request->input('exclude')))){
-            continue;
-        }
-
-        try {
-            (App()->make(ApproveShippingInvoiceTransactionProcessor::class))->execute($packingList);
-            echo '<span style="color: green;">Invoice Approved...</span><br>';
-
-        } catch (Exception $exception){
-            echo '<span style="color: red;">failed to approve...</span><br>';
-
-        }
-    }
-
-
-})->name('invoices.approve');
-
 

tests/acceptance/DashboardCest.php

@@ -0,0 +1,49 @@
+<?php
+
+class DashboardCest
+{
+    public function _before(AcceptanceTester $I)
+    {
+
+        $I->wantTo('Test All Dashboard Data is Loaded');
+        $I->amOnPage('/dashboard');
+    }
+
+    /**
+     * test if the sidebar was loaded
+     * @param AcceptanceTester $I
+     * @return void
+     */
+    public function tryToTestIfAllAdminSidebarAreLoaded(AcceptanceTester $I)
+    {
+        $I->amOnPage('/dashboard');
+        $I->see('DASHBOARD');
+        $I->see('CUSTOMERS');
+        $I->see('DELIVERY LIST');
+        $I->see('CONTAINERS');
+        $I->see('PAYMENT AND BILLING');
+
+    }
+
+
+    /**
+     * test if the dashboard content is Loaded
+     * @param AcceptanceTester $I
+     * @return void
+     */
+    public function tryToTestAllDashboardComponentLoaded(AcceptanceTester $I)
+    {
+        $I->amOnPage('/dashboard');
+        $I->see('Dashboard');
+        $I->see('NEW CUSTOMERS');
+        $I->see('Unclaimed Packing Lists');
+        $I->see('Identification Verification');
+        $I->see('ACTIVATED ORDERS');
+        $I->see('PENDING SHIPMENT');
+
+        //delay a few second
+        $I->wait(5); // 2 seconds delay
+
+        $I->see('Unclaimed Packing Lists');
+    }
+}