selenium json file

Add new tasks post payment into CRM + Add task append to lead

See merge request CIEFWorldwideSdnBhd/shipping-portal!146

.env.example

@@ -10,9 +10,9 @@ LOG_LEVEL=debug
 DB_CONNECTION=mysql
 DB_HOST=127.0.0.1
 DB_PORT=3306
-DB_DATABASE=laravel
+DB_DATABASE=shpping_portal
 DB_USERNAME=root
-DB_PASSWORD=
+DB_PASSWORD=root
 
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file
@@ -55,3 +55,5 @@ EXCHANGE_URL=https://dev.exchange.cief-malaysia.com/
 MIX_EXCHANGE_URL="${EXCHANGE_URL}"
 
 YD_API_CODE=''
+
+JWT_SECRET=Btj63iMEleEaww6Bb2IBECkxWn7YHPhhPFluAkg9DfcQik0qDRy6QW75ABGmPT2h

.env.testing

@@ -0,0 +1,59 @@
+APP_NAME=Laravel
+APP_ENV=local
+APP_KEY=base64:rIar2fvNeRzQdvKOgLUg03detGDMx6ym2SYFRjawrAc=
+APP_DEBUG=true
+APP_URL=http://localhost
+
+LOG_CHANNEL=stack
+LOG_LEVEL=debug
+
+DB_CONNECTION=mysql
+DB_HOST=127.0.0.1
+DB_PORT=3306
+DB_DATABASE=shpping_portal
+DB_USERNAME=root
+DB_PASSWORD=P@ssw0rd
+
+BROADCAST_DRIVER=log
+CACHE_DRIVER=file
+FILESYSTEM_DRIVER=local
+QUEUE_CONNECTION=sync
+SESSION_DRIVER=file
+SESSION_LIFETIME=120
+
+MEMCACHED_HOST=127.0.0.1
+
+REDIS_HOST=127.0.0.1
+REDIS_PASSWORD=null
+REDIS_PORT=6379
+
+MAIL_MAILER=smtp
+MAIL_HOST=mailhog
+MAIL_PORT=1025
+MAIL_USERNAME=null
+MAIL_PASSWORD=null
+MAIL_ENCRYPTION=null
+MAIL_FROM_ADDRESS=null
+MAIL_FROM_NAME="${APP_NAME}"
+
+AWS_ACCESS_KEY_ID=
+AWS_SECRET_ACCESS_KEY=
+AWS_DEFAULT_REGION=us-east-1
+AWS_BUCKET=
+AWS_USE_PATH_STYLE_ENDPOINT=false
+
+PUSHER_APP_ID=
+PUSHER_APP_KEY=
+PUSHER_APP_SECRET=
+PUSHER_APP_CLUSTER=mt1
+
+MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
+MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
+
+UNITY_APP_URL="https://unity.izyim.com"
+EXCHANGE_URL=https://dev.exchange.cief-malaysia.com/
+MIX_EXCHANGE_URL="${EXCHANGE_URL}"
+
+YD_API_CODE=''
+
+JWT_SECRET=Btj63iMEleEaww6Bb2IBECkxWn7YHPhhPFluAkg9DfcQik0qDRy6QW75ABGmPT2h

.gitignore

@@ -2,6 +2,8 @@
 /public/hot
 /public/storage
 /storage/*.key
+/tests/_output
+/tests/_support
 /vendor
 **/.idea/
 .env
@@ -21,7 +23,6 @@ gox.iml
 rebuild_docker.sh
 docker/*
 db/*
-docker-compose.yml
 package-lock.json
 public/*
 /public/*

.gitlab-ci.yml

@@ -0,0 +1,149 @@
+image: php:7.4
+stages:
+  - service_build
+  - node
+  - building_assets
+  - database
+  - unit_test
+  - acceptance_test
+  - code_quality
+
+# Variables
+variables:
+  MYSQL_ROOT_PASSWORD: root
+  MYSQL_USER: mysql_password
+  MYSQL_PASSWORD: mysql_password
+  MYSQL_DATABASE: shpping_portal
+  DB_HOST: mysql
+
+
+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
+  - apt-get install -y libgd-dev
+
+  # Install PDO MySQL extension
+  - docker-php-ext-install pdo_mysql
+
+  #install php dependencies
+  - 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
+
+  # Install MySQL client
+  - apt-get install -y default-mysql-client
+
+  #install node js
+  - apt-get update && apt-get install -y  nodejs npm
+
+  #install gulp Js
+  - npm install -g gulp-cli
+
+
+#jobs
+
+#buld the backend
+composer_php:
+  stage: service_build
+  script:
+    - composer install
+    - cp .env.example .env
+    - php artisan key:generate
+  rules:
+    - if: '$CI_COMMIT_BRANCH =~ /.*/'
+
+#build the UI
+#node installation
+npm:
+  stage: node
+  script:
+    - npm install # Install npm dependencies
+  rules:
+    - if: '$CI_COMMIT_BRANCH =~ /.*/'
+
+#building assets
+building_assets:
+  stage: building_assets
+  # dependencies:
+  # - npm
+  script:
+    - npm install # Install npm dependencies
+    - gulp build # Build assets
+  rules:
+    - if: '$CI_COMMIT_BRANCH =~ /.*/'
+
+#mysql
+database:
+  stage: database
+  services:
+    - name: mysql:8.0
+      command: [ "--default-authentication-plugin=mysql_native_password" ]
+    #dependencies:
+    # - composer_php
+  script:
+    - composer install
+    - cp .env.example .env
+    - php artisan key:generate
+    - php artisan migrate:fresh
+    - php artisan db:seed
+  rules:
+    - if: '$CI_COMMIT_BRANCH =~ /.*/'
+
+#unit test
+unit_test:
+  stage: unit_test
+  services:
+    - name: mysql:8.0
+      command: [ "--default-authentication-plugin=mysql_native_password" ]
+  #dependencies:
+  #  - database
+  script:
+    - npm install # Install npm dependencies
+    - gulp build # Build assets
+    - composer install
+    - cp .env.example .env
+    - php artisan key:generate
+    - php artisan migrate:fresh
+    - php artisan db:seed
+    - php artisan test
+  rules:
+    - if: '$CI_COMMIT_BRANCH =~ /.*/'
+
+
+
+#acceptance tests
+acceptance_test:
+  stage: acceptance_test
+  services:
+    - name: mysql:8.0
+      command: [ "--default-authentication-plugin=mysql_native_password" ]
+    - selenium/standalone-chrome:latest
+  #dependencies:
+  #  - database
+  script:
+    - npm install # Install npm dependencies
+    - gulp build # Build assets
+    - composer install
+    - cp .env.example .env
+    - php artisan key:generate
+    - php artisan migrate:fresh
+    - php artisan db:seed
+    - php artisan serve &
+    - vendor/bin/codecept run
+  artifacts:
+    when: always
+    paths:
+      - tests/_output
+  rules:
+    - if: '$CI_COMMIT_BRANCH =~ /.*/'
+
+
+
+
+

README.md

@@ -1,62 +1,39 @@
-<p align="center"><a href="https://laravel.com" target="_blank"><img src="https://raw.githubusercontent.com/laravel/art/master/logo-lockup/5%20SVG/2%20CMYK/1%20Full%20Color/laravel-logolockup-cmyk-red.svg" width="400"></a></p>
+## Shipping portal documentation
 
-<p align="center">
-<a href="https://travis-ci.org/laravel/framework"><img src="https://travis-ci.org/laravel/framework.svg" alt="Build Status"></a>
-<a href="https://packagist.org/packages/laravel/framework"><img src="https://img.shields.io/packagist/dt/laravel/framework" alt="Total Downloads"></a>
-<a href="https://packagist.org/packages/laravel/framework"><img src="https://img.shields.io/packagist/v/laravel/framework" alt="Latest Stable Version"></a>
-<a href="https://packagist.org/packages/laravel/framework"><img src="https://img.shields.io/packagist/l/laravel/framework" alt="License"></a>
-</p>
+simple documentation on how to install, run, test, commit and deploy application
 
-## About Laravel
+## creating and running unit tests
 
-Laravel is a web application framework with expressive, elegant syntax. We believe development must be an enjoyable and creative experience to be truly fulfilling. Laravel takes the pain out of development by easing common tasks used in many web projects, such as:
+Required Tools
 
-- [Simple, fast routing engine](https://laravel.com/docs/routing).
-- [Powerful dependency injection container](https://laravel.com/docs/container).
-- Multiple back-ends for [session](https://laravel.com/docs/session) and [cache](https://laravel.com/docs/cache) storage.
-- Expressive, intuitive [database ORM](https://laravel.com/docs/eloquent).
-- Database agnostic [schema migrations](https://laravel.com/docs/migrations).
-- [Robust background job processing](https://laravel.com/docs/queues).
-- [Real-time event broadcasting](https://laravel.com/docs/broadcasting).
+- Chromium Driver / selenium
+- add running and setting selenium  on all OS if possible
 
-Laravel is accessible, powerful, and provides tools required for large, robust applications.
+Required Packages :
 
-## Learning Laravel
+- laravel/legacy-factories
 
-Laravel has the most extensive and thorough [documentation](https://laravel.com/docs) and video tutorial library of all modern web application frameworks, making it a breeze to get started with the framework.
+- codeception/codeception
 
-If you don't feel like reading, [Laracasts](https://laracasts.com) can help. Laracasts contains over 1500 video tutorials on a range of topics including Laravel, modern PHP, unit testing, and JavaScript. Boost your skills by digging into our comprehensive video library.
+Or Simply Run
 
-## Laravel Sponsors
+``Composer install``
 
-We would like to extend our thanks to the following sponsors for funding Laravel development. If you are interested in becoming a sponsor, please visit the Laravel [Patreon page](https://patreon.com/taylorotwell).
+To create a unit test
 
-### Premium Partners
+``php artisan make test: Test Example --unit``
 
-- **[Vehikl](https://vehikl.com/)**
-- **[Tighten Co.](https://tighten.co)**
-- **[Kirschbaum Development Group](https://kirschbaumdevelopment.com)**
-- **[64 Robots](https://64robots.com)**
-- **[Cubet Techno Labs](https://cubettech.com)**
-- **[Cyber-Duck](https://cyber-duck.co.uk)**
-- **[Many](https://www.many.co.uk)**
-- **[Webdock, Fast VPS Hosting](https://www.webdock.io/en)**
-- **[DevSquad](https://devsquad.com)**
-- **[Curotec](https://www.curotec.com/services/technologies/laravel/)**
-- **[OP.GG](https://op.gg)**
+Running the tests :
 
-## Contributing
+Running a single Test
 
-Thank you for considering contributing to the Laravel framework! The contribution guide can be found in the [Laravel documentation](https://laravel.com/docs/contributions).
+`` php artisan test --filter Example``
 
-## Code of Conduct
+Running Unit tests -
 
-In order to ensure that the Laravel community is welcoming to all, please review and abide by the [Code of Conduct](https://laravel.com/docs/contributions#code-of-conduct).
+`` php artisan test ``
 
-## Security Vulnerabilities
+Running Codeception tests -
 
-If you discover a security vulnerability within Laravel, please send an e-mail to Taylor Otwell via [taylor@laravel.com](mailto:taylor@laravel.com). All security vulnerabilities will be promptly addressed.
+``vendor/bin/codecept run``
 
-## License
-
-The Laravel framework is open-sourced software licensed under the [MIT license](https://opensource.org/licenses/MIT).

app/Classes/General/Abstracts/AbstractControllerLogic.php

@@ -95,4 +95,4 @@ abstract class AbstractControllerLogic
         return $this->response(json_decode($collection->response()->getContent(), true));
     }
 
-}
+}

app/Classes/General/Eloquent/AbstractListRecord.php

@@ -39,6 +39,11 @@ abstract class AbstractListRecord extends AbstractGetRecord
             $query = $query->orderBy($filters->get('order_by')->column, $filters->get('order_by')->DESC ? 'DESC': 'ASC');
         }
 
+        if($filters->has('group_by')){
+            $query = $query->groupBy($filters->get('group_by')->column);
+        }
+
+        //dd($query->toSql());
         return $filters->has('per_page') ? $query->paginate($filters->get('per_page')) : $query->get();
 
     }

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

@@ -0,0 +1,37 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use Illuminate\Database\Eloquent\Builder;
+
+class CreditTerm implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder;
+
+        return $builder->whereHas('packingLists.owner', function($query) use($value) {
+             $query->whereHas('companyModule.connections', function($query) use($value){
+                if ($value) {
+                     $query->whereHas('segments', function($query) {
+                         $query->where('segments.id' , 3);
+                    });
+                }else{
+                     $query->whereDoesntHave('segments', function($query) {
+                         $query->where('segments.id' , 3);
+                    });
+                }
+            });
+        });
+    }
+
+}

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

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Builder;
+
+class DoesNotHaveTransactionType implements Filter
+{
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->whereDoesntHave('transactions', function (Builder $query) use($value) {
+            $query->where('type', $value);
+        })->whereHas('containers', function ($query){
+            return $query->whereDate('loading_date', '>=', Carbon::parse('20-09-2022'));
+        });
+    }
+}

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

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class HasInvoiceStatusIn implements Filter
+{
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->whereHas('transactions', function (Builder $query) use($value) {
+            $query->where('type', 1)->whereIn('status', $value);
+        });
+    }
+}

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

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class HasTransactionType implements Filter
+{
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->whereHas('transactions', function (Builder $query) use($value) {
+            $query->where('type', $value);
+        });
+    }
+}

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

@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Builder;
+
+class IsPublished implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->whereDate('starting_on', '<=', Carbon::now())
+            ->whereDate('ending_on', '>=', Carbon::now());
+    }
+}

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

@@ -0,0 +1,21 @@
+<?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/General/Eloquent/Filters/OwnerIdNotIn.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class OwnerIdNotIn implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->whereNotIn('owner_id', $value);
+    }
+
+}

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

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class OwnerType implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->where('owner_type', $value);
+    }
+
+}

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

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Models\PackingList;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Facades\DB;
+
+class PackingListOrderedByInvoiceDate implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->select('packing_lists.*')->join('transactions', function($join){
+            $join->on('transactions.owner_id', '=', 'packing_lists.id');
+            $join->where('transactions.owner_type', '=', PackingList::class);
+            $join->where('transactions.status', '=', ApprovalStatus::APPROVED);
+        })->orderBy('transactions.updated_at', 'DESC');
+    }
+
+}

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

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Builder;
+
+class PaymentDay implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->whereHas('transactions', function (Builder $query) use($value) {
+            $query->where('transactions.type', 1)->where('status', ApprovalStatus::APPROVED)->whereDate('updated_at', '<=', Carbon::now()->subdays($value));
+        });
+    }
+}

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

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class PaymentReference implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->where('payment_reference', '=', $value);
+    }
+
+}

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

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class Receiver implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->where('receiver', '=', $value);
+    }
+
+}

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

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class SegmentIdIn implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->whereIn('segment_id', $value);
+    }
+
+}

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

@@ -4,7 +4,7 @@ namespace App\Classes\General\Eloquent\Filters;
 
 use Illuminate\Database\Eloquent\Builder;
 
-class OwnerId implements Filter
+class TypeIn implements Filter
 {
 
     /**
@@ -14,7 +14,7 @@ class OwnerId implements Filter
      */
     public static function apply(Builder $builder, $value)
     {
-        return $builder->where('owner_id', $value);
+        return $builder->whereIn('type', $value);
     }
 
 }

app/Classes/General/ExcelHandel.php

@@ -0,0 +1,87 @@
+<?php
+namespace App\Classes\General;
+
+use Illuminate\Support\Str;
+use Illuminate\Support\Facades\Cache;
+
+class ExcelHandel
+{
+	function __construct()
+	{
+
+	}
+
+	public static function generateFolder($path = '')
+    {
+    	$folder = \Storage::disk('public')->makeDirectory($path);
+        return $folder;
+    }
+
+	public static function insertExcel($path = '', $base64Set = [])
+	{
+    	$file_info = [];
+        $folder_path = ExcelHandel::generateFolder('excels/' . $path);
+
+        foreach ($base64Set as $key => $row) {
+
+	    	$exceldata = $row;
+	        $filename = (string) Str::uuid();
+
+	        $f = finfo_open();
+	        $mime_type = finfo_file($f, $exceldata, FILEINFO_MIME_TYPE);
+
+	        $extension = 'xls';
+
+	        switch ($mime_type) {
+	            case 'application/vnd.ms-excel':
+	                $extension = 'xls';
+	                break;
+	            case 'application/zip':
+	                $extension = 'xlsx';
+	                break;
+	        }
+
+	        if (empty($extension)) {
+	            return false;
+	        }
+
+	        $exceldata = explode('base64,', $exceldata);
+	        $exceldata = base64_decode($exceldata[1]);
+
+	        $filename_with_ext = $filename . '.' . $extension;
+
+	        $file = ExcelHandel::generateExcel($path, $exceldata, $filename, $extension);
+
+	        $file_info[] = [
+	            'path' => $path,
+	            'filename' => $filename_with_ext,
+	            'mime_type' => $mime_type,
+	            'extension' => $extension,
+	            'file_info' => empty($file) ? [] : $file,
+	        ];
+    	}
+
+        return $file_info;
+	}
+
+	public static function generateExcel($path = '', $exceldata = '', $filename = '', $extension = '')
+    {
+        $file_info = [];
+        $file = \Storage::disk('public')->put('excels/' . $path . '/' . $filename . '.' . $extension, $exceldata);
+        $file_info['original']['file'] = storage_path('app/public/excels/' . $path . '/' . $filename . '.' . $extension);
+        
+        return $file_info;
+    }
+
+    public static function removeExcel($excel_info = [])
+    {
+        $excel_info = json_decode(json_encode($excel_info), true);
+        foreach ($excel_info as $key => $row) {
+        	if (!empty($row['path'])) {
+	            \File::delete([$row['file_info']['original']['file']]);
+           }
+        }
+        return true;
+    }
+
+}

app/Classes/General/Traits/LogData.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace App\Classes\General\Traits;
+
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Support\Str;
+
+trait LogData
+{
+
+    public static function boot()
+    {
+        parent::boot();
+
+
+        static::updating(function($model)
+        {
+
+            $tableName = Str::singular($model->table).'_logs';
+            $relationshipColumn = Str::singular($model->table).'_id';
+
+            $originalData = $model->getRawOriginal();
+
+            $originalData[$relationshipColumn] = $originalData['id'];
+            unset($originalData['id']);
+
+            if (!Schema::hasTable($tableName)) {
+                DB::statement('CREATE TABLE '.$tableName.' LIKE '.$model->table);
+
+                $indexs = DB::select('SHOW INDEX FROM '.$tableName.';');
+
+                $removedIndexes = [];
+                foreach ($indexs as $index){
+                    if($index->Column_name === 'id' || in_array($index->Key_name, $removedIndexes)) continue;
+                    DB::statement('ALTER TABLE '.$tableName.' drop index '.$index->Key_name);
+                    $removedIndexes[] = $index->Key_name;
+                }
+
+                DB::statement('ALTER TABLE '.$tableName.' ADD COLUMN `'.$relationshipColumn.'` BIGINT NOT NULL AFTER `id`');
+            }
+
+            DB::table($tableName)->insert($originalData);
+
+        });
+    }
+}

app/Classes/Jobs/CreatePerfexCRMCustomer.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Classes\Jobs;
+
+use App\Classes\Modules\PerfexCRM\Processors\CreatePerfexCRMLeadProcessor;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use App\Classes\Modules\PerfexCRM\DataTransferObjects\CreateLeadPerfexCRMObject;
+
+class CreatePerfexCRMCustomer implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    /** @var CreateLeadPerfexCRMObject */
+    private $createLeadPerfexCRMObject;
+
+    /**
+     * CreatePerfexCRMCustomer constructor.
+     * @param CreateLeadPerfexCRMObject $createLeadPerfexCRMObject
+     */
+    public function __construct(CreateLeadPerfexCRMObject $createLeadPerfexCRMObject)
+    {
+        $this->createLeadPerfexCRMObject = $createLeadPerfexCRMObject;
+    }
+
+    public function handle()
+    {
+        (App()->make(CreatePerfexCRMLeadProcessor::class))->execute($this->createLeadPerfexCRMObject);
+    }
+}

app/Classes/Jobs/CreatePerfexCRMSingleTask.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Classes\Jobs;
+
+use App\Classes\Modules\PerfexCRM\Processors\CreatePerfexCRMTaskProcessor;
+use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMLead;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use App\Classes\Modules\PerfexCRM\DataTransferObjects\CreateTaskPerfexCRMObject;
+
+class CreatePerfexCRMSingleTask implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    /** @var FetchesPerfexCRMLead  */
+    private $fetchesPerfexCRMLead;
+
+    /** @var CreateTaskPerfexCRMObject */
+    private $createTaskPerfexCRMObject;
+
+    /**
+     * CreatePerfexCRMSingleTask constructor.
+     * @param CreateTaskPerfexCRMObject $createTaskPerfexCRMObject
+     */
+    public function __construct(CreateTaskPerfexCRMObject $createTaskPerfexCRMObject)
+    {
+        $this->createTaskPerfexCRMObject = $createTaskPerfexCRMObject;
+    }
+
+    public function handle()
+    {
+        $lead = (App()->make(FetchesPerfexCRMLead::class))->execute($this->createTaskPerfexCRMObject->getEmail());
+        if(!is_null($lead))
+        {
+            $this->createTaskPerfexCRMObject->setLeadId($lead->id);
+            (App()->make(CreatePerfexCRMTaskProcessor::class))->execute($this->createTaskPerfexCRMObject);
+        }
+    }
+}

app/Classes/Jobs/FetchOrdersFromYDPortalJob.php

@@ -2,8 +2,12 @@
 
 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;
@@ -25,8 +29,12 @@ 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/Jobs/InitializePerfexCRM.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Classes\Jobs;
+
+use App\Classes\Modules\PerfexCRM\Processors\InitializePerfexCRMProcessor;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use App\Classes\Modules\PerfexCRM\DataTransferObjects\InitialPerfexCRMObject;
+
+class InitializePerfexCRM implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    /** @var InitialPerfexCRMObject */
+    private $initialPerfexCRMObject;
+
+    /**
+     * InitializePerfexCRM constructor.
+     * @param InitialPerfexCRMObject $initialPerfexCRMObject
+     */
+    public function __construct(InitialPerfexCRMObject $initialPerfexCRMObject)
+    {
+        $this->initialPerfexCRMObject = $initialPerfexCRMObject;
+    }
+
+    public function handle()
+    {
+        (App()->make(InitializePerfexCRMProcessor::class))->execute($this->initialPerfexCRMObject);
+    }
+}

app/Classes/Jobs/UpdatePerfexCRM.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Classes\Jobs;
+
+use App\Classes\Modules\PerfexCRM\Processors\UpdatePerfexCRMProcessor;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use App\Classes\Modules\PerfexCRM\DataTransferObjects\UpdatePerfexCRMObject;
+
+class UpdatePerfexCRM implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    /** @var UpdatePerfexCRMObject */
+    private $updatePerfexCRMObject;
+
+    /**
+     * UpdatePerfexCRM constructor.
+     * @param UpdatePerfexCRMObject $updatePerfexCRMObject
+     */
+    public function __construct(UpdatePerfexCRMObject $updatePerfexCRMObject)
+    {
+        $this->updatePerfexCRMObject = $updatePerfexCRMObject;
+    }
+
+    public function handle()
+    {
+        (App()->make(UpdatePerfexCRMProcessor::class))->execute($this->updatePerfexCRMObject);
+    }
+}

app/Classes/Modules/Accounts/ControllersLogic/CreateCustomerLogic.php

@@ -8,22 +8,27 @@ use App\Classes\General\Services\GeneratesInitials;
 use App\Classes\Modules\Accounts\Processors\AuthenticationProcessor;
 use App\Classes\Modules\Accounts\Processors\CreateUserProcessor;
 use App\Classes\Modules\Accounts\Processors\GenerateEmailVerificationAttemptProcessor;
-use App\Classes\Modules\Companies\DataTransferObjects\CompanyConnectionObject;
 use App\Classes\Modules\Companies\Processors\AssignEmployeeProcessor;
 use App\Classes\Modules\Companies\Processors\CreateCompanyProcessor;
 use App\Classes\Modules\Companies\Processors\CreateCompanyModuleProcessor;
-use App\Classes\Modules\Companies\DataTransferObjects\EmploymentObject;
 use App\Classes\Modules\Companies\Services\ApprovesCompanyConnection;
 use App\Classes\Modules\Companies\Services\CreatesCompanyConnection;
-use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
+use App\Classes\Modules\Companies\Services\FetchesCompanyModule;
 use App\Classes\Modules\Contacts\Processors\CreateContactProcessor;
+use App\Classes\Modules\PerfexCRM\Processors\CreatePerfexCRMLeadProcessor;
 use App\Classes\Modules\Documents\Processors\UploadIdentityDocumentProcessor;
+use App\Classes\Modules\Companies\DataTransferObjects\CompanyConnectionObject;
+use App\Classes\Modules\PerfexCRM\DataTransferObjects\CreateLeadPerfexCRMObject;
+use App\Classes\Modules\Companies\DataTransferObjects\EmploymentObject;
+use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
 
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\BusinessType;
 use App\Classes\ValueObjects\Constants\CompanyType;
 use App\Classes\ValueObjects\Constants\RoleTypes;
 
+use App\Classes\Jobs\CreatePerfexCRMCustomer;
+
 use App\Models\Company;
 use App\Models\CompanyModule;
 use App\Models\User;
@@ -76,6 +81,12 @@ class CreateCustomerLogic extends AbstractControllerLogic
     /** @var GenerateEmailVerificationAttemptProcessor */
     private $generateEmailVerificationAttemptProcessor;
 
+    /** @var FetchesCompanyModule */
+    private $fetchesCompanyModule;
+
+    /** @var CreatePerfexCRMLeadProcessor */
+    private $createPerfexCRMLeadProcessor;
+
     /**
      * CreateCustomerLogic constructor.
      * @param CreateUserProcessor $createUserProcessor
@@ -88,8 +99,10 @@ class CreateCustomerLogic extends AbstractControllerLogic
      * @param UploadIdentityDocumentProcessor $uploadIdentityDocumentProcessor
      * @param AuthenticationProcessor $authenticationProcessor
      * @param GenerateEmailVerificationAttemptProcessor $generateEmailVerificationAttemptProcessor
+     * @param FetchesCompanyModule $fetchesCompanyModule
+     * @param CreatePerfexCRMLeadProcessor $createPerfexCRMLeadProcessor
      */
-    public function __construct(CreateUserProcessor $createUserProcessor, CreateCompanyProcessor $createCompanyProcessor, CreateCompanyModuleProcessor $createCompanyModuleProcessor, CreateContactProcessor $createContactProcessor, CreatesCompanyConnection $createsCompanyConnection, ApprovesCompanyConnection $approvesCompanyConnection, AssignEmployeeProcessor $assignEmployeeProcessor, UploadIdentityDocumentProcessor $uploadIdentityDocumentProcessor, AuthenticationProcessor $authenticationProcessor, GenerateEmailVerificationAttemptProcessor $generateEmailVerificationAttemptProcessor)
+    public function __construct(CreateUserProcessor $createUserProcessor, CreateCompanyProcessor $createCompanyProcessor, CreateCompanyModuleProcessor $createCompanyModuleProcessor, CreateContactProcessor $createContactProcessor, CreatesCompanyConnection $createsCompanyConnection, ApprovesCompanyConnection $approvesCompanyConnection, AssignEmployeeProcessor $assignEmployeeProcessor, UploadIdentityDocumentProcessor $uploadIdentityDocumentProcessor, AuthenticationProcessor $authenticationProcessor, GenerateEmailVerificationAttemptProcessor $generateEmailVerificationAttemptProcessor, FetchesCompanyModule $fetchesCompanyModule, CreatePerfexCRMLeadProcessor $createPerfexCRMLeadProcessor)
     {
         $this->createUserProcessor = $createUserProcessor;
         $this->createCompanyProcessor = $createCompanyProcessor;
@@ -101,6 +114,8 @@ class CreateCustomerLogic extends AbstractControllerLogic
         $this->uploadIdentityDocumentProcessor = $uploadIdentityDocumentProcessor;
         $this->authenticationProcessor = $authenticationProcessor;
         $this->generateEmailVerificationAttemptProcessor = $generateEmailVerificationAttemptProcessor;
+        $this->fetchesCompanyModule = $fetchesCompanyModule;
+        $this->createPerfexCRMLeadProcessor = $createPerfexCRMLeadProcessor;
     }
 
     /**
@@ -126,7 +141,9 @@ class CreateCustomerLogic extends AbstractControllerLogic
         /** @var CompanyModule $companyModule */
         $companyModule = $this->createCompanyModuleProcessor->execute($company, BusinessType::IMPORTER);
 
-        $connectionObject = new CompanyConnectionObject($companyModule, 'CIEF', mt_rand(1000, 9999).(new GeneratesInitials())->name($company->name)->length(3)->generate());
+        $inviter = $this->fetchesCompanyModule->execute(['reference'=>'CIEF']);
+
+        $connectionObject = new CompanyConnectionObject($companyModule, $inviter, mt_rand(1000, 9999).(new GeneratesInitials())->name($company->name)->length(3)->generate(), 'CIEF');
 
         $connection = $this->createsCompanyConnection->execute($connectionObject);
 
@@ -138,6 +155,17 @@ class CreateCustomerLogic extends AbstractControllerLogic
 
         $this->uploadIdentityDocumentProcessor->execute($request, $company);
 
+        if(config('perfexcrm.is_enabled') == 'true'){
+            // $this->createPerfexCRMLeadProcessor->execute($request);
+            $createLeadPerfexCRMObject = new CreateLeadPerfexCRMObject(
+                $request->input('name'),
+                $request->input('email'),
+                $request->input('phone'),
+                $request->input('type') === CompanyType::COMPANY_BUSINESS ? $request->input('company_name') : $request->input('name')
+            );
+            CreatePerfexCRMCustomer::dispatch($createLeadPerfexCRMObject);
+        }
+
 //        $this->generateEmailVerificationAttemptProcessor->execute($user);
 
         return $this->response($this->authenticationProcessor->execute($request));

app/Classes/Modules/Accounts/ControllersLogic/FetchUserByEmailLogic.php

@@ -0,0 +1,63 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\ControllersLogic;
+
+use App\Classes\Modules\Accounts\Services\FetchesUser;
+use App\Classes\Modules\Accounts\Standards\Rules\CanFetchUser;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Http\Resources\UserCompanyResource;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class FetchUserByEmailLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Fetch Users',
+            'message' => 'You have successfully retrieved the user by email'
+        ];
+    }
+
+    /** @var CanFetchUser */
+    private $canFetchUser;
+
+    /** @var FetchesUser */
+    private $fetchesUser;
+
+    /**
+     * FetchUserByEmailLogic constructor.
+     * @param CanFetchUser $canFetchUser
+     * @param FetchesUser $fetchessUser
+     */
+    public function __construct(CanFetchUser $canFetchUser, FetchesUser $fetchesUser)
+    {
+        $this->canFetchUser = $canFetchUser;
+        $this->fetchesUser = $fetchesUser;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        try {
+
+            $this->canFetchUser->passes();
+
+            $query = $this->fetchesUser->execute(['email' => $request->route('email')]);
+
+            return $this->resourceResponse(new UserCompanyResource($query));
+
+        } catch (\Exception $exception){
+            throw new ErrorException($exception->getMessage(), $exception->getCode());
+        }
+    }
+
+}

app/Classes/Modules/Accounts/ControllersLogic/GeneratePasswordResetLogic.php

@@ -12,6 +12,7 @@ use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\ValueObjects\Constants\Notifications;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Log;
 
 class GeneratePasswordResetLogic extends AbstractControllerLogic
 {

app/Classes/Modules/Accounts/Processors/AuthenticationProcessor.php

@@ -67,4 +67,4 @@ class AuthenticationProcessor
 
     }
 
-}
+}

app/Classes/Modules/Accounts/Services/AuthenticatesUser.php

@@ -23,4 +23,4 @@ class AuthenticatesUser
 
     }
 
-}
+}

app/Classes/Modules/Accounts/Services/AuthenticationRedirect.php

@@ -2,6 +2,7 @@
 
 namespace App\Classes\Modules\Accounts\Services;
 
+use App\Classes\ValueObjects\Constants\BusinessType;
 use App\Classes\ValueObjects\Constants\RoleTypes;
 use App\Models\User;
 
@@ -11,6 +12,11 @@ class AuthenticationRedirect
     public function url(User $user){
 
         if($user->type === RoleTypes::USER){
+
+            if (in_array($user->companyModule()->first()->type, [BusinessType::ONLINE_SELLER, BusinessType::LAST_MILE_DELIVERY_AGENT])) {
+                return route('last_mile_delivery.dashboard');
+            }
+
             return route('dashboard');
         }
 

app/Classes/Modules/Accounts/Services/GeneratesAuthenticationToken.php

@@ -68,7 +68,11 @@ class GeneratesAuthenticationToken {
             $companyModule = $user->companyModule()->first();
 
             $claims = array_merge($claims, [
-                'company_id' => $companyModule->company_id
+                'company_id' => $companyModule->company_id,
+                'company_module_id' => $companyModule->id,
+                'company_module_type' => $companyModule->type,
+                'company_name' => $companyModule->name,
+                'company_marking' => $companyModule->type !== 8 ? $companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference : 'HWT',
             ]);
         }
 

app/Classes/Modules/Addresses/ControllersLogic/CreateAddressLogic.php

@@ -14,6 +14,7 @@ use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
 use App\Classes\Modules\Contacts\Processors\CreateContactProcessor;
 use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
 use App\Classes\Modules\Remarks\Processors\CreateRemarkProcessor;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Http\Resources\AddressResource;
 use App\Models\Address;
 use ErrorException;
@@ -82,7 +83,7 @@ class CreateAddressLogic extends AbstractControllerLogic
 
         $district = $this->fetchesDistrict->execute(['id' => $request->input('district_id')]);
 
-        $object = new AddressObject($request->input('street_one'), $request->input('street_two'), $district->country_id, $district->state_id, $district->id, $request->input('post_code'), $request->input('reference'));
+        $object = new AddressObject($request->input('street_one'), $request->input('street_two'), $district->country_id, $district->state_id, $district->id, $request->input('post_code'), $request->input('type'), ApprovalStatus::APPROVED, $request->input('reference'));
 
         $this->canCreateAddress->passes($object);
 

app/Classes/Modules/Addresses/ControllersLogic/CreateBillingAddressLogic.php

@@ -0,0 +1,86 @@
+<?php
+
+namespace App\Classes\Modules\Addresses\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Addresses\Services\CreatesAddress;
+use App\Classes\Modules\Addresses\Standards\Rules\CanCreateAddress;
+use App\Classes\Modules\Addresses\DataTransferObjects\AddressObject;
+use App\Classes\Modules\Addresses\Services\FetchesAddress;
+use App\Classes\Modules\Companies\Services\FetchesCompanyModule;
+use App\Classes\ValueObjects\Constants\AddressType;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Http\Resources\AddressResource;
+use App\Models\Address;
+use App\Models\CompanyModule;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreateBillingAddressLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Created Billing Address',
+            'message' => 'You have successfully created a new Billing Address'
+        ];
+    }
+
+    /** @var CanCreateAddress */
+    private $canCreateAddress;
+
+    /** @var FetchesCompanyModule */
+    private $fetchesCompanyModule;
+
+    /** @var CreatesAddress */
+    private $createsAddress;
+
+    /** @var FetchesAddress */
+    private $fetchesAddress;
+
+    /**
+     * CreateAddressLogic constructor.
+     * @param CanCreateAddress $canCreateAddress
+     * @param FetchesCompanyModule $fetchesCompanyModule
+     * @param CreatesAddress $createsAddress
+     * @param FetchesAddress $fetchesAddress
+     */
+    public function __construct(CanCreateAddress $canCreateAddress, FetchesCompanyModule $fetchesCompanyModule, CreatesAddress $createsAddress, FetchesAddress $fetchesAddress)
+    {
+        $this->canCreateAddress = $canCreateAddress;
+        $this->fetchesCompanyModule = $fetchesCompanyModule;
+        $this->createsAddress = $createsAddress;
+        $this->fetchesAddress = $fetchesAddress;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $companyModule = $this->fetchesCompanyModule->execute(['id' => $request->input('company_module_id')]);
+        
+        $billingAddressInputed = $this->fetchesAddress->execute(['id' => $request->input('billing_address_id')]);
+
+        if ($billingAddressInputed->type !== AddressType::BILLING || $billingAddressInputed->id !== $companyModule->addresses->where('type', AddressType::BILLING)->first()->id) {
+            // delete all current billing address
+            Address::where('owner_type', CompanyModule::class)->where('owner_id', $request->input('company_module_id'))->where('type', AddressType::BILLING)->delete();
+
+            // create new billing addrress
+            $billingAddress = new AddressObject($billingAddressInputed->street_one, $billingAddressInputed->street_two, $billingAddressInputed->country_id, $billingAddressInputed->state_id, $billingAddressInputed->district_id, $billingAddressInputed->postcode, AddressType::BILLING, ApprovalStatus::APPROVED, $billingAddressInputed->reference);
+            $this->canCreateAddress->passes($billingAddress);
+            $this->createsAddress->execute($companyModule, $billingAddress);
+        }
+
+        return $this->resourceResponse(new AddressResource($billingAddressInputed));
+    }
+
+}

app/Classes/Modules/Addresses/ControllersLogic/UpdateAddressLogic.php

@@ -13,6 +13,8 @@ use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
 use App\Classes\Modules\Contacts\Processors\CreateContactProcessor;
 use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
 use App\Classes\Modules\Remarks\Processors\CreateRemarkProcessor;
+use App\Classes\ValueObjects\Constants\AddressType;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Http\Resources\AddressResource;
 use App\Models\Address;
 use Illuminate\Http\JsonResponse;
@@ -79,7 +81,7 @@ class UpdateAddressLogic extends AbstractControllerLogic
     {
         $district = $this->fetchesDistrict->execute(['id' => $request->input('district_id')]);
 
-        $object = new AddressObject($request->input('street_one'), $request->input('street_two'), $district->country_id, $district->state_id, $district->id, $request->input('post_code'), $request->input('reference'));
+        $object = new AddressObject($request->input('street_one'), $request->input('street_two'), $district->country_id, $district->state_id, $district->id, $request->input('post_code'), AddressType::DELIVERY, ApprovalStatus::APPROVED, $request->input('reference'));
 
         $this->canUpdateAddress->passes($object);
 

app/Classes/Modules/Addresses/DataTransferObjects/AddressObject.php

@@ -26,6 +26,12 @@ class AddressObject implements DataTransferObject
     /** @var int */
     private $postCode;
 
+    /** @var int */
+    private $type;
+
+    /** @var int */
+    private $status;
+
     /** @var string|null */
     private $reference;
 
@@ -37,9 +43,11 @@ class AddressObject implements DataTransferObject
      * @param int $stateId
      * @param int $districtId
      * @param int $postCode
+     * @param int $type
+     * @param int $status
      * @param null|string $reference
      */
-    public function __construct(string $streetOne, ?string $streetTwo, int $countryId, int $stateId, int $districtId, int $postCode, ?string $reference = null, ?int $status = ApprovalStatus::APPROVED)
+    public function __construct(string $streetOne, ?string $streetTwo, int $countryId, int $stateId, int $districtId, int $postCode, int $type, int $status, ?string $reference = null)
     {
         $this->streetOne = $streetOne;
         $this->streetTwo = $streetTwo;
@@ -47,8 +55,9 @@ class AddressObject implements DataTransferObject
         $this->stateId = $stateId;
         $this->districtId = $districtId;
         $this->postCode = $postCode;
-        $this->reference = $reference;
+        $this->type = $type;
         $this->status = $status;
+        $this->reference = $reference;
     }
 
     /**
@@ -100,11 +109,11 @@ class AddressObject implements DataTransferObject
     }
 
     /**
-     * @return null|string
+     * @return int
      */
-    public function getReference(): ?string
+    public function getType(): int
     {
-        return $this->reference;
+        return $this->type;
     }
 
     /**
@@ -115,5 +124,13 @@ class AddressObject implements DataTransferObject
         return $this->status;
     }
 
+    /**
+     * @return null|string
+     */
+    public function getReference(): ?string
+    {
+        return $this->reference;
+    }
+
 
 }

app/Classes/Modules/Addresses/Services/CleansOldAddress.php

@@ -10,6 +10,8 @@ namespace App\Classes\Modules\Addresses\Services;
 
 
 use App\Classes\Modules\Addresses\DataTransferObjects\AddressObject;
+use App\Classes\ValueObjects\Constants\AddressType;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Models\District;
 use App\Models\OldAddress;
 
@@ -31,7 +33,7 @@ class CleansOldAddress
             return null;
         }
 
-        return new AddressObject($this->cleanAddress($address->street_one, $district, $address->post_code), $this->cleanAddress($address->street_two, $district, $address->post_code), $district->country_id, $district->state_id, $district->id, $address->post_code, 'Delivery Address');
+        return new AddressObject($this->cleanAddress($address->street_one, $district, $address->post_code), $this->cleanAddress($address->street_two, $district, $address->post_code), $district->country_id, $district->state_id, $district->id, $address->post_code, AddressType::DELIVERY, ApprovalStatus::APPROVED, 'Delivery Address');
 
     }
 

app/Classes/Modules/Addresses/Services/CreatesAddress.php

@@ -29,6 +29,7 @@ class CreatesAddress extends AbstractUpdateRelationshipRecord
         $model->district_id = $object->getDistrictId();
         $model->postcode = $object->getPostCode();
         $model->status = $object->getStatus();
+        $model->type = $object->getType();
 
         return $this->handler($addressable->addresses(), $model);
 

app/Classes/Modules/Announcements/Services/CreatesAnnouncement.php

@@ -5,6 +5,7 @@ namespace App\Classes\Modules\Announcements\Services;
 use App\Classes\General\Eloquent\AbstractUpdateRecord;
 use App\Classes\Modules\Announcements\DataTransferObjects\AnnouncementObject;
 use App\Models\Announcement;
+use DateTime;
 
 class CreatesAnnouncement extends AbstractUpdateRecord
 {
@@ -18,9 +19,17 @@ class CreatesAnnouncement extends AbstractUpdateRecord
         $model = new Announcement();
         $model->title = $object->getTitle();
         $model->description = $object->getDescription();
-        $model->starting_on = $object->getStartingOn();
-        $model->ending_on = $object->getEndingOn();
+        // $model->starting_on = $object->getStartingOn();
+        $model->starting_on = $this->convertDateFormat($object->getStartingOn());
+        // $model->ending_on = $object->getEndingOn();
+        $model->ending_on = $this->convertDateFormat($object->getEndingOn());
 
         return $this->handler($model);
     }
+
+    public function convertDateFormat($value) {
+        $value = DateTime::createFromFormat('d-m-Y', $value)->format('Y-m-d H:i:s');
+
+        return $value;
+    }
 }

app/Classes/Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php

@@ -2,6 +2,8 @@
 
 namespace App\Classes\Modules\Billplzs\ControllersLogic;
 
+use App\Classes\Modules\Orders\Processors\UpdateDoFromVTPortalProcessor;
+use App\Classes\Modules\Orders\Processors\UpdateDoFromYDPortalProcessor;
 use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
 use App\Classes\Modules\Wallets\Services\UpdatesWallet;
 
@@ -21,13 +23,12 @@ use App\Classes\Modules\Billplzs\DataTransferObjects\BillplzXSignatureObject;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Transactions\Services\FetchesTransaction;
 use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
+use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Log;
 
 class CallbackBillplzLogic
 {
-
-
     /** @var GetBillplzBill */
     private $getBillplzBill;
 
@@ -37,22 +38,27 @@ class CallbackBillplzLogic
     /** @var UpdatesTransactionStatus */
     private $updatesTransactionStatus;
 
-    /** @var UpdatesWalletBalance */
-    private $updatesWalletBalance;
+    /** @var UpdateDoFromVTPortalProcessor */
+    private $updateDoFromVTPortalProcessor;
+
+    /** @var UpdateDoFromYDPortalProcessor */
+    private $updateDoFromYDPortalProcessor ;
 
     /**
      * CallbackBillplzLogic constructor.
      * @param GetBillplzBill $getBillplzBill
      * @param FetchesTransaction $fetchesTransaction
      * @param UpdatesTransactionStatus $updatesTransactionStatus
-     * @param UpdatesWalletBalance $updatesWalletBalance
+     * @param UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor
+     * @param UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor
      */
-    public function __construct(GetBillplzBill $getBillplzBill, FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, UpdatesWalletBalance $updatesWalletBalance)
+    public function __construct(GetBillplzBill $getBillplzBill, FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor, UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor)
     {
         $this->getBillplzBill = $getBillplzBill;
         $this->fetchesTransaction = $fetchesTransaction;
         $this->updatesTransactionStatus = $updatesTransactionStatus;
-        $this->updatesWalletBalance = $updatesWalletBalance;
+        $this->updateDoFromVTPortalProcessor = $updateDoFromVTPortalProcessor;
+        $this->updateDoFromYDPortalProcessor = $updateDoFromYDPortalProcessor;
     }
 
 
@@ -61,6 +67,8 @@ class CallbackBillplzLogic
      * @return bool|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
      * @throws MalformedRequestException
      * @throws ResourceNotFoundException
+     * @throws \App\Classes\Exceptions\InternalServerErrorException
+     * @throws \GuzzleHttp\Exception\GuzzleException
      */
     public function execute(Request $request)
     {
@@ -76,6 +84,12 @@ class CallbackBillplzLogic
 
         $transaction = $this->fetchesTransaction->execute(['payment_reference' => $billplzXSignatureObject->getBillPlzId()]);
 
+        $invoice = $transaction->owner;
+        $packingList = $invoice->owner;
+        $order = $packingList->owner;
+
+        $status = ApprovalStatus::PENDING_VERIFICATION;
+
         if($billPlz->state === 'paid') {
             $status = ApprovalStatus::APPROVED;
         }
@@ -84,22 +98,26 @@ class CallbackBillplzLogic
             $status = $billplzXSignatureObject->getStatus() === 'failed' ? ApprovalStatus::REJECTED : ApprovalStatus::PENDING_VERIFICATION;
         }
 
-        if($transaction->status !== ApprovalStatus::COMPLETED){
-
-            if($transaction->owner instanceof Wallet && $transaction->status !== ApprovalStatus::APPROVED && $status === ApprovalStatus::APPROVED) {
-                $this->updatesWalletBalance->execute($transaction->owner, $transaction->amount);
-            }
-            $this->updatesTransactionStatus->execute($transaction, $status);
-
-        }
-
-
         $token = Auth::fromUser(User::find(1));
         $request->headers->set('Authorization', 'Bearer '.$token);
 
-        $marking = $transaction->owner instanceof Booking ? $transaction->booking->marking : $transaction->owner->owner->bookings()->orderBy('id', 'DESC')->first()->marking;
+        $this->updatesTransactionStatus->execute($transaction, ApprovalStatus::APPROVED);
 
-        return $request->method() === 'POST' ? true : view('pages.payments_redirect', ['marking' => $marking, 'transaction' => $transaction, 'status' => $status]);
+        if(($invoice->amount - $transaction->amount) < 0.01) {
+            $this->updatesTransactionStatus->execute($invoice, ApprovalStatus::COMPLETED);
 
+            $packingList->status = ApprovalStatus::APPROVED;
+            $packingList->save();
+
+            if(app()->environment('production')){
+                $this->updateDoFromVTPortalProcessor->execute($packingList);
+                $this->updateDoFromYDPortalProcessor->execute($packingList);
+            }
+        }
+
+
+
+
+        return $request->method() === 'POST' ? true : view('pages.payments_redirect', ['marking' => $order->reference, 'transaction' => $transaction, 'status' => $status]);
     }
-}
+}

app/Classes/Modules/Billplzs/Services/CreatesBillplzBill.php

@@ -23,7 +23,7 @@ class CreatesBillplzBill
         try{
 //            config('billplz.maybank')
             $response = Http::withBasicAuth(config('billplz.api_key').':', '')->post(config('billplz.base_url').'/api/v3/bills', [
-                'collection_id' => $wallet ? config('billplz.wallet_collection_id') : config('billplz.collection_id'),
+                'collection_id' => config('billplz.collection_id'),
                 'name' => $name,
                 'email' => $email,
                 'description' => $description,

app/Classes/Modules/Companies/ControllersLogic/ApproveIdentificationDocumentLogic.php

@@ -97,15 +97,15 @@ class ApproveIdentificationDocumentLogic extends AbstractControllerLogic
 
         $this->updatesCompanyStatus->execute($document->owner, $status === 'approve' ? ApprovalStatus::APPROVED : ApprovalStatus::REJECTED);
 
-        $object = new NotificationObject(
-            'ID Verification ' . ( $status === 'approve' ? 'Approved' : 'Rejected' ), 
-            ( $status === 'approve' ? 'Dear user, congratulations that your ' : 'Dear user, we are sorry to inform you that your ' ) . ( $document->type ===  'IDENTITY_CARD' ? 'IC' : 'SSM' ) . ( $status === 'approve' ? ' has been approved. Start your first order now!' : ' has been rejected due to ' . ( $request->input('rejectRemark') ?? '' ) . ', please resubmit it for further action.' ), 
-            $document->owner,
-            $document->owner->companyModules()->first()->employees()->first(), 
-            $document, 
-        );
-
-        $this->createNotificationProcessor->execute($object);
+//        $object = new NotificationObject(
+//            'ID Verification ' . ( $status === 'approve' ? 'Approved' : 'Rejected' ),
+//            ( $status === 'approve' ? 'Dear user, congratulations that your ' : 'Dear user, we are sorry to inform you that your ' ) . ( $document->type ===  'IDENTITY_CARD' ? 'IC' : 'SSM' ) . ( $status === 'approve' ? ' has been approved. Start your first order now!' : ' has been rejected due to ' . ( $request->input('rejectRemark') ?? '' ) . ', please resubmit it for further action.' ),
+//            $document->owner,
+//            $document->owner->companyModules()->first()->employees()->first(),
+//            $document,
+//        );
+//
+//        $this->createNotificationProcessor->execute($object);
 
         if($status === 'approve'){
             $orders = $this->updatesOrdersStatus->execute($document->owner, ApprovalStatus::APPROVED);

app/Classes/Modules/Companies/ControllersLogic/UpdateCompanyNameAndDebtorLogic.php

@@ -0,0 +1,88 @@
+<?php
+
+namespace App\Classes\Modules\Companies\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Companies\Services\UpdatesCompany;
+use App\Classes\Modules\Companies\Services\UpdatesCompanyModuleName;
+use App\Classes\Modules\Companies\Services\FetchesCompany;
+use App\Classes\Modules\Companies\Standards\Rules\CanUpdateCompany;
+use App\Classes\Modules\Companies\DataTransferObjects\CompanyObject;
+use App\Classes\Modules\Companies\Services\UpdatesCompanyDebtor;
+use App\Http\Resources\CompanyResource;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateCompanyNameAndDebtorLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Updated Company Name and Debtor',
+            'message' => 'You have successfully updated the Company'
+        ];
+    }
+
+    /** @var CanUpdateCompany */
+    private $canUpdateCompany;
+ 
+    /** @var UpdatesCompany */
+    private $updatesCompany;
+
+    /** @var FetchesCompany */
+    private $fetchesCompany;
+
+    /** @var UpdatesCompanyDebtor */
+    private $updatesCompanyDebtor;
+
+    /** @var UpdatesCompanyModuleName */
+    private $updatesCompanyModuleName;
+
+    /**
+     * UpdateCompanyControllersLogic constructor.
+     * @param CanUpdateCompany $canUpdateCompany
+     * @param UpdatesCompany $updatesCompany
+     * @param FetchesCompany $fetchesCompany
+     * @param UpdatesCompanyDebtor $updatesCompanyDebtor
+     * @param UpdatesCompanyModuleName $updatesCompanyModuleName
+     */
+    public function __construct(CanUpdateCompany $canUpdateCompany, UpdatesCompany $updatesCompany, FetchesCompany $fetchesCompany, UpdatesCompanyDebtor $updatesCompanyDebtor, UpdatesCompanyModuleName $updatesCompanyModuleName)
+    {
+        $this->canUpdateCompany = $canUpdateCompany;
+        $this->updatesCompany = $updatesCompany;
+        $this->fetchesCompany = $fetchesCompany;
+        $this->updatesCompanyDebtor = $updatesCompanyDebtor;
+        $this->updatesCompanyModuleName = $updatesCompanyModuleName;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $object = new CompanyObject($request->input('name'), $request->input('reference'), $request->input('type'));
+
+        $this->canUpdateCompany->passes($object);
+
+        $query = $this->fetchesCompany->execute(['id' => $request->route('id')]);
+
+        $this->updatesCompanyModuleName->execute($query->companyModules()->first(), $object->getName());
+
+        $query = $this->updatesCompany->execute($query, $object);
+
+        if ($request->input('debtor') || $query->first()->debtor !== null) {
+            $this->updatesCompanyDebtor->execute($query, $request->input('debtor'));
+        }
+
+        return $this->resourceResponse(new CompanyResource($query));
+    }
+
+}

app/Classes/Modules/Companies/DataTransferObjects/CompanyConnectionObject.php

@@ -10,6 +10,9 @@ class CompanyConnectionObject implements DataTransferObject
 
     /** @var CompanyModule */
     private $invitee;
+    
+    /** @var CompanyModule */
+    private $inviter;
 
     /** @var string */
     private $inviterReference;
@@ -20,12 +23,14 @@ class CompanyConnectionObject implements DataTransferObject
     /**
      * CompanyConnectionObject constructor.
      * @param CompanyModule $invitee
+     * @param CompanyModule $inviter
      * @param string $inviterReference
      * @param string $inviteeReference
      */
-    public function __construct(CompanyModule $invitee, string $inviterReference, string $inviteeReference)
+    public function __construct(CompanyModule $invitee, CompanyModule $inviter, string $inviteeReference, string $inviterReference)
     {
         $this->invitee = $invitee;
+        $this->inviter = $inviter;
         $this->inviterReference = $inviterReference;
         $this->inviteeReference = $inviteeReference;
     }
@@ -38,6 +43,14 @@ class CompanyConnectionObject implements DataTransferObject
         return $this->invitee;
     }
 
+    /**
+     * @return CompanyModule
+     */
+    public function getInviter(): CompanyModule
+    {
+        return $this->inviter;
+    }
+
     /**
      * @return string
      */

app/Classes/Modules/Companies/Services/AssignsCompanyToSegment.php

@@ -4,6 +4,7 @@ namespace App\Classes\Modules\Companies\Services;
 
 use App\Classes\Exceptions\MalformedRequestException;
 use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\ValueObjects\Constants\BusinessType;
 use App\Models\Company;
 use App\Models\Segment;
 use Illuminate\Database\QueryException;
@@ -19,8 +20,9 @@ class AssignsCompanyToSegment extends AbstractUpdateRecord
     public function execute(Company $company, Segment $segment)
     {
         try {
-
-            $company->segments()->attach($segment);
+            $companyModule = $company->companyModules()->where('type', BusinessType::IMPORTER)->first();
+            $connection = $companyModule->connections()->where('inviter_reference', 'CIEF');
+            $connection->segments()->attach($segment);
 
             return $company;
 

app/Classes/Modules/Companies/Services/CreatesCompanyConnection.php

@@ -30,10 +30,8 @@ class CreatesCompanyConnection extends AbstractUpdateRecord
     public function execute(CompanyConnectionObject $object)
     {
 
-        $companyModule = $this->fetchesCompany->execute(['id', 1])->companyModules()->first();
-
         $connection = new CompanyConnection();
-        $connection->inviter_id = $companyModule->id;
+        $connection->inviter_id = $object->getInviter()->id;
         $connection->invitee_id = $object->getInvitee()->id;
         $connection->inviter_reference = $object->getInviterReference();
         $connection->invitee_reference = $object->getInviteeReference();

app/Classes/Modules/Companies/Services/UpdatesCompanyDebtor.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Classes\Modules\Companies\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\Modules\Companies\DataTransferObjects\CompanyObject;
+use App\Models\Company;
+
+class UpdatesCompanyDebtor extends AbstractUpdateRecord
+{
+
+    /**
+     * @param Company $model
+     * @param CompanyObject $object
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Company $model, ?string $debtor) 
+    {
+        $model->debtor = $debtor;
+
+        return $this->handler($model);
+    }
+}

app/Classes/Modules/Delivery/ControllersLogic/CancelDeliveryOrderLogic.php

@@ -0,0 +1,58 @@
+<?php
+
+namespace App\Classes\Modules\Delivery\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Orders\Services\CancelsOrder;
+use App\Classes\Modules\Orders\Services\FetchesOrder;
+use App\Http\Resources\DeliveryOrderResource;
+use App\Models\Order;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CancelDeliveryOrderLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification(): array
+    {
+        return [
+            'title' => 'Cancelled Order',
+            'message' => 'You have successfully cancelled an order'
+        ];
+    }
+
+    /** @var CancelsOrder */
+    private $cancelsOrder;
+
+    /** @var FetchesOrder */
+    private $fetchesOrder;
+
+    /**
+     * CancelDeliveryOrderLogic constructor.
+     * @param CancelsOrder $cancelsOrder
+     * @param FetchesOrder $fetchesOrder
+     */
+    public function __construct(CancelsOrder $cancelsOrder, FetchesOrder $fetchesOrder)
+    {
+        $this->cancelsOrder = $cancelsOrder;
+        $this->fetchesOrder = $fetchesOrder;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function logic(Request $request): JsonResponse
+    {
+
+        /** @var Order $order */
+        $order = $this->fetchesOrder->execute(['id' => $request->route('id')]);
+
+        return $this->resourceResponse(new DeliveryOrderResource($this->cancelsOrder->execute($order)));
+
+    }
+}

app/Classes/Modules/Delivery/ControllersLogic/CreateDeliveryCustomerLogic.php

@@ -0,0 +1,150 @@
+<?php
+
+namespace App\Classes\Modules\Delivery\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+
+use App\Classes\General\Services\GeneratesInitials;
+use App\Classes\Modules\Accounts\Processors\AuthenticationProcessor;
+use App\Classes\Modules\Accounts\Processors\CreateUserProcessor;
+use App\Classes\Modules\Accounts\Processors\GenerateEmailVerificationAttemptProcessor;
+use App\Classes\Modules\Companies\DataTransferObjects\CompanyConnectionObject;
+use App\Classes\Modules\Companies\Processors\AssignEmployeeProcessor;
+use App\Classes\Modules\Companies\Processors\CreateCompanyProcessor;
+use App\Classes\Modules\Companies\Processors\CreateCompanyModuleProcessor;
+use App\Classes\Modules\Companies\DataTransferObjects\EmploymentObject;
+use App\Classes\Modules\Companies\Services\ApprovesCompanyConnection;
+use App\Classes\Modules\Companies\Services\CreatesCompanyConnection;
+use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
+use App\Classes\Modules\Contacts\Processors\CreateContactProcessor;
+use App\Classes\Modules\Documents\Processors\UploadIdentityDocumentProcessor;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\BusinessType;
+use App\Classes\ValueObjects\Constants\CompanyType;
+use App\Classes\ValueObjects\Constants\RoleTypes;
+
+use App\Models\Company;
+use App\Models\CompanyModule;
+use App\Models\User;
+
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\App;
+use App\Classes\Modules\Companies\Services\FetchesCompanyModule;
+use Illuminate\Support\Facades\Log;
+
+class CreateDeliveryCustomerLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification(): array
+    {
+        return [
+            'title' => 'Created User',
+            'message' => 'You have successfully created a new User'
+        ];
+    }
+
+    /** @var CreateUserProcessor */
+    private $createUserProcessor;
+
+    /** @var CreateCompanyProcessor */
+    private $createCompanyProcessor;
+
+    /** @var CreateCompanyModuleProcessor */
+    private $createCompanyModuleProcessor;
+
+    /** @var CreateContactProcessor */
+    private $createContactProcessor;
+
+    /** @var CreatesCompanyConnection */
+    private $createsCompanyConnection;
+
+    /** @var ApprovesCompanyConnection */
+    private $approvesCompanyConnection;
+
+    /** @var AssignEmployeeProcessor */
+    private $assignEmployeeProcessor;
+
+    /** @var UploadIdentityDocumentProcessor */
+    private $uploadIdentityDocumentProcessor;
+
+    /** @var AuthenticationProcessor */
+    private $authenticationProcessor;
+
+    /** @var GenerateEmailVerificationAttemptProcessor */
+    private $generateEmailVerificationAttemptProcessor;
+
+    /** @var FetchesCompanyModule */
+    private $fetchesCompanyModule;
+
+    /**
+     * CreateDeliveryCustomerLogic constructor.
+     * @param CreateUserProcessor $createUserProcessor
+     * @param CreateCompanyProcessor $createCompanyProcessor
+     * @param CreateCompanyModuleProcessor $createCompanyModuleProcessor
+     * @param CreateContactProcessor $createContactProcessor
+     * @param CreatesCompanyConnection $createsCompanyConnection
+     * @param ApprovesCompanyConnection $approvesCompanyConnection
+     * @param AssignEmployeeProcessor $assignEmployeeProcessor
+     * @param UploadIdentityDocumentProcessor $uploadIdentityDocumentProcessor
+     * @param AuthenticationProcessor $authenticationProcessor
+     * @param GenerateEmailVerificationAttemptProcessor $generateEmailVerificationAttemptProcessor
+     * @param FetchesCompanyModule $fetchesCompanyModule
+     */
+    public function __construct(CreateUserProcessor $createUserProcessor, CreateCompanyProcessor $createCompanyProcessor, CreateCompanyModuleProcessor $createCompanyModuleProcessor, CreateContactProcessor $createContactProcessor, CreatesCompanyConnection $createsCompanyConnection, ApprovesCompanyConnection $approvesCompanyConnection, AssignEmployeeProcessor $assignEmployeeProcessor, UploadIdentityDocumentProcessor $uploadIdentityDocumentProcessor, AuthenticationProcessor $authenticationProcessor, GenerateEmailVerificationAttemptProcessor $generateEmailVerificationAttemptProcessor, FetchesCompanyModule $fetchesCompanyModule)
+    {
+        $this->createUserProcessor = $createUserProcessor;
+        $this->createCompanyProcessor = $createCompanyProcessor;
+        $this->createCompanyModuleProcessor = $createCompanyModuleProcessor;
+        $this->createContactProcessor = $createContactProcessor;
+        $this->createsCompanyConnection = $createsCompanyConnection;
+        $this->approvesCompanyConnection = $approvesCompanyConnection;
+        $this->assignEmployeeProcessor = $assignEmployeeProcessor;
+        $this->uploadIdentityDocumentProcessor = $uploadIdentityDocumentProcessor;
+        $this->authenticationProcessor = $authenticationProcessor;
+        $this->generateEmailVerificationAttemptProcessor = $generateEmailVerificationAttemptProcessor;
+        $this->fetchesCompanyModule = $fetchesCompanyModule;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\AccessUnauthorisedException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function logic(Request $request): JsonResponse
+    {
+        /** @var User $user */
+        $user = $this->createUserProcessor->execute($request, RoleTypes::USER, !App::environment(['production']) ? ApprovalStatus::APPROVED : ApprovalStatus::PENDING_VERIFICATION);
+
+        /** @var Company $company */
+        $company = $this->createCompanyProcessor->execute($request->input('name'), CompanyType::PERSONAL_BUSINESS, ApprovalStatus::PENDING_SUBMISSION);
+
+        $contactObject = new ContactObject($request->input('name'), $request->input('phone'), $request->input('contact_email'), $request->input('wechat_id'));
+
+        $this->createContactProcessor->execute($contactObject, $company);
+
+        /** @var CompanyModule $companyModule */
+        $companyModule = $this->createCompanyModuleProcessor->execute($company, BusinessType::ONLINE_SELLER);
+
+        $inviter = $this->fetchesCompanyModule->execute(['reference'=>'HWT']);
+
+        $connectionObject = new CompanyConnectionObject($companyModule, $inviter, mt_rand(1000, 9999).(new GeneratesInitials())->name($company->name)->length(3)->generate(), 'HWT');
+
+        $connection = $this->createsCompanyConnection->execute($connectionObject);
+
+        $this->approvesCompanyConnection->execute($connection);
+
+        $Object = new EmploymentObject($companyModule, $user);
+
+        $this->assignEmployeeProcessor->execute($Object);
+
+        return $this->response($this->authenticationProcessor->execute($request));
+    }
+}

app/Classes/Modules/Delivery/ControllersLogic/CreateDeliveryOrderLogic.php

@@ -0,0 +1,178 @@
+<?php
+
+namespace App\Classes\Modules\Delivery\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+
+use App\Classes\Modules\Addresses\DataTransferObjects\AddressObject;
+use App\Classes\Modules\Addresses\Services\CreatesAddress;
+use App\Classes\Modules\Addresses\Services\FetchesAddress;
+use App\Classes\Modules\Companies\Services\FetchesCompany;
+use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
+use App\Classes\Modules\Contacts\Processors\CreateContactProcessor;
+use App\Classes\Modules\Orders\DataTransferObjects\OrderObject;
+use App\Classes\Modules\Orders\Services\CreatesOrder;
+use App\Classes\Modules\Orders\Services\GeneratesOrderNumber;
+use App\Classes\Modules\Orders\Standards\Rules\CanCreateOrder;
+use App\Classes\Modules\PackingLists\DataTransferObjects\PackageObject;
+use App\Classes\Modules\PackingLists\DataTransferObjects\PackingListObject;
+use App\Classes\Modules\PackingLists\Services\CreatesPackingList;
+use App\Classes\Modules\PackingLists\Services\Packages\CreatesPackage;
+use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
+use App\Classes\Modules\Remarks\Processors\CreateRemarkProcessor;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\BusinessType;
+use App\Classes\ValueObjects\Constants\OrderType;
+use App\Classes\ValueObjects\Constants\PackingListType;
+use App\Http\Resources\DeliveryOrderResource;
+use App\Models\Address;
+use App\Models\CompanyModule;
+use App\Models\Order;
+use App\Models\PackingList;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreateDeliveryOrderLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification(): array
+    {
+        return [
+            'title' => 'Created Order',
+            'message' => 'You have successfully created a new Order'
+        ];
+    }
+
+    /** @var FetchesCompany */
+    private $fetchesCompany;
+
+    /** @var fetchesAddress */
+    private $fetchesAddress;
+
+    /** @var CanCreateOrder */
+    private $canCreateOrder;
+
+    /** @var CreatesOrder */
+    private $createsOrder;
+
+    /** @var CreatesAddress */
+    private $createAddress;
+
+    /** @var CreateContactProcessor */
+    private $createContactProcessor;
+
+    /** @var CreateRemarkProcessor */
+    private $createRemarkProcessor;
+
+    /** @var GeneratesOrderNumber */
+    private $generatesOrderNumber;
+
+    /** @var CreatesPackingList */
+    private $createsPackingList;
+
+    /** @var CreatesPackage */
+    private $createsPackage;
+
+
+    /**
+     * CreateDeliveryOrderLogic constructor.
+     * @param FetchesCompany $fetchesCompany
+     * @param FetchesAddress $fetchesAddress
+     * @param CanCreateOrder $canCreateOrder
+     * @param CreatesOrder $createsOrder
+     * @param CreatesAddress $createAddress
+     * @param CreateContactProcessor $createContactProcessor
+     * @param CreateRemarkProcessor $createRemarkProcessor
+     * @param GeneratesOrderNumber $generatesOrderNumber
+     * @param CreatesPackingList $createsPackingList
+     * @param CreatesPackage $createPackage
+     */
+    public function __construct(FetchesCompany $fetchesCompany, FetchesAddress $fetchesAddress, CanCreateOrder $canCreateOrder, CreatesOrder $createsOrder, CreatesAddress $createAddress, CreateContactProcessor $createContactProcessor, CreateRemarkProcessor $createRemarkProcessor, GeneratesOrderNumber $generatesOrderNumber, CreatesPackingList $createsPackingList, CreatesPackage $createsPackage)
+    {
+        $this->fetchesCompany = $fetchesCompany;
+        $this->fetchesAddress = $fetchesAddress;
+        $this->canCreateOrder = $canCreateOrder;
+        $this->createsOrder = $createsOrder;
+        $this->createAddress = $createAddress;
+        $this->createContactProcessor = $createContactProcessor;
+        $this->createRemarkProcessor = $createRemarkProcessor;
+        $this->generatesOrderNumber = $generatesOrderNumber;
+        $this->createsPackingList = $createsPackingList;
+        $this->createsPackage = $createsPackage;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function logic(Request $request): JsonResponse
+    {
+        $company = $this->fetchesCompany->execute(['id' => $request->input('company_id')]);
+
+        $senderAddress = $this->fetchesAddress->execute(['id' => $request->input('sender_address_id')]);
+        $deliveryAddress = $this->fetchesAddress->execute(['id' => $request->input('delivery_address_id')]);
+
+        /** @var CompanyModule $companyModule */
+        $companyModule = $company->companyModules()->where('type', BusinessType::ONLINE_SELLER)->first();
+
+        $orderObject = new OrderObject($this->generatesOrderNumber->execute('168M', 7), OrderType::LAST_MILE_DELIVERY, ApprovalStatus::APPROVED);
+
+        $this->canCreateOrder->passes($orderObject);
+
+        /** @var Order $order */
+        $order = $this->createsOrder->execute($companyModule, $orderObject);
+
+        $senderAddressObject = new AddressObject($senderAddress->street_one, $senderAddress->street_two, $senderAddress->country_id, $senderAddress->state_id, $senderAddress->district_id, $senderAddress->postcode, $senderAddress->type, ApprovalStatus::APPROVED, $senderAddress->reference);
+        $deliveryAddressObject = new AddressObject($deliveryAddress->street_one, $deliveryAddress->street_two, $deliveryAddress->country_id, $deliveryAddress->state_id, $deliveryAddress->district_id, $deliveryAddress->postcode, $deliveryAddress->type, ApprovalStatus::APPROVED, $deliveryAddress->reference);
+
+        /** @var Address $orderSenderAddress */
+        $orderSenderAddress = $this->createAddress->execute($order, $senderAddressObject);
+        /** @var Address $orderDeliveryAddress */
+        $orderDeliveryAddress = $this->createAddress->execute($order, $deliveryAddressObject);
+
+        $senderContact = $senderAddress->contacts()->first();
+        $deliveryContact = $deliveryAddress->contacts()->first();
+
+        $contactObject = new ContactObject($senderContact->reference, $senderContact->phone, '','');
+        $this->createContactProcessor->execute($contactObject, $orderSenderAddress);
+
+        $contactObject = new ContactObject($deliveryContact->reference, $deliveryContact->phone, '','');
+        $this->createContactProcessor->execute($contactObject, $orderDeliveryAddress);
+
+        $senderRemark = $senderAddress->remarks()->first();
+        $deliveryRemark = $deliveryAddress->remarks()->first();
+
+        if ($senderRemark){
+            $remarkObject = new RemarkObject($senderRemark->content, Auth()->user()->id);
+
+            if($remarkObject->getContent()){
+                $this->createRemarkProcessor->execute($orderSenderAddress, $remarkObject);
+            }
+        }
+
+        if ($deliveryRemark){
+            $remarkObject = new RemarkObject($deliveryRemark->content, Auth()->user()->id);
+
+            if($remarkObject->getContent()){
+                $this->createRemarkProcessor->execute($orderDeliveryAddress, $remarkObject);
+            }
+        }
+
+        $packingListObject = new PackingListObject($order->reference, $companyModule->id, PackingListType::DELIVERY_PACKING_LIST, ApprovalStatus::PENDING_VERIFICATION);
+
+        /** @var PackingList $packingList */
+        $packingList = $this->createsPackingList->execute($packingListObject, $order);
+
+        $packageObject = new PackageObject($request->input('packing_list.type'), $request->input('packing_list.description'), (float) 1, (float) 1, (float) 1, $request->input('packing_list.weight'), (float) $request->input('packing_list.quantity'), ApprovalStatus::APPROVED);
+        $this->createsPackage->execute($packageObject, $packingList);
+
+        return $this->resourceResponse(new DeliveryOrderResource($order));
+
+    }
+}

app/Classes/Modules/Delivery/ControllersLogic/ListOrdersLogic.php

@@ -0,0 +1,57 @@
+<?php
+
+
+namespace App\Classes\Modules\Delivery\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Orders\Services\ListsOrders;
+use App\Classes\Modules\Orders\Standards\Rules\CanListOrders;
+use App\Classes\ValueObjects\Constants\OrderType;
+use App\Http\Resources\DeliveryOrderResource;
+use App\Http\Resources\OrderResource;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ListOrdersLogic extends AbstractControllerLogic
+{
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Retrieved Orders',
+            'message' => 'You have successfully retrieved a list of Orders'
+        ];
+    }
+
+    /** @var CanListOrders */
+    private $canListOrders;
+
+    /** @var ListsOrders */
+    private $listsOrders;
+
+    /**
+     * ListOrdersLogic constructor.
+     * @param CanListOrders $canListOrders
+     * @param ListsOrders $listsOrders
+     */
+    public function __construct(CanListOrders $canListOrders, ListsOrders $listsOrders)
+    {
+        $this->canListOrders = $canListOrders;
+        $this->listsOrders = $listsOrders;
+    }
+
+    public function logic(Request $request) : JsonResponse
+    {
+        $this->canListOrders->passes();
+
+        $query = $this->listsOrders->execute(array_merge($this->listsOrders->deserializeFilters($request->input('filters')), ['with_parcels' => true, 'type_in' => [OrderType::LAST_MILE_DELIVERY]]));
+
+        return $this->collectionResponse(DeliveryOrderResource::collection($query));
+
+    }
+
+
+
+}

app/Classes/Modules/Documents/DataTransferObjects/FileObject.php

@@ -28,7 +28,7 @@ class FileObject implements DataTransferObject
      */
     public function getData()
     {
-        return $this->getExtension() === 'pdf' ? $this->data : (new imageManager())->make($this->data);
+        return in_array($this->getExtension(), ['pdf', 'excel'])  ? $this->data : (new imageManager())->make($this->data);
     }
 
     /**
@@ -66,7 +66,7 @@ class FileObject implements DataTransferObject
      */
     public function getDecodedData(): string
     {
-        return $this->getExtension() === 'pdf' ?
+        return in_array($this->getExtension(), ['pdf', 'excel']) ?
             base64_decode((explode('base64,', $this->getData()))[1]):
             $this->getData()->encode('data-url')->encoded;
     }
@@ -78,9 +78,4 @@ class FileObject implements DataTransferObject
     {
         $this->data = $data;
     }
-
-
-
-
-
-}
+}

app/Classes/Modules/Documents/Services/ConvertsBase64ToFile.php

@@ -36,7 +36,7 @@ class ConvertsBase64ToFile
         foreach ($files as $file) {
 
             $object = new FileObject($file);
-            $object->getExtension() === 'pdf' ? $this->generatePDF($object) : $this->generateImage($object);
+            in_array($object->getExtension(), ['pdf', 'excel']) ? $this->generatePDF($object) : $this->generateImage($object);
 
         }
 
@@ -122,4 +122,4 @@ class ConvertsBase64ToFile
         ]);
     }
 
-}
+}

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

@@ -0,0 +1,73 @@
+<?php
+
+namespace App\Classes\Modules\Exports\Services;
+
+use App\Models\Order;
+use App\Models\PackingList;
+use Carbon\Carbon;
+use Maatwebsite\Excel\Concerns\Exportable;
+use Maatwebsite\Excel\Concerns\FromQuery;
+use Maatwebsite\Excel\Concerns\WithHeadingRow;
+use Maatwebsite\Excel\Concerns\WithMapping;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\ShouldAutoSize;
+use App\Classes\ValueObjects\Constants\OrderRoleTypes;
+
+class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize, FromQuery
+{
+
+    use Exportable;
+
+    public function headings(): array
+    {
+        return [
+            'ORDER NUMBER',
+            'Marking',
+            'Warehouse',
+            'Cbm',
+            'Description',
+            'quantity',
+            'Received Date',
+            'Remarks'
+        ];
+    }
+
+    /**
+     * @return \Illuminate\Support\Collection|mixed
+     */
+    public function query()
+    {
+        return PackingList::where('type', '=', 1)->where('status', '=', 2)->where('owner_type', Order::class);
+    }
+
+    /**
+     * @param $packingList
+     * @return array
+     */
+    public function map($packingList): array
+    {
+        $order = $packingList->owner;
+
+        $connection = $order->companyModule()->first()->inviters()->withPivot('invitee_reference')->first();
+        $marking = $connection ? $connection->pivot->invitee_reference:'';
+
+        $warehouse = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee;
+
+        $cbm = $packingList->packages->sum(function($package){
+           return (($package->width / 100) * ($package->height / 100) * ($package->length / 100)) * $package->quantity;
+        });
+
+        $arrival_date = $packingList->transports()->first()->drop_date->format('d-m-Y');
+
+        return [
+            $packingList->owner->reference,
+            $marking,
+            $warehouse->reference,
+            $cbm,
+            $packingList->packages->implode('description', ', '),
+            $packingList->packages->sum('quantity'),
+            $arrival_date,
+            ''
+        ];
+    }
+}

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

@@ -0,0 +1,91 @@
+<?php
+
+namespace App\Classes\Modules\Exports\Services;
+
+use App\Models\Container;
+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 ExportsCompanyModuleSummary implements FromCollection, WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize
+{
+
+    use Exportable;
+
+    protected $companyModuleId, $containerIds;
+
+    public function headings(): array
+    {
+        return [
+            'Date',
+            'Full Marking',
+            'Container',
+            'Description',
+            'Ctns',
+            'L (cm)',
+            'H (cm)',
+            'W (cm)',
+            'CBM'
+        ];
+    }
+    
+    public function setParameters($companyModuleId, $containerIds)
+    {
+        $this->companyModuleId = $companyModuleId;
+        $this->containerIds = $containerIds;
+    }
+
+    /**
+     * @return \Illuminate\Support\Collection|mixed
+     */
+    public function collection()
+    {
+        $packagesArray = collect();
+        $containers = Container::whereIn('reference', explode(',', $this->containerIds))->get();
+        foreach ($containers as $container){
+            $company_module_id = $this->companyModuleId;
+            $packingLists = $container->packingLists()->get()->filter(function ($packingList) use ($company_module_id) {
+                return $packingList->owner->company_module_id == $company_module_id;
+            });
+            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
+    {
+        $connection = $package->packingList->owner->companyModule->inviters()->withPivot('invitee_reference')->first();
+        $marking = $connection ? $connection->pivot->invitee_reference:'';
+
+        return [
+            Carbon::parse($package->created_at)->format('d-m-Y'),
+            $marking,
+            $package->packingList->containers()->first()->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/ExportsCustomerTotalOrderByYear.php

@@ -0,0 +1,84 @@
+<?php
+
+namespace App\Classes\Modules\Exports\Services;
+
+use App\Classes\ValueObjects\Constants\PackingListType;
+use App\Models\CompanyModule;
+use App\Models\Company;
+use App\Models\PackingList;
+use Carbon\Carbon;
+use Maatwebsite\Excel\Concerns\Exportable;
+use Maatwebsite\Excel\Concerns\FromCollection;
+use Maatwebsite\Excel\Concerns\ShouldAutoSize;
+use Maatwebsite\Excel\Concerns\WithHeadingRow;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\WithMapping;
+use Illuminate\Http\Request;
+
+class ExportsCustomerTotalOrderByYear implements FromCollection, WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize
+{
+    use Exportable;
+
+    private $request;
+
+    public function __construct(Request $request)
+    {
+        $this->request = $request;
+    }
+
+    public function headings(): array
+    {
+        return [
+            'CompanyId',
+            'CompanyName',
+            'CompanyReference',
+            'TotalCbm'
+        ];
+    }
+
+    /**
+     * @return \Illuminate\Support\Collection|mixed
+     */
+    public function collection()
+    {
+        $packingLists = PackingList::where('type', PackingListType::SHIPPING_PACKING_LIST)->whereHas('containers', function($container){
+            return $container->where('loading_date', '>=', Carbon::parse('01-01-' . $this->request->route('year')))
+                ->where('loading_date', '<=', Carbon::parse('31-12-' . $this->request->route('year')));
+        })->get();
+
+        $packingLists = $packingLists->groupBy(function ($packingList){
+            return $packingList->owner->company_module_id;
+        })->sortByDesc(function($companyModule){
+            return $companyModule->sum(function($packingList){
+                return $packingList->packages->sum(function ($package){
+                    return (($package->width / 100) * ($package->height / 100) * ($package->length / 100)) * $package->quantity;
+                });
+            });
+        })->take(10);
+        return $packingLists;
+    }
+
+    /**
+     * @param $row
+     * @return array
+     */
+    public function map($row): array
+    {
+
+        $companyModule = $row[0]->owner->companyModule;
+        $marking = $companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
+
+        $cbm = $row->sum(function($packingList){
+            return $packingList->packages->sum(function ($package){
+                return (($package->width / 100) * ($package->height / 100) * ($package->length / 100)) * $package->quantity;
+            });
+        });
+
+        return [
+            $companyModule->company_id,
+            $companyModule->name,
+            $marking,
+            $cbm
+        ];
+    }
+}

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

@@ -0,0 +1,120 @@
+<?php
+
+namespace App\Classes\Modules\Exports\Services;
+
+use App\Classes\ValueObjects\Constants\AddressType;
+use App\Classes\ValueObjects\Constants\OrderType;
+use App\Classes\ValueObjects\Constants\PackageType;
+use App\Models\Order;
+use Maatwebsite\Excel\Concerns\Exportable;
+use Maatwebsite\Excel\Concerns\FromQuery;
+use Maatwebsite\Excel\Concerns\ShouldAutoSize;
+use Maatwebsite\Excel\Concerns\WithHeadingRow;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\WithMapping;
+use Illuminate\Http\Request;
+use Maatwebsite\Excel\Concerns\WithTitle;
+
+class ExportsDeliveryOrders implements FromQuery, WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize, WithTitle
+{
+    use Exportable;
+
+    private $request;
+
+    public function __construct(Request $request)
+    {
+        $this->request = $request;
+    }
+
+    public function headings(): array
+    {
+        return [
+            'Types_Of_Services',
+            'Service_Type',
+            'Sender_Name',
+            'Sender_Company_Name',
+            'Sender_Building_Unit',
+            'Sender_Address',
+            'Sender_Address_2',
+            'Sender_Postal_Code',
+            'Sender_Phone_Number',
+            'Delivery_Name',
+            'Delivery Company Name',
+            'Delivery_Building_Unit',
+            'Delivery_Address',
+            'Delivery_Address_2',
+            'Delivery_Postal_Code',
+            'Delivery_Phone_Number',
+            'Shipment_Type',
+            'Mode',
+            'Pickup_Address_Type',
+            'Reference_Number',
+            'Quantity',
+            'Weight',
+            'Length',
+            'Width',
+            'Height',
+            'COD_Amount',
+            'DO_Numbers'
+        ];
+    }
+
+    /**
+     * @return \Illuminate\Support\Collection|mixed
+     */
+    public function query()
+    {
+        $selectedIds = array_map(function($value){
+            return ['id' => $value];
+        }, json_decode($this->request->input('ids')));
+        
+        return Order::where('type', OrderType::LAST_MILE_DELIVERY)->whereIn('id', $selectedIds);
+    }
+
+    public function title(): string
+    {
+        return 'bulk-shipment';
+    }
+
+    /**
+     * @param Order $order
+     *
+     * @return array
+     */
+    public function map($order): array
+    {
+        $senderAddress = $order->addresses()->where('type', AddressType::PICK_UP)->first();
+        $deliveryAddress = $order->addresses()->where('type', AddressType::DELIVERY)->first();
+        $package = $order->packingLists()->first()->packages()->first();
+
+        return [
+            'Domestic Shipment',
+            'ST00000020',
+            $senderAddress->contacts()->first()->reference,
+            $senderAddress->reference ? $senderAddress->reference : $order->companyModule->name,
+            $senderAddress->street_one,
+            $senderAddress->street_two.' '.$senderAddress->district->name.' '.$senderAddress->postcode.' '.$senderAddress->state->name.' '.$senderAddress->country->name,
+            '',
+            $senderAddress->postcode,
+            $senderAddress->contacts()->first()->phone,
+            $deliveryAddress->contacts()->first()->reference,
+            $deliveryAddress->reference,
+            $deliveryAddress->street_one,
+            $deliveryAddress->street_two.' '.$deliveryAddress->district->name.' '.$deliveryAddress->postcode.' '.$deliveryAddress->state->name.' '.$deliveryAddress->country->name,
+            '',
+            $deliveryAddress->postcode,
+            $deliveryAddress->contacts()->first()->phone,
+            $package->type === PackageType::CARTON ? 'Package' : ($package->type === PackageType::PALLET ? 'Pallet' : 'Documents'),
+            'Pick Up',
+            'Default',
+            $order->reference,
+            $package->quantity,
+            $package->weight * $package->quantity,
+            1,
+            1,
+            1,
+            '',
+            ''
+        ];
+    }
+}

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

@@ -0,0 +1,74 @@
+<?php
+
+namespace App\Classes\Modules\Exports\Services;
+
+use Maatwebsite\Excel\Concerns\Exportable;
+use Maatwebsite\Excel\Concerns\ShouldAutoSize;
+use Maatwebsite\Excel\Concerns\WithHeadingRow;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\WithMapping;
+use Maatwebsite\Excel\Concerns\FromCollection;
+use Illuminate\Http\Request;
+use Maatwebsite\Excel\Concerns\WithTitle;
+
+class ExportsDeliveryValidValues implements WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize, WithTitle, FromCollection
+{
+    use Exportable;
+
+    private $request;
+
+    /**
+     * ExportsDeliveryValidValues constructor.
+     * @param Request $request
+     */
+    public function __construct(Request $request)
+    {
+        $this->request = $request;
+    }
+
+    public function headings(): array
+    {
+        return [
+            'Types_Of_Services',
+            'Service_Type',
+            'Mode',
+            'Flag',
+            'Pickup Address'
+        ];
+    }
+
+    /**
+     * @return \Illuminate\Support\Collection|mixed
+     */
+    public function collection()
+    {
+        $returnArray = collect();
+
+        $returnArray->push(['Domestic Shipment', 'Package', 'Pick Up', 'Yes', 'Default']);
+        $returnArray->push(['', 'Documents', 'Lodge In / Walk In', 'No', 'Sender']);
+        $returnArray->push(['', 'Pallet', '', '', '']);
+
+        return $returnArray;
+    }
+
+    public function title(): string
+    {
+        return 'valid-values';
+    }
+
+    /**
+     * @param ReturnArray $returnArray
+     *
+     * @return array
+     */
+    public function map($returnArray): array
+    {
+        return [
+            $returnArray[0],
+            $returnArray[1],
+            $returnArray[2],
+            $returnArray[3],
+            $returnArray[4],
+        ];
+    }
+}

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

@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Classes\Modules\Exports\Services;
+
+use App\Classes\Modules\Exports\Services\ExportsDeliveryOrders; 
+use App\Classes\Modules\Exports\Services\ExportsDeliveryValidValues; 
+use App\Models\Order;
+use Maatwebsite\Excel\Concerns\Exportable;
+use Illuminate\Http\Request;
+use Maatwebsite\Excel\Concerns\WithMultipleSheets;
+
+class ExportsMultipleDeliveryOrders implements WithMultipleSheets
+{
+    use Exportable;
+
+    protected $request;
+    
+    /**
+     * ExportsMultipleDeliveryOrders constructor.
+     * @param Request $request
+     */
+    public function __construct(Request $request)
+    {
+        $this->request = $request;
+    }
+
+    /**
+     * @return array
+     */
+    public function sheets(): array
+    {
+        $sheets = [];
+        $sheets[] = new ExportsDeliveryOrders($this->request);
+        $sheets[] = new ExportsDeliveryValidValues($this->request);
+
+        return $sheets;
+    }
+}

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

@@ -0,0 +1,97 @@
+<?php
+
+namespace App\Classes\Modules\Exports\Services;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\BusinessType;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Models\Company;
+use Maatwebsite\Excel\Concerns\Exportable;
+use Maatwebsite\Excel\Concerns\FromQuery;
+use Maatwebsite\Excel\Concerns\ShouldAutoSize;
+use Maatwebsite\Excel\Concerns\WithHeadingRow;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\WithMapping;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+
+class ExportsNullDebtors implements FromQuery, WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize
+{
+
+    use Exportable;
+
+
+    public function headings(): array
+    {
+        return [
+            'Code',
+            'DebtorControlAcc',
+            'ControlAccount',
+            'CompanyName',
+            'Desc2',
+            'DebtorType',
+            'DisplayTerm',
+            'CurrencyCode',
+            'RegisterNo',
+            'Address1',
+            'Address2',
+            'Address3',
+            'PostCode',
+            'DeliverAddr1',
+            'DeliverAddr2',
+            'DeliverAddr3',
+            'DeliverPostCode',
+            'EmailAddress',
+            'Attention',
+            'Phone1',
+            'Phone2',
+            'Fax1'
+        ];
+    }
+
+    /**
+     * @return \Illuminate\Support\Collection|mixed
+     */
+    public function query()
+    {
+        return Company::where(function($query){
+            $query->whereNull('debtor')->orWhere('debtor', '');
+        })->whereHas('companyModules', function($query){
+            $query->where('type', BusinessType::IMPORTER);
+        })->whereHas('parcels')->where('status', ApprovalStatus::APPROVED);
+    }
+
+    /**
+     * @param Company $company
+     *
+     * @return array
+     */
+    public function map($company): array
+    {
+        $marking = $company->companyModules()->where('type', BusinessType::IMPORTER)->first()->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
+
+        return [
+            '<<New>>',
+            '300-0000',
+            '300-0000',
+            $company->name.' (Shipping)',
+            $marking,
+            '',
+            'PIA',
+            'MYR',
+            '',
+            '',
+            '',
+            '',
+            '',
+            '',
+            '',
+            '',
+            '',
+            '',//EmailAddress
+            '',
+            '',
+            '',
+            ''
+        ];
+    }
+}

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

@@ -0,0 +1,61 @@
+<?php
+
+namespace App\Classes\Modules\Exports\Services;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Models\Order;
+use App\Models\PackingList;
+use Maatwebsite\Excel\Concerns\Exportable;
+use Maatwebsite\Excel\Concerns\FromQuery;
+use Maatwebsite\Excel\Concerns\WithHeadingRow;
+use Maatwebsite\Excel\Concerns\WithMapping;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\ShouldAutoSize;
+use Carbon\Carbon;
+
+class ExportsOnHoldPackingList implements FromQuery, WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize
+{
+
+    use Exportable;
+
+    public function headings(): array
+    {
+        return [
+            'Container Ref.',
+            'ETA',
+            'Unstuffing',
+            'Marking',
+            'Order Number'
+        ];
+    }
+
+    /**
+     * @return \Illuminate\Support\Collection|mixed
+     */
+    public function query()
+    {
+        return PackingList::where('type', '=', 2)->whereIn('status', [4, 5])->whereHas('containers');
+    }
+
+    /**
+     * @param PackingList $packingList
+     *
+     * @return array
+     */
+    public function map($packingList): array
+    {
+        $container = $packingList->containers()->first();
+        $ContainerTransport = $container->transports()->first();
+        $order = $packingList->owner;
+        if(!$order instanceof Order)return [];
+        $marking = $order->companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
+
+        return [
+            $container->reference,
+            $ContainerTransport ? $ContainerTransport->schedules()->where('status', '=', ApprovalStatus::APPROVED)->first() ? $ContainerTransport->schedules()->where('status', '=', ApprovalStatus::APPROVED)->first()->eta : 'n/a' : 'n/a',
+            $ContainerTransport ? $ContainerTransport->drop_date : 'n/a',
+            $marking,
+            $order->reference,
+        ];
+    }
+}

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

@@ -0,0 +1,108 @@
+<?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/ExportsParcel.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Classes\Modules\Exports\Services;
+
+use App\Classes\Modules\Exports\Sheets\ContainersSheet;
+use App\Classes\Modules\Exports\Sheets\PackingListsSheet;
+use Maatwebsite\Excel\Concerns\Exportable;
+use Maatwebsite\Excel\Concerns\WithMultipleSheets;;
+
+class ExportsParcel implements WithMultipleSheets
+{
+    use Exportable;
+
+
+    /**
+     * @return array
+     */
+    public function sheets(): array
+    {
+        $sheets = [];
+
+        $sheets[] = new ContainersSheet();
+        $sheets[] = new PackingListsSheet();
+
+        return $sheets;
+    }
+
+}

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

@@ -0,0 +1,52 @@
+<?php
+
+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\PackingList;
+use Carbon\Carbon;
+use Maatwebsite\Excel\Concerns\Exportable;
+use Maatwebsite\Excel\Concerns\FromQuery;
+use Maatwebsite\Excel\Concerns\WithHeadingRow;
+use Maatwebsite\Excel\Concerns\WithMapping;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\ShouldAutoSize;
+use App\Classes\ValueObjects\Constants\OrderRoleTypes;
+
+class ExportsParcelPostcodes implements WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize, FromQuery
+{
+
+    use Exportable;
+
+    public function headings(): array
+    {
+        return [
+            'Order Number',
+            'Postcode'
+        ];
+    }
+
+    /**
+     * @return \Illuminate\Support\Collection|mixed
+     */
+    public function query()
+    {
+        return PackingList::where('type', PackingListType::SHIPPING_PACKING_LIST)->whereRaw('LENGTH(reference) > 8')->where('reference', 'not like', "%YW%")->where('owner_type', Order::class)->whereDate('created_at', '>=', Carbon::parse('20-09-2022'))->whereDoesntHave('containers');
+    }
+
+    /**
+     * @param $packingList
+     * @return array
+     */
+    public function map($packingList): array
+    {
+
+        $address = $packingList->owner->addresses()->where('status', ApprovalStatus::APPROVED)->first();
+        return [
+            $packingList->reference,
+            $address->postcode
+        ];
+    }
+}

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

@@ -0,0 +1,143 @@
+<?php
+
+namespace App\Classes\Modules\Exports\Services;
+
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Models\Transaction;
+use Maatwebsite\Excel\Concerns\Exportable;
+use Maatwebsite\Excel\Concerns\FromQuery;
+use Maatwebsite\Excel\Concerns\ShouldAutoSize;
+use Maatwebsite\Excel\Concerns\WithHeadingRow;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\WithMapping;
+use Illuminate\Http\Request;
+use Carbon\Carbon;
+
+class ExportsPaymentTransactions implements FromQuery, WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize
+{
+    use Exportable;
+
+    private $request;
+
+    public function __construct(Request $request)
+    {
+        $this->request = $request;
+    }
+
+    public function headings(): array
+    {
+        return [
+            'DocNo',
+            'DocDate',
+            'DebtorCode',
+            'ShipInfo',
+            'AccNo',
+            'DetailDescription',
+            'FurtherDescription',
+            'ProjNo',
+            'DeptNo',
+            'Qty',
+            'UnitPrice'
+        ];
+    }
+
+    /**
+     * @return \Illuminate\Support\Collection|mixed
+     */
+    public function query()
+    {
+        $start_date = $this->request->input('startDate', null);
+        if ($start_date) {
+            $start_date = Carbon::parse($this->request->input('startDate'))->format('Y-m-d');
+        }
+
+        $end_date = $this->request->input('endDate', null);
+        if ($end_date) {
+            $end_date = Carbon::parse($this->request->input('endDate'))->format('Y-m-d');
+        }
+
+        $query = Transaction::query();
+
+        // paidInvoiceSection
+        $approvalStatus = ApprovalStatus::COMPLETED;
+
+        if ($this->request->route('section') == 'pendingPaymentSection') {
+            // pendingPaymentSection
+            $approvalStatus = ApprovalStatus::APPROVED;
+        }
+
+        $query->where('type', TransactionType::SHIPPING_INVOICE)->whereIn('status', [$approvalStatus]);
+
+        if($start_date && $end_date) {
+            $query->whereBetween('updated_at', [
+                Carbon::parse($start_date)->format('Y-m-d 0:00:00'),
+                Carbon::parse($end_date)->format('Y-m-d 23:59:59')
+            ]);
+        }
+        elseif($start_date && !$end_date) {
+            $query->whereHas('transactions', function($transaction) use ($start_date) {
+                $transaction->where('type', TransactionType::PAYMENT)->where('updated_at', '>=',  Carbon::parse($start_date)->format('Y-m-d 0:00:00'));
+            });
+
+        }
+        elseif(!$start_date && $end_date) {
+            $query->whereHas('transactions', function($transaction) use ($end_date) {
+                $transaction->where('type', TransactionType::PAYMENT)->where('updated_at', '>=',  Carbon::parse($end_date)->format('Y-m-d 0:00:00'));
+            });
+        }
+
+        return $query;
+    }
+
+    public function map($transaction): array
+    {
+        $container = $transaction->owner->containers()->first();
+        $order = $transaction->owner->owner;
+        $company = $order->companyModule->company;
+        $shippingTransactionDetails = $transaction->transactionDetails()->where('reference', 'SHIPPING_FEE')->first();
+
+        $furtherDescription = '';
+
+        foreach ($transaction->transactionDetails as $item){
+
+            if($item->reference === 'SHIPPING_FEE')
+                $furtherDescription .= str_replace('X1 Freight Service Charge<br>', '', $item->name)."\n";
+            elseif($item->reference === 'OVER_WEIGHT_CHARGES')
+                $furtherDescription .= $item->name.' '.$item->quantity.' CBM'."\n";
+            elseif($item->reference === 'MIN_CBM_CHARGES')
+                $furtherDescription .= $item->name.' '.$item->quantity.' CBM'."\n";
+            else
+                $furtherDescription .= $item->name.' '.$item->quantity.' X '.$item->price."\n";
+        }
+
+        return [
+            '<<New>>',
+            $transaction->created_at->format('m/d/Y H:m'),
+            $company->debtor,
+            $order->reference,
+            '500-0000',
+            'X1 Freight Service Charge',
+            $furtherDescription,
+            $container->reference,
+            'CIEF',
+            $shippingTransactionDetails->quantity,
+            $shippingTransactionDetails->price
+        ];
+        return [
+            '<<New>>',
+            $transaction->updated_at->format('m/d/Y H:m'),
+            $company->debtor,
+            $container->reference,
+            '500-0000',
+            'X1 Freight Service Charge',
+            'FurtherDescription',
+            $container->reference,
+            'M3',
+            'CIEF',
+            $shippingTransactionDetails->quantity,
+            $shippingTransactionDetails->price,
+        ];
+    }
+}

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

@@ -0,0 +1,86 @@
+<?php
+
+namespace App\Classes\Modules\Exports\Services;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Models\PackingList;
+use Maatwebsite\Excel\Concerns\Exportable;
+use Maatwebsite\Excel\Concerns\FromQuery;
+use Maatwebsite\Excel\Concerns\WithHeadingRow;
+use Maatwebsite\Excel\Concerns\WithMapping;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\ShouldAutoSize;
+use Carbon\Carbon;
+
+class ExportsPendingArrangementDeliveryList implements FromQuery, WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize
+{
+
+    use Exportable;
+
+    public function headings(): array
+    {
+        return [
+            'Container Ref.',
+            'ETA',
+            'Unstuffing',
+            'Marking',
+            'Order Number',
+            'status',
+            'Delay Days / delivery date',
+            'Quantity',
+            'State',
+            'Postcode',
+            'Address',
+            'PIC',
+            'Phone',
+            'Remark'
+        ];
+    }
+
+    /**
+     * @return \Illuminate\Support\Collection|mixed
+     */
+    public function query()
+    {
+        return PackingList::where('type', '=', 2)->whereHas('containers', function ($query){
+            $query->where('containers.status', ApprovalStatus::COMPLETED)->where('containers.created_at', '>',  Carbon::now()->subMonths(3));
+        });
+    }
+
+    /**
+     * @param PackingList $packingList
+     *
+     * @return array
+     */
+    public function map($packingList): array
+    {
+        $container = $packingList->containers()->first();
+        $ContainerTransport = $container->transports()->first();
+        $order = $packingList->owner;
+        $inviter = $order->companyModule ? $order->companyModule->inviters()->withPivot('invitee_reference')->first() : null;
+        $marking = $inviter ? $inviter->pivot->invitee_reference : 'Unclaimed';
+        $address = $order->addresses()->where('status', ApprovalStatus::APPROVED)->first();
+        $contacts = $address->contacts->first() ? $address->contacts->first(): '';
+        $originalPackingList = $packingList->owner instanceof PackingList ? $packingList->owner : $packingList;
+        $transport = $originalPackingList->containers()->first()->transports()->first();
+        $deliveryTransport = $originalPackingList->transports()->first();
+        $schedule = $deliveryTransport ? $deliveryTransport->schedules()->first() : null;
+
+        return [
+            $container->reference,
+            $ContainerTransport->schedules()->where('status', '=', ApprovalStatus::APPROVED)->first() ? $ContainerTransport->schedules()->where('status', '=', ApprovalStatus::APPROVED)->first()->eta : '',
+            $ContainerTransport->drop_date,
+            $marking,
+            $order->reference,
+            $schedule ?  (Carbon::parse($schedule->eta) < Carbon::now() ? 'Delivered' : 'Pending Delivery') :  'Pending Arrangement',
+            $schedule ?  $schedule->eta : ($transport ? Carbon::now()->diffInDays($transport->drop_date, false) . ' Days' : ''),
+            $packingList->packages()->sum('quantity'),
+            $address->state->name,
+            $address->postcode,
+            $address->street_one.', '.$address->street_two.' '.$address->district->name.' '.$address->postcode.' '.$address->state->name.' '.$address->country->name,
+            $address->remarks->first() ? $address->remarks->first()->content: '',
+            $contacts ? $contacts ->reference : '',
+            $contacts ? $contacts ->phone : '',
+        ];
+    }
+}

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

@@ -0,0 +1,55 @@
+<?php
+
+namespace App\Classes\Modules\Exports\Services;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\PackingListType;
+use App\Models\Order;
+use Maatwebsite\Excel\Concerns\Exportable;
+use Maatwebsite\Excel\Concerns\FromQuery;
+use Maatwebsite\Excel\Concerns\WithHeadingRow;
+use Maatwebsite\Excel\Concerns\WithMapping;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\ShouldAutoSize;
+use Carbon\Carbon;
+
+class ExportsWarehousePackingList implements FromQuery, WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize
+{
+
+    use Exportable;
+
+    public function headings(): array
+    {
+        return [
+            'Customer Marking',
+            'Order Number'
+        ];
+    }
+
+    /**
+     * @return \Illuminate\Support\Collection|mixed
+     */
+    public function query()
+    {
+        return Order::whereHas('addresses', function($address) {
+            $address->where('status', ApprovalStatus::APPROVED);
+        })->whereHas('packingLists', function($packingLists) {
+            $packingLists->where('type', PackingListType::SHIPPING_PACKING_LIST)->whereDoesntHave('transports');
+        });
+    }
+
+    /**
+     * @param Order $order
+     *
+     * @return array
+     */
+    public function map($order): array
+    {
+        $marking = $order->companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
+
+        return [
+            $marking,
+            $order->reference,
+        ];
+    }
+}

app/Classes/Modules/Exports/Sheets/ContainersSheet.php

@@ -0,0 +1,105 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Omair Saleh
+ * Date: 20/9/2022
+ * Time: 12:20 AM
+ */
+
+namespace App\Classes\Modules\Exports\Sheets;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Models\Container;
+use Carbon\Carbon;
+use Illuminate\Support\Facades\DB;
+use Maatwebsite\Excel\Concerns\Exportable;
+use Maatwebsite\Excel\Concerns\FromQuery;
+use Maatwebsite\Excel\Concerns\WithTitle;
+use Maatwebsite\Excel\Concerns\WithHeadingRow;
+use Maatwebsite\Excel\Concerns\WithMapping;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\ShouldAutoSize;
+
+
+class ContainersSheet implements WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize, FromQuery, WithTitle
+{
+
+    use Exportable;
+
+    public function headings(): array
+    {
+        return [
+            'Container No.',
+            'Loaded Date',
+            'ETD',
+            'ETA',
+            'Delay',
+            'Unstuffing date',
+            'Status',
+            'CTN',
+            'CBM'
+        ];
+    }
+
+    /**
+     * @return \Illuminate\Support\Collection|mixed
+     */
+    public function query()
+    {
+        return Container::query();
+    }
+
+    /**
+     * @param $container
+     * @return array
+     */
+    public function map($container): array
+    {
+
+        $transport = $container->transports()->first();
+        $currentSchedule = $transport ? $transport->schedules()->where('status', '!=', ApprovalStatus::EXPIRED)->first() : null;
+        $scheduleHistory = $transport ? $transport->schedules()->where('status', ApprovalStatus::EXPIRED)->get() : null;
+
+        $status = 'Loaded';
+
+        if($currentSchedule) {
+            if(Carbon::parse($currentSchedule->etd) >= Carbon::today()){
+                $status = 'Shipping';
+            }
+
+            if(Carbon::parse($currentSchedule->eta) >= Carbon::today()){
+                $status = 'Arrived?';
+            }
+
+            if($transport->drop_date){
+                $status = 'Pending deliveries';
+                if(!$container->packinglists()->whereDoesntHave('transports')->get()){
+                    $status = 'Complete';
+                }
+            }
+
+
+        }
+
+        return [
+            $container->reference,
+            $container->loading_date,
+            $currentSchedule ? $currentSchedule->etd : null,
+            $currentSchedule ? $currentSchedule->eta : null,
+            $scheduleHistory ? count($scheduleHistory) : 0,
+            $transport ? $transport->drop_date : null,
+            $status,
+            $container->packages()->sum('quantity'),
+            $container->packages()->sum(DB::raw('(width/100) * (height/100) * (length/100) * quantity')),
+
+        ];
+    }
+
+    /**
+     * @return string
+     */
+    public function title(): string
+    {
+        return 'Containers';
+    }
+}

app/Classes/Modules/Exports/Sheets/PackingListsSheet.php

@@ -0,0 +1,131 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Omair Saleh
+ * Date: 20/9/2022
+ * Time: 12:20 AM
+ */
+
+namespace App\Classes\Modules\Exports\Sheets;
+
+use App\Classes\ValueObjects\Constants\OrderRoleTypes;
+use App\Classes\ValueObjects\Constants\PackageType;
+use App\Classes\ValueObjects\Constants\PackingListType;
+use App\Models\Order;
+use App\Models\PackingList;
+use Illuminate\Support\Facades\DB;
+use Maatwebsite\Excel\Concerns\Exportable;
+use Maatwebsite\Excel\Concerns\FromCollection;
+use Maatwebsite\Excel\Concerns\WithTitle;
+use Maatwebsite\Excel\Concerns\WithHeadingRow;
+use Maatwebsite\Excel\Concerns\WithMapping;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\ShouldAutoSize;
+
+
+
+class PackingListsSheet implements WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize, FromCollection, WithTitle
+{
+
+    use Exportable;
+
+    public function headings(): array
+    {
+        return [
+            'Arrival Date',
+            'Marking',
+            'Order No.',
+            'Reference',
+            'Quantity',
+            'CBM',
+            'Overweight',
+            'Total CBM',
+            'Container No.',
+            'Delivery Date',
+            'Warehouse',
+            'Warehouse District',
+        ];
+    }
+
+    /**
+     * @return \Illuminate\Support\Collection|mixed
+     */
+    public function collection()
+    {
+        $packingLists = PackingList::where('status', '=', 2)->whereIn('type', [PackingListType::WAREHOUSE_RECEIVE_LIST, PackingListType::SHIPPING_PACKING_LIST])->get();
+
+        return $packingLists->filter(function ($packingList) {
+
+            if($packingList->type === PackingListType::SHIPPING_PACKING_LIST){
+                $warehouseArrival = PackingList::where('type', PackingListType::WAREHOUSE_RECEIVE_LIST)->where('reference', $packingList->reference)->get();
+                return $warehouseArrival ? false : true;
+            }
+
+            return true;
+        });
+    }
+
+    /**
+     * @param $packingList
+     * @return array
+     */
+    public function map($packingList): array
+    {
+
+        $warehouseArrivalList = $packingList;
+        $shippingList = PackingList::where('type', PackingListType::SHIPPING_PACKING_LIST)->where('reference', $packingList->reference)->first();
+
+        if($packingList->type === PackingListType::SHIPPING_PACKING_LIST) {
+            $warehouseArrivalList = null;
+            $shippingList = $packingList;
+
+        }
+
+        $arrivalTransport = null;
+
+        if($warehouseArrivalList){
+            $arrivalTransport = $warehouseArrivalList->transports()->first();
+        }
+
+        $order = null;
+        if($packingList->owner instanceof Order){
+            $order = $packingList->owner;
+        }
+
+        $cbm = $packingList->packages->where('type', '!=', PackageType::OVER_WEIGHT)->sum(function($package) {
+            return ($package->width / 100) * ($package->height / 100) *($package->length / 100) * ($package->quantity);
+        });
+
+        $overWeight = $packingList->packages->where('type', PackageType::OVER_WEIGHT)->sum(function($package) {
+            return ($package->width / 100) * ($package->height / 100) *($package->length / 100) * ($package->quantity);
+        });
+
+        $container = $shippingList ? $shippingList->container : null;
+
+        $delivery = $shippingList ? $shippingList->transport : null;
+
+        return [
+            $arrivalTransport ? $arrivalTransport->drop_date : null,
+            $order ? $order->reference : 'Unclaimed',
+            $order ? $order->companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference : 'Unclaimed',
+            $packingList->reference,
+            $packingList->packages()->sum('quantity'),
+            $cbm,
+            $overWeight ? $overWeight : 0,
+            $cbm + $overWeight,
+            $container ? $container->reference : null,
+            $delivery ? $delivery->drop_date : null,
+            strlen($packingList->reference) > 8 ? 'YD' : 'VT',
+            $order ? $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee->name : null,
+        ];
+
+    }
+
+    /**
+     * @return string
+     */
+    public function title(): string
+    {
+        return 'Packing Lists';
+    }
+}

app/Classes/Modules/Imports/Services/ImportsDebtor.php

@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Classes\Modules\Imports\Services;
+
+use App\Classes\ValueObjects\Constants\BusinessType;
+use App\Models\Company;
+
+use Maatwebsite\Excel\Concerns\ToModel;
+use Maatwebsite\Excel\Concerns\WithHeadingRow;
+use Maatwebsite\Excel\Concerns\WithBatchInserts;
+use Maatwebsite\Excel\Concerns\WithValidation;
+
+class ImportsDebtor implements ToModel, WithHeadingRow, WithBatchInserts, WithValidation
+{
+  public function __construct() {
+
+  }
+
+  public function model($row = [])
+  {
+      try {
+          preg_match_all('/([0-9]{3,4}[a-zA-Z]{3,4})/', $row['desc2'], $matches);
+
+          foreach ($matches[0] as $match){
+              $reference = $match;
+              $debtor =  $row['code'];
+              $company = Company::whereNull('debtor')->whereHas('companyModules', function($query) use ($reference) {
+                  $query->whereHas('connections', function($query) use ($reference) {
+                      $query->where('invitee_reference', $reference);
+                  });
+              })->first();
+
+              if ($company) {
+                  $company->debtor = $debtor;
+                  $company->update();
+              }
+
+          }
+
+      } catch (\Exception $exception){
+          dd($exception);
+      }
+  }
+
+  public function batchSize(): int
+  {
+    return 100;
+  }
+
+  public function rules(): array
+  {
+      return [
+
+      ];
+  }
+}

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

@@ -4,13 +4,19 @@ namespace App\Classes\Modules\Orders\ControllersLogic;
 
 use App\Classes\Exceptions\RequestValidationException;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Addresses\DataTransferObjects\AddressObject;
+use App\Classes\Modules\Addresses\Services\CreatesAddress;
 use App\Classes\Modules\Addresses\Services\FetchesAddress;
 use App\Classes\Modules\Companies\Services\FetchesCompany;
 use App\Classes\Modules\Companies\Services\FetchesCompanyModule;
 use App\Classes\Modules\Orders\Processors\CreateOrderProcessor;
 use App\Classes\Modules\Orders\Services\GeneratesOrderNumber;
+use App\Classes\ValueObjects\Constants\AddressType;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\WarehouseReferences;
 use App\Http\Resources\OrderResource;
+use App\Classes\Modules\Addresses\Standards\Rules\CanCreateAddress;
+use App\Models\Address;
 use Illuminate\Http\Request;
 use Illuminate\Http\JsonResponse;
 
@@ -39,6 +45,12 @@ class CreateOrderLogic extends AbstractControllerLogic
     /** @var GeneratesOrderNumber */
     private $generatesOrderNumber;
 
+    /** @var CreatesAddress */
+    private $createsAddress;
+
+    /** @var CanCreateAddress */
+    private $canCreateAddress;
+
     /**
      * CreateOrderLogic constructor.
      * @param FetchesCompany $fetchesCompany
@@ -46,14 +58,18 @@ class CreateOrderLogic extends AbstractControllerLogic
      * @param CreateOrderProcessor $createOrderProcessor
      * @param FetchesCompanyModule $fetchesCompanyModule
      * @param GeneratesOrderNumber $generatesOrderNumber
+     * @param CreatesAddress $createsAddress
+     * @param CanCreateAddress $canCreateAddress
      */
-    public function __construct(FetchesCompany $fetchesCompany, FetchesAddress $fetchesAddress, CreateOrderProcessor $createOrderProcessor, FetchesCompanyModule $fetchesCompanyModule, GeneratesOrderNumber $generatesOrderNumber)
+    public function __construct(FetchesCompany $fetchesCompany, FetchesAddress $fetchesAddress, CreateOrderProcessor $createOrderProcessor, FetchesCompanyModule $fetchesCompanyModule, GeneratesOrderNumber $generatesOrderNumber, CreatesAddress $createsAddress, CanCreateAddress $canCreateAddress)
     {
         $this->fetchesCompany = $fetchesCompany;
         $this->fetchesAddress = $fetchesAddress;
         $this->createOrderProcessor = $createOrderProcessor;
         $this->fetchesCompanyModule = $fetchesCompanyModule;
         $this->generatesOrderNumber = $generatesOrderNumber;
+        $this->createsAddress = $createsAddress;
+        $this->canCreateAddress = $canCreateAddress;
     }
 
 
@@ -66,6 +82,21 @@ class CreateOrderLogic extends AbstractControllerLogic
 
         $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $request->input('warehouse_id')]);
 
+        if ($request->input('billing_address_id')) {
+            $companyModule = $company->companyModules->first();
+            $billingAddressInputed = $this->fetchesAddress->execute(['id' => $request->input('billing_address_id')]);
+
+            if ($billingAddressInputed->type !== AddressType::BILLING || $billingAddressInputed->id !== $companyModule->addresses->where('type', AddressType::BILLING)->first()->id) {
+                // delete all current billing address
+                Address::where('owner_type', CompanyModule::class)->where('owner_id', $request->input('company_module_id'))->where('type', AddressType::BILLING)->delete();
+    
+                // create new billing addrress
+                $billingAddress = new AddressObject($billingAddressInputed->street_one, $billingAddressInputed->street_two, $billingAddressInputed->country_id, $billingAddressInputed->state_id, $billingAddressInputed->district_id, $billingAddressInputed->postcode, AddressType::BILLING, ApprovalStatus::APPROVED, $billingAddressInputed->reference);
+                $this->canCreateAddress->passes($billingAddress);
+                $this->createsAddress->execute($companyModule, $billingAddress);
+            }
+        }
+
         if(!in_array($company->companyModules()->importers()->first()->id, WarehouseReferences::YD_EXEMPT_LIST)){
             $originWarehouse = $this->fetchesCompanyModule->execute(['reference' =>  $originWarehouse->reference === WarehouseReferences::VT_GUANG_ZHOU ? WarehouseReferences::YD_GUANG_ZHOU : WarehouseReferences::YD_YIWU]);
         }

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

@@ -6,6 +6,7 @@ namespace App\Classes\Modules\Orders\ControllersLogic;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Orders\Services\ListsOrders;
 use App\Classes\Modules\Orders\Standards\Rules\CanListOrders;
+use App\Classes\ValueObjects\Constants\OrderType;
 use App\Http\Resources\OrderResource;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
@@ -44,7 +45,7 @@ class ListOrdersLogic extends AbstractControllerLogic
     {
         $this->canListOrders->passes();
 
-        $query = $this->listsOrders->execute(array_merge($this->listsOrders->deserializeFilters($request->input('filters')), ['with_parcels' => true]));
+        $query = $this->listsOrders->execute(array_merge($this->listsOrders->deserializeFilters($request->input('filters')), ['with_parcels' => true, 'type_in' => [OrderType::SHARED_CONTAINER, OrderType::DEDICATED_CONTAINER]]));
 
         return $this->collectionResponse(OrderResource::collection($query));
 

app/Classes/Modules/Orders/DataTransferObjects/OrderObject.php

@@ -9,7 +9,7 @@ use App\Classes\ValueObjects\Constants\ApprovalStatus;
 class OrderObject  implements DataTransferObject
 {
 
-    /** @var int */
+    /** @var string */
     private $reference;
 
     /** @var int  */
@@ -20,11 +20,11 @@ class OrderObject  implements DataTransferObject
 
     /**
      * OrderObject constructor.
-     * @param int $reference
+     * @param string $reference
      * @param int $type
      * @param int|null $status
      */
-    public function __construct(int $reference, int $type, ?int $status = ApprovalStatus::PENDING_VERIFICATION)
+    public function __construct(string $reference, int $type, ?int $status)
     {
         $this->reference = $reference;
         $this->type = $type;
@@ -32,9 +32,9 @@ class OrderObject  implements DataTransferObject
     }
 
     /**
-     * @return int
+     * @return string
      */
-    public function getReference(): int
+    public function getReference(): string
     {
         return $this->reference;
     }
@@ -48,12 +48,13 @@ class OrderObject  implements DataTransferObject
     }
 
     /**
-     * @return int
+     * @return int|null
      */
-    public function getStatus(): int
+    public function getStatus(): ?int
     {
         return $this->status;
     }
 
 
+
 }

app/Classes/Modules/Orders/Processors/ApproveChangeOrderAddressProcessor.php

@@ -7,6 +7,7 @@ use App\Classes\Modules\Orders\Standards\Rules\CanApproveChangeOrderAddress;
 use App\Classes\Modules\Orders\Services\UpdatesOrdersAddress;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\OrderRoleTypes;
+use App\Classes\ValueObjects\Constants\PackingListType;
 use Illuminate\Http\Request;
 
 class ApproveChangeOrderAddressProcessor
@@ -65,7 +66,11 @@ class ApproveChangeOrderAddressProcessor
             $address->owner->addresses()->update(['status' => ApprovalStatus::EXPIRED]);
 
             $appointee = $address->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id;
-            $appointee === 2  ? $this->updateDoFromVTPortalProcessor->execute($address) : $this->updateDoFromYDPortalProcessor->execute($address);
+            if($appointee === 2) {
+                foreach($address->owner->packingLists()->where('type', PackingListType::SHIPPING_PACKING_LIST) as $packingList){
+                    $this->updateDoFromVTPortalProcessor->execute($packingList);
+                }
+            }
 
         }
 

app/Classes/Modules/Orders/Processors/CreateOrderProcessor.php

@@ -84,7 +84,7 @@ class CreateOrderProcessor
         /** @var Order $order */
         $order = $this->createsOrder->execute($importer, $orderObject);
 
-        $addressObject = new AddressObject($address->street_one, $address->street_two, $address->country_id, $address->state_id, $address->district_id, $address->postcode,$address->reference);
+        $addressObject = new AddressObject($address->street_one, $address->street_two, $address->country_id, $address->state_id, $address->district_id, $address->postcode, $address->type, ApprovalStatus::APPROVED, $address->reference);
 
         /** @var Address $order_address */
         $order_address = $this->createAddress->execute($order, $addressObject);

app/Classes/Modules/Orders/Processors/RequestChangeOrderAddressProcessor.php

@@ -8,6 +8,7 @@ use App\Classes\Modules\Addresses\Services\CreatesAddress;
 use App\Classes\Modules\Addresses\Services\FetchesAddress;
 use App\Classes\Modules\Addresses\Services\DeletesAddress;
 use App\Classes\Modules\Addresses\DataTransferObjects\AddressObject;
+use App\Classes\ValueObjects\Constants\AddressType;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
 use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
@@ -76,7 +77,7 @@ class RequestChangeOrderAddressProcessor
         }
 
         $address = $this->fetchesAddress->execute(['id' => $request->get('address_id')]);
-        $addressObject = new AddressObject($address->street_one, $address->street_two, $address->country_id, $address->state_id, $address->district_id, $address->postcode, $address->reference, ApprovalStatus::PENDING_VERIFICATION);
+        $addressObject = new AddressObject($address->street_one, $address->street_two, $address->country_id, $address->state_id, $address->district_id, $address->postcode, AddressType::DELIVERY, ApprovalStatus::PENDING_VERIFICATION, $address->reference);
         $order_address = $this->createsAddress->execute($order, $addressObject);
 
         $contact = $address->contacts()->first();

app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php

@@ -6,23 +6,9 @@ use App\Classes\Exceptions\InternalServerErrorException;
 use App\Classes\Modules\Orders\Services\FetchesDataFromVTPortal;
 use App\Classes\Modules\Addresses\Services\FetchesAddress;
 
-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\Models\PackingList;
-use App\Models\Transport;
-use Carbon\Carbon;
 use GuzzleHttp\Exception\GuzzleException;
-use Illuminate\Support\Facades\Log;
-
-use Illuminate\Http\Request;
-
 class UpdateDoFromVTPortalProcessor
 {
     /** @var FetchesDataFromVTPortal */
@@ -43,19 +29,20 @@ class UpdateDoFromVTPortalProcessor
     }
 
     /**
-     * @param $address
+     * @param PackingList $packing_list
      * @return array
      * @throws GuzzleException
+     * @throws InternalServerErrorException
      */
-    public function execute($address) {
+    public function execute(PackingList $packing_list) {
 
         if(!app()->environment(['production'])){
             return [];
         }
 
         try {
-            $order = $address->owner()->orderBy('id', 'desc')->first();
-            $packing_list = $order->packingLists()->orderBy('id', 'desc')->first();
+            $address= $packing_list->owner->addresses()->where('status', ApprovalStatus::APPROVED)->first();
+            $order = $packing_list->owner;
 
             if ($packing_list) {
                 $contact = $address->contacts()->first();
@@ -67,7 +54,7 @@ class UpdateDoFromVTPortalProcessor
 
                 $status = 'On Hold';
 
-                if (in_array($packing_list->status, [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])) {
+                if (in_array($packing_list->status, [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])) {
                     $status = 'Release';
                 }
 
@@ -77,6 +64,7 @@ class UpdateDoFromVTPortalProcessor
 
                 if ($vt_do) {
                     foreach ($vt_do->Rows as $key => $row) {
+                        if($row[4] !== $packing_list->containers()->first()->reference) continue;
                         $vt_do_update = $this->fetchesDataFRomVTPortal->clientRequest(
                         'http://portal.vtnation.com.my/Services/DataControllerService.asmx/Execute', 
                         'POST', 
@@ -141,7 +129,7 @@ class UpdateDoFromVTPortalProcessor
             }
 
         } catch (\Exception $exception){
-            return [];
+            throw new InternalServerErrorException('failed to approve address due to an error related to VT portal: '.$exception->getMessage());
         }
 
     }

app/Classes/Modules/Orders/Processors/UpdateDoFromYDPortalProcessor.php

@@ -3,11 +3,13 @@
 namespace App\Classes\Modules\Orders\Processors;
 
 use App\Classes\Exceptions\InternalServerErrorException;
+use App\Classes\Exceptions\MalformedRequestException;
 use App\Classes\Modules\Orders\Services\FetchesDataFromYDPortal;
 use App\Classes\Modules\Addresses\Services\FetchesAddress;
 
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\PackingListType;
+use App\Models\PackingList;
 use Illuminate\Support\Facades\Log;
 
 class UpdateDoFromYDPortalProcessor
@@ -30,36 +32,35 @@ class UpdateDoFromYDPortalProcessor
     }
 
     /**
-     * @param $address
+     * @param PackingList $packingList
      * @return void
      * @throws InternalServerErrorException
      */
-    public function execute($address) {
+    public function execute(PackingList $packingList) {
+        if(!app()->environment(['production'])){
+            return;
+        }
+
         try {
-            $order = $address->owner()->orderBy('id', 'desc')->first();
-            $packing_lists = $order->packingLists()
-                ->where('type', PackingListType::SHIPPING_PACKING_LIST)
-                ->where('status', '!=', ApprovalStatus::SUSPENDED)
-                ->orderBy('id', 'desc')->get();
+            $address = $packingList->owner->addresses()->where('status', ApprovalStatus::APPROVED)->first();
 
+            if (!in_array($packingList->status, [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])) {
+                return;
+            }
 
-            foreach ($packing_lists as $key => $row) {
-                if ($row->status === ApprovalStatus::SUSPENDED) {
-                    continue;
-                }
+            $contact = $address->contacts()->first();
+            $remark = $address->remarks()->first();
 
-                $contact = $address->contacts()->first();
-                $remark = $address->remarks()->first();
+            $phone = $contact ? $contact->phone : null;
+            $reference = $contact ? $contact->reference : null;
+            $remark = $remark ? $remark->content :  'URGENT!!! PLEASE CALL BEFORE ONE DAY DELIVERY.';
 
-                $phone = $contact ? $contact->phone : null;
-                $reference = $contact ? $contact->reference : null;
-                $remark = $remark ? $remark->content :  'URGENT!!! PLEASE CALL BEFORE ONE DAY DELIVERY.';
-
-                $this->fetchesDataFRomYDPortal->clientRequest(
-                'http://www.yd-wl.com/api/UpdateOrderAddress.ashx', 
-                'POST', 
+            if(!$phone || !$reference) throw new MalformedRequestException('Can\'t release this packing list because it doesn\'t have the person in charge contact information');
+            $this->fetchesDataFRomYDPortal->clientRequest(
+                'http://www.yd-wl.com/api/UpdateOrderAddress.ashx',
+                'POST',
                 [
-                    'expressno' => $row->reference,
+                    'expressno' => $packingList->reference,
                     'customers_name' => $reference,
                     'cellphone' => $phone,
                     'postcode' => $address->postcode,
@@ -68,8 +69,6 @@ class UpdateDoFromYDPortalProcessor
                 ]);
 
 
-            }
-
         } catch (\Exception $exception){
             throw new InternalServerErrorException('failed to approve address due to an error related to YD portal');
         }

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

@@ -21,7 +21,7 @@ class ChecksIfOrderNumberExists
         $this->repository = $repository;
     }
 
-    public function execute(int $orderNumber): bool {
+    public function execute(string $orderNumber): bool {
         return $this->repository->where('reference', $orderNumber)->exists();
     }
 

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

@@ -14,12 +14,11 @@ class FetchesDataFromYDPortal
      * @return \Psr\Http\Message\ResponseInterface
      */
     public function clientRequest(string $url, string $method, $body){
-        
-        $client = new \GuzzleHttp\Client();
 
+        $client = new \GuzzleHttp\Client();
         $body['apicode'] = env('YD_API_CODE');
 
-        $request = $client->requestAsync($method, $url, ['query' => $body]);
+        $request = $client->requestAsync($method, $url, ['query' => $body, 'timeout' => 15]);
 
         return $request->wait();
     }
@@ -32,6 +31,7 @@ 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/Orders/Services/GeneratesOrderNumber.php

@@ -20,11 +20,13 @@ class GeneratesOrderNumber
 
 
     /**
-     * @return int
+     * @param null|string $prefix
+     * @param int|null $length
+     * @return string
      */
-    public function execute(): int {
+    public function execute(?string $prefix = '', ?int $length = 9): string {
 
-        $reference = rand(100000001, 999999999);
+        $reference = $prefix.rand((int)('1'.str_repeat(0, $length - 2).'1'), (int) str_repeat(9, $length));
         return !$this->checkIfOrderNumberExists->execute($reference) ? $reference : self::execute();
     }
 

app/Classes/Modules/PackingLists/ControllersLogic/AssignPackingListOrderLogic.php

@@ -2,6 +2,7 @@
 
 namespace App\Classes\Modules\PackingLists\ControllersLogic;
 
+use App\Classes\Exceptions\ResourceNotFoundException;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\PackingLists\Services\FetchesPackingList;
 use App\Classes\Modules\Orders\Services\FetchesOrder;
@@ -134,20 +135,25 @@ class AssignPackingListOrderLogic extends AbstractControllerLogic
 
         $this->unityAssignContractEntity->execute($supervisorContractEntity->hash_id, $contractObligations);
 
-        $packing_list = $this->fetchesPackingList->execute([
-            'reference' => $warehouse_packing_list->reference, 
-            'type' => PackingListType::SHIPPING_PACKING_LIST
-        ]);
+        try {
+            $packing_list = $this->fetchesPackingList->execute([
+                'reference' => $warehouse_packing_list->reference,
+                'type' => PackingListType::SHIPPING_PACKING_LIST
+            ]);
 
-        $warehouse_packing_list = $this->updatesPackingListOwner->execute($packing_list, $order);
-        
-        $this->updatesPackingListContractReference->execute($packing_list, $contractReference);
+            $warehouse_packing_list = $this->updatesPackingListOwner->execute($packing_list, $order);
+
+            $this->updatesPackingListContractReference->execute($packing_list, $contractReference);
+
+            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($packing_list, $stepObject);
+            }
+        } catch (ResourceNotFoundException $exception) {
 
-        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($packing_list, $stepObject);
         }
 
+
         return $this->resourceResponse(new PackingListResource($warehouse_packing_list));
     }
 }

app/Classes/Modules/PackingLists/ControllersLogic/DeletePackingListLogic.php

@@ -7,6 +7,8 @@ use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\PackingLists\Services\DeletesPackingList;
 use App\Classes\Modules\PackingLists\Services\FetchesPackingList;
 use App\Classes\Modules\PackingLists\Standards\Rules\CanDeletePackingList;
+use App\Classes\ValueObjects\Constants\PackingListType;
+use App\Models\PackingList;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -58,9 +60,9 @@ class DeletePackingListLogic extends AbstractControllerLogic
 
             $this->canDeletePackingList->passes();
 
-            $query = $this->fetchesPackingList->execute(['id' => $request->route('id')]);
+            $packingList = $this->fetchesPackingList->execute(['id' => $request->route('id')]);
 
-            $this->deletesPackingList->execute($query);
+            PackingList::where('reference', $packingList->reference)->delete();
 
             return $this->response([]);
 

app/Classes/Modules/PackingLists/ControllersLogic/ReschedulePackingListLogic.php

@@ -7,9 +7,13 @@ use App\Classes\Modules\PackingLists\Services\FetchesPackingList;
 use App\Classes\Modules\Schedules\Services\CreatesSchedule;
 use App\Classes\Modules\Schedules\Services\UpdatesScheduleStatus;
 use App\Classes\Modules\Schedules\DataTransferObjects\ScheduleObject;
+use App\Classes\Modules\Transports\DataTransferObjects\TransportObject;
+use App\Classes\Modules\Transports\Services\CreatesTransport;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 
+use App\Classes\ValueObjects\Constants\TransportType;
 use App\Http\Resources\PackingListResource;
+use App\Models\Transport;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -17,6 +21,8 @@ use Carbon\Carbon;
 
 class ReschedulePackingListLogic extends AbstractControllerLogic
 {
+
+
     /**
      * @return array
      */
@@ -33,51 +39,57 @@ class ReschedulePackingListLogic extends AbstractControllerLogic
     /** @var UpdatesScheduleStatus */
     private $updatesScheduleStatus;
 
+    /** @var CreatesTransport */
+    private $createsTransport;
+
     /** @var CreatesSchedule */
     private $createsSchedule;
 
     /**
-     * DeleteContainerControllersLogic constructor.
+     * ReschedulePackingListLogic constructor.
      * @param FetchesPackingList $fetchesPackingList
+     * @param UpdatesScheduleStatus $updatesScheduleStatus
+     * @param CreatesTransport $createsTransport
      * @param CreatesSchedule $createsSchedule
      */
-    public function __construct(FetchesPackingList $fetchesPackingList, UpdatesScheduleStatus $updatesScheduleStatus, CreatesSchedule $createsSchedule)
+    public function __construct(FetchesPackingList $fetchesPackingList, UpdatesScheduleStatus $updatesScheduleStatus, CreatesTransport $createsTransport, CreatesSchedule $createsSchedule)
     {
         $this->fetchesPackingList = $fetchesPackingList;
         $this->updatesScheduleStatus = $updatesScheduleStatus;
+        $this->createsTransport = $createsTransport;
         $this->createsSchedule = $createsSchedule;
     }
 
-
     /**
      * @param Request $request
      * @return JsonResponse
-     * @throws ErrorException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
      */
     public function logic(Request $request) : JsonResponse
     {
-        try {
-            $packing_list = $this->fetchesPackingList->execute(['id' => $request->route('id')]);
+        $packing_list = $this->fetchesPackingList->execute(['id' => $request->route('id')]);
 
-            $transport = $packing_list->transports()->first();
+        $transport = $packing_list->transports()->first();
 
-            $old_sechedule = $transport->schedules()->first();
-
-            $this->updatesScheduleStatus->execute($old_sechedule, ApprovalStatus::REJECTED);
-
-            $scheduleObject = new ScheduleObject(
-                Carbon::parse($request->input('eta')), 
-                Carbon::parse($request->input('etd')), 
-                ApprovalStatus::APPROVED
-             );
-            $schedule = $this->createsSchedule->execute($transport, $scheduleObject);
-
-            return $this->resourceResponse(new PackingListResource($packing_list));
-
-        } catch (\Exception $exception){
-            throw new ErrorException($exception->getMessage(), $exception->getCode());
+        if(!$transport) {
+            $object = new TransportObject(TransportType::LAND, null, '', Carbon::parse($request->input('etd')), Carbon::parse($request->input('eta')),ApprovalStatus::APPROVED);
+            /** @var Transport $transport */
+            $transport = $this->createsTransport->execute($object, $packing_list);
         }
 
+        $transport->schedules()->update([
+            'status' => ApprovalStatus::REJECTED
+        ]);
+
+        $scheduleObject = new ScheduleObject(
+            Carbon::parse($request->input('eta')), 
+            Carbon::parse($request->input('etd')), 
+            ApprovalStatus::APPROVED
+        );
+        
+        $schedule = $this->createsSchedule->execute($transport, $scheduleObject);
+
+        return $this->resourceResponse(new PackingListResource($packing_list));
     }
 
 }

app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListStatusLogic.php

@@ -14,6 +14,7 @@ use App\Classes\Modules\Orders\Processors\UpdateDoFromVTPortalProcessor;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\OrderRoleTypes;
 use App\Http\Resources\PackingListResource;
+use App\Models\PackingList;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -70,16 +71,16 @@ class UpdatePackingListStatusLogic extends AbstractControllerLogic
     {
         $packingList = $this->fetchesPackingList->execute(['id' => $request->route('id')]);
 
-        $packing_list = $this->updatesPackingListStatus->execute($packingList, $request->route('status'));
-        $address = $packing_list->owner()->first()->addresses()->where('status', ApprovalStatus::APPROVED)->first();
+        /** @var PackingList $packingList */
+        $packingList = $this->updatesPackingListStatus->execute($packingList, $request->route('status'));
 
 
 //        $appointee = $address->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id;
 
-        $this->updateDoFromVTPortalProcessor->execute($address);
-        $this->updateDoFromYDPortalProcessor->execute($address);
+        $this->updateDoFromVTPortalProcessor->execute($packingList);
+        $this->updateDoFromYDPortalProcessor->execute($packingList);
 
-        return $this->resourceResponse(new PackingListResource($packing_list));
+        return $this->resourceResponse(new PackingListResource($packingList));
     }
 
 }

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

@@ -6,6 +6,8 @@ namespace App\Classes\Modules\PackingLists\Processors;
 use App\Classes\Modules\PackingLists\DataTransferObjects\PackageObject;
 use App\Classes\Modules\PackingLists\Services\Packages\CreatesPackage;
 use App\Classes\Modules\PackingLists\Standards\Rules\Packages\CanCreatePackage;
+use App\Classes\ValueObjects\Constants\WarehouseReferences;
+use App\Models\Order;
 use App\Models\PackingList;
 
 class CreatePackageProcessor
@@ -48,6 +50,11 @@ class CreatePackageProcessor
 
         if($replica) {
             $modificationValue = 1;
+
+            if($replica->owner->owner instanceof Order){
+                $modificationValue = in_array( $replica->owner->owner->companyModule->id, WarehouseReferences::REPLICA_WHITE_LIST) ? 0 : 1;
+            }
+
             $packageObject = new PackageObject($object->getType(), $object->getDescription(), $object->getWidth() + $modificationValue, $object->getHeight() + $modificationValue, $object->getLength() + $modificationValue, $object->getWeight(), $object->getQuantity(), $object->getStatus());
             $package = $this->createsPackage->execute($packageObject, $replica);
         }

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

@@ -10,7 +10,10 @@ use App\Classes\Modules\PackingLists\Standards\Rules\CanCreatePackingList;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\OrderRoleTypes;
 use App\Classes\ValueObjects\Constants\PackingListType;
+use App\Classes\ValueObjects\Constants\WarehouseReferences;
+use App\Models\Order;
 use App\Models\PackingList;
+use function PHPUnit\Framework\isInstanceOf;
 
 class CreatePackingListProcessor
 {
@@ -48,14 +51,15 @@ class CreatePackingListProcessor
         /** @var PackingList $packingList */
         $packingList = $this->createsPackingList->execute($object, $packable);
 
-        $appointee_id = $packingList->owner_id == 1 ? 2037 : $packingList->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id;
+        $appointee_id = $packingList->owner_id == 1 ? 2307 : $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

@@ -0,0 +1,160 @@
+<?php
+
+namespace App\Classes\Modules\PackingLists\Processors;
+
+use App\Classes\Exceptions\AccessForbiddenException;
+use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\Exceptions\RequestValidationException;
+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 GuzzleHttp\Exception\GuzzleException;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Str;
+
+class FetchContainersFromYdPortalProcessor
+{
+    /** @var FetchesDataFromYDPortal */
+    private $fetchesDataFRomYDPortal;
+
+    /** @var CreatesTransport */
+    private $createsTransport;
+
+    /** @var CreatesSchedule */
+    private $createsSchedule;
+
+    /** @var FetchesContainer */
+    private $fetchesContainer;
+
+    /** @var CreateContainerProcessor */
+    private $createContainerProcessor;
+
+    /**
+     * @param FetchesDataFromYDPortal $fetchesDataFRomYDPortal
+     * @param CreatesTransport $createsTransport
+     * @param CreatesSchedule $createsSchedule
+     * @param FetchesContainer $fetchesContainer
+     * @param CreateContainerProcessor $createContainerProcessor
+     */
+    public function __construct(FetchesDataFromYDPortal $fetchesDataFRomYDPortal, CreatesTransport $createsTransport, CreatesSchedule $createsSchedule, FetchesContainer $fetchesContainer, CreateContainerProcessor $createContainerProcessor)
+    {
+        $this->fetchesDataFRomYDPortal = $fetchesDataFRomYDPortal;
+        $this->createsTransport = $createsTransport;
+        $this->createsSchedule = $createsSchedule;
+        $this->fetchesContainer = $fetchesContainer;
+        $this->createContainerProcessor = $createContainerProcessor;
+    }
+
+
+    /**
+     * @return void
+     * @throws MalformedRequestException
+     * @throws AccessForbiddenException
+     * @throws RequestValidationException
+     */
+    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

@@ -0,0 +1,162 @@
+<?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()->random();
+
+            $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/FetchDeliveryListFromVTPortalProcessor.php

@@ -91,7 +91,6 @@ class FetchDeliveryListFromVTPortalProcessor
                     $deliveryStep->update(['status' => ApprovalStatus::COMPLETED]);
 
                 } catch (GuzzleException $exception) {
-                    dd($exception);
                     continue;
                 }
 

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

@@ -0,0 +1,115 @@
+<?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

@@ -7,12 +7,15 @@ use App\Classes\Modules\Companies\Services\FetchesCompanyModule;
 use App\Classes\Modules\Orders\Services\FetchesDataFromVTPortal;
 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;
@@ -21,10 +24,13 @@ use App\Classes\Modules\Unity\Services\CreatesContract;
 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\RoleTypes;
 use App\Classes\ValueObjects\Constants\PackingListType;
+use App\Classes\ValueObjects\Constants\TransportType;
 use App\Models\Order;
 use App\Models\PackingList;
+use App\Models\Transport;
 use Carbon\Carbon;
 use GuzzleHttp\Exception\GuzzleException;
 use Illuminate\Support\Facades\DB;
@@ -124,9 +130,8 @@ class FetchLoadedContainersFromVTPortalProcessor
      */
     public function execute(?Carbon $start = null, ?Carbon $end = null){
 
-        DB::beginTransaction();
         try {
-            $start = $start ? $start : Carbon::now()->subDays(10);
+            $start = $start ? $start : Carbon::today()->subDays(5);
 
             $startLimit = Carbon::parse('11-08-2021');
 
@@ -134,84 +139,162 @@ class FetchLoadedContainersFromVTPortalProcessor
                 $start = $startLimit;
             }
 
-            $end = $end ? $end : Carbon::now();
+            $end = $end ? $end : Carbon::today()->addDay();
             $filter = '["LoadedTime:$between$%js%\"'.$start->format('Y-m-d').'T00:00:00.000\"$and$%js%\"'.$end->format('Y-m-d').'T00:00:00.000\"\u0000"]';
 
             $containersRequest = $this->fetchesDataFRomVTPortal->clientRequest('http://portal.vtnation.com.my/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"VCustomercontainer","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"LoadedTime asc","Filter":'.$filter.'}}'), '');
 
             $containers = $this->fetchesDataFRomVTPortal->getResponseBody($containersRequest);
-
             foreach ($containers->Rows as $container){
-                $filter = '["ContainerID:=%js%'.$container[11].'"]';
-                $containerDetailRequest = $this->fetchesDataFRomVTPortal->clientRequest('http://portal.vtnation.com.my/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"VPodetailparcel","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"CreatedOn asc","Filter":'.$filter.'}}'), '');
+                $filter = '["ContainerID:=%js%'.$container[12].'"]';
+                $containerDetailRequest = $this->fetchesDataFRomVTPortal->clientRequest('http://portal.vtnation.com.my/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"ParcelInContainer","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":null,"Filter":'.$filter.'}}'), '');
 
                 $containerDetail = $this->fetchesDataFRomVTPortal->getResponseBody($containerDetailRequest);
 
-                $containerObject = new ContainerObject($container[0], str_replace(' ', '', $container[24]), str_replace(' ', '', $container[15]), ContainerTypes::FORTY_FEET_DRY_CONTAINER, Carbon::parse($container[5]), ApprovalStatus::PENDING_VERIFICATION);
+                $containerObject = new ContainerObject($container[0], str_replace(' ', '', $container[24]), str_replace(' ', '', $container[16]), ContainerTypes::FORTY_FEET_DRY_CONTAINER, Carbon::parse($container[6]), ApprovalStatus::PENDING_VERIFICATION);
+                $containerInfo = $container;
 
                 try {
                     $container = $this->fetchesContainer->execute(['reference' => $containerObject->getReference()]);
                 } catch (ResourceNotFoundException $exception){
-                    $warehouseId = $container[12];
+                    $warehouseId = $container[13];
                     $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $warehouseId === 11 ? 3 : 4]);
                     $container = $this->createContainerProcessor->execute($containerObject, $originWarehouse);
                 }
 
+                $eta = Carbon::parse($containerInfo[4])->addDays(2);
+                $etd = Carbon::parse($eta)->subDays(7);
+
+                $delayDate = $containerInfo[7];
+
+                $containerStatus = $containerInfo[10];
+
+                $unstuffingDate = $containerInfo[8];
+
+                $transport = $container->transports()->first();
+
+                if(!$transport || $eta !== $transport->eta){
+                    $container->transports()->delete();
+
+                    $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 = Carbon::parse($delayDate)->addDays(2);
+                    $transport = $container->transports()->first();
+
+                    if(!$transport->schedules()->where('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));
+                    }
+
+                }
+
+                if($containerStatus === 'Unstuffing'){
+                    $container->update(['status' => ApprovalStatus::COMPLETED]);
+                    $container->transports()->first()->update(['drop_date' => Carbon::parse($unstuffingDate)->subDay(), 'status' => ApprovalStatus::COMPLETED]);
+
+                    /** @var PackingList $packingList */
+                    foreach($container->packingLists as $packingList){
+
+                        if($packingList->status === ApprovalStatus::PENDING_VERIFICATION){
+                            $packingList->status = ApprovalStatus::APPROVED;
+                            $packingList->save();
+                        }
+
+                    }
+                }
+
                 foreach($containerDetail->Rows as $packingList){
-                    $marking = explode('/', explode('CIEF/', $packingList[13])[1]);
+                    $marking = preg_split('(-|\(|\)|\/)', str_replace("/YW","", $packingList[39]));
 
-                    if(!array_key_exists(1, $marking)){
+                    $orderNumber = $marking[array_key_last($marking)];
+
+                    if(!$packingList[11]){
                         continue;
                     }
 
-                    $orderNumber = $marking[1];
-
-                    if(!$packingList[22]){
-                        continue;
-                    }
+                    $allow_contract = true;
 
                     try {
-                        /** @var Order $order */
-                        $order = $this->fetchesOrder->execute(['reference' => $orderNumber]);
-                    } catch (ResourceNotFoundException $exception){
-                        continue;
+                        $warehousePackingList = $this->fetchesPackingList->execute(['reference' => $packingList[3]]);
+                        if(!$warehousePackingList->owner instanceof Order) throw new ResourceNotFoundException;
+                        $order = $warehousePackingList->owner;
+                    } catch (ResourceNotFoundException $exception) {
+                        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 = $packingList[16];
 
-                    try{
-                        $this->fetchesPackingList->execute(['reference' => $packingListReference]);
+                    $packingListReference = $packingList[3];
+                    $package = $packingList;
+                    $deliveryDate = $package[1] ? Carbon::parse($package[1]) : null;
+
+                    try {
+                        $packingList = $this->fetchesPackingList->execute(['reference' => $packingListReference, 'type' => PackingListType::SHIPPING_PACKING_LIST]);
                     } catch (ResourceNotFoundException $exception){
-                        $contract = $this->unityCreateContract->execute();
-                        $contractReference = $contract->hash_id;
-                        $contractObligations = $contract->contract_obligation_list;
+                        if ($allow_contract) {
+                            $appointee_id = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id;
+//                            $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);
+                        } else {
+                            $appointee_id = 2307;
+                        }
 
-                        $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);
-
-                        $connection = $order->companyModule->connections()->first();
-                        $marking = $connection->invitee_reference;
-
-                        $packingListObject = new PackingListObject($packingListReference, $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id, PackingListType::SHIPPING_PACKING_LIST, ApprovalStatus::SUSPENDED, $contractReference);
+                        $packingListObject = new PackingListObject($packingListReference, $appointee_id, PackingListType::SHIPPING_PACKING_LIST, ApprovalStatus::SUSPENDED, null);
 
                         /** @var PackingList $packingList */
                         $packingList = $this->createPackingListProcessor->execute($packingListObject, $order);
-                        $container->packingLists()->attach($packingList);
+                    }
 
-                        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);
+                    $container->packingLists()->detach($packingList);
+                    $container->packingLists()->attach($packingList);
+                    $packingList->packages()->delete();
+
+                    $replica = $packingList->packingLists()->where('type', PackingListType::SHIPPING_PACKING_LIST_REPLICA)->first();
+                    if($replica) $replica->packages()->delete();
+
+                    $packageObject = new PackageObject(PackageType::CARTON, $package[8], $package[21], $package[22], $package[20], 0, $package[11], ApprovalStatus::APPROVED);
+                    $this->createPackageProcessor->execute($packageObject, $packingList);
+                    if($containerStatus === 'Unstuffing'){
+                        $packingList->transports()->delete();
+
+                        if($deliveryDate) {
+//                            && !$packingList->transports()->exists()
+                            $packingList->status = ApprovalStatus::COMPLETED;
+                            $packingList->save();
+
+                            $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));
                         }
-
                     }
 
                 }
@@ -221,8 +304,6 @@ class FetchLoadedContainersFromVTPortalProcessor
             Log::error($exception);
         }
 
-
-        DB::commit();
         return [];
 
     }

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

@@ -2,6 +2,7 @@
 
 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;
@@ -23,6 +24,8 @@ 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;
@@ -36,6 +39,7 @@ use App\Models\Transport;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Str;
 
 class FetchOrderListsFromYdPortalProcessor
 {
@@ -131,272 +135,364 @@ class FetchOrderListsFromYdPortalProcessor
      * @param Carbon|null $start
      * @param Carbon|null $end
      * @return void
+     * @throws \GuzzleHttp\Exception\GuzzleException
      */
     public function execute(?Carbon $start = null, ?Carbon $end = null)
     {
-        try {
-            $start = $start ? $start : Carbon::now()->subMonths(2);
+        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'];
 
-            $startLimit = Carbon::parse('01-12-2021');
+        $from = $end ? Carbon::today()->diff($end)->days : 0;
+        $to = $start ? Carbon::today()->diff($start)->days : 10;
 
-            if($start->isBefore($startLimit)){
-                $start = $startLimit;
-            }
+        for ($x = $from; $x <= $to; $x++) {
+            try {
+                $startDate = Carbon::today()->subDays($x);
 
-            $end = $end ? $end : Carbon::now();
+                $startLimit = Carbon::parse('01-12-2021');
 
-            $orderRequest = $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/GetOrderList.ashx', 'GET', [
-                'begintime' => $start->timestamp,
-                'endtime' => $end->timestamp,
-            ]);
+                if($startDate->isBefore($startLimit)){
+                    $startDate = $startLimit;
+                }
 
-            $rows = $this->fetchesDataFRomYDPortal->getResponseBody($orderRequest);
+                $endDate = Carbon::today()->subDays($x - 1);
 
-            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
+                $orderRequest = $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/GetOrderList.ashx', 'GET', [
+                    'begintime' => $startDate->timestamp,
+                    'endtime' => $endDate->timestamp,
                 ]);
 
-                $rows = $this->fetchesDataFRomYDPortal->getResponseBody($trackingRequest);
+                $rows = $this->fetchesDataFRomYDPortal->getResponseBody($orderRequest);
 
-                foreach (array_reverse($rows->data) as $trackingRow) {
-                    if ($trackingRow->tracking === '货物已送达仓库准备入库中') {
-                        $receiveDate = Carbon::parse($trackingRow->trackingtime);
-                    }
+                if(!$rows->data) continue;
 
-                    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]);
-                    }
+                foreach($rows->data as $row){
+                    $time_start = microtime(true);
 
-                    if (strpos($trackingRow->tracking, '预计船时间为') !== false) {
-                        $tracking = explode('预计船时间为', $trackingRow->tracking);
-                        $delayDate = Carbon::parse(explode('日', $tracking[1])[0]);
-                    }
+                    $containerReference = null;
+                    $loadingDate = null;
+                    $unstuffingDate = null;
+                    $deliveryDate = null;
+                    $etd = null;
+                    $eta = null;
+                    $delayDate = null;
+                    $status = $row->status;
 
-                    if (strpos($trackingRow->tracking, '预计开船为') !== false) {
-                        $tracking = explode('预计开船为', $trackingRow->tracking);
-                        $delayDate = Carbon::parse(explode('日', $tracking[1])[0]);
-                    }
+                    if($status >= 3){
+                        $trackingRequest = $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/ApiTracking.ashx', 'GET', [
+                            'trakingno' => $row->expressno
+                        ]);
 
-                    if ($trackingRow->tracking === '货物已进目的港仓库') {
-                        $unstuffingDate = Carbon::parse($trackingRow->trackingtime);
-                    }
+                        $rows = $this->fetchesDataFRomYDPortal->getResponseBody($trackingRequest);
 
-                    if ($trackingRow->tracking === '货物已派送完成') {
-                        $deliveryDate = Carbon::parse($trackingRow->trackingtime);
-                    }
-                }
+                        if(!$rows){
+                            continue;
+                        }
 
-                $customerno = preg_split('(-|\(|\)|\/)', $row->customerno);
+                        foreach (array_reverse($rows->data) as $trackingRow) {
+                            if ($trackingRow->tracking === '货物已送达仓库准备入库中') {
+                                $receiveDate = Carbon::parse($trackingRow->trackingtime);
+                            }
 
-                $orderNumber = $customerno[array_key_last($customerno)];
-                $allow_contract = true;
+                            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);
+                            }
 
-                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;
-                    }
+                            $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;
+                                    }
 
-                DB::beginTransaction();
+                                }
 
-                $packingListReference = $row->expressno;
+                                $rescheduleDate = $dates->sortDesc()->first();
 
-                try{
-                    $packingList = $this->fetchesPackingList->execute(['reference' => $row->expressno, 'type' => PackingListType::SHIPPING_PACKING_LIST]);
+                                if(!$delayDate || $rescheduleDate > $delayDate){
+                                    /** @var Carbon $delayDate */
+                                    $delayDate = $rescheduleDate;
 
-                    $packingList->packages()->delete();
-                    $replica = $packingList->packingLists()->where('type', PackingListType::SHIPPING_PACKING_LIST_REPLICA)->first();
-                    if($replica) $replica->packages()->delete();
+                                    if($rescheduleETA === false && $delayDate) {
+                                        $delayDate = $delayDate->addDays('5');
+                                    }
+                                }
 
-                    $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 ($trackingRow->tracking === '到港') {
+                                $delayDate = Carbon::parse($trackingRow->trackingtime);
+                            }
 
-                    if (!$allow_contract) {
-                        $appointee_id = 2037;
-                    } else {
-                        $appointee_id = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id;
-                    }
+                            if ($trackingRow->tracking === '已开船') {
+                                $delayDate = Carbon::parse($trackingRow->trackingtime)->addDays('5');
+                            }
 
-                    $warehouseReceiveObject = new PackingListObject($packingListReference, $appointee_id, PackingListType::WAREHOUSE_RECEIVE_LIST, $allow_contract ? ApprovalStatus::APPROVED : ApprovalStatus::REJECTED);
+                            if ($trackingRow->tracking === '货物已进目的港仓库') {
+                                $unstuffingDate = Carbon::parse($trackingRow->trackingtime);
+                            }
 
-                    /** @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);
+                            if (Str::contains($trackingRow->tracking, ['派送中', '已签收', '签收完成', ' 第三方提货', '货物已派送完成', '派送', 'delivery', 'delivered'])) {
+                                $deliveryDate = Carbon::parse($trackingRow->trackingtime);
+                            }
                         }
                     }
-                }
 
-                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($status >= 5){
+                        $client = new \GuzzleHttp\Client(['cookies' => true, 'headers' => ['Cookie' => 'utc_offset=480']]);
 
-                $weightCbm = (float) $row->weight / 500;
-                $overWeightCbm = $weightCbm - $packingList->packages()->sum(DB::raw('(width/100) * (height/100) * (length/100) * quantity'));
+                        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($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, ['2192KAA', '2353GFE', '6866DTR', '153DSR', '1291NSC', '8288MIB'])){
-                        $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/confirmsendorder.ashx', 'GET', [
-                            'expressno' => $row->expressno
-                        ]);
+                                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;
 
-                if($containerReference) {
                     try {
-                        $container = $this->fetchesContainer->execute(['reference' => $containerReference]);
-                        $container->packingLists()->detach($packingList);
-                        $container->packingLists()->attach($packingList);
-                    } catch (ResourceNotFoundException $exception){
+                        $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 = 2037;
-                        }
-                        else {
-                            $appointee_id = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee->id;
+                            $appointee_id = 2307;
+                        } else {
+                            $appointee_id = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id;
                         }
 
-                        $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $appointee_id]);
+                        $warehouseReceiveObject = new PackingListObject($packingListReference, $appointee_id, PackingListType::WAREHOUSE_RECEIVE_LIST, $allow_contract ? ApprovalStatus::APPROVED : ApprovalStatus::REJECTED);
 
-                        $containerObject = new ContainerObject($containerReference, '', '', ContainerTypes::FORTY_FEET_DRY_CONTAINER, $loadingDate, ApprovalStatus::PENDING_VERIFICATION);
-                        /** @var Container $container */
-                        $container = $this->createContainerProcessor->execute($containerObject, $originWarehouse);
+                        /** @var PackingList $warehouseReceiveList */
+                        $warehouseReceiveList = $this->createPackingListProcessor->execute($warehouseReceiveObject, $order);
 
-                        $container->packingLists()->detach($packingList);
-                        $container->packingLists()->attach($packingList);
+                        $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);
 
-                        $transport = $container->transports()->first();
+                        if ($allow_contract) {
 
-                        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));
-                        }
-                    }
+                            $contract = $this->unityCreateContract->execute();
 
-                    if($delayDate){
+                            $contractReference = $contract->hash_id;
+                            $contractObligations = $contract->contract_obligation_list;
 
-                        $transport = $container->transports()->first();
+                            $this->unityActivateContract->execute($contractReference);
 
-                        if(!$transport->schedules()->where('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));
+                            $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);
                         }
 
-                    }
-
-                    if($unstuffingDate && $container->status !== ApprovalStatus::COMPLETED){
-                        $container->update(['status' => ApprovalStatus::COMPLETED]);
-                        $container->transports()->first()->update(['drop_date' => $unstuffingDate, 'status' => ApprovalStatus::COMPLETED]);
+                        $packingListObject = new PackingListObject($packingListReference, $appointee_id, PackingListType::SHIPPING_PACKING_LIST, ApprovalStatus::SUSPENDED, !$allow_contract ? null : $contractReference);
 
                         /** @var PackingList $packingList */
-                        foreach($container->packingLists as $packingList){
+                        $packingList = $this->createPackingListProcessor->execute($packingListObject, $order);
 
-                            if($packingList->status === ApprovalStatus::PENDING_VERIFICATION){
-                                $packingList->status = ApprovalStatus::APPROVED;
-                                $packingList->save();
-                            }
-
-                            $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 ($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';
+
                 }
 
-                if($deliveryDate && !$packingList->transports){
-                    $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));
-
-                    $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]);
-                }
-
-                DB::commit();
-                echo 'successful';
-
+            } catch (\Exception $exception) {
+                Log::debug($exception);
             }
-        } catch (\Exception $exception) {
-            Log::debug($exception);
         }
 
 
+
     }
 }
+

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

@@ -46,42 +46,31 @@ class FetchPackingListFromVTPortalProcessor
      */
     public function execute(){
 
-        $packingLists = PackingList::where('type', '=', PackingListType::SHIPPING_PACKING_LIST)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::SUSPENDED])->whereDoesntHave('containers', function($query){
+        $packingLists = PackingList::where('type', '=', PackingListType::SHIPPING_PACKING_LIST)->where('reference', 'not like', '%PO%')->whereIn('claimant_id', [2])->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::SUSPENDED])->whereDoesntHave('containers', function($query){
             $query->where('status', '=', ApprovalStatus::COMPLETED);
-        })->get();
+        })->limit(10)->get();
 
-        DB::beginTransaction();
         foreach($packingLists as $packingList){
             try {
 
+                $filter = '["PoID:=%js%'.$packingList->reference.'"]';
 
-                $filter = '["PoNumber:=%js%\"'.$packingList->reference.'\"\u0000"]';
-
-                $shippingPackingListsRequest = $this->fetchesDataFRomVTPortal->clientRequest('http://portal.vtnation.com.my/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"VPodetailparcel","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"CreatedOn asc","Filter":'.$filter.'}}'), '');
+                $shippingPackingListsRequest = $this->fetchesDataFRomVTPortal->clientRequest('http://portal.vtnation.com.my/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"Po","view":"grid1","request":{"PageIndex":-1,"PageSize":1000,"Filter":'.$filter.'}}'), '');
 
                 $shippingPackingLists = $this->fetchesDataFRomVTPortal->getResponseBody($shippingPackingListsRequest);
+
                 if(count($shippingPackingLists->Rows)) {
-                    $packingList->packages()->delete();
 
-                    $replica = $packingList->packingLists()->where('type', PackingListType::SHIPPING_PACKING_LIST_REPLICA)->first();
-                    if($replica) $replica->packages()->delete();
-
-                    foreach($shippingPackingLists->Rows as $shippingPackingList){
-                        if(!$shippingPackingList[22]) {
-                            continue;
-                        }
-
-                        $packageObject = new PackageObject(PackageType::CARTON, $shippingPackingList[19], $shippingPackingList[31], $shippingPackingList[30], $shippingPackingList[29], 0, $shippingPackingList[22], ApprovalStatus::APPROVED);
-                        $this->createPackageProcessor->execute($packageObject, $packingList);
-                    }
+                } else {
+                    dump($packingList->reference);
                 }
 
             } catch (GuzzleException $exception) {
+                Log::error($exception);
                 continue;
             }
 
         }
-        DB::commit();
 
         return [];
 

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

@@ -0,0 +1,267 @@
+<?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

@@ -116,7 +116,7 @@ class FetchWarehouseReceiveListFromVTPortalProcessor
 
         try {
 
-            $start = $start ? $start : Carbon::now()->subMonth();
+            $start = $start ? $start : Carbon::today()->subDays(10);
 
             $startLimit = Carbon::parse('11-08-2021');
 
@@ -124,82 +124,44 @@ class FetchWarehouseReceiveListFromVTPortalProcessor
                 $start = $startLimit;
             }
 
-            $end = $end ? $end : Carbon::now();
+            $end = $end ? $end : Carbon::today()->addDay();
 
             $filter = '["ParcelDate:$between$%js%\"'.$start->format('Y-m-d').'T00:00:00.000\"$and$%js%\"'.$end->format('Y-m-d').'T00:00:00.000\"\u0000"]';
 
-            $warehouseListRequest = $this->fetchesDataFRomVTPortal->clientRequest('http://portal.vtnation.com.my/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"WarehouseList","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"ParcelDate asc","Filter":'.$filter.'}}'), '');
+            $warehouseListRequest = $this->fetchesDataFRomVTPortal->clientRequest('http://portal.vtnation.com.my/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"Parcel","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"ParcelDate asc","Filter":'.$filter.'}}'), '');
 
             $response = $this->fetchesDataFRomVTPortal->getResponseBody($warehouseListRequest);
 
             foreach ($response->Rows as $parcel){
 
-                $marking = explode('/', explode('CIEF/', $parcel[5])[1]);
+                $allow_contract = true;
+                $marking = preg_split('(-|\(|\)|\/)', str_replace("/YW","", $parcel[11]));
+                $orderNumber = $marking[array_key_last($marking)];
 
-                if(!array_key_exists(1, $marking)){
-                    continue;
-                }
-
-                $orderNumber = $marking[1];
-
-                if(!$parcel[9]){
+                $quantity = $parcel[16];
+
+                if(!$quantity){
                     continue;
                 }
 
+                if(!$parcel[23] || !$parcel[22] || !$parcel[21]) continue;
 
                 try {
                     $order = $this->fetchesOrder->execute(['reference' => $orderNumber]);
+                    $appointee_id = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id;
                 } catch (ResourceNotFoundException $exception) {
-
-                    $oldOrder = OldOrders::where('marking', '=', $orderNumber)->first();
-
-                    if(!$oldOrder){
-                        continue;
-                    }
-
-
-                    $customerMarking = str_replace('/', '', str_replace(' ', '', explode('CIEF/', $oldOrder->company->marking)[1]));
-
-                    $companyModule = CompanyModule::whereHas('inviters', function($query) use ($customerMarking) {
-                        return $query->where('invitee_reference', '=', $customerMarking);
-                    })->first();
-
-
-                    if(!$companyModule){
-                        log::error('unknown customer: '.$customerMarking);
-                        continue;
-                    }
-
-                    if(!$oldOrder->address) {
-                        continue;
-                    }
-
-                    /** @var Address $address */
-                    $address = $this->createAddressFromOldAddressProcessor->execute($oldOrder->address, $companyModule);
-
-                    if(!$address){
-                        continue;
-                    }
-
-
-                    $warehouseId = $parcel[0];
-                    $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $warehouseId === 11 ? 3 : 4]);
-
-                    $order = $this->createOrderProcessor->execute($companyModule->company, $originWarehouse, $address, $orderNumber);
-
-                    $order->created_at = Carbon::parse($parcel[1]);
-                    $order->save();
-
+                    $allow_contract = false;
+                    $order = $this->fetchesCompanyModule->execute(['id' => 1]);
+                    $appointee_id = 2307;
                 }
 
-                $packingListReference = $parcel[17];
-                $quantity = $parcel[9];
-                $measurement = round(($parcel[10]/$quantity) ** (1/3) * 100, 2);
-                $description = $parcel[7];
-                $tracking = $parcel[6];
+                $packingListReference = $parcel[0];
+//                $measurement = round(($parcel[26]/$quantity) ** (1/3) * 100, 2);
+                $description = $parcel[13];
+                $tracking = $parcel[37];
                 $receiveDate = $parcel[1];
 
-                $packingListObject = new PackingListObject($packingListReference, $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee->id, PackingListType::WAREHOUSE_RECEIVE_LIST, ApprovalStatus::APPROVED);
+                $packingListObject = new PackingListObject($packingListReference, $appointee_id, PackingListType::WAREHOUSE_RECEIVE_LIST, $allow_contract ? ApprovalStatus::APPROVED : ApprovalStatus::REJECTED);
 
                 /** @var PackingList $packingList */
                 $packingList = $order->packingLists()->where('reference', '=', $packingListReference)->first();
@@ -222,7 +184,7 @@ class FetchWarehouseReceiveListFromVTPortalProcessor
                 $packingList->packages()->delete();
                 if($replica) $replica->packages()->delete();
 
-                $packageObject = new PackageObject(PackageType::CARTON, $description, $measurement, $measurement, $measurement, 0, $quantity, ApprovalStatus::APPROVED);
+                $packageObject = new PackageObject(PackageType::CARTON, $description, $parcel[23], $parcel[22], $parcel[21], 0, $quantity, ApprovalStatus::APPROVED);
                 $this->createPackageProcessor->execute($packageObject, $packingList);
             }
         } catch (\Exception $exception){

app/Classes/Modules/PerfexCRM/DataTransferObjects/CreateLeadPerfexCRMObject.php

@@ -0,0 +1,63 @@
+<?php
+
+namespace App\Classes\Modules\PerfexCRM\DataTransferObjects;
+
+use Illuminate\Http\Request;
+use App\Classes\General\Interfaces\DataTransferObject;
+
+class CreateLeadPerfexCRMObject implements DataTransferObject
+{
+    /** @var string */
+    private $name;
+
+    /** @var string */
+    private $email;
+
+    /** @var string */
+    private $phone;
+
+    /** @var string */
+    private $companyName;
+
+    public function __construct(string $name, string $email, string $phone, string $companyName)
+    {
+
+        $this->name = $name;
+        $this->email = $email;
+        $this->phone = $phone;
+        $this->companyName = $companyName;
+    }
+
+    /**
+     * @return string
+     */
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    /**
+     * @return string
+     */
+    public function getEmail(): string
+    {
+        return $this->email;
+    }
+
+    /**
+     * @return string
+     */
+    public function getPhone(): string
+    {
+        return $this->phone;
+    }
+
+    /**
+     * @return string
+     */
+    public function getCompanyName(): string
+    {
+        return $this->companyName;
+    }
+
+}