Merge branch 'dillon/69-shipping-portal-debugging-on-dev' into development

Data patch for a problem reported about an item not suppose to appear in ...

See merge request CIEFWorldwideSdnBhd/shipping-portal!236

.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
@@ -56,6 +56,16 @@ MIX_EXCHANGE_URL="${EXCHANGE_URL}"
 
 YD_API_CODE=''
 
+JWT_SECRET=Btj63iMEleEaww6Bb2IBECkxWn7YHPhhPFluAkg9DfcQik0qDRy6QW75ABGmPT2h
+
 PERFEXCRM_BASE_URL=""
 PERFEXCRM_API_KEY=""
 PERFEXCRM_IS_ENABLED="false"
+
+WEPOST_BASE_URL=https://wepost-uat.90warehouse.com/api/router
+WEPOST_CLIENT_ID=1234
+WEPOST_CLIENT_SECRET=cief-secret-temp
+WEPOST_IS_ENABLED=false
+
+STORAGE_FEE_LAUNCH_DATE="2023-12-11 00:00:00"
+SST_START_DATE="2024-04-01 00:00:00"

.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

.gitlab-ci.yml

@@ -0,0 +1,120 @@
+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 =~ /.*/'
+
+#mysql
+#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 =~ /.*/'
+
+
+
+

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/Exceptions/JobResourceNotFoundException.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Classes\Exceptions;
+
+use App\Classes\ValueObjects\Constants\HttpStatus;
+
+final class JobResourceNotFoundException extends ServiceApiException {
+    public function __construct(?string $message = null) {
+        parent::__construct($message ?? 'Unable to find the requested resource', HttpStatus::RESOURCE_NOT_FOUND);
+    }
+}

app/Classes/General/Abstracts/AbstractControllerLogic.php

@@ -15,6 +15,8 @@ use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Http\Resources\Json\ResourceCollection;
 use Illuminate\Support\Facades\DB;
+use App\Classes\Exceptions\JobResourceNotFoundException;
+use Illuminate\Support\Facades\Log;
 
 abstract class AbstractControllerLogic
 {
@@ -62,9 +64,28 @@ abstract class AbstractControllerLogic
             return $response;
 
         } catch (ErrorException|GeneralExceptions|TypeError  $exception){
-            return (new ApiResponseObject($this->getNotificationTitle().' failed', $exception->getMessage(),
+            if ($request->has('isApiPub')) {
+                Log::error($exception);
+                return (new ApiResponseObject($this->getNotificationTitle().' failed', "Server Error",
                 !in_array($exception->getCode(), [0, 42000]) ? $exception->getCode() : HttpStatus::SERVER_ERROR))->handler();
 
+            } else {
+                if ($exception instanceof JobResourceNotFoundException) {
+                    Log::channel('vue_polling')->info(sprintf(
+                        "Uncaught exception '%s' with message '%s' in %s:%d",
+                        get_class($exception),
+                        $exception->getMessage(),
+                        $exception->getTrace()[0]['file'],
+                        $exception->getTrace()[0]['line']
+                    ));
+                }
+                else{
+                    Log::error($exception);
+                }
+
+                return (new ApiResponseObject($this->getNotificationTitle().' failed', $exception->getMessage(),
+                !in_array($exception->getCode(), [0, 42000]) ? $exception->getCode() : HttpStatus::SERVER_ERROR))->handler();
+            }
         }
     }
 

app/Classes/General/Eloquent/AbstractFetchRecord.php

@@ -6,6 +6,8 @@ namespace App\Classes\General\Eloquent;
 use App\Classes\Exceptions\ResourceNotFoundException;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
+use App\Classes\Exceptions\JobResourceNotFoundException;
+
 
 abstract class AbstractFetchRecord extends AbstractGetRecord
 {
@@ -26,12 +28,18 @@ abstract class AbstractFetchRecord extends AbstractGetRecord
      * @return Model
      * @throws ResourceNotFoundException
      */
-    public function getResults(Builder $query): Model {
+    public function getResults(Builder $query, array $param = []): Model {
         if(!$query->exists()){
-            throw new ResourceNotFoundException('Unable to find any record based on the criteria provided');
+            $table = $query->getModel()->getTable();
+            if($table ==='job_results'){
+                throw new JobResourceNotFoundException('Unable to find any job based on the criteria provided');
+            }
+            else{
+                throw new ResourceNotFoundException('Unable to find any record based on the criteria provided');
+            }
         }
 
         return $query->first();
     }
 
-}
+}

app/Classes/General/Eloquent/AbstractGetRecord.php

@@ -50,9 +50,9 @@ abstract class AbstractGetRecord
      * @param array $filters
      * @return mixed
      */
-    public function handler(array $filters){
+    public function handler(array $filters, array $params = []){
         $this->filters = collect($filters);
-        return $this->getResults($this->applyFiltersToQuery());
+        return $this->getResults($this->applyFiltersToQuery(), $params);
     }
 
 
@@ -65,6 +65,6 @@ abstract class AbstractGetRecord
      * @param Builder $query
      * @return mixed
      */
-    abstract function getResults(Builder $query);
+    abstract function getResults(Builder $query, array $params = []);
 
-}
+}

app/Classes/General/Eloquent/AbstractListRecord.php

@@ -16,11 +16,10 @@ abstract class AbstractListRecord extends AbstractGetRecord
      * @return mixed
      * @throws MalformedRequestException
      */
-    public function execute(array $filters = []){
+    public function execute(array $filters = [], array $param = []){
 
         try{
-
-            return $this->handler($filters);
+            return $this->handler($filters, $param);
 
         } catch (QueryException $exception){
             throw new MalformedRequestException('Unable to fetch the list of records due to unexpected error');
@@ -32,7 +31,7 @@ abstract class AbstractListRecord extends AbstractGetRecord
      * @param Builder $query
      * @return mixed
      */
-    public function getResults(Builder $query) {
+    public function getResults(Builder $query, array $param = []) {
         $filters = $this->getDecorationFilters();
 
         if($filters->has('order_by')){
@@ -44,8 +43,12 @@ abstract class AbstractListRecord extends AbstractGetRecord
         }
 
         //dd($query->toSql());
-        return $filters->has('per_page') ? $query->paginate($filters->get('per_page')) : $query->get();
-
+        if(!empty($param)){
+            return $filters->has('per_page') ? $query->paginate($filters->get('per_page'), ['*'], 'page', $param['page']) : $query->get(); //page data from query parameters e.g ?page=1
+        }
+        else{
+            return $filters->has('per_page') ? $query->paginate($filters->get('per_page')) : $query->get();
+        }
     }
 
 }

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

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class CompanySegmentsIn implements Filter
+{
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->whereHas('companyModules', function ($module) use ($value) {
+            $module->whereHas('connections', function ($connection) use ($value) {
+                $connection->whereHas('connectionSegments', function ($segment) use ($value) {
+                    $segment->whereIn('segment_id', $value);
+                });
+            });
+        });
+    }
+}

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,32 @@
+<?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 PackingListLimitOneByTypeOrderedByInvoiceDate 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);
+            $join->whereRaw('(transactions.type <> 16 OR transactions.id = (
+                SELECT id FROM transactions WHERE owner_id = packing_lists.id AND type = 16 LIMIT 1
+            ))');
+        })->orderBy('transactions.updated_at', 'DESC');
+    }
+
+}

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

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

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

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

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

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

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

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Facades\Log;
+
+class WithContainersPackages implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        // Log::info('WithContainersPackages: '.$value);
+        // return $builder->with(['containers', 'packages']);
+        return null;
+    }
+}

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

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

app/Classes/General/Helper.php

@@ -2,6 +2,7 @@
 
 namespace App\Classes\General;
 
+use Illuminate\Http\Resources\Json\ResourceCollection;
 use Illuminate\Support\Str;
 use Illuminate\Support\Facades\Log;
 
@@ -40,4 +41,12 @@ class Helper
             }
         }
     }
+
+    /**
+     * @param ResourceCollection $collection
+     * @return array
+     */
+    static function collectionResponse(ResourceCollection $collection){
+        return json_decode($collection->response()->getContent(), true);
+    }
 }

app/Classes/General/Interfaces/KeyValueInterface.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace App\Classes\General\Interfaces;
+
+
+use Illuminate\Database\Eloquent\Relations\MorphMany;
+
+interface KeyValueInterface
+{
+
+    public function attributes(): morphMany;
+}

app/Classes/General/WePostHelper.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Classes\General;
+
+
+class WePostHelper
+{
+
+    /**
+     * @param string $clientId
+     * @param string $clientSecrent
+     * @param string $type
+     * @return string
+     */
+    static function generateSignature(string $clientId, string $clientSecrent, string $type){
+        // public parameters
+        $timestamp = 1234; //time();
+
+        $params = [
+            'client_id' => $clientId,
+            'type' => $type,
+            'timestamp' => $timestamp
+        ];
+
+        // $businessParams = [
+        //     'test1' => '1',
+        // ];
+
+        ksort($params);
+        $str = '';
+        foreach ($params as $key => $value) {
+            if(is_array($value)) {
+                $str .= $key.json_encode($value, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
+                continue;
+            }
+            $str .= $key. $value;
+        }
+        $str = $clientSecrent.$str.$clientSecrent;
+        $signature = strtoupper(md5($str));
+        return $signature;
+    }
+}

app/Classes/Jobs/FetchOrdersFromYDPortalJob.php

@@ -13,6 +13,7 @@ use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Log;
 
 class FetchOrdersFromYDPortalJob implements ShouldQueue
 {
@@ -29,12 +30,17 @@ class FetchOrdersFromYDPortalJob implements ShouldQueue
      */
     public function handle()
     {
+        Log::info('FetchOrdersFromYDPortalJob starts');
+        Log::info('FetchPackingListsFromYdPortalProcessor starts');
         (App()->make(FetchPackingListsFromYdPortalProcessor::class))->execute();
+        Log::info('FetchContainersFromYdPortalProcessor starts');
         (App()->make(FetchContainersFromYdPortalProcessor::class))->execute();
+        Log::info('FetchContainersUpdatesFromYdPortalProcessor starts');
         (App()->make(FetchContainersUpdatesFromYdPortalProcessor::class))->execute();
+        Log::info('FetchDeliveryUpdatesFromYdPortalProcessor starts');
         (App()->make(FetchDeliveryUpdatesFromYdPortalProcessor::class))->execute();
-
-//        (App()->make(FetchOrderListsFromYdPortalProcessor::class))->execute();
+        Log::info('FetchOrdersFromYDPortalJob ends');
+        //        (App()->make(FetchOrderListsFromYdPortalProcessor::class))->execute();
     }
 
 }

app/Classes/Jobs/ListPackingListsJob.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace App\Classes\Jobs;
+
+use App\Classes\Modules\PackingLists\Processors\ListPackingListsJobProcessor;
+use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+
+
+class ListPackingListsJob implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    public $timeout = 900;
+
+    /** @var ListGenericJobObject */
+    private $listGenericJobObject;
+
+    /**
+     * ListPackingListsJob constructor.
+     * @param ListGenericJobObject $listGenericJobObject
+     */
+    public function __construct(ListGenericJobObject $listGenericJobObject)
+    {
+        $this->listGenericJobObject = $listGenericJobObject;
+    }
+
+    public function handle()
+    {
+        $rawPayload = $this->job->payload();
+        if(isset($rawPayload['data']['commandName'])){
+            $this->listGenericJobObject->setJobCommandName($rawPayload['data']['commandName']);
+        }
+
+        if(isset($rawPayload['data']['command'])){
+            $this->listGenericJobObject->setJobCommand($rawPayload['data']['command']);
+        }
+
+        $result = (App()->make(ListPackingListsJobProcessor::class))->execute($this->listGenericJobObject);
+    }
+}

app/Classes/Jobs/UpdatePerfexCRMInvoice.php

@@ -11,14 +11,16 @@ use App\Classes\Modules\PerfexCRM\Services\UpdatesPerfexCRMInvoice;
 use App\Classes\Modules\PerfexCRM\DataTransferObjects\UpdatePerfexCRMInvoiceObject;
 use App\Classes\Modules\PerfexCRM\DataTransferObjects\InvoicePaymentPerfexCRMObject;
 use App\Classes\ValueObjects\Constants\PerfexCRMInvoiceStatus;
+use App\Models\PackingList;
 use App\Models\Transaction;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
-use Carbon\Carbon;
 use Illuminate\Support\Facades\Log;
+use Carbon\Carbon;
+
 use App\Classes\General\Helper;
 
 class UpdatePerfexCRMInvoice implements ShouldQueue
@@ -47,7 +49,7 @@ class UpdatePerfexCRMInvoice implements ShouldQueue
         $invoiceId = 0;
         $invoiceStatus = 0;
         $invoice = (App()->make(FetchesPerfexCRMInvoice::class))->execute($customer->userid,"INV-", $transaction->owner->bill_no);
-        Log::error('UpdatePerfexCRMInvoice debug bill_no: ' . $transaction->owner->bill_no . ', Project Id: ' . $this->updatePerfexCRMInvoiceObject->getProjectId());
+        Log::channel('perfex_crm')->info('UpdatePerfexCRMInvoice debug bill_no: ' . $transaction->owner->bill_no . ', Project Id: ' . $this->updatePerfexCRMInvoiceObject->getProjectId());
 
         if(is_null($invoice)){
             $result = (App()->make(CreatePerfexCRMInvoiceProcessor::class))->execute($transaction->owner, $this->updatePerfexCRMInvoiceObject->getIsPaid());
@@ -55,7 +57,7 @@ class UpdatePerfexCRMInvoice implements ShouldQueue
                 $invoiceId = $result->payload['id'];
             } else {
                 // Log::error(json_encode('UpdatePerfexCRMInvoice CreatePerfexCRMInvoiceProcessor failed'));
-                Helper::debugLogger('UpdatePerfexCRMInvoice CreatePerfexCRMInvoiceProcessor failed');
+                Log::channel('perfex_crm')->info('UpdatePerfexCRMInvoice CreatePerfexCRMInvoiceProcessor failed');
             }
         }
         else{

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

@@ -28,7 +28,8 @@ use App\Classes\ValueObjects\Constants\CompanyType;
 use App\Classes\ValueObjects\Constants\RoleTypes;
 
 use App\Classes\Jobs\CreatePerfexCRMCustomer;
-
+use App\Classes\Modules\Accounts\Processors\RegisterOnExchangeProcessor;
+use App\Classes\Modules\Companies\Services\ConnectCompanyModuleToExchangeCompany;
 use App\Models\Company;
 use App\Models\CompanyModule;
 use App\Models\User;
@@ -36,6 +37,8 @@ use App\Models\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Http;
+use Illuminate\Support\Facades\Log;
 
 class CreateCustomerLogic extends AbstractControllerLogic
 {
@@ -87,6 +90,12 @@ class CreateCustomerLogic extends AbstractControllerLogic
     /** @var CreatePerfexCRMLeadProcessor */
     private $createPerfexCRMLeadProcessor;
 
+    /** @var RegisterOnExchangeProcessor */
+    private $registerOnExchangeProcessor;
+
+    /** @var ConnectCompanyModuleToExchangeCompany */
+    private $connectCompanyModuleToExchangeCompany;
+
     /**
      * CreateCustomerLogic constructor.
      * @param CreateUserProcessor $createUserProcessor
@@ -101,8 +110,10 @@ class CreateCustomerLogic extends AbstractControllerLogic
      * @param GenerateEmailVerificationAttemptProcessor $generateEmailVerificationAttemptProcessor
      * @param FetchesCompanyModule $fetchesCompanyModule
      * @param CreatePerfexCRMLeadProcessor $createPerfexCRMLeadProcessor
+     * @param RegisterOnExchangeProcessor $registerOnExchangeProcessor
+     * @param ConnectCompanyModuleToExchangeCompany $connectCompanyModuleToExchangeCompany
      */
-    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)
+    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, RegisterOnExchangeProcessor $registerOnExchangeProcessor, ConnectCompanyModuleToExchangeCompany $connectCompanyModuleToExchangeCompany)
     {
         $this->createUserProcessor = $createUserProcessor;
         $this->createCompanyProcessor = $createCompanyProcessor;
@@ -116,6 +127,8 @@ class CreateCustomerLogic extends AbstractControllerLogic
         $this->generateEmailVerificationAttemptProcessor = $generateEmailVerificationAttemptProcessor;
         $this->fetchesCompanyModule = $fetchesCompanyModule;
         $this->createPerfexCRMLeadProcessor = $createPerfexCRMLeadProcessor;
+        $this->registerOnExchangeProcessor = $registerOnExchangeProcessor;
+        $this->connectCompanyModuleToExchangeCompany = $connectCompanyModuleToExchangeCompany;
     }
 
     /**
@@ -153,7 +166,7 @@ class CreateCustomerLogic extends AbstractControllerLogic
 
         $this->assignEmployeeProcessor->execute($Object);
 
-        $this->uploadIdentityDocumentProcessor->execute($request, $company);
+        // $this->uploadIdentityDocumentProcessor->execute($request, $company);
 
         if(config('perfexcrm.is_enabled') == 'true'){
             // $this->createPerfexCRMLeadProcessor->execute($request);
@@ -167,8 +180,34 @@ class CreateCustomerLogic extends AbstractControllerLogic
             CreatePerfexCRMCustomer::dispatch($createLeadPerfexCRMObject);
         }
 
+        if(app()->environment(['production'])){
+            // call wac webhook
+            $url = config('wagWebhookUrl.account_registration_url');
+            $payload = [
+                'name'     => $request->input('name'),
+                'email'    => $request->input('email'),
+                'phone'    => $request->input('phone'),
+                'portal'   => 'izyim'
+            ];
+            $response = Http::post($url, $payload);
+            Log::channel('wac_webhook')->info('Register Account: ' . json_encode($response));
+        }
+
 //        $this->generateEmailVerificationAttemptProcessor->execute($user);
 
+        $exchangeCompanyId = null;
+        if ($request->input('exchange_company_id')) {
+            $exchangeCompanyId = $request->input('exchange_company_id');
+        } else {
+            // register account on exchange portal if this registration not coming from exchange
+            $exchangeCompanyId = $this->registerOnExchangeProcessor->execute($request, $companyModule->id);
+        }
+        
+        if ($exchangeCompanyId) {
+            // create exchange company connection
+            $this->connectCompanyModuleToExchangeCompany->execute($companyModule, $exchangeCompanyId);
+        }
+
         return $this->response($this->authenticationProcessor->execute($request));
     }
 }

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

@@ -0,0 +1,83 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\ControllersLogic;
+
+use App\Classes\Exceptions\AccessUnauthorisedException;
+use App\Classes\Modules\Accounts\Processors\AuthenticationProcessor;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Accounts\Services\GeneratesAuthenticationToken;
+use App\Classes\Modules\Accounts\Services\GeneratesAuthenticationTokenWithExchangeBookingId;
+use App\Models\ExchangeCompanyConnection;
+use App\Models\Order;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Log;
+
+class LoginThroughExchangeLogic extends AbstractControllerLogic
+{
+
+    protected function notification():array {
+        return [
+            'title' => 'Authentication',
+            'message' => 'You have successfully logged in to your account'
+        ];
+    }
+
+    /** @var AuthenticationProcessor */
+    private $authenticationProcessor;
+
+    /** @var GeneratesAuthenticationToken */
+    private $generatesAuthenticationToken;
+
+    /** @var GeneratesAuthenticationTokenWithExchangeBookingId */
+    private $generatesAuthenticationTokenWithExchangeBookingId;
+
+
+    /**
+     * LoginThroughExchangeLogic constructor.
+     * @param AuthenticationProcessor $authenticationProcessor
+     * @param GeneratesAuthenticationToken $generatesAuthenticationToken
+     * @param GeneratesAuthenticationTokenWithExchangeBookingId $generatesAuthenticationTokenWithExchangeBookingId
+     */
+    public function __construct(GeneratesAuthenticationToken $generatesAuthenticationToken, GeneratesAuthenticationTokenWithExchangeBookingId $generatesAuthenticationTokenWithExchangeBookingId)
+    {
+        $this->generatesAuthenticationToken = $generatesAuthenticationToken;
+        $this->generatesAuthenticationTokenWithExchangeBookingId = $generatesAuthenticationTokenWithExchangeBookingId;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\AccessUnauthorisedException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    protected function logic(Request $request): JsonResponse {
+
+        $token = explode('.', $request->input("exchangeToken"))[1];
+        $decodedToken = base64_decode($token);
+        $exchangeUser = json_decode($decodedToken, true)['user'];
+        $exchangeCompanyId = $exchangeUser['company_id'];
+        $connection = ExchangeCompanyConnection::where("exchange_company_id", $exchangeCompanyId)->first();
+        if (!$connection) {
+            throw new AccessUnauthorisedException('These credentials do not match our records.');
+        }
+        $companyModule = $connection->companyModule;
+        $user = $companyModule->employees->last();
+        
+        $exchangeBookingId = null;
+        if (isset($exchangeUser['booking_id']) && $exchangeUser['booking_id']) {
+            $exchangeBookingId = $exchangeUser['booking_id'];
+            $token = $this->generatesAuthenticationTokenWithExchangeBookingId->execute($user, $exchangeBookingId);
+            
+            return $this->response(['access_token' => $token, 'redirect_url' => route('dashboard') . "?createOrder=true"]);
+        } else {
+            $token = $this->generatesAuthenticationToken->execute($user);
+            $order = Order::where('id', $request->input("orderId"))->first();
+
+            return $this->response(['access_token' => $token, 'redirect_url' => route('order.show' , $order->reference)]);
+        }
+        
+    }
+    
+}

app/Classes/Modules/Accounts/DataTransferObjects/KeyValuePairObject.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\DataTransferObjects;
+
+
+use App\Classes\General\Interfaces\DataTransferObject;
+
+class KeyValuePairObject implements DataTransferObject
+{
+    /** @var string */
+    private $key;
+
+    /** @var string */
+    private $value;
+
+
+    /**
+     * KeyValuePairObject constructor.
+     * @param string $key
+     * @param string $value
+     */
+    public function __construct(string $key, string $value)
+    {
+        $this->key = $key;
+        $this->value = $value;
+    }
+
+    /**
+     * @return string
+     */
+    public function getKey(): string
+    {
+        return $this->key;
+    }
+
+    /**
+     * @return string
+     */
+    public function getValue(): string
+    {
+        return $this->value;
+    }
+
+}

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

@@ -0,0 +1,45 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\Processors;
+
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Log;
+
+class RegisterOnExchangeProcessor
+{
+    /**
+     * @param Request $request
+     * @return string
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function execute(Request $request, $companyModuleId) {
+        if (App::environment(['production'])) {
+            dd("Delete this line before push to production");
+            $url = 'https://exchange.cief-malaysia.com/api/v1/account/registration/registration';
+        } else if (App::environment(['local'])) {
+            $url = 'http://127.0.0.1:8000/api/v1/account/registration/registration';
+        } else {
+            $url = 'https://dev.exchange.cief-malaysia.com/api/v1/account/registration/registration';
+        }
+        try {
+            $client = new \GuzzleHttp\Client(['verify' => false]);
+            $formParams = $request->toArray();
+            $formParams['shipping_company_module_id'] = $companyModuleId;
+            $response = $client->request('POST', $url, ['form_params' => $formParams]);
+            $body = $response->getBody();
+            $contents = json_decode($body, true);
+            $payload = $contents['payload'];
+            $token = explode('.', $payload['access_token'])[1];
+            $decodedToken = base64_decode($token);
+            $exchangeUser = json_decode($decodedToken, true)['user'];
+
+            return $exchangeUser['company_id'];
+        } catch(\GuzzleHttp\Exception\RequestException $exception){
+            Log::error($exception->getResponse()->getBody()->getContents());
+        }
+    }
+
+}

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

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\Services;
+
+
+use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
+use App\Classes\General\Interfaces\KeyValueInterface;
+use App\Classes\Modules\Accounts\DataTransferObjects\KeyValuePairObject;
+use App\Models\KeyValuePair;
+
+class CreatesKeyValuePair extends AbstractUpdateRelationshipRecord
+{
+    /**
+     * @param KeyValueInterface $kv
+     * @param KeyValuePairObject $object
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+
+    public function execute(KeyValueInterface $kv, KeyValuePairObject $object) {
+        $model = new KeyValuePair();
+        $model->key = $object->getKey();
+        $model->value = $object->getValue();
+
+        return $this->handler($kv->attributes(), $model);
+
+    }
+}

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

@@ -0,0 +1,81 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\Services;
+
+use App\Classes\Exceptions\InternalServerErrorException;
+use App\Classes\ValueObjects\Constants\OrderRoleTypes;
+use App\Classes\ValueObjects\Constants\RoleTypes;
+use App\Models\Company;
+use App\Models\Role;
+use App\Models\User;
+use Carbon\Carbon;
+use Tymon\JWTAuth\JWT;
+
+class GeneratesAuthenticationTokenWithExchangeBookingId {
+
+    /** @var JWT */
+    private $builder;
+
+
+    /**
+     * GeneratesAuthenticationTokenWithExchangeBookingId constructor.
+     * @param JWT $builder
+     */
+    public function __construct(JWT $builder) {
+        $this->builder = $builder;
+    }
+
+
+    /**
+     * @param User $user
+     * @param bool $rememberUser
+     * @return string
+     */
+    public function execute(User $user, $bookingId): string {
+
+        $this->builder->manager()->setBlacklistEnabled(false);
+
+        // generate token for the customer
+        $this->builder->factory()->setTTL(Carbon::now()->addDay()->timestamp);
+
+        // set the claim based on the object
+        $this->setTokenClaims($user, $bookingId);
+
+        return $this->builder->fromUser($user);
+    }
+
+
+    /**
+     * @param User $user
+     */
+    private function setTokenClaims(User $user, $bookingId): void {
+
+        $claims = [
+            'id' => $user->id,
+            'name' => $user->name,
+            'email' => $user->email,
+            'type' => $user->type,
+            'status' => $user->status
+        ];
+
+        if($user->type === RoleTypes::USER) {
+
+            /** @var Company $companyModule */
+            $companyModule = $user->companyModule()->first();
+
+            $claims = array_merge($claims, [
+                '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',
+                'exchange_booking_id' => $bookingId
+            ]);
+        }
+
+        $this->builder->factory()->customClaims(['user' => $claims]);
+
+
+        $this->builder->factory()->buildClaimsCollection();
+    }
+}

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

@@ -3,6 +3,9 @@
 namespace App\Classes\Modules\Addresses\ControllersLogic;
 
 
+use App\Classes\Exceptions\AccessForbiddenException;
+use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\Exceptions\RequestValidationException;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\General\Interfaces\Contactable;
 use App\Classes\Modules\Addresses\Services\CreatesAddress;
@@ -15,8 +18,10 @@ 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\Classes\ValueObjects\Constants\RemarkTypes;
 use App\Http\Resources\AddressResource;
 use App\Models\Address;
+use App\Transformers\AddressTransformer;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -27,7 +32,8 @@ class CreateAddressLogic extends AbstractControllerLogic
     /**
      * @return array
      */
-    protected function notification():array {
+    protected function notification(): array
+    {
         return [
             'title' => 'Created Address',
             'message' => 'You have successfully created a new Address'
@@ -74,11 +80,11 @@ class CreateAddressLogic extends AbstractControllerLogic
     /**
      * @param Request $request
      * @return JsonResponse
-     * @throws \App\Classes\Exceptions\AccessForbiddenException
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     * @throws \App\Classes\Exceptions\RequestValidationException
+     * @throws AccessForbiddenException
+     * @throws MalformedRequestException
+     * @throws RequestValidationException
      */
-    public function logic(Request $request) : JsonResponse
+    public function logic(Request $request): JsonResponse
     {
 
         $district = $this->fetchesDistrict->execute(['id' => $request->input('district_id')]);
@@ -90,16 +96,31 @@ class CreateAddressLogic extends AbstractControllerLogic
         /** @var Address $address */
         $address = $this->createsAddress->execute($this->fetchesCompanyModule->execute(['id' => $request->input('company_module_id')]), $object);
 
-        if($request->input('phone')){
+        if ($request->input('phone')) {
             $contactObject = new ContactObject($request->input('person_in_charge'), $request->input('phone'), '', '');
             $this->createContactProcessor->execute($contactObject, $address);
         }
 
-        if($request->input('remark')){
+        if ($request->input('remark')) {
             $remarkObject = new RemarkObject($request->input('remark'), Auth()->user()->id);
             $this->createRemarkProcessor->execute($address, $remarkObject);
         }
 
+/*        return fractal()
+            ->item($address, new AddressTransformer())
+            ->parseIncludes('remark')
+            ->respond(200, [], JSON_PRETTY_PRINT);*/
+
+        $addressExtraFields = [
+            'property_type'         => $request->input('property_type'),
+            'tools_required_unload' => $request->input('tools_required_unload'),
+            'pickup_time_from'      => $request->input('pickup_time_from'),
+            'pickup_time_to'        => $request->input('pickup_time_to'),
+        ];
+
+        $addressExtraFieldsObject = new RemarkObject(json_encode($addressExtraFields), Auth()->user()->id, RemarkTypes::ADDRESS_EXTRA_COLUMNS);
+        $this->createRemarkProcessor->execute($address, $addressExtraFieldsObject);
+
         return $this->resourceResponse(new AddressResource($address));
 
     }

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

@@ -3,6 +3,9 @@
 namespace App\Classes\Modules\Addresses\ControllersLogic;
 
 
+use App\Classes\Exceptions\AccessForbiddenException;
+use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\Exceptions\RequestValidationException;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Addresses\Services\CreatesAddress;
 use App\Classes\Modules\Addresses\Standards\Rules\CanCreateAddress;
@@ -14,6 +17,7 @@ use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Http\Resources\AddressResource;
 use App\Models\Address;
 use App\Models\CompanyModule;
+use App\Transformers\AddressTransformer;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
@@ -23,7 +27,8 @@ class CreateBillingAddressLogic extends AbstractControllerLogic
     /**
      * @return array
      */
-    protected function notification():array {
+    protected function notification(): array
+    {
         return [
             'title' => 'Created Billing Address',
             'message' => 'You have successfully created a new Billing Address'
@@ -60,27 +65,35 @@ class CreateBillingAddressLogic extends AbstractControllerLogic
     /**
      * @param Request $request
      * @return JsonResponse
-     * @throws \App\Classes\Exceptions\AccessForbiddenException
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     * @throws \App\Classes\Exceptions\RequestValidationException
+     * @throws AccessForbiddenException
+     * @throws MalformedRequestException
+     * @throws RequestValidationException
      */
-    public function logic(Request $request) : JsonResponse
+    public function logic(Request $request): JsonResponse
     {
         $companyModule = $this->fetchesCompanyModule->execute(['id' => $request->input('company_module_id')]);
-        
-        $address = $this->fetchesAddress->execute(['id' => $request->input('billing_address_id')]);
 
-        if ($address->type !== AddressType::BILLING || $address->id !== $companyModule->addresses->where('type', AddressType::BILLING)->first()->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 addrress
-            $billingAddress = new AddressObject($address->street_one, $address->street_two, $address->country_id, $address->state_id, $address->district_id, $address->postcode, AddressType::BILLING, ApprovalStatus::APPROVED, $address->reference);
+            // 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($address));
+        //load address with only owner address
+
+/*        return fractal()
+            ->item($billingAddressInputed, new AddressTransformer())
+            ->parseIncludes('Owner_address')
+            ->respond(200, [], JSON_PRETTY_PRINT);*/
+
+
+        return $this->resourceResponse(new AddressResource($billingAddressInputed));
     }
 
 }

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

@@ -3,6 +3,8 @@
 namespace App\Classes\Modules\Addresses\ControllersLogic;
 
 
+use App\Classes\Exceptions\AccessForbiddenException;
+use App\Classes\Exceptions\RequestValidationException;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Addresses\Services\FetchesAddress;
 use App\Classes\Modules\Addresses\Standards\Rules\CanFetchAddress;
@@ -17,7 +19,8 @@ class FetchAddressLogic extends AbstractControllerLogic
     /**
      * @return array
      */
-    protected function notification():array {
+    protected function notification(): array
+    {
         return [
             'title' => 'Retrieved Address',
             'message' => 'You have successfully retrieved a Address'
@@ -45,15 +48,22 @@ class FetchAddressLogic extends AbstractControllerLogic
     /**
      * @param Request $request
      * @return JsonResponse
-     * @throws \App\Classes\Exceptions\AccessForbiddenException
-     * @throws \App\Classes\Exceptions\RequestValidationException
+     * @throws AccessForbiddenException
+     * @throws RequestValidationException
      */
-    public function logic(Request $request) : JsonResponse
+    public function logic(Request $request): JsonResponse
     {
         $this->canFetchAddress->passes();
 
         $query = $this->fetchesAddress->execute(['id' => $request->route('id')]);
 
+
+        //load address with no relationships
+        /*          return fractal()
+                    ->item($address, new AddressTransformer())
+                    ->respond(200, [], JSON_PRETTY_PRINT);*/
+
+
         return $this->resourceResponse(new AddressResource($query));
 
     }

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

@@ -3,10 +3,14 @@
 namespace App\Classes\Modules\Addresses\ControllersLogic;
 
 
+use App\Classes\Exceptions\AccessForbiddenException;
+use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\Exceptions\RequestValidationException;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Addresses\Services\ListsAddresses;
 use App\Classes\Modules\Addresses\Standards\Rules\CanListAddresses;
 use App\Http\Resources\AddressResource;
+use App\Transformers\AddressTransformer;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -17,7 +21,8 @@ class ListAddressesLogic extends AbstractControllerLogic
     /**
      * @return array
      */
-    protected function notification():array {
+    protected function notification(): array
+    {
         return [
             'title' => 'Retrieved Addresses',
             'message' => 'You have successfully retrieved a list of Addresses'
@@ -45,17 +50,25 @@ class ListAddressesLogic extends AbstractControllerLogic
     /**
      * @param Request $request
      * @return JsonResponse
-     * @throws \App\Classes\Exceptions\AccessForbiddenException
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     * @throws \App\Classes\Exceptions\RequestValidationException
+     * @throws AccessForbiddenException
+     * @throws MalformedRequestException
+     * @throws RequestValidationException
      */
-    public function logic(Request $request) : JsonResponse
+    public function logic(Request $request): JsonResponse
     {
 
         $this->canListAddresses->passes();
 
         $query = $this->listsAddresses->execute($this->listsAddresses->deserializeFilters($request->input('filters')));
 
+        //a collection of addresses with all incluides
+ /*       return fractal()
+            ->collection($query, new AddressTransformer)
+            ->parseIncludes('Owner_address')
+            ->parseIncludes('remark')
+            ->parseIncludes('contact')
+            ->respond(200, [], JSON_PRETTY_PRINT);*/
+
         return $this->collectionResponse(AddressResource::collection($query));
 
     }

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

@@ -7,7 +7,6 @@ use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Addresses\Services\ListsAddresses;
 use App\Classes\Modules\Addresses\Services\ListsDistricts;
 use App\Classes\Modules\Addresses\Standards\Rules\CanListAddresses;
-use App\Http\Resources\AddressResource;
 use App\Http\Resources\DistrictResource;
 use ErrorException;
 use Illuminate\Http\JsonResponse;

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

@@ -7,7 +7,6 @@ use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Addresses\Services\ListsAddresses;
 use App\Classes\Modules\Addresses\Services\ListsStates;
 use App\Classes\Modules\Addresses\Standards\Rules\CanListAddresses;
-use App\Http\Resources\AddressResource;
 use App\Http\Resources\StateResource;
 use ErrorException;
 use Illuminate\Http\JsonResponse;

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

@@ -9,6 +9,7 @@ use App\Classes\Modules\Addresses\Services\FetchesAddress;
 use App\Classes\Modules\Addresses\Services\ResetsAddressesDefault;
 use App\Classes\Modules\Addresses\Services\SetsAddressToDefault;
 use App\Models\Address;
+use App\Transformers\AddressTransformer;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
@@ -33,7 +34,7 @@ class SetAddressToDefaultLogic extends AbstractControllerLogic
     /** @var ResetsAddressesDefault */
     private $resetsAddressesDefault;
 
-    /** @var SetsAddressToDefault*/
+    /** @var SetsAddressToDefault */
     private $setsAddressToDefault;
 
 
@@ -64,7 +65,15 @@ class SetAddressToDefaultLogic extends AbstractControllerLogic
 
         $this->resetsAddressesDefault->execute($address->owner, $address->type);
 
-        return $this->resourceResponse(new AddressResource($this->setsAddressToDefault->execute($address)));
+
+        $setAddress = $this->setsAddressToDefault->execute($address);
+        //no relationships needed
+       /* return fractal()
+            ->item($setAddress, new AddressTransformer())
+            ->respond(200, [], JSON_PRETTY_PRINT);*/
+
+
+        return $this->resourceResponse(new AddressResource($address));
 
     }
 }

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

@@ -15,10 +15,13 @@ 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\Classes\ValueObjects\Constants\RemarkTypes;
 use App\Http\Resources\AddressResource;
 use App\Models\Address;
+use App\Transformers\AddressTransformer;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use Carbon\Carbon;
 
 class UpdateAddressLogic extends AbstractControllerLogic
 {
@@ -26,7 +29,8 @@ class UpdateAddressLogic extends AbstractControllerLogic
     /**
      * @return array
      */
-    protected function notification():array {
+    protected function notification(): array
+    {
         return [
             'title' => 'Updated Address',
             'message' => 'You have successfully updated the Address'
@@ -77,7 +81,7 @@ class UpdateAddressLogic extends AbstractControllerLogic
      * @throws \App\Classes\Exceptions\MalformedRequestException
      * @throws \App\Classes\Exceptions\RequestValidationException
      */
-    public function logic(Request $request) : JsonResponse
+    public function logic(Request $request): JsonResponse
     {
         $district = $this->fetchesDistrict->execute(['id' => $request->input('district_id')]);
 
@@ -90,18 +94,44 @@ class UpdateAddressLogic extends AbstractControllerLogic
         /** @var Address $address */
         $address = $this->updatesAddress->execute($address, $object);
 
-        $address->contacts()->delete(); $address->remarks()->delete();
+        $address->contacts()->delete();
+        $address->remarks()->delete();
 
-        if($request->input('phone')){
+        if ($request->input('phone')) {
             $contactObject = new ContactObject($request->input('person_in_charge'), $request->input('phone'), '', '');
             $this->createContactProcessor->execute($contactObject, $address);
         }
 
-        if($request->input('remark')){
+        if ($request->input('remark')) {
             $remarkObject = new RemarkObject($request->input('remark'), Auth()->user()->id);
             $this->createRemarkProcessor->execute($address, $remarkObject);
         }
 
+        //only remark relationship needed
+/*        return fractal()
+            ->item($address, new AddressTransformer())
+            ->parseIncludes('remark')
+            ->respond(200, [], JSON_PRETTY_PRINT);*/
+            
+        if ($request->input('pickup_time_to') <= $request->input('pickup_time_from')) {
+            $pickupTimeFrom = Carbon::parse($request->input('pickup_time_from'));
+            $request->merge([
+                'pickup_time_to' => $pickupTimeFrom->addHour()->format('H:i') // Format to hh:mm
+            ]);
+        }
+
+        $addressExtraFields = [
+            'property_type'                  => $request->input('property_type'),
+            'additional_request'             => $request->input('additional_request'),
+            'receive_goods_working_hours'    => $request->input('receive_goods_working_hours'),
+            'receive_goods_after_hours'      => $request->input('receive_goods_after_hours'),
+            'receive_goods_on_saturday'      => $request->input('receive_goods_on_saturday'),
+        ];
+
+        $address->addressExtraFields()->delete();
+        $addressExtraFieldsObject = new RemarkObject(json_encode($addressExtraFields), Auth()->user()->id, RemarkTypes::ADDRESS_EXTRA_COLUMNS);
+        $this->createRemarkProcessor->execute($address, $addressExtraFieldsObject);
+
         return $this->resourceResponse(new AddressResource($address));
 
     }

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

@@ -20,7 +20,7 @@ class AssignsAnnouncementToSegment extends AbstractUpdateRecord
     {
         try {
 
-            $announcement->segments()->attach($segment);
+            $announcement->segments()->attach($segment, ['created_at' => now(), 'updated_at' => now()]);
 
             return $announcement;
 

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

@@ -18,11 +18,13 @@ use App\Classes\Modules\Billplzs\Processors\CallbackBillplzProcessor;
 use App\Classes\Modules\Transactions\Services\FetchesTransaction;
 use App\Classes\Modules\Transactions\Processors\CreatePaymentTransactionProcessor;
 use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
+use App\Classes\Modules\Transactions\Processors\CheckStorageInvoiceTransactionProcessor;
 use App\Classes\ValueObjects\Constants\PaymentMethodType;
 use App\Classes\ValueObjects\Constants\TransactionType;
 use App\Models\Group;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Log;
 
 class CallbackBillplzLogic
 {
@@ -50,6 +52,9 @@ class CallbackBillplzLogic
     /** @var CallbackBillplzProcessor */
     private $callbackBillplzProcessor;
 
+    /** @var CheckStorageInvoiceTransactionProcessor */
+    private $storageInvoiceTransactionProcessor;
+
     /**
      * CallbackBillplzLogic constructor.
      * @param GetBillplzBill $getBillplzBill
@@ -59,8 +64,9 @@ class CallbackBillplzLogic
      * @param UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor
      * @param CreatePaymentTransactionProcessor $createPaymentTransactionProcessor
      * @param CallbackBillplzProcessor $callbackBillplzProcessor
+     * @param CheckStorageInvoiceTransactionProcessor $storageInvoiceTransactionProcessor
      */
-    public function __construct(GetBillplzBill $getBillplzBill, FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor, UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor, UpdatesWalletBalance $updatesWalletBalance, CreatePaymentTransactionProcessor $createPaymentTransactionProcessor, CallbackBillplzProcessor $callbackBillplzProcessor)
+    public function __construct(GetBillplzBill $getBillplzBill, FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor, UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor, UpdatesWalletBalance $updatesWalletBalance, CreatePaymentTransactionProcessor $createPaymentTransactionProcessor, CallbackBillplzProcessor $callbackBillplzProcessor, CheckStorageInvoiceTransactionProcessor $storageInvoiceTransactionProcessor)
     {
         $this->getBillplzBill = $getBillplzBill;
         $this->fetchesTransaction = $fetchesTransaction;
@@ -70,6 +76,7 @@ class CallbackBillplzLogic
         $this->updatesWalletBalance = $updatesWalletBalance;
         $this->createPaymentTransactionProcessor = $createPaymentTransactionProcessor;
         $this->callbackBillplzProcessor = $callbackBillplzProcessor;
+        $this->storageInvoiceTransactionProcessor = $storageInvoiceTransactionProcessor;
     }
 
 
@@ -109,10 +116,13 @@ class CallbackBillplzLogic
             $status = $billplzXSignatureObject->getStatus() === 'failed' ? ApprovalStatus::REJECTED : ApprovalStatus::PENDING_VERIFICATION;
         }
 
+        Log::info('Debug billPlz status: '.$status);
+
         $token = Auth::fromUser(User::find(1));
         $request->headers->set('Authorization', 'Bearer '.$token);
 
-        $this->callbackBillplzProcessor->execute($transaction, $status);
+        $this->storageInvoiceBackDoorPreventionCheck($transaction, $status);
+        $result = $this->callbackBillplzProcessor->execute($transaction, $status);
 
         $company_module_marking = $transaction->owner->owner->connections? $transaction->owner->owner->connections->first()->invitee_reference: null;
 
@@ -123,6 +133,22 @@ class CallbackBillplzLogic
             $company_module_marking = $order->companyModule->connections? $order->companyModule->connections->first()->invitee_reference: null;
         }
 
-        return $request->method() === 'POST' ? true : view('pages.payments_redirect', ['marking' => $order->reference ?? null, 'company_module_marking' => $company_module_marking ?? null, 'transaction' => $transaction, 'status' => $status]);
+        return $request->method() === 'POST' ? true : view('pages.payments_redirect', ['marking' => $order->reference ?? null, 'company_module_marking' => $company_module_marking ?? null, 'transaction' => $transaction, 'status' => $status, 'result' => $result]);
+    }
+
+    private function storageInvoiceBackDoorPreventionCheck($transaction, $status){
+        if ($transaction->owner instanceof Wallet && $status === ApprovalStatus::APPROVED) {
+            $group = Group::where('reference', $transaction->payment_reference)->first();
+            if ($group) {
+                foreach ($group->groupTransactions as $groupTransaction) {
+                    $invoice = $groupTransaction->transaction;
+                    $pL = $invoice->owner;
+                    $order = $pL->owner;
+                    if($order){
+                        $this->storageInvoiceTransactionProcessor->executeOrder($order);
+                    }
+                }
+            }
+        }
     }
 }

app/Classes/Modules/Billplzs/Processors/CallbackBillplzDataPatchProcessor.php

@@ -0,0 +1,140 @@
+<?php
+
+namespace App\Classes\Modules\Billplzs\Processors;
+
+use Illuminate\Http\Request;
+use App\Models\Wallet;
+use App\Models\Group;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use App\Classes\Modules\Transactions\Processors\CreatePaymentTransactionProcessor;
+use App\Classes\Modules\Transactions\Processors\ReleaseGoodsToCustomerProcessor;
+use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
+use App\Classes\Modules\Wallets\Services\UpdatesWalletBalance;
+use App\Classes\Modules\Orders\Processors\UpdateDoFromVTPortalProcessor;
+use App\Classes\Modules\Orders\Processors\UpdateDoFromYDPortalProcessor;
+use Illuminate\Support\Facades\Log;
+
+//Date: 20240817
+//This Processor is used for one time data patching with OneTimeTransactionFixBillplzFailedCallback.php
+class CallbackBillplzDataPatchProcessor
+{
+    /** @var UpdatesTransactionStatus */
+    private $updatesTransactionStatus;
+
+    /** @var UpdateDoFromVTPortalProcessor */
+    private $updateDoFromVTPortalProcessor;
+
+    /** @var UpdateDoFromYDPortalProcessor */
+    private $updateDoFromYDPortalProcessor;
+
+    /** @var UpdatesWalletBalance */
+    private $updatesWalletBalance;
+
+    /** @var CreatePaymentTransactionProcessor */
+    private $createPaymentTransactionProcessor;
+
+    /** @var ReleaseGoodsToCustomerProcessor */
+    private $releaseGoodsToCustomerProcessor;
+
+    /**
+     * CallbackBillplzDataPatchProcessor constructor.
+     * @param UpdatesTransactionStatus $updatesTransactionStatus
+     * @param UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor
+     * @param UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor
+     * @param UpdatesWalletBalance $updatesWalletBalance
+     * @param CreatePaymentTransactionProcessor $createPaymentTransactionProcessor
+     * @param ReleaseGoodsToCustomerProcessor $releaseGoodsToCustomerProcessor
+     */
+    public function __construct(UpdatesTransactionStatus $updatesTransactionStatus, UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor, UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor, UpdatesWalletBalance $updatesWalletBalance, CreatePaymentTransactionProcessor $createPaymentTransactionProcessor, ReleaseGoodsToCustomerProcessor $releaseGoodsToCustomerProcessor)
+    {
+        $this->updatesTransactionStatus = $updatesTransactionStatus;
+        $this->updateDoFromVTPortalProcessor = $updateDoFromVTPortalProcessor;
+        $this->updateDoFromYDPortalProcessor = $updateDoFromYDPortalProcessor;
+        $this->updatesWalletBalance = $updatesWalletBalance;
+        $this->createPaymentTransactionProcessor = $createPaymentTransactionProcessor;
+        $this->releaseGoodsToCustomerProcessor = $releaseGoodsToCustomerProcessor;
+    }
+
+
+    /**
+     * @param Request $request
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute($transaction, $status)
+    {
+        $invoice = $transaction->owner;
+        $packingList = $invoice->owner;
+
+        $proceed = $this->checkForGroupPayment($transaction);
+        if(!$proceed) return false;
+
+        $this->updatesTransactionStatus->execute($transaction, $status);
+
+        Log::info('CallbackBillplzDataPatchProcessor 1');
+
+        // check if is wallet top up
+        if ($transaction->owner instanceof Wallet && $status === ApprovalStatus::APPROVED) {
+
+            Log::info('CallbackBillplzDataPatchProcessor 2');
+
+            $this->updatesWalletBalance->execute($transaction->owner, $transaction->amount);
+
+            $group = Group::where('reference', $transaction->payment_reference)->first();
+
+            // check if is group payment
+            if ($group) {
+                foreach ($group->groupTransactions as $groupTransaction) {
+                    $invoice = $groupTransaction->transaction;
+                    Log::info('CallbackBillplzDataPatchProcessor 3: '.json_encode($invoice));
+
+                    //if($invoice->status !== ApprovalStatus::COMPLETED){
+                        // $paymentTransaction = $this->createPaymentTransactionProcessor->execute($invoice, PaymentMethodType::WALLET, null, false);
+
+                        // if($paymentTransaction && $paymentTransaction->status == ApprovalStatus::APPROVED){
+                            $pL = $invoice->owner;
+                            $this->releaseGoodsToCustomerProcessor->execute($pL, $invoice, true);
+                        //}
+                    //}
+                }
+
+                $group->status = $status;
+                $group->save();
+            }
+        }
+
+        if (!$transaction->owner instanceof Wallet) {
+            Log::info('CallbackBillplzDataPatchProcessor 3');
+            $this->releaseGoodsToCustomerProcessor->execute($packingList, $invoice);
+        }
+
+        return true;
+    }
+
+    private function checkForGroupPayment($transaction){
+        //This check is targetting group payment that expired and soft deleted
+        //command:check-storage-invoices must already run for this part of the code to work properly
+        $group = Group::withTrashed()->where('reference', $transaction->payment_reference)->first();
+        if ($group) {
+            $totalAmountToBePaid = 0;
+            $actualAmountPaid = $transaction->amount;
+
+            foreach ($group->groupTransactions as $groupTransaction) {
+                $invoice = $groupTransaction->transaction;
+                if($invoice->status !== ApprovalStatus::COMPLETED){
+                    $totalAmountToBePaid += $invoice->amount;
+                }
+            }
+
+            if(($totalAmountToBePaid - $actualAmountPaid) < 0.01){
+
+            }
+            else{
+                Log::channel('storage_invoices')->info('Total amount from current transaction: '.$totalAmountToBePaid); //cief todo: to be removed
+                Log::channel('storage_invoices')->info('Total amount from paid transaction: '.$transaction->amount); //cief todo: to be removed
+                return false;
+            }
+        }
+        return true;
+    }
+}

app/Classes/Modules/Billplzs/Processors/CallbackBillplzProcessor.php

@@ -6,13 +6,14 @@ use Illuminate\Http\Request;
 use App\Models\Wallet;
 use App\Models\Group;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\TransactionType;
 use App\Classes\ValueObjects\Constants\PaymentMethodType;
 use App\Classes\Modules\Transactions\Processors\CreatePaymentTransactionProcessor;
+use App\Classes\Modules\Transactions\Processors\ReleaseGoodsToCustomerProcessor;
 use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
 use App\Classes\Modules\Wallets\Services\UpdatesWalletBalance;
 use App\Classes\Modules\Orders\Processors\UpdateDoFromVTPortalProcessor;
 use App\Classes\Modules\Orders\Processors\UpdateDoFromYDPortalProcessor;
+use Illuminate\Support\Facades\Log;
 
 class CallbackBillplzProcessor
 {
@@ -31,21 +32,26 @@ class CallbackBillplzProcessor
     /** @var CreatePaymentTransactionProcessor */
     private $createPaymentTransactionProcessor;
 
+    /** @var ReleaseGoodsToCustomerProcessor */
+    private $releaseGoodsToCustomerProcessor;
+
     /**
-     * CreateUserProcessor constructor.
+     * CallbackBillplzProcessor constructor.
      * @param UpdatesTransactionStatus $updatesTransactionStatus
      * @param UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor
      * @param UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor
      * @param UpdatesWalletBalance $updatesWalletBalance
      * @param CreatePaymentTransactionProcessor $createPaymentTransactionProcessor
+     * @param ReleaseGoodsToCustomerProcessor $releaseGoodsToCustomerProcessor
      */
-    public function __construct(UpdatesTransactionStatus $updatesTransactionStatus, UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor, UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor, UpdatesWalletBalance $updatesWalletBalance, CreatePaymentTransactionProcessor $createPaymentTransactionProcessor)
+    public function __construct(UpdatesTransactionStatus $updatesTransactionStatus, UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor, UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor, UpdatesWalletBalance $updatesWalletBalance, CreatePaymentTransactionProcessor $createPaymentTransactionProcessor, ReleaseGoodsToCustomerProcessor $releaseGoodsToCustomerProcessor)
     {
         $this->updatesTransactionStatus = $updatesTransactionStatus;
         $this->updateDoFromVTPortalProcessor = $updateDoFromVTPortalProcessor;
         $this->updateDoFromYDPortalProcessor = $updateDoFromYDPortalProcessor;
         $this->updatesWalletBalance = $updatesWalletBalance;
         $this->createPaymentTransactionProcessor = $createPaymentTransactionProcessor;
+        $this->releaseGoodsToCustomerProcessor = $releaseGoodsToCustomerProcessor;
     }
 
 
@@ -58,6 +64,9 @@ class CallbackBillplzProcessor
         $invoice = $transaction->owner;
         $packingList = $invoice->owner;
 
+        $proceed = $this->checkForGroupPayment($transaction);
+        if(!$proceed) return false;
+
         $this->updatesTransactionStatus->execute($transaction, $status);
 
         // check if is wallet top up
@@ -66,33 +75,57 @@ class CallbackBillplzProcessor
             $this->updatesWalletBalance->execute($transaction->owner, $transaction->amount);
 
             $group = Group::where('reference', $transaction->payment_reference)->first();
-            
+
             // check if is group payment
             if ($group) {
                 foreach ($group->groupTransactions as $groupTransaction) {
                     $invoice = $groupTransaction->transaction;
-                    $this->createPaymentTransactionProcessor->execute($invoice, PaymentMethodType::WALLET, null);
+                    if($invoice->status !== ApprovalStatus::COMPLETED){
+                        $paymentTransaction = $this->createPaymentTransactionProcessor->execute($invoice, PaymentMethodType::WALLET, null, false);
+
+                        if($paymentTransaction && $paymentTransaction->status == ApprovalStatus::APPROVED){
+                            $pL = $invoice->owner;
+                            $this->releaseGoodsToCustomerProcessor->execute($pL, $invoice);
+                        }
+                    }
                 }
-    
+
                 $group->status = $status;
                 $group->save();
             }
         }
 
         if (!$transaction->owner instanceof Wallet) {
-            $totalPaidAmount = $invoice->transactions->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->sum('amount');
+            $this->releaseGoodsToCustomerProcessor->execute($packingList, $invoice);
+        }
 
-            if (($invoice->amount - $totalPaidAmount) < 0.01) {
-                $this->updatesTransactionStatus->execute($invoice, ApprovalStatus::COMPLETED);
+        return true;
+    }
 
-                $packingList->status = ApprovalStatus::APPROVED;
-                $packingList->save();
+    private function checkForGroupPayment($transaction){
+        //This check is targetting group payment that expired and soft deleted
+        //command:check-storage-invoices must already run for this part of the code to work properly
+        $group = Group::withTrashed()->where('reference', $transaction->payment_reference)->first();
+        if ($group) {
+            $totalAmountToBePaid = 0;
+            $actualAmountPaid = $transaction->amount;
 
-                if (app()->environment('production')) {
-                    $this->updateDoFromVTPortalProcessor->execute($packingList);
-                    $this->updateDoFromYDPortalProcessor->execute($packingList);
+            foreach ($group->groupTransactions as $groupTransaction) {
+                $invoice = $groupTransaction->transaction;
+                if($invoice->status !== ApprovalStatus::COMPLETED){
+                    $totalAmountToBePaid += $invoice->amount;
                 }
             }
+
+            if(($totalAmountToBePaid - $actualAmountPaid) < 0.01){
+
+            }
+            else{
+                Log::channel('storage_invoices')->info('Total amount from current transaction: '.$totalAmountToBePaid); //cief todo: to be removed
+                Log::channel('storage_invoices')->info('Total amount from paid transaction: '.$transaction->amount); //cief todo: to be removed
+                return false;
+            }
         }
+        return true;
     }
 }

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

@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Classes\Modules\Billplzs\Services;
+
+use Illuminate\Support\Facades\Http;
+use App\Classes\Exceptions\MalformedRequestException;
+use Illuminate\Support\Facades\Log;
+
+class DeletesBillplzBill
+{
+
+    /**
+     * @param string $billID
+     * @throws MalformedRequestException
+     */
+    public function execute(string $billID) {
+        try{
+            $response = Http::withBasicAuth(config('billplz.api_key').':', '')->delete(config('billplz.base_url').'/api/v3/bills/'.$billID);
+            Log::channel('storage_invoices')->info('DeletesBillplzBill response: '.json_encode($response));
+
+            if($response->successful()){
+                $data = $response->json();
+
+                // $data['url'] = $data['url'].'?auto_submit=true';
+
+                return (object) $data;
+            }else{
+                return null;
+            }
+        }catch(\Exception $exception){
+            throw new MalformedRequestException('Unable to get correct response from billplz server: ' . $exception->getMessage());
+        }
+    }
+}

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

@@ -10,16 +10,18 @@ use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Http\Resources\DocumentResource;
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
-
+use App\Classes\Modules\Companies\Processors\ApproveIdentificationDocumentOnExchangeProcessor;
 use App\Classes\Modules\Documents\Services\FetchesDocument;
 
 use App\Classes\Modules\Documents\Services\ApprovesDocument;
 use App\Classes\Modules\Notifications\DataTransferObjects\NotificationObject;
 Use App\Classes\Modules\Notifications\Processors\CreateNotificationProcessor;
-
+use App\Classes\ValueObjects\Constants\DocumentType;
 use App\Models\Document;
+use App\Models\ExchangeCompanyConnection;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Log;
 
 class ApproveIdentificationDocumentLogic extends AbstractControllerLogic
 {
@@ -55,6 +57,9 @@ class ApproveIdentificationDocumentLogic extends AbstractControllerLogic
     /** @var CreateNotificationProcessor */
     private $createNotificationProcessor;
 
+    /** @var ApproveIdentificationDocumentOnExchangeProcessor */
+    private $approveIdentificationDocumentOnExchangeProcessor;
+
     /**
      * ApproveIdentificationDocumentLogic constructor.
      * @param CanApproveDocument $canApproveDocument
@@ -64,8 +69,9 @@ class ApproveIdentificationDocumentLogic extends AbstractControllerLogic
      * @param UpdatesCompanyStatus $updatesCompanyStatus
      * @param UpdatesOrdersStatus $updatesOrdersStatus
      * @param CreateNotificationProcessor $createNotificationProcessor
+     * @param ApproveIdentificationDocumentOnExchangeProcessor $approveIdentificationDocumentOnExchangeProcessor
      */
-    public function __construct(CanApproveDocument $canApproveDocument, ApprovesDocument $approvesDocument, RejectsDocument $rejectsDocument, FetchesDocument $fetchesDocument, UpdatesCompanyStatus $updatesCompanyStatus, UpdatesOrdersStatus $updatesOrdersStatus, CreateNotificationProcessor $createNotificationProcessor)
+    public function __construct(CanApproveDocument $canApproveDocument, ApprovesDocument $approvesDocument, RejectsDocument $rejectsDocument, FetchesDocument $fetchesDocument, UpdatesCompanyStatus $updatesCompanyStatus, UpdatesOrdersStatus $updatesOrdersStatus, CreateNotificationProcessor $createNotificationProcessor, ApproveIdentificationDocumentOnExchangeProcessor $approveIdentificationDocumentOnExchangeProcessor)
     {
         $this->canApproveDocument = $canApproveDocument;
         $this->approvesDocument = $approvesDocument;
@@ -74,6 +80,7 @@ class ApproveIdentificationDocumentLogic extends AbstractControllerLogic
         $this->updatesCompanyStatus = $updatesCompanyStatus;
         $this->updatesOrdersStatus = $updatesOrdersStatus;
         $this->createNotificationProcessor = $createNotificationProcessor;
+        $this->approveIdentificationDocumentOnExchangeProcessor = $approveIdentificationDocumentOnExchangeProcessor;
     }
 
     /**
@@ -85,11 +92,18 @@ class ApproveIdentificationDocumentLogic extends AbstractControllerLogic
      */
     public function logic(Request $request) : JsonResponse
     {
+        $documentId = $request->route('document_id');
+
+        if ($request->route('exchange_company_id')) {
+            $companyModule = ExchangeCompanyConnection::where('exchange_company_id', $request->route('exchange_company_id'))->first()->companyModule;
+            $company = $companyModule->company;
+            $documentId = $company->documents()->whereIn('document_type', DocumentType::IDENTIFICATION_DOCUMENTS)->where('status', ApprovalStatus::PENDING_VERIFICATION)->first()->id;
+        }
 
         $status = $request->route('status');
 
         /** @var Document $document */
-        $document = $this->fetchesDocument->execute(['id' => $request->route('document_id')]);
+        $document = $this->fetchesDocument->execute(['id' => $documentId]);
 
         $this->canApproveDocument->passes();
 
@@ -111,6 +125,11 @@ class ApproveIdentificationDocumentLogic extends AbstractControllerLogic
             $orders = $this->updatesOrdersStatus->execute($document->owner, ApprovalStatus::APPROVED);
         }
 
+         // if this request is not calling from exchange portal, then approve the document on exchange portal for this user
+         $companyModule = $document->owner->companyModules()->first();
+         if (!$request->route('exchange_company_id') && $companyModule->exchangeCompanyConnection()->first()) {
+            $this->approveIdentificationDocumentOnExchangeProcessor->execute($request, $companyModule->id, $status);
+        }
 
         return $this->resourceResponse(new DocumentResource($document));
 

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

@@ -7,6 +7,8 @@ use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Companies\Processors\AssignConnectionSegmentProcessor;
 use App\Classes\Modules\Companies\Services\FetchesCompany;
 use App\Classes\Modules\Companies\Services\FetchesCompanyConnection;
+use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
+use App\Classes\Modules\Contacts\Processors\CreateContactProcessor;
 use App\Http\Resources\CompanyResource;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -33,17 +35,22 @@ class AssignCompanyConnectionToConnectionSegmentLogic extends AbstractController
     /** @var AssignConnectionSegmentProcessor */
     private $assignCompanyConnectionToConnectionSegmentProcessor;
 
+    /** @var CreateContactProcessor */
+    private $createContactProcessor;
+
     /**
      * AssignCompanyToSegmentLogic constructor.
      * @param FetchesCompany $fetchesCompany
      * @param FetchesCompanyConnection $fetchesCompanyConnection
      * @param AssignConnectionSegmentProcessor $assignCompanyConnectionToConnectionSegmentProcessor
+     * @param CreateContactProcessor $createContactProcessor
      */
-    public function __construct(FetchesCompany $fetchesCompany, FetchesCompanyConnection $fetchesCompanyConnection, AssignConnectionSegmentProcessor $assignCompanyConnectionToConnectionSegmentProcessor)
+    public function __construct(FetchesCompany $fetchesCompany, FetchesCompanyConnection $fetchesCompanyConnection, AssignConnectionSegmentProcessor $assignCompanyConnectionToConnectionSegmentProcessor, CreateContactProcessor $createContactProcessor)
     {
         $this->fetchesCompany = $fetchesCompany;
         $this->fetchesCompanyConnection = $fetchesCompanyConnection;
         $this->assignCompanyConnectionToConnectionSegmentProcessor = $assignCompanyConnectionToConnectionSegmentProcessor;
+        $this->createContactProcessor = $createContactProcessor;
     }
 
     /**
@@ -62,6 +69,11 @@ class AssignCompanyConnectionToConnectionSegmentLogic extends AbstractController
 
         $this->assignCompanyConnectionToConnectionSegmentProcessor->execute($companyConnection, $request->input('segment_id'));
 
+        if ($request->input('segment_id') == 10 || $request->input('segment_id') == 11) {
+            $contactObject = new ContactObject('Whatsapp: ' . $request->input('name'), $request->input('phone'), null, null);
+            $this->createContactProcessor->execute($contactObject, $company);
+        }
+
         return $this->resourceResponse(new CompanyResource($company));
     }
 }

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

@@ -4,6 +4,7 @@ namespace App\Classes\Modules\Companies\ControllersLogic;
 
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Companies\Processors\CreateIdentificationDocumentOnExchangeProcessor;
 use App\Classes\Modules\Companies\Services\FetchesCompany;
 use App\Classes\Modules\Companies\Services\UpdatesCompanyStatus;
 use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
@@ -14,6 +15,7 @@ use App\Classes\ValueObjects\Constants\CompanyType;
 use App\Classes\ValueObjects\Constants\DocumentType;
 use App\Models\Company;
 use App\Models\Document;
+use App\Models\ExchangeCompanyConnection;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
@@ -42,6 +44,9 @@ class CreateIdentificationDocumentLogic extends AbstractControllerLogic
     /** @var UpdatesCompanyStatus */
     private $updatesCompanyStatus;
 
+    /** @var CreateIdentificationDocumentOnExchangeProcessor */
+    private $createIdentificationDocumentOnExchangeProcessor;
+
 
     /**
      * CreateIdentificationDocumentLogic constructor.
@@ -49,13 +54,15 @@ class CreateIdentificationDocumentLogic extends AbstractControllerLogic
      * @param CreatesDocument $createsDocument
      * @param CreatesFiles $createsFile
      * @param UpdatesCompanyStatus $updatesCompanyStatus
+     * @param CreateIdentificationDocumentOnExchangeProcessor $createIdentificationDocumentOnExchangeProcessor
      */
-    public function __construct(FetchesCompany $fetchesCompany, CreatesDocument $createsDocument, CreatesFiles $createsFile, UpdatesCompanyStatus $updatesCompanyStatus)
+    public function __construct(FetchesCompany $fetchesCompany, CreatesDocument $createsDocument, CreatesFiles $createsFile, UpdatesCompanyStatus $updatesCompanyStatus, CreateIdentificationDocumentOnExchangeProcessor $createIdentificationDocumentOnExchangeProcessor)
     {
         $this->fetchesCompany = $fetchesCompany;
         $this->createsDocument = $createsDocument;
         $this->createsFile = $createsFile;
         $this->updatesCompanyStatus = $updatesCompanyStatus;
+        $this->createIdentificationDocumentOnExchangeProcessor = $createIdentificationDocumentOnExchangeProcessor;
     }
 
     /**
@@ -66,8 +73,15 @@ class CreateIdentificationDocumentLogic extends AbstractControllerLogic
     public function logic(Request $request) : JsonResponse
     {
 
+        if ($request->route('exchange_company_id')) {
+            $companyModule = ExchangeCompanyConnection::where('exchange_company_id', $request->route('exchange_company_id'))->first()->companyModule;
+            $companyId = $companyModule->company_id;
+        } else {
+            $companyId = $request->route('id');
+        }
+
         /** @var Company $company */
-        $company = $this->fetchesCompany->execute(['id' => $request->route('id')]);
+        $company = $this->fetchesCompany->execute(['id' => $companyId]);
         $object = new DocumentObject($company->type === CompanyType::COMPANY_BUSINESS ?
             DocumentType::SSM_REGISTRATION : DocumentType::IDENTITY_CARD, $request->input('files'),
             $request->input('identification_no'), ApprovalStatus::PENDING_VERIFICATION, 'identifications');
@@ -78,6 +92,12 @@ class CreateIdentificationDocumentLogic extends AbstractControllerLogic
 
         $this->updatesCompanyStatus->execute($company, ApprovalStatus::PENDING_VERIFICATION);
 
+        // create identification on exchange if this request not coming from exchange
+        $companyModule = $company->companyModules()->first();
+        if (!$request->route('exchange_company_id') && $companyModule->exchangeCompanyConnection()->first()) {
+            $this->createIdentificationDocumentOnExchangeProcessor->execute($request, $companyModule->id);
+        }
+
         return $this->response([]);
     }
 

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

@@ -0,0 +1,45 @@
+<?php
+
+namespace App\Classes\Modules\Companies\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Companies\Processors\LinkExchangeCompanyProcessor;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class LinkExchangeCompanyLogic extends AbstractControllerLogic
+{
+
+    protected function notification():array {
+        return [
+            'title' => 'Connect Exchange with Izyim Account',
+            'message' => 'You have successfully connect your exchange account to Izyim Account'
+        ];
+    }
+
+    /** @var LinkExchangeCompanyProcessor */
+    private $linkExchangeCompanyProcessor;
+
+
+    /**
+     * LinkExchangeCompanyLogic constructor.
+     * @param LinkExchangeCompanyProcessor $linkExchangeCompanyProcessor
+     */
+    public function __construct(LinkExchangeCompanyProcessor $linkExchangeCompanyProcessor)
+    {
+        $this->linkExchangeCompanyProcessor = $linkExchangeCompanyProcessor;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\AccessUnauthorisedException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    protected function logic(Request $request): JsonResponse {
+
+        return $this->response($this->linkExchangeCompanyProcessor->execute($request));
+    }
+
+}

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

@@ -3,10 +3,14 @@
 namespace App\Classes\Modules\Companies\ControllersLogic;
 
 
+use App\Classes\Exceptions\AccessForbiddenException;
+use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\Exceptions\RequestValidationException;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Companies\Services\ListsCompanyModules;
 use App\Classes\Modules\Companies\Standards\Rules\CanListCompanies;
 use App\Http\Resources\CompanyModuleResource;
+use App\Transformers\CompanyTransformer;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -17,7 +21,8 @@ class ListCompanyModulesLogic extends AbstractControllerLogic
     /**
      * @return array
      */
-    protected function notification():array {
+    protected function notification(): array
+    {
         return [
             'title' => 'Retrieved Company Moduels',
             'message' => 'You have successfully retrieved a list of Companies'
@@ -45,15 +50,26 @@ class ListCompanyModulesLogic extends AbstractControllerLogic
     /**
      * @param Request $request
      * @return JsonResponse
-     * @throws \App\Classes\Exceptions\AccessForbiddenException
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     * @throws \App\Classes\Exceptions\RequestValidationException
+     * @throws AccessForbiddenException
+     * @throws MalformedRequestException
+     * @throws RequestValidationException
      */
-    public function logic(Request $request) : JsonResponse
+    public function logic(Request $request): JsonResponse
     {
         $this->canListCompanies->passes();
 
         $query = $this->listsCompanyModules->execute($this->listsCompanyModules->deserializeFilters($request->input('filters')));
+
+        /*include all relationships*/
+/*        return fractal()
+            ->collection($query, new CompanyTransformer)
+            ->parseIncludes('company')
+            ->parseIncludes('contact')
+            ->parseIncludes('remarks')
+            ->parseIncludes('address')
+            ->parseIncludes('billingAddress')
+            ->respond(200, [], JSON_PRETTY_PRINT);*/
+
         return $this->collectionResponse(CompanyModuleResource::collection($query));
 
     }

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

@@ -0,0 +1,121 @@
+<?php
+
+namespace App\Classes\Modules\Companies\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Companies\Services\FetchesCompany;
+use App\Classes\Modules\Companies\Services\UpdatesCompanyModuleIsCreditTerm;
+use App\Classes\Modules\Companies\Standards\Rules\CanUpdateCompanyModule;
+use App\Classes\Modules\Transactions\Services\ListsTransactions;
+use App\Classes\Modules\Transactions\Services\UpdatesTransactionIsWaived;
+use App\Classes\Modules\Transactions\Processors\CheckStorageInvoiceTransactionProcessor;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Models\Order;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Log;
+
+class UpdateCompanyCreditTermStatusLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Update Company Credit Term Status',
+            'message' => 'You have successfully updated Company Credit Term Status'
+        ];
+    }
+
+    /** @var FetchesCompany */
+    private $fetchesCompany;
+
+    /** @var UpdatesCompanyModuleIsCreditTerm */
+    private $updatesCompanyModuleIsCreditTerm;
+
+    /** @var CanUpdateCompanyModule */
+    private $canUpdateCompanyModule;
+
+    /** @var ListsTransactions */
+    private $listsTransactions;
+
+    /** @var UpdatesTransactionIsWaived */
+    private $updatesTransactionIsWaived;
+
+    /** @var CheckStorageInvoiceTransactionProcessor */
+    private $storageInvoiceTransactionProcessor;
+
+
+
+    /**
+     * UpdateCompanyCreditTermStatusLogic constructor.
+     * @param FetchesCompany $fetchesCompany
+     * @param UpdatesCompanyModuleIsCreditTerm $updatesCompanyModuleIsCreditTerm
+     * @param CanUpdateCompanyModule $canUpdateCompanyModule
+     * @param UpdatesTransactionIsWaived $updatesTransactionIsWaived
+     * @param ListsTransactions $listsTransactions
+     * @param CheckStorageInvoiceTransactionProcessor $storageInvoiceTransactionProcessor
+     */
+    public function __construct(FetchesCompany $fetchesCompany, UpdatesCompanyModuleIsCreditTerm $updatesCompanyModuleIsCreditTerm, CanUpdateCompanyModule $canUpdateCompanyModule, UpdatesTransactionIsWaived $updatesTransactionIsWaived, ListsTransactions $listsTransactions, CheckStorageInvoiceTransactionProcessor $storageInvoiceTransactionProcessor)
+    {
+        $this->fetchesCompany = $fetchesCompany;
+        $this->updatesCompanyModuleIsCreditTerm = $updatesCompanyModuleIsCreditTerm;
+        $this->canUpdateCompanyModule = $canUpdateCompanyModule;
+        $this->listsTransactions = $listsTransactions;
+        $this->updatesTransactionIsWaived = $updatesTransactionIsWaived;
+        $this->storageInvoiceTransactionProcessor = $storageInvoiceTransactionProcessor;
+    }
+
+    /**
+     * @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
+    {
+        $this->canUpdateCompanyModule->passes();
+
+        $company = $this->fetchesCompany->execute(['id' => $request->route('id')]);
+        $companyModule = $company->companyModules()->first();
+        $isCreditTerm = $companyModule->connections()->first()->is_credit_term;
+
+        if ($isCreditTerm == 1) {
+            $isCreditTerm = 0;
+        } else {
+            $isCreditTerm = 1;
+        }
+
+        if($isCreditTerm === 1){
+            //{"per_page":10,"order_by":{"column":"id","DESC":true},"status_in":[2],"receiver":190,"type_in":[1],"does_not_have_payment_status_in":[0,1],"does_not_have_groups":1,"check_for_storage_invoice":1}
+
+            $filters = [
+                'status_in' => [2],
+                'receiver' =>  $companyModule->id,
+                'type_in' => [TransactionType::STORAGE_INVOICE]
+            ];
+
+            $transactions = $this->listsTransactions->execute($filters);
+            foreach($transactions as $transaction){
+                $this->updatesTransactionIsWaived->execute($transaction);
+                $packingList = $transaction->owner()->first();
+                if($packingList){
+                    $order = $packingList->owner()->first();
+                    if($order instanceof Order){
+                        $storages = $this->storageInvoiceTransactionProcessor->executeOrder($order);
+                    }
+                }
+            }
+        }
+
+        $this->updatesCompanyModuleIsCreditTerm->execute($company->companyModules()->first()->connections()->first(), $isCreditTerm);
+        Log::info(Auth::user()->email." updated credit term status for customer with id: " .$request->route('id'). " to status " . $isCreditTerm);
+
+        $result = ['is_credit_term' => $isCreditTerm];
+        return $this->response(['data' => $result]);
+    }
+}

app/Classes/Modules/Companies/Processors/ApproveIdentificationDocumentOnExchangeProcessor.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace App\Classes\Modules\Companies\Processors;
+
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Log;
+
+class ApproveIdentificationDocumentOnExchangeProcessor
+{
+    /**
+     * @param Request $request
+     * @return string
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function execute(Request $request, $companyModuleId, $status) {
+        if (App::environment(['production'])) {
+            dd("Delete this line before push to production");
+            $url = "https://exchange.cief-malaysia.com/api/v1/shipping/company/{$companyModuleId}/identification/approval/{$status}";
+        } else if (App::environment(['local'])) {
+            $url = "http://127.0.0.1:8000/api/v1/shipping/company/{$companyModuleId}/identification/approval/{$status}";
+        } else {
+            $url = "https://dev.exchange.cief-malaysia.com/api/v1/shipping/company/{$companyModuleId}/identification/approval/{$status}";
+        }
+        try {
+            $client = new \GuzzleHttp\Client(['verify' => false]);
+            $token = $request->bearerToken();
+            $headers = [
+                'Authorization' => 'Bearer ' . $token,        
+                'Accept'        => 'application/json',
+            ];
+            $formParams = $request->toArray();
+            $response = $client->request('PUT', $url, [
+                'headers' => $headers,
+                'form_params' => $formParams
+            ]);
+            $body = $response->getBody();
+            $contents = json_decode($body, true);
+
+            return $contents;
+        } catch(\GuzzleHttp\Exception\RequestException $exception){
+            Log::error($exception->getResponse()->getBody()->getContents());
+        }
+    }
+
+}

app/Classes/Modules/Companies/Processors/CreateIdentificationDocumentOnExchangeProcessor.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace App\Classes\Modules\Companies\Processors;
+
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Log;
+
+class CreateIdentificationDocumentOnExchangeProcessor
+{
+    /**
+     * @param Request $request
+     * @return string
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function execute(Request $request, $companyModuleId) {
+        if (App::environment(['production'])) {
+            dd("Delete this line before push to production");
+            $url = "https://exchange.cief-malaysia.com/api/v1/shipping/company/{$companyModuleId}/identification/create";
+        } else if (App::environment(['local'])) {
+            $url = "http://127.0.0.1:8000/api/v1/shipping/company/{$companyModuleId}/identification/create";
+        } else {
+            $url = "https://dev.exchange.cief-malaysia.com/api/v1/shipping/company/{$companyModuleId}/identification/create";
+        }
+        try {
+            $client = new \GuzzleHttp\Client(['verify' => false]);
+            $token = $request->bearerToken();
+            $headers = [
+                'Authorization' => 'Bearer ' . $token,        
+                'Accept'        => 'application/json',
+            ];
+            $formParams = $request->toArray();
+            $response = $client->request('POST', $url, [
+                'headers' => $headers,
+                'form_params' => $formParams
+            ]);
+            $body = $response->getBody();
+            $contents = json_decode($body, true);
+
+            return $contents;
+        } catch(\GuzzleHttp\Exception\RequestException $exception){
+            Log::error($exception->getResponse()->getBody()->getContents());
+        }
+    }
+
+}

app/Classes/Modules/Companies/Processors/LinkExchangeCompanyProcessor.php

@@ -0,0 +1,80 @@
+<?php
+
+namespace App\Classes\Modules\Companies\Processors;
+
+use App\Classes\Modules\Accounts\DataTransferObjects\AuthenticationCredentialsObject;
+use App\Classes\Modules\Accounts\Services\AuthenticatesUser;
+use App\Classes\Modules\Accounts\Services\AuthenticationRedirect;
+use App\Classes\Modules\Accounts\Services\FetchesUser;
+use App\Classes\Modules\Accounts\Services\GeneratesAuthenticationToken;
+use App\Classes\Modules\Accounts\Standards\Rules\CanAuthenticateUser;
+use App\Classes\Modules\Companies\Services\ConnectCompanyModuleToExchangeCompany;
+use Illuminate\Http\Request;
+
+class LinkExchangeCompanyProcessor
+{
+
+    /** @var CanAuthenticateUser */
+    private $canAuthenticateUser;
+
+    /** @var AuthenticatesUser */
+    private $authenticatesUser;
+
+    /** @var GeneratesAuthenticationToken */
+    private $generatesAuthenticationToken;
+
+    /** @var FetchesUser */
+    private $fetchesUser;
+
+    /** @var AuthenticationRedirect */
+    private $authenticationRedirect;
+
+    /** @var ConnectCompanyModuleToExchangeCompany */
+    private $connectCompanyModuleToExchangeCompany;
+
+    /**
+     * AuthenticationProcessor constructor.
+     * @param CanAuthenticateUser $canAuthenticateUser
+     * @param AuthenticatesUser $authenticatesUser
+     * @param GeneratesAuthenticationToken $generatesAuthenticationToken
+     * @param FetchesUser $fetchesUser
+     * @param AuthenticationRedirect $authenticationRedirect
+     * @param ConnectCompanyModuleToExchangeCompany $connectCompanyModuleToExchangeCompany
+     */
+    public function __construct(CanAuthenticateUser $canAuthenticateUser, AuthenticatesUser $authenticatesUser, GeneratesAuthenticationToken $generatesAuthenticationToken, FetchesUser $fetchesUser, AuthenticationRedirect $authenticationRedirect, ConnectCompanyModuleToExchangeCompany $connectCompanyModuleToExchangeCompany)
+    {
+        $this->canAuthenticateUser = $canAuthenticateUser;
+        $this->authenticatesUser = $authenticatesUser;
+        $this->generatesAuthenticationToken = $generatesAuthenticationToken;
+        $this->fetchesUser = $fetchesUser;
+        $this->authenticationRedirect = $authenticationRedirect;
+        $this->connectCompanyModuleToExchangeCompany = $connectCompanyModuleToExchangeCompany;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return array
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\AccessUnauthorisedException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function execute(Request $request): array {
+
+        $object = new AuthenticationCredentialsObject($request->input('email'), $request->input('password'));
+
+        $this->canAuthenticateUser->passes($object);
+
+        $this->authenticatesUser->execute($object);
+
+        $user = $this->fetchesUser->execute(['email' => $object->getEmail()]);
+
+        $companyModule = $user->companyModule()->first();
+
+        $this->connectCompanyModuleToExchangeCompany->execute($companyModule, $request->route('exchange_company_id'));
+        
+        return ['shipping_company_module_id' => $companyModule->id];
+
+    }
+
+}

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

@@ -20,7 +20,7 @@ class AssignsCompanyConnectionToConnectionSegment extends AbstractUpdateRecord
     {
         try {
 
-            $companyConnection->segments()->attach($segment);
+            $companyConnection->segments()->attach($segment, ['created_at' => now(), 'updated_at' => now()]);
 
             return $companyConnection;
 

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

@@ -22,7 +22,7 @@ class AssignsCompanyToSegment extends AbstractUpdateRecord
         try {
             $companyModule = $company->companyModules()->where('type', BusinessType::IMPORTER)->first();
             $connection = $companyModule->connections()->where('inviter_reference', 'CIEF');
-            $connection->segments()->attach($segment);
+            $connection->segments()->attach($segment, ['created_at' => now(), 'updated_at' => now()]);
 
             return $company;
 

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

@@ -18,7 +18,7 @@ class AssignsEmployee extends AbstractUpdateRecord
     {
         try {
 
-            $object->getCompanyModule()->employees()->attach($object->getUser(), ['status' => $object->getStatus(),'role_id' => $object->getRoleId()]);
+            $object->getCompanyModule()->employees()->attach($object->getUser(), ['status' => $object->getStatus(), 'role_id' => $object->getRoleId(), 'created_at' => now(), 'updated_at' => now()]);
 
             return $object->getCompanyModule();
 

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

@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Classes\Modules\Companies\Services;
+
+use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Models\CompanyModule;
+use App\Models\ExchangeCompanyConnection;
+
+class ConnectCompanyModuleToExchangeCompany extends AbstractUpdateRecord
+{
+    /**
+     * @param Company $company
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws MalformedRequestException
+     */
+    public function execute(CompanyModule $companyModule, $exchangeCompanyId)
+    {
+        $model = new ExchangeCompanyConnection();
+        $model->company_module_id = $companyModule->id;
+        $model->exchange_company_id = $exchangeCompanyId;            
+
+        return $this->handler($model);
+    }
+}

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

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Classes\Modules\Companies\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Models\CompanyConnection;
+
+class UpdatesCompanyModuleIsCreditTerm extends AbstractUpdateRecord
+{
+
+    /**
+     * @param CompanyConnection $model
+     * @param int $isCreditTerm
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(CompanyConnection $model, int $isCreditTerm)
+    {
+        $model->is_credit_term = $isCreditTerm;
+
+        return $this->handler($model);
+    }
+}

app/Classes/Modules/Companies/Standards/Rules/CanUpdateCompanyModule.php

@@ -0,0 +1,53 @@
+<?php
+
+namespace App\Classes\Modules\Companies\Standards\Rules;
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Companies\DataTransferObjects\CompanyObject;
+use App\Classes\ValueObjects\Constants\RoleTypes;
+
+class CanUpdateCompanyModule extends AbstractRule
+{
+
+    /**
+     * CanUpdateCompanyModule constructor.
+     */
+    public function __construct()
+    {
+    }
+
+    /**
+     * @return bool
+     */
+    protected function authorized($object): bool
+    {
+        $user = Auth()->user();
+        if($user){
+            $roleToCheck = Auth()->user()->type;
+            if (in_array($roleToCheck, RoleTypes::ADMIN_ROLES)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * @param $object
+     * @return bool
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    protected function validators($object): bool
+    {
+        return true;
+    }
+
+    /**
+     * @param CompanyObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+}

app/Classes/Modules/Contacts/ControllersLogic/UpdateContactLogic.php

@@ -8,6 +8,7 @@ use App\Classes\Modules\Contacts\Services\UpdatesContact;
 use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
 use App\Classes\Modules\Contacts\Services\FetchesContact;
 use App\Http\Resources\ContactResource;
+use App\Transformers\ContactTransformer;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -63,6 +64,13 @@ class UpdateContactLogic extends AbstractControllerLogic
 
         $query = $this->updatesContact->execute($query, $object);
 
+        /*uniformity*/
+            /*  return fractal()
+            ->item($query, new ContactTransformer())
+            ->parseIncludes('remark')
+            ->respond(200, [], JSON_PRETTY_PRINT);*/
+
+
         return $this->resourceResponse(new ContactResource($query));
     }
 

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

@@ -7,6 +7,7 @@ use App\Classes\Modules\Orders\Services\CancelsOrder;
 use App\Classes\Modules\Orders\Services\FetchesOrder;
 use App\Http\Resources\DeliveryOrderResource;
 use App\Models\Order;
+use App\Transformers\DeliveryOrderTransformer;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
@@ -52,6 +53,14 @@ class CancelDeliveryOrderLogic extends AbstractControllerLogic
         /** @var Order $order */
         $order = $this->fetchesOrder->execute(['id' => $request->route('id')]);
 
+        $order = $this->cancelsOrder->execute($order);
+
+                //no relationship  needed
+        /*   return fractal()
+            ->item($order, new DeliveryOrderTransformer())
+            ->respond(200, [], JSON_PRETTY_PRINT);*/
+
+
         return $this->resourceResponse(new DeliveryOrderResource($this->cancelsOrder->execute($order)));
 
     }

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

@@ -172,6 +172,12 @@ class CreateDeliveryOrderLogic extends AbstractControllerLogic
         $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);
 
+        //add relationship to order
+             /*   return fractal()
+            ->item($order, new DeliveryOrderTransformer())
+             ->parseIncludes(['sender_address', 'delivery_address', 'sender_address.contacts', 'delivery_address.contacts', 'sender_address.remarks', 'delivery_address.remarks', 'packing_list', 'packing_list.packages'])
+            ->respond(200, [], JSON_PRETTY_PRINT);*/
+
         return $this->resourceResponse(new DeliveryOrderResource($order));
 
     }

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

@@ -48,6 +48,12 @@ class ListOrdersLogic extends AbstractControllerLogic
 
         $query = $this->listsOrders->execute(array_merge($this->listsOrders->deserializeFilters($request->input('filters')), ['with_parcels' => true, 'type_in' => [OrderType::LAST_MILE_DELIVERY]]));
 
+
+        //no relationship  needed
+             /*   return fractal()
+            ->collection($query, new DeliveryOrderTransformer)
+            ->respond(200, [], JSON_PRETTY_PRINT);*/
+
         return $this->collectionResponse(DeliveryOrderResource::collection($query));
 
     }

app/Classes/Modules/Documents/ControllersLogic/ListDocumentLogic.php

@@ -7,9 +7,13 @@ use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Documents\Services\ListsDocuments;
 use App\Classes\Modules\Documents\Standards\Rules\CanListDocuments;
 use App\Http\Resources\DocumentResource;
+use App\Models\Document;
+use App\Transformers\DocumentTransformer;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use League\Fractal;
+
 
 class ListDocumentLogic extends AbstractControllerLogic
 {
@@ -58,6 +62,11 @@ class ListDocumentLogic extends AbstractControllerLogic
 
         return $this->collectionResponse(DocumentResource::collection($query));
 
+
+      /*  return fractal()
+            ->collection($query, new DocumentTransformer)
+            ->respond(200, [], JSON_PRETTY_PRINT);*/
+
     }
 
 }

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

@@ -5,6 +5,7 @@ namespace App\Classes\Modules\Documents\Services;
 use App\Classes\General\Eloquent\AbstractUpdateRecord;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Models\Document;
+use App\Models\User;
 use Carbon\Carbon;
 
 class ApprovesDocument extends AbstractUpdateRecord
@@ -17,8 +18,19 @@ class ApprovesDocument extends AbstractUpdateRecord
      */
     public function execute(Document $model)
     {
+        $user = Auth()->user();
+        // if auth user is null, then this services is calling from exchange
+        if (!$user) {
+            $token = explode('.', request()->bearerToken())[1];
+            $decodedToken = base64_decode($token);
+            $exchangeUser = json_decode($decodedToken, true)['user'];
+            $user = User::where('email', $exchangeUser['email'])->first();
+            if (!$user) {
+                $user = User::find(1);
+            }
+        }
         $model->status = ApprovalStatus::APPROVED;
-        $model->approver = Auth()->user()->id;
+        $model->approver = $user->id;
         $model->approval_date = Carbon::now();
 
         return $this->handler($model);

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

@@ -5,7 +5,10 @@ namespace App\Classes\Modules\Documents\Services;
 use App\Classes\General\Eloquent\AbstractUpdateRecord;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Models\Document;
+use App\Models\User;
 use Carbon\Carbon;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Log;
 
 class RejectsDocument extends AbstractUpdateRecord
 {
@@ -17,8 +20,19 @@ class RejectsDocument extends AbstractUpdateRecord
      */
     public function execute(Document $model)
     {
+        $user = Auth()->user();
+        // if auth user is null, then this services is calling from exchange
+        if (!$user) {
+            $token = explode('.', request()->bearerToken())[1];
+            $decodedToken = base64_decode($token);
+            $exchangeUser = json_decode($decodedToken, true)['user'];
+            $user = User::where('email', $exchangeUser['email'])->first();
+            if (!$user) {
+                $user = User::find(1);
+            }
+        }
         $model->status = ApprovalStatus::REJECTED;
-        $model->approver = Auth()->user()->id;
+        $model->approver = $user->id;
         $model->approval_date = Carbon::now();
 
         return $this->handler($model);

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

@@ -24,8 +24,8 @@ class ExportsAgingList implements WithHeadings, WithHeadingRow, WithMapping, Sho
     {
         $this->filters = [
             "has_invoice_status_in"                 => [2],
-            "packing_list_ordered_by_invoice_date"  => true,
-            "with_aging_column"                     => true
+            // "packing_list_ordered_by_invoice_date"  => true,
+            // "with_aging_column"                     => true
         ];
     }
 
@@ -39,6 +39,7 @@ class ExportsAgingList implements WithHeadings, WithHeadingRow, WithMapping, Sho
             'Invoice Date',
             'Days',
             'Amount',
+            'Credit Term Customer',
         ];
     }
 
@@ -55,9 +56,16 @@ class ExportsAgingList implements WithHeadings, WithHeadingRow, WithMapping, Sho
         $invDate = 'n/a';
         $invNo   = 'n/a';
         $days    = 'n/a';
+        $isCreditTermCustomer = false;
 
         if ($list->owner instanceof Order) {
             $inviterPivotInviteeReference = $list->owner->companyModule->inviters()->withPivot('invitee_reference')->first();
+            $companyModule = $list->owner->companyModule;
+
+            $segment = $companyModule->connections()->first()->segments()->where('name', 'Credit Term Customer')->first();
+            if ($segment) {
+                $isCreditTermCustomer = true;
+            }
 
             if ($inviterPivotInviteeReference) {
                 $marking = $inviterPivotInviteeReference->pivot->invitee_reference;
@@ -87,6 +95,7 @@ class ExportsAgingList implements WithHeadings, WithHeadingRow, WithMapping, Sho
             $invDate,
             $days,
             $amt,
+            $isCreditTermCustomer ? 'TRUE' : 'FALSE',
         ];
     }
 

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

@@ -70,15 +70,31 @@ class ExportsCustomersWalletTransactionHistory implements FromQuery, WithHeading
                 $description = 'Credit Voucher for ' . $transaction->payment_reference;
                 break;
             case TransactionType::PAYMENT:
-                $booking = Transaction::where('payment_reference', $transaction->bill_no)->first()->owner;
-
-                if (!$booking) {
-                    $description = 'Payment for unknown booking, please contact tech support.';
+                $payment = Transaction::where('payment_reference', $transaction->bill_no)->first();
+                if (!$payment) {
+                    $description = 'Payment not found, please contact tech support.';
                     break;
                 }
 
-                $marking = $booking->marking;
-                $description = 'Payment For booking refs' . $marking;
+                $invoice = $payment->owner;
+                if (!$invoice) {
+                    $description = 'Invoice not found, please contact tech support.';
+                    break;
+                }
+
+                $packingList = $invoice->owner;
+                if (!$packingList) {
+                    $description = 'Packing List not found, please contact tech support.';
+                    break;
+                }
+
+                $order = $packingList->owner;
+                if (!$order) {
+                    $description = 'Order not found, please contact tech support.';
+                    break;
+                }
+
+                $description = 'Payment For booking refs ' . $order->reference;
                 break;
             case TransactionType::DEBIT_NOTE:
                 $description = 'Debit Voucher for ' . $transaction->payment_reference;

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

@@ -20,9 +20,11 @@ class ExportsFeedback implements FromQuery, WithHeadings, WithHeadingRow, WithMa
     public function headings(): array
     {
         return [
+            'Version',
             'Question Set',
             'Question Text',
-            'Answer',
+            'Answer Text',
+            'Answer Value',
             'Source System',
             'Source Marking',
             'Source Email',
@@ -38,7 +40,7 @@ class ExportsFeedback implements FromQuery, WithHeadings, WithHeadingRow, WithMa
         return QAUserAnswerSelected::whereHas('question', function ($query) {
             $query->whereHas('questionnaire', function ($innerQuery) {
                 $innerQuery->where('group', 'feedback');
-            })->where('created_at', '>',  Carbon::now()->subMonths(1));
+            }); //->where('created_at', '>',  Carbon::now()->subMonths(1));
         })->orderBy('created_at', 'desc');
     }
 
@@ -56,11 +58,14 @@ class ExportsFeedback implements FromQuery, WithHeadings, WithHeadingRow, WithMa
             $companyModule = $user->companyModule()->first();
             $user_marking = $companyModule ? $companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference : "";
         }
+        $answer = $userAnswer->answer;
 
         return [
+            $userAnswer->question->questionnaire->version,
             $userAnswer->question->questionnaire->description,
             $userAnswer->question->question_text,
-            $userAnswer->free_text_answer,
+            $answer->display_text,
+            $answer->value,
             $user ? QASystemSourceType::getText(QASystemSourceType::IZYIM) : QASystemSourceType::getText($source->system),
             $user ? $user_marking : $source->marking,
             $user ? $user->email : $source->email,

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

@@ -0,0 +1,108 @@
+<?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\Group;
+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 ExportsGroupTransactions 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',
+            'PaymentDate',
+            'DebtorCode',
+            'Ref',
+            'ShipInfo',
+            'AccNo',
+            'DetailDescription',
+            'FurtherDescription',
+            'ProjNo',
+            'DeptNo',
+            'Qty',
+            'UnitPrice',
+            'TaxType',
+            'TaxableAmt',
+            'TaxRate'
+        ];
+    }
+
+    public function query()
+    {
+        $start_date = $this->parseDate($this->request->input('startDate'));
+        $end_date = $this->parseDate($this->request->input('endDate'));
+
+        return Group::when($start_date && $end_date, function ($query) use ($start_date, $end_date) {
+            $query->whereBetween('created_at', [
+                $start_date->startOfDay(),
+                $end_date->endOfDay()
+            ]);
+        })
+            ->when($start_date && !$end_date, function ($query) use ($start_date) {
+                $query->where('created_at', '>=', $start_date->startOfDay());
+            })
+            ->when(!$start_date && $end_date, function ($query) use ($end_date) {
+                $query->where('created_at', '<=', $end_date->endOfDay());
+            });
+    }
+
+    private function parseDate($date)
+    {
+        return $date ? Carbon::parse($date)->startOfDay() : null;
+    }
+
+    public function map($transaction): array
+    {
+        $company = $transaction->receiverCompany;
+        return [
+            '<<New>>',                                     //'DocNo',
+            '',                                            //'DocDate',
+            $transaction->created_at->format('m/d/Y H:m'), //'PaymentDate',
+            $company->debtor,                              //'DebtorCode',
+            $company->referece,                            //'Ref',
+            $company->referece,                            //'ShipInfo',
+            '500-0000',                                    //'AccNo',
+            'X1 Freight Service Charge',                   //'DetailDescription',
+            'FurtherDescription',                          //'FurtherDescription',
+            'M3',                                          //'ProjNo',
+            'CIEF',                                        //'DeptNo',
+            '',                                            //'Qty',
+            '',                                            //'UnitPrice',
+            '',                                            //'TaxType',
+            floatval($transaction->tax) > 0 ? number_format($transaction->tax, 2) : '0.00', //'TaxableAmt',
+            '',                                            //'TaxRate'
+        ];
+    }
+
+    private function getTaxType($tax_percentage)
+    {
+        return floatval($tax_percentage) > 0 ? 'SV-6' : '';
+    }
+}

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

@@ -31,6 +31,7 @@ class ExportsPaymentTransactions implements FromQuery, WithHeadings, WithHeading
         return [
             'DocNo',
             'DocDate',
+            'PaymentDate',
             'DebtorCode',
             'Ref',
             'ShipInfo',
@@ -41,6 +42,9 @@ class ExportsPaymentTransactions implements FromQuery, WithHeadings, WithHeading
             'DeptNo',
             'Qty',
             'UnitPrice',
+            'TaxType',
+            'TaxableAmt',
+            'TaxRate',
 //            'marking',
 //            'contact person',
 //            'contact number',
@@ -56,12 +60,12 @@ class ExportsPaymentTransactions implements FromQuery, WithHeadings, WithHeading
     {
         $start_date = $this->request->input('startDate', null);
         if ($start_date) {
-            $start_date = Carbon::parse($this->request->input('startDate'))->format('Y-m-d');
+            $start_date = Carbon::parse($start_date)->startOfDay();
         }
 
         $end_date = $this->request->input('endDate', null);
         if ($end_date) {
-            $end_date = Carbon::parse($this->request->input('endDate'))->format('Y-m-d');
+            $end_date = Carbon::parse($end_date)->endOfDay();
         }
 
         $query = Transaction::query();
@@ -74,35 +78,42 @@ class ExportsPaymentTransactions implements FromQuery, WithHeadings, WithHeading
             $approvalStatus = ApprovalStatus::APPROVED;
         }
 
-        $query->where('type', TransactionType::SHIPPING_INVOICE)->whereIn('status', [$approvalStatus]);
+        // Adjusted the query to include both types and status
+        $query->whereIn('type', [TransactionType::SHIPPING_INVOICE, TransactionType::STORAGE_INVOICE])
+            ->where('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'));
+        if ($start_date && $end_date) {
+            $query->whereHas('transactions', function($transaction) use ($start_date, $end_date) {
+                $transaction->where('type', TransactionType::PAYMENT)
+                    ->whereBetween('updated_at', [$start_date, $end_date]);
             });
-
-        }
-        elseif(!$start_date && $end_date) {
+        } elseif ($start_date) {
+            $query->whereHas('transactions', function($transaction) use ($start_date) {
+                $transaction->where('type', TransactionType::PAYMENT)
+                    ->where('updated_at', '>=', $start_date);
+            });
+        } elseif ($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'));
+                $transaction->where('type', TransactionType::PAYMENT)
+                    ->where('updated_at', '<=', $end_date);
             });
         }
 
         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();
+        if($transaction->type === TransactionType::STORAGE_INVOICE){
+            $shippingTransactionDetails = $transaction->transactionDetails()->where('reference', 'STORAGE_FEE')->first();
+        }
+        else{
+            $shippingTransactionDetails = $transaction->transactionDetails()->where('reference', 'SHIPPING_FEE')->first();
+        }
         $marking = $order->companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
         $contact = $order->companyModule->company->contacts->first();
         $userName = $order->companyModule->employees()->first();
@@ -118,13 +129,47 @@ class ExportsPaymentTransactions implements FromQuery, WithHeadings, WithHeading
                 $furtherDescription .= $item->name.' '.$item->quantity.' CBM'."\n";
             elseif($item->reference === 'MIN_CBM_CHARGES')
                 $furtherDescription .= $item->name.' '.$item->quantity.' CBM'."\n";
+            elseif($item->reference === 'STORAGE_FEE')
+                $furtherDescription .= str_replace('<br>', ' | ', $item->name).' '."\n";
             else
                 $furtherDescription .= $item->name.' '.$item->quantity.' X '.$item->price."\n";
         }
 
+        $transactionDetails = $transaction->transactionDetails;
+
+        $firstItem = true;
+        $rows = [];
+        foreach ($transactionDetails as $detail) {
+            // Prepare each row based on the transaction detail
+            $rows[] = [
+                $firstItem ? '<<New>>' : '',
+                $transaction->created_at->format('m/d/Y H:m'),
+                $transaction->transactions()->where('type', TransactionType::PAYMENT)->first()->updated_at->format('m/d/Y H:m'),
+                $company->debtor,
+                $order->reference,
+                $order->reference,
+                '500-0000',
+                str_replace('<br>', ' ', $detail->name),
+                '',
+                $container->reference,
+                'CIEF',
+                $detail->quantity,
+                $detail->price,
+                floatval($detail->tax_percentage) > 0 ? 'SV-6' : '',
+                floatval($detail->tax_percentage) > 0 ? number_format($detail->amount, 2) : '0.00',
+                $detail->tax_percentage,
+            ];
+
+            if($firstItem) {
+                $firstItem = false;
+            }
+        }
+
+        return $rows;
+
         return [
             '<<New>>',
-            $transaction->created_at->format('m/d/Y H:m'),
+            $transaction->transactions()->where('type', TransactionType::PAYMENT)->first()->updated_at->format('m/d/Y H:m'),
             $company->debtor,
             $order->reference,
             $order->reference,

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

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

app/Classes/Modules/HelpMenu/ControllersLogic/ListQuestionsQALogic.php

@@ -59,7 +59,7 @@ class ListQuestionsQALogic extends AbstractControllerLogic
         $delimiter = "|";
         $parts = explode($delimiter, $decriptedToken);
         $questionSet = $parts[3];
-        $query = $this->listsHelpMenuQuestions->execute(['questionnaire_set_id' => $questionSet]);
+        $query = $this->listsHelpMenuQuestions->execute(['questionnaire_set_id' => $questionSet, 'order_by' => (object)['column' => 'order','DESC' => false]]);
         return $this->collectionResponse(HelpMenuQuestionResource::collection($query));
     }
 

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

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Classes\Modules\Imports\Services;
+
+use Maatwebsite\Excel\Concerns\WithHeadingRow;
+use Illuminate\Support\Collection;
+use Maatwebsite\Excel\Concerns\ToCollection;
+
+
+class GenericImport implements ToCollection, WithHeadingRow
+{
+    function headingRow(): int { return 1; }
+
+    public $rows;
+
+    /**
+     * @param Collection $collection
+     */
+    public function collection(Collection $collection)
+    {
+        $this->rows = $collection;
+    }
+}

app/Classes/Modules/Jobs/ControllersLogic/FetchJobResultLogic.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace App\Classes\Modules\Jobs\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Jobs\Processors\FetchesJobResultProcessor;
+use App\Http\Resources\JobResultResource;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class FetchJobResultLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Retrieved Data',
+            'message' => 'You have successfully retrieved data'
+        ];
+    }
+
+    /** @var FetchesJobResultProcessor */
+    private $fetchesJobResultProcessor;
+
+    /**
+     * FetchJobResultLogic constructor.
+     * @param FetchesJobResultProcessor $fetchesJobResultProcessor
+     */
+    public function __construct(FetchesJobResultProcessor $fetchesJobResultProcessor)
+    {
+        $this->fetchesJobResultProcessor = $fetchesJobResultProcessor;
+    }
+
+
+    /**
+     * @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
+    {
+        $query = $this->fetchesJobResultProcessor->execute($request);
+
+        return $this->resourceResponse(new JobResultResource($query));
+    }
+
+}

app/Classes/Modules/Jobs/DataTransferObjects/ListGenericJobObject.php

@@ -0,0 +1,118 @@
+<?php
+
+namespace App\Classes\Modules\Jobs\DataTransferObjects;
+
+use App\Classes\General\Interfaces\DataTransferObject;
+
+class ListGenericJobObject implements DataTransferObject
+{
+    /** @var string */
+    private $name;
+
+    /** @var array */
+    private $payload;
+
+    /** @var string */
+    private $jobId;
+
+    /** @var string */
+    private $requestSignature;
+
+    /** @var string */
+    private $resultSignature;
+
+    /** @var object */
+    private $userInfo;
+
+    /** @var string */
+    private $jobCommandName;
+
+    /** @var string */
+    private $jobCommand;
+
+    public function __construct(string $name, array $payload, string $requestSignature, ?string $resultSignature, string $jobId, object $userInfo = null)
+    {
+        $this->name = $name;
+        $this->payload = $payload;
+        $this->jobId = $jobId;
+        $this->requestSignature = $requestSignature;
+        $this->resultSignature = $resultSignature;
+        $this->userInfo = $userInfo;
+    }
+
+    /**
+     * @return string
+     */
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    /**
+     * @return array
+     */
+    public function getPayload(): array
+    {
+        return $this->payload;
+    }
+
+    /**
+     * @return string
+     */
+    public function getJobId(): string
+    {
+        return $this->jobId;
+    }
+
+    /**
+     * @return string
+     */
+    public function getRequestSignature(): string
+    {
+        return $this->requestSignature;
+    }
+
+    /**
+     * @return string
+     */
+    public function getResultSignature(): ?string
+    {
+        return $this->resultSignature;
+    }
+
+    /**
+     * @return object
+     */
+    public function getUserInfo(): object
+    {
+        return $this->userInfo;
+    }
+
+    /**
+     * @return string
+     */
+    public function getJobCommandName(): string
+    {
+        return $this->jobCommandName;
+    }
+
+    /**
+     * @return string
+     */
+    public function getJobCommand(): string
+    {
+        return $this->jobCommand;
+    }
+
+
+    public function setJobCommandName(string $jobCommandName)
+    {
+        $this->jobCommandName = $jobCommandName;
+    }
+
+    public function setJobCommand(string $jobCommand)
+    {
+        $this->jobCommand = $jobCommand;
+    }
+
+}

app/Classes/Modules/Jobs/DataTransferObjects/UpdateJobResultObject.php

@@ -0,0 +1,60 @@
+<?php
+
+namespace App\Classes\Modules\Jobs\DataTransferObjects;
+
+use App\Classes\General\Interfaces\DataTransferObject;
+
+class UpdateJobResultObject implements DataTransferObject
+{
+    /** @var string */
+    private $result;
+
+    /** @var string */
+    private $resultSignature;
+
+    /** @var string */
+    private $jobCommandName;
+
+    /** @var string */
+    private $jobCommand;
+
+    public function __construct(string $result, string $resultSignature, string $jobCommandName, string $jobCommand)
+    {
+        $this->result = $result;
+        $this->resultSignature = $resultSignature;
+        $this->jobCommandName = $jobCommandName;
+        $this->jobCommand = $jobCommand;
+    }
+
+    /**
+     * @return string
+     */
+    public function getResult(): string
+    {
+        return $this->result;
+    }
+
+    /**
+     * @return array
+     */
+    public function getResultSignature(): string
+    {
+        return $this->resultSignature;
+    }
+
+    /**
+     * @return string
+     */
+    public function getJobCommandName(): string
+    {
+        return $this->jobCommandName;
+    }
+
+    /**
+     * @return string
+     */
+    public function getJobCommand(): string
+    {
+        return $this->jobCommand;
+    }
+}

app/Classes/Modules/Jobs/Processors/FetchesJobResultProcessor.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace App\Classes\Modules\Jobs\Processors;
+
+use App\Classes\Exceptions\JobResourceNotFoundException;
+use App\Classes\Modules\Jobs\Services\FetchesJobResult;
+use Illuminate\Http\Request;
+
+
+class FetchesJobResultProcessor
+{
+    /** @var FetchesJobResult */
+    private $fetchesJobResult;
+
+
+    /**
+     * FetchesJobResultProcessor constructor.
+     * @param FetchesJobResult $fetchesJobResult
+     */
+    public function __construct(FetchesJobResult $fetchesJobResult)
+    {
+        $this->fetchesJobResult = $fetchesJobResult;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\JobResourceNotFoundException
+     * @throws \App\Classes\Exceptions\ResourceNotFoundException
+     */
+    public function execute(Request $request){
+
+        $res1 = $this->fetchesJobResult->execute(['job_id' => $request->route('job_id')]);
+        if($request->route('is_last')){
+            $res2 = $this->fetchesJobResult->execute(['request_signature' => $res1->request_signature, 'result_not_null' => true, 'order_by_id_desc' => true]);
+            return $res2;
+        }
+
+        if(!$res1->result){
+            throw new JobResourceNotFoundException('Unable to find any job based on the criteria provided');
+        }
+
+        return $res1;
+    }
+}

app/Classes/Modules/Jobs/Processors/UpdateJobResultProcessor.php

@@ -0,0 +1,64 @@
+<?php
+
+namespace App\Classes\Modules\Jobs\Processors;
+
+
+use App\Classes\Modules\Jobs\Services\UpdatesJobResult;
+use App\Classes\Modules\Jobs\Services\FetchesJobResult;
+use App\Classes\Exceptions\JobResourceNotFoundException;
+use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;
+use App\Classes\Modules\Jobs\DataTransferObjects\UpdateJobResultObject;
+
+class UpdateJobResultProcessor
+{
+
+    /** @var FetchesJobResult */
+    private $fetchesJobResult;
+
+    /** @var UpdatesJobResult */
+    private $updatesJobResult;
+
+    /**
+     * UpdateJobResultProcessor constructor.
+     * @param FetchesJobResult $fetchesJobResult
+     * @param UpdatesJobResult $updatesJobResult
+     */
+    public function __construct(FetchesJobResult $fetchesJobResult, UpdatesJobResult $updatesJobResult)
+    {
+        $this->fetchesJobResult = $fetchesJobResult;
+        $this->updatesJobResult = $updatesJobResult;
+    }
+
+    /**
+     * @param ListGenericJobObject $listGenericJobObject
+     * @param array $resultCurrent
+     * @return void
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\JobResourceNotFoundException
+     */
+    public function execute(ListGenericJobObject $listGenericJobObject, $resultCurrent) {
+        $jobResultCurrent = $this->fetchesJobResult->execute(['job_id' => $listGenericJobObject->getJobId()]);
+        $resultCurrentJson = json_encode($resultCurrent);
+        $resultSignatureCurrent = md5($resultCurrentJson);
+
+        try{
+            $jobResultExisting = $this->fetchesJobResult->execute(['request_signature' => $jobResultCurrent->request_signature, 'result_not_null' => true, 'order_by_id_desc' => true]);
+            $resultSignatureExisting = $jobResultExisting->result_signature;
+            //if($resultSignatureExisting != $resultSignatureCurrent){
+                $this->updateJobResult($jobResultCurrent, $resultCurrentJson, $resultSignatureCurrent, $listGenericJobObject->getJobCommandName(), $listGenericJobObject->getJobCommand());
+            //}
+        } catch (JobResourceNotFoundException $exception){
+            $this->updateJobResult($jobResultCurrent, $resultCurrentJson, $resultSignatureCurrent, $listGenericJobObject->getJobCommandName(), $listGenericJobObject->getJobCommand());
+        }
+    }
+
+    private function updateJobResult($jobResultCurrent, $resultCurrentJson, $resultSignatureCurrent, $jobCommandName, $jobCommand){
+        $updateJobResultObject = new UpdateJobResultObject(
+            $resultCurrentJson,
+            $resultSignatureCurrent,
+            $jobCommandName,
+            $jobCommand
+        );
+        $create = $this->updatesJobResult->execute($jobResultCurrent, $updateJobResultObject);
+    }
+}

app/Classes/Modules/Jobs/Services/CreatesJobResult.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Classes\Modules\Jobs\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Models\JobResult;
+use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;
+
+class CreatesJobResult extends AbstractUpdateRecord
+{
+    /**
+     * @param ListGenericJobObject $listGenericJobObject
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(ListGenericJobObject $listGenericJobObject)
+    {
+        $model = new JobResult();
+        $model->job_id = $listGenericJobObject->getJobId();
+        $model->request_signature = $listGenericJobObject->getRequestSignature();
+        $model->result_signature = $listGenericJobObject->getResultSignature();
+        $model->url = $listGenericJobObject->getName();
+
+        return $this->handler($model);
+    }
+}

app/Classes/Modules/Jobs/Services/FetchesJobResult.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Classes\Modules\Jobs\Services;
+
+
+use App\Classes\General\Eloquent\AbstractFetchRecord;
+use Illuminate\Database\Eloquent\Builder;
+use App\Models\JobResult;
+
+class FetchesJobResult extends AbstractFetchRecord
+{
+
+    /** @var JobResult */
+    private $repository;
+
+    /**
+     * FetchesJobResult constructor.
+     * @param JobResult $repository
+     */
+    public function __construct(JobResult $repository)
+    {
+        $this->repository = $repository;
+    }
+
+
+    /**
+     * @return Builder
+     */
+    public function getRepository(): Builder
+    {
+        return $this->repository->newQuery();
+    }
+}

app/Classes/Modules/Jobs/Services/ListsJobResult.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Classes\Modules\Jobs\Services;
+
+
+use App\Classes\General\Eloquent\AbstractListRecord;
+use Illuminate\Database\Eloquent\Builder;
+use App\Models\JobResult;
+
+class ListsJobResult extends AbstractListRecord
+{
+
+    /** @var JobResult */
+    private $repository;
+
+    /**
+     * ListsJobResult constructor.
+     * @param JobResult $repository
+     */
+    public function __construct(JobResult $repository)
+    {
+        $this->repository = $repository;
+    }
+
+
+    /**
+     * @return Builder
+     */
+    function getRepository(): Builder
+    {
+        return $this->repository->newQuery();
+    }
+}

app/Classes/Modules/Jobs/Services/UpdatesJobResult.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Classes\Modules\Jobs\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\Modules\Jobs\DataTransferObjects\UpdateJobResultObject;
+use App\Models\JobResult;
+
+class UpdatesJobResult extends AbstractUpdateRecord
+{
+
+    /**
+     * @param JobResult $model
+     * @param UpdateJobResultObject $updateJobResultObject
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(JobResult $model, UpdateJobResultObject $updateJobResultObject) {
+
+        $model->result = $updateJobResultObject->getResult();
+        $model->result_signature = $updateJobResultObject->getResultSignature();
+        $model->job_command_name = $updateJobResultObject->getJobCommandName();
+        $model->job_command = $updateJobResultObject->getJobCommand();
+
+        return $this->handler($model);
+
+    }
+}

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

@@ -6,6 +6,7 @@ use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Orders\Processors\ApproveChangeOrderAddressProcessor;
 use App\Http\Resources\AddressResource;
 use App\Http\Resources\OrderResource;
+use App\Transformers\AddressTransformer;
 use Illuminate\Http\Request;
 use Illuminate\Http\JsonResponse;
 
@@ -39,6 +40,12 @@ class ApproveChangeOrderAddressLogic extends AbstractControllerLogic
     {
         $address = $this->approveChangeOrderAddressProcessor->execute($request);
 
+
+        //load address with no relationships
+        /*          return fractal()
+                    ->item($address, new AddressTransformer())
+                    ->respond(200, [], JSON_PRETTY_PRINT);*/
+
         return $this->resourceResponse(new AddressResource($address));
     }
 }

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

@@ -4,14 +4,25 @@ 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\Accounts\DataTransferObjects\KeyValuePairObject;
 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\ConnectOrderToExchangeBookingOnExchangeProcessor;
 use App\Classes\Modules\PerfexCRM\Processors\NewLeadTaskToPerfexCRMProcessor;
 use App\Classes\Modules\Orders\Processors\CreateOrderProcessor;
+use App\Classes\Modules\Orders\Services\ConnectOrderToExchangeBooking;
 use App\Classes\Modules\Orders\Services\GeneratesOrderNumber;
+use App\Classes\ValueObjects\Constants\AddressType;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\Modules\Addresses\Standards\Rules\CanCreateAddress;
+use App\Models\Address;
+use App\Classes\Modules\Accounts\Services\CreatesKeyValuePair;
 use App\Classes\ValueObjects\Constants\WarehouseReferences;
 use App\Http\Resources\OrderResource;
+use App\Models\Order;
 use Illuminate\Http\Request;
 use Illuminate\Http\JsonResponse;
 
@@ -41,8 +52,25 @@ class CreateOrderLogic extends AbstractControllerLogic
     /** @var GeneratesOrderNumber */
     private $generatesOrderNumber;
 
+    /** @var CreatesAddress */
+    private $createsAddress;
+
+    /** @var CanCreateAddress */
+    private $canCreateAddress;
+
     /** @var NewLeadTaskToPerfexCRMProcessor */
     private $newLeadTaskToPerfexCRMProcessor;
+
+    /** @var ConnectOrderToExchangeBooking */
+    private $connectOrderToExchangeBooking;
+
+    /** @var ConnectOrderToExchangeBookingOnExchangeProcessor */
+    private $connectOrderToExchangeBookingOnExchangeProcessor;
+
+    /** @var CreatesKeyValuePair */
+    private $createsKeyValuePair;
+
+
     /**
      * CreateOrderLogic constructor.
      * @param FetchesCompany $fetchesCompany
@@ -51,8 +79,10 @@ class CreateOrderLogic extends AbstractControllerLogic
      * @param FetchesCompanyModule $fetchesCompanyModule
      * @param GeneratesOrderNumber $generatesOrderNumber
      * @param NewLeadTaskToPerfexCRMProcessor $newLeadTaskToPerfexCRMProcessor
+     * @param ConnectOrderToExchangeBooking $connectOrderToExchangeBooking
+     * @param ConnectOrderToExchangeBookingOnExchangeProcessor $connectOrderToExchangeBookingOnExchangeProcessor
      */
-    public function __construct(FetchesCompany $fetchesCompany, FetchesAddress $fetchesAddress, CreateOrderProcessor $createOrderProcessor, FetchesCompanyModule $fetchesCompanyModule, GeneratesOrderNumber $generatesOrderNumber,  NewLeadTaskToPerfexCRMProcessor $newLeadTaskToPerfexCRMProcessor)
+    public function __construct(FetchesCompany $fetchesCompany, FetchesAddress $fetchesAddress, CreateOrderProcessor $createOrderProcessor, FetchesCompanyModule $fetchesCompanyModule, GeneratesOrderNumber $generatesOrderNumber,  NewLeadTaskToPerfexCRMProcessor $newLeadTaskToPerfexCRMProcessor, ConnectOrderToExchangeBooking $connectOrderToExchangeBooking, ConnectOrderToExchangeBookingOnExchangeProcessor $connectOrderToExchangeBookingOnExchangeProcessor, CreatesKeyValuePair $createsKeyValuePair)
     {
         $this->fetchesCompany = $fetchesCompany;
         $this->fetchesAddress = $fetchesAddress;
@@ -60,12 +90,18 @@ class CreateOrderLogic extends AbstractControllerLogic
         $this->fetchesCompanyModule = $fetchesCompanyModule;
         $this->generatesOrderNumber = $generatesOrderNumber;
         $this->newLeadTaskToPerfexCRMProcessor = $newLeadTaskToPerfexCRMProcessor;
+        $this->connectOrderToExchangeBooking = $connectOrderToExchangeBooking;
+        $this->connectOrderToExchangeBookingOnExchangeProcessor = $connectOrderToExchangeBookingOnExchangeProcessor;
+        $this->createsKeyValuePair = $createsKeyValuePair;
     }
 
 
     public function logic(Request $request): JsonResponse
     {
-
+        $isTermsAgreed = $request->input('is_terms_agree');
+        if(!$isTermsAgreed){
+            throw new RequestValidationException('You must read and agree to our terms and conditions to proceed');
+        }
 
         $company = $this->fetchesCompany->execute(['id' => $request->input('company_id')]);
 
@@ -91,12 +127,32 @@ class CreateOrderLogic extends AbstractControllerLogic
             throw new RequestValidationException('Our Yiwu warehouse is unable to ship goods to Sabah & Sarawak at the moment. you can select our Guangzhou warehouse as an alternative.');
         }
 
+        /** @var Order $order */
         $order = $this->createOrderProcessor->execute($company, $originWarehouse, $address, $this->generatesOrderNumber->execute());
 
+        $keyValuePairObject = new KeyValuePairObject(
+           "TERMS_AND_CONDITIONS",
+           $isTermsAgreed
+        );
+        $this->createsKeyValuePair->execute($order, $keyValuePairObject);
+
         if(config('perfexcrm.is_enabled') == 'true'){
             $this->newLeadTaskToPerfexCRMProcessor->execute($company);
         }
 
+        $token = explode('.', $request->bearerToken())[1];
+        $decodedToken = base64_decode($token);
+        $exchangeUser = json_decode($decodedToken, true)['user'];
+        $exchangeBookingId = null;
+        if (isset($exchangeUser['exchange_booking_id']) && $exchangeUser['exchange_booking_id']) {
+            $exchangeBookingId = $exchangeUser['exchange_booking_id'];
+        }
+
+        if ($exchangeBookingId) {
+            $this->connectOrderToExchangeBooking->execute($order, $exchangeBookingId);
+            $this->connectOrderToExchangeBookingOnExchangeProcessor->execute($request, $order->id, $exchangeBookingId);
+        }
+
         return $this->resourceResponse(new OrderResource($order));
     }
 }

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

@@ -53,8 +53,12 @@ class FetchOrderV2Logic extends AbstractControllerLogic
 
         $query = $this->fetchesOrder->execute(['reference' => $request->route('id'), 'with_packing_lists' => true]);
 
+        if($request->input('storages')){
+            $query->storages = $request->input('storages'); //from middleware
+        }
+
         return $this->resourceResponse(new OrderV2Resource($query));
 
     }
 
-}
+}

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

@@ -0,0 +1,48 @@
+<?php
+
+namespace App\Classes\Modules\Orders\Processors;
+
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Log;
+
+class ConnectOrderToExchangeBookingOnExchangeProcessor
+{
+    /**
+     * @param Request $request
+     * @return string
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function execute(Request $request, $orderId, $exchangeBookingId) {
+        if (App::environment(['production'])) {
+            dd("Delete this line before push to production");
+            $url = "https://exchange.cief-malaysia.com/api/v1/shipping/order/{$orderId}/booking/{$exchangeBookingId}/connect";
+        } else if (App::environment(['local'])) {
+            $url = "http://127.0.0.1:8000/api/v1/shipping/order/{$orderId}/booking/{$exchangeBookingId}/connect";
+        } else {
+            $url = "https://dev.exchange.cief-malaysia.com/api/v1/shipping/order/{$orderId}/booking/{$exchangeBookingId}/connect";
+        }
+        try {
+            $client = new \GuzzleHttp\Client(['verify' => false]);
+            $token = $request->bearerToken();
+            $headers = [
+                'Authorization' => 'Bearer ' . $token,        
+                'Accept'        => 'application/json',
+            ];
+            $formParams = $request->toArray();
+            $response = $client->request('POST', $url, [
+                'headers' => $headers,
+                'form_params' => $formParams
+            ]);
+            $body = $response->getBody();
+            $contents = json_decode($body, true);
+
+            return $contents;
+        } catch(\GuzzleHttp\Exception\RequestException $exception){
+            Log::error($exception->getResponse()->getBody()->getContents());
+        }
+    }
+
+}

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

@@ -67,7 +67,7 @@ class CreateOrderProcessor
      * @param CompanyModule $originWarehouse
      * @param Address $address
      * @param int|null $orderNumber
-     * @return Addressable
+     * @return Order
      * @throws \App\Classes\Exceptions\AccessForbiddenException
      * @throws \App\Classes\Exceptions\MalformedRequestException
      * @throws \App\Classes\Exceptions\RequestValidationException

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

@@ -38,6 +38,7 @@ class UpdateDoFromYDPortalProcessor
      */
     public function execute(PackingList $packingList) {
         Log::info('Trying to Call UpdateDoFromYDPortalProcessor');
+        Log::channel('storage_invoices')->info('UpdateDoFromYDPortalProcessor: '.json_encode($packingList));
 
         if(!app()->environment(['production'])){
             return;
@@ -72,6 +73,7 @@ class UpdateDoFromYDPortalProcessor
 
 
         } catch (\Exception $exception){
+            log::debug($exception);
             throw new InternalServerErrorException('failed to approve address due to an error related to YD portal');
         }
     }

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

@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Classes\Modules\Orders\Services;
+
+use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Models\ExchangeBookingOrder;
+use App\Models\Order;
+
+class ConnectOrderToExchangeBooking extends AbstractUpdateRecord
+{
+    /**
+     * @param Order $order
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws MalformedRequestException
+     */
+    public function execute(Order $order, $exchangeBookingId)
+    {
+        $model = new ExchangeBookingOrder();
+        $model->order_id = $order->id;
+        $model->exchange_booking_id = $exchangeBookingId;            
+
+        return $this->handler($model);
+    }
+}

app/Classes/Modules/PackingLists/ControllersLogic/Containers/AssignPackingListContainerLogic.php

@@ -6,6 +6,7 @@ use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\PackingLists\Services\Containers\FetchesContainer;
 use App\Classes\Modules\PackingLists\Services\FetchesPackingList;
 use App\Http\Resources\ContainerResource;
+use App\Transformers\ContainerTransformer;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -53,9 +54,16 @@ class AssignPackingListContainerLogic extends AbstractControllerLogic
 
             foreach ($packing_list as $key => $row) {
                 $packing_list_item = $this->fetchesPackingList->execute(['id' => $row]);
-                $container->packingLists()->attach($packing_list_item);
+                $container->packingLists()->attach($packing_list_item, ['created_at' => now(), 'updated_at' => now()]);
             }
 
+            //only return with packing list relationship
+
+      /*      return fractal()
+            ->item($container, new ContainerTransformer())
+            ->parseInclude(['packingLists'])
+            ->respond(200, [], JSON_PRETTY_PRINT);*/
+
             return $this->resourceResponse(new ContainerResource($container));
 
         } catch (\Exception $exception){

app/Classes/Modules/PackingLists/ControllersLogic/Containers/CompleteContainerLogic.php

@@ -8,6 +8,7 @@ use App\Classes\Modules\PackingLists\Services\Containers\FetchesContainer;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 
 use App\Http\Resources\ContainerResource;
+use App\Transformers\ContainerTransformer;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -19,7 +20,8 @@ class CompleteContainerLogic extends AbstractControllerLogic
     /**
      * @return array
      */
-    protected function notification():array {
+    protected function notification(): array
+    {
         return [
             'title' => 'Updated Container',
             'message' => 'You have successfully updated the Container'
@@ -51,10 +53,16 @@ class CompleteContainerLogic extends AbstractControllerLogic
      * @return JsonResponse
      * @throws ErrorException
      */
-    public function logic(Request $request) : JsonResponse
+    public function logic(Request $request): JsonResponse
     {
         $container = $this->fetchesContainer->execute(['id' => $request->route('id')]);
         $query = $this->updatesContainerStatus->execute($container, ApprovalStatus::COMPLETED);
+
+        //no relationships needed
+/*        return fractal()
+            ->item($container, new ContainerTransformer())
+            ->respond(200, [], JSON_PRETTY_PRINT);*/
+
         return $this->resourceResponse(new ContainerResource($container));
     }
 

app/Classes/Modules/PackingLists/ControllersLogic/Containers/CreateContainerLogic.php

@@ -11,6 +11,7 @@ use App\Classes\Modules\PackingLists\DataTransferObjects\ContainerObject;
 use App\Classes\Modules\PackingLists\Services\FetchesPackingList;
 
 use App\Http\Resources\ContainerResource;
+use App\Transformers\ContainerTransformer;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -70,6 +71,11 @@ class CreateContainerLogic extends AbstractControllerLogic
 
         $query = $this->createsContainer->execute($object, $this->fetchesCompanyModule->execute(['id' => $request->input('company_module_id')]));
 
+        //no relationship  needed
+           /*   return fractal()
+            ->item($query, new ContainerTransformer())
+            ->respond(200, [], JSON_PRETTY_PRINT);*/
+
         return $this->resourceResponse(new ContainerResource($query));
     }
 

app/Classes/Modules/PackingLists/ControllersLogic/Containers/CreateContainerRemarkLogic.php

@@ -8,6 +8,7 @@ use App\Classes\Modules\PackingLists\Services\Containers\FetchesContainer;
 use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
 use App\Classes\Modules\Remarks\Processors\CreateRemarkProcessor;
 use App\Http\Resources\ContainerResource;
+use App\Transformers\ContainerTransformer;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
@@ -18,7 +19,8 @@ class CreateContainerRemarkLogic extends AbstractControllerLogic
     /**
      * @return array
      */
-    protected function notification():array {
+    protected function notification(): array
+    {
         return [
             'title' => 'Created Container Remark',
             'message' => 'You have successfully created a new Container Remark'
@@ -50,7 +52,7 @@ class CreateContainerRemarkLogic extends AbstractControllerLogic
      * @throws \App\Classes\Exceptions\MalformedRequestException
      * @throws \App\Classes\Exceptions\RequestValidationException
      */
-    public function logic(Request $request) : JsonResponse
+    public function logic(Request $request): JsonResponse
     {
 
         $container = $this->fetchesContainer->execute(['id' => $request->route('id')]);
@@ -59,6 +61,12 @@ class CreateContainerRemarkLogic extends AbstractControllerLogic
 
         $this->createRemarkProcessor->execute($container, $object);
 
+        //load with remarks only
+  /*      return fractal()
+            ->item($container, new ContainerTransformer())
+            ->parseIncludes(['remarks'])
+            ->respond(200, [], JSON_PRETTY_PRINT);*/
+
         return $this->resourceResponse(new ContainerResource($container));
 
     }

app/Classes/Modules/PackingLists/ControllersLogic/Containers/CreateLoadContainerLogic.php

@@ -17,6 +17,7 @@ use App\Classes\ValueObjects\Constants\TransportType;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 
 use App\Http\Resources\ContainerResource;
+use App\Transformers\ContainerTransformer;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -28,7 +29,8 @@ class CreateLoadContainerLogic extends AbstractControllerLogic
     /**
      * @return array
      */
-    protected function notification():array {
+    protected function notification(): array
+    {
         return [
             'title' => 'Created Container',
             'message' => 'You have successfully created a new Container'
@@ -41,7 +43,7 @@ class CreateLoadContainerLogic extends AbstractControllerLogic
     /** @var FetchesPackingList */
     private $fetchesPackingList;
 
-     /** @var FetchesCompanyModule */
+    /** @var FetchesCompanyModule */
     private $fetchesCompanyModule;
 
     /** @var CreatesPackingList */
@@ -54,12 +56,12 @@ class CreateLoadContainerLogic extends AbstractControllerLogic
     private $createsSchedule;
 
     public function __construct(
-        CanCreateContainer $canCreateContainer, 
-        FetchesPackingList $fetchesPackingList, 
-        FetchesCompanyModule $fetchesCompanyModule, 
-        CreatesContainer $createsContainer,
-        CreatesTransport $createsTransport, 
-        CreatesSchedule $createsSchedule
+        CanCreateContainer   $canCreateContainer,
+        FetchesPackingList   $fetchesPackingList,
+        FetchesCompanyModule $fetchesCompanyModule,
+        CreatesContainer     $createsContainer,
+        CreatesTransport     $createsTransport,
+        CreatesSchedule      $createsSchedule
     )
     {
         $this->canCreateContainer = $canCreateContainer;
@@ -77,11 +79,11 @@ class CreateLoadContainerLogic extends AbstractControllerLogic
      * @throws \App\Classes\Exceptions\MalformedRequestException
      * @throws \App\Classes\Exceptions\RequestValidationException
      */
-    public function logic(Request $request) : JsonResponse
+    public function logic(Request $request): JsonResponse
     {
         $object = new ContainerObject(
-            $request->input('container_reference'), 
-            $request->input('container_number'), 
+            $request->input('container_reference'),
+            $request->input('container_number'),
             $request->input('seal_reference'),
             $request->input('container_type'),
             ApprovalStatus::APPROVED
@@ -92,21 +94,27 @@ class CreateLoadContainerLogic extends AbstractControllerLogic
         $container = $this->createsContainer->execute($object, $this->fetchesCompanyModule->execute(['id' => $request->input('company_module_id')]));
 
         $transportObject = new TransportObject(
-            TransportType::LAND, null, 
-            $request->input('tracking'), 
-            Carbon::parse($request->input('etd')), 
-            Carbon::parse($request->input('eta')), 
+            TransportType::LAND, null,
+            $request->input('tracking'),
+            Carbon::parse($request->input('etd')),
+            Carbon::parse($request->input('eta')),
             ApprovalStatus::APPROVED
         );
         $transport = $this->createsTransport->execute($transportObject, $container);
 
         $scheduleObject = new ScheduleObject(
-            Carbon::parse($request->input('etd')), 
+            Carbon::parse($request->input('etd')),
             Carbon::parse($request->input('eta')),
             ApprovalStatus::APPROVED
-         );
+        );
         $schedule = $this->createsSchedule->execute($transport, $scheduleObject);
 
+        //include transport
+ /*       return fractal()
+            ->item($container, new ContainerTransformer())
+            ->parseIncludes(['transport'])
+            ->respond(200, [], JSON_PRETTY_PRINT);*/
+
         return $this->resourceResponse(new ContainerResource($container));
     }
 

app/Classes/Modules/PackingLists/ControllersLogic/Containers/FetchContainerLogic.php

@@ -7,6 +7,7 @@ use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\PackingLists\Services\Containers\FetchesContainer;
 use App\Classes\Modules\PackingLists\Standards\Rules\Containers\CanFetchContainer;
 use App\Http\Resources\ContainerResource;
+use App\Transformers\ContainerTransformer;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -17,7 +18,8 @@ class FetchContainerLogic extends AbstractControllerLogic
     /**
      * @return array
      */
-    protected function notification():array {
+    protected function notification(): array
+    {
         return [
             'title' => 'Retrieved Container',
             'message' => 'You have successfully retrieved a Container'
@@ -48,12 +50,18 @@ class FetchContainerLogic extends AbstractControllerLogic
      * @throws \App\Classes\Exceptions\AccessForbiddenException
      * @throws \App\Classes\Exceptions\RequestValidationException
      */
-    public function logic(Request $request) : JsonResponse
+    public function logic(Request $request): JsonResponse
     {
         $this->canFetchContainer->passes();
 
         $query = $this->fetchesContainer->execute(['id' => $request->route('id'), 'with_packing_lists' => true]);
 
+        //load with packing lists
+/*        return fractal()
+            ->item($query, new ContainerTransformer())
+            ->parseIncludes(['packing_lists'])
+            ->respond(200, [], JSON_PRETTY_PRINT);*/
+
         return $this->resourceResponse(new ContainerResource($query));
 
     }

app/Classes/Modules/PackingLists/ControllersLogic/Containers/InboundCustomClearedLogic.php

@@ -9,6 +9,7 @@ use App\Classes\Modules\PackingLists\Standards\Rules\Containers\CanListContainer
 use App\Classes\Modules\PackingLists\Processors\FetchInboundCustomClearedProcessor;
 
 use App\Http\Resources\ContainerResource;
+use App\Transformers\ContainerTransformer;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -19,7 +20,8 @@ class InboundCustomClearedLogic extends AbstractControllerLogic
     /**
      * @return array
      */
-    protected function notification():array {
+    protected function notification(): array
+    {
         return [
             'title' => 'Retrieved Containers',
             'message' => 'You have successfully retrieved a list of Containers'
@@ -52,11 +54,16 @@ class InboundCustomClearedLogic extends AbstractControllerLogic
      * @return JsonResponse
      * @throws ErrorException
      */
-    public function logic(Request $request) : JsonResponse
+    public function logic(Request $request): JsonResponse
     {
 
         $query = $this->fetchInboundCustomCleared->execute();
 
+        //no relations required
+     /*   return fractal()
+            ->item($query, new ContainerTransformer())
+            ->respond(200, [], JSON_PRETTY_PRINT);*/
+
         return $this->collectionResponse(ContainerResource::collection($query));
 
     }

app/Classes/Modules/PackingLists/ControllersLogic/Containers/ListContainersLogic.php

@@ -3,10 +3,14 @@
 namespace App\Classes\Modules\PackingLists\ControllersLogic\Containers;
 
 
+use App\Classes\Exceptions\AccessForbiddenException;
+use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\Exceptions\RequestValidationException;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\PackingLists\Services\Containers\ListsContainers;
 use App\Classes\Modules\PackingLists\Standards\Rules\Containers\CanListContainers;
 use App\Http\Resources\ContainerResource;
+use App\Transformers\ContainerTransformer;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -17,7 +21,8 @@ class ListContainersLogic extends AbstractControllerLogic
     /**
      * @return array
      */
-    protected function notification():array {
+    protected function notification(): array
+    {
         return [
             'title' => 'Retrieved Containers',
             'message' => 'You have successfully retrieved a list of Containers'
@@ -45,16 +50,22 @@ class ListContainersLogic extends AbstractControllerLogic
     /**
      * @param Request $request
      * @return JsonResponse
-     * @throws \App\Classes\Exceptions\AccessForbiddenException
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     * @throws \App\Classes\Exceptions\RequestValidationException
+     * @throws AccessForbiddenException
+     * @throws MalformedRequestException
+     * @throws RequestValidationException
      */
-    public function logic(Request $request) : JsonResponse
+    public function logic(Request $request): JsonResponse
     {
         $this->canListContainers->passes();
 
         $query = $this->listsContainers->execute($this->listsContainers->deserializeFilters($request->input('filters')));
 
+        //load with no filters, a details page to be added to load one with all related data
+/*        return fractal()
+            ->collection($query, new ContainerTransformer)
+            ->respond(200, [], JSON_PRETTY_PRINT);*/
+
+
         return $this->collectionResponse(ContainerResource::collection($query));
 
     }