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,10 +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/General/Abstracts/AbstractControllerLogic.php

@@ -64,22 +64,28 @@ abstract class AbstractControllerLogic
             return $response;
 
         } catch (ErrorException|GeneralExceptions|TypeError  $exception){
-            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{
+            if ($request->has('isApiPub')) {
                 Log::error($exception);
-            }
-
-            return (new ApiResponseObject($this->getNotificationTitle().' failed', $exception->getMessage(),
+                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/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/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/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

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;
@@ -89,6 +90,12 @@ class CreateCustomerLogic extends AbstractControllerLogic
     /** @var CreatePerfexCRMLeadProcessor */
     private $createPerfexCRMLeadProcessor;
 
+    /** @var RegisterOnExchangeProcessor */
+    private $registerOnExchangeProcessor;
+
+    /** @var ConnectCompanyModuleToExchangeCompany */
+    private $connectCompanyModuleToExchangeCompany;
+
     /**
      * CreateCustomerLogic constructor.
      * @param CreateUserProcessor $createUserProcessor
@@ -103,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;
@@ -118,6 +127,8 @@ class CreateCustomerLogic extends AbstractControllerLogic
         $this->generateEmailVerificationAttemptProcessor = $generateEmailVerificationAttemptProcessor;
         $this->fetchesCompanyModule = $fetchesCompanyModule;
         $this->createPerfexCRMLeadProcessor = $createPerfexCRMLeadProcessor;
+        $this->registerOnExchangeProcessor = $registerOnExchangeProcessor;
+        $this->connectCompanyModuleToExchangeCompany = $connectCompanyModuleToExchangeCompany;
     }
 
     /**
@@ -155,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);
@@ -184,6 +195,19 @@ class CreateCustomerLogic extends AbstractControllerLogic
 
 //        $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/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

@@ -36,7 +36,7 @@ class CallbackBillplzProcessor
     private $releaseGoodsToCustomerProcessor;
 
     /**
-     * CreateUserProcessor constructor.
+     * CallbackBillplzProcessor constructor.
      * @param UpdatesTransactionStatus $updatesTransactionStatus
      * @param UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor
      * @param UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor

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/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/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/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/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

@@ -156,7 +156,7 @@ class ExportsPaymentTransactions implements FromQuery, WithHeadings, WithHeading
                 $detail->quantity,
                 $detail->price,
                 floatval($detail->tax_percentage) > 0 ? 'SV-6' : '',
-                floatval($detail->tax_percentage) > 0 ? $detail->amount : '0',
+                floatval($detail->tax_percentage) > 0 ? number_format($detail->amount, 2) : '0.00',
                 $detail->tax_percentage,
             ];
 

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

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

app/Classes/Modules/Orders/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/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/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));
 
     }

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

@@ -10,6 +10,7 @@ use App\Classes\Modules\Schedules\DataTransferObjects\ScheduleObject;
 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;
@@ -20,7 +21,8 @@ class RescheduleContainerLogic extends AbstractControllerLogic
     /**
      * @return array
      */
-    protected function notification():array {
+    protected function notification(): array
+    {
         return [
             'title' => 'Reschedule Container',
             'message' => 'You have successfully Reschedule Container'
@@ -54,7 +56,7 @@ class RescheduleContainerLogic 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')]);
         $transport = $container->transports()->first();

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

@@ -3,12 +3,16 @@
 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\UpdatesContainer;
 use App\Classes\Modules\PackingLists\Services\Containers\FetchesContainer;
 use App\Classes\Modules\PackingLists\Standards\Rules\Containers\CanUpdateContainer;
 use App\Classes\Modules\PackingLists\DataTransferObjects\ContainerObject;
 use App\Http\Resources\ContainerResource;
+use App\Transformers\ContainerTransformer;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -19,7 +23,8 @@ class UpdateContainerLogic extends AbstractControllerLogic
     /**
      * @return array
      */
-    protected function notification():array {
+    protected function notification(): array
+    {
         return [
             'title' => 'Updated Container',
             'message' => 'You have successfully updated the Container'
@@ -52,19 +57,19 @@ class UpdateContainerLogic 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
     {
 
         $container = $this->fetchesContainer->execute(['id' => $request->route('id')]);
-        
-        $object = new ContainerObject( 
-            $request->input('container_reference'), 
-            $container->container_number, 
-            $request->input('container_type'), 
+
+        $object = new ContainerObject(
+            $request->input('container_reference'),
+            $container->container_number,
+            $request->input('container_type'),
             $request->input('seal_reference'),
             $request->input('loading_date'),
             $container->status,
@@ -74,6 +79,12 @@ class UpdateContainerLogic extends AbstractControllerLogic
 
         $query = $this->updatesContainer->execute($container, $object);
 
+        //no relationships
+/*
+        return fractal()
+            ->item($query, new ContainerTransformer())
+            ->respond(200, [], JSON_PRETTY_PRINT);*/
+
         return $this->resourceResponse(new ContainerResource($query));
 
     }

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

@@ -6,6 +6,7 @@ use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Transports\Services\UpdatesDispatchDateTransport;
 use App\Classes\Modules\PackingLists\Services\Containers\FetchesContainer;
 use App\Http\Resources\ContainerResource;
+use App\Transformers\ContainerTransformer;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -17,7 +18,8 @@ class UpdateDispatchDateContainerLogic extends AbstractControllerLogic
     /**
      * @return array
      */
-    protected function notification():array {
+    protected function notification(): array
+    {
         return [
             'title' => 'Updated Dispatch Date Container',
             'message' => 'You have successfully updated the Dispatch Date Container'
@@ -49,11 +51,18 @@ class UpdateDispatchDateContainerLogic 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')]);
         $transport = $container->transports()->first();
         $query = $this->updatesDispatchDateTransport->execute($transport, Carbon::parse($request->input('dispatch_date')));
+
+
+        //no relationships queried
+     /*   return fractal()
+            ->item($query, new ContainerTransformer())
+            ->respond(200, [], JSON_PRETTY_PRINT);*/
+
         return $this->resourceResponse(new ContainerResource($container));
     }
 

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

@@ -6,6 +6,7 @@ use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Transports\Services\UpdatesDropDateTransport;
 use App\Classes\Modules\PackingLists\Services\Containers\FetchesContainer;
 use App\Http\Resources\ContainerResource;
+use App\Transformers\ContainerTransformer;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -17,7 +18,8 @@ class UpdateDropDateContainerLogic extends AbstractControllerLogic
     /**
      * @return array
      */
-    protected function notification():array {
+    protected function notification(): array
+    {
         return [
             'title' => 'Updated Drop Date Container',
             'message' => 'You have successfully updated the Drop Date Container'
@@ -49,11 +51,17 @@ class UpdateDropDateContainerLogic 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')]);
         $transport = $container->transports()->first();
         $query = $this->updatesDropDateTransport->execute($transport, Carbon::parse($request->input('drop_date')));
+
+        //no relationship needed
+        /*     return fractal()
+             ->item($query, new ContainerTransformer())
+             ->respond(200, [], JSON_PRETTY_PRINT);*/
+
         return $this->resourceResponse(new ContainerResource($container));
     }
 

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

@@ -14,6 +14,7 @@ use App\Classes\ValueObjects\Constants\OrderRoleTypes;
 use App\Classes\ValueObjects\Constants\PackingListType;
 
 use App\Http\Resources\DeliverPackingListResource;
+use App\Transformers\DeliverPackingListTransformer;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
@@ -24,7 +25,8 @@ class CreateDeliverPackingListLogic extends AbstractControllerLogic
     /**
      * @return array
      */
-    protected function notification():array {
+    protected function notification(): array
+    {
         return [
             'title' => 'Created Deliver PackingList',
             'message' => 'You have successfully created a new Deliver PackingList'
@@ -60,7 +62,7 @@ class CreateDeliverPackingListLogic extends AbstractControllerLogic
      * @param Request $request
      * @return JsonResponse
      */
-    public function logic(Request $request) : JsonResponse
+    public function logic(Request $request): JsonResponse
     {
         $company_module = $this->fetchesCompanyModule->execute(['id' => $request->input('company_module_id')]);
         $packing_list_id = $request->input('packing_list_id');
@@ -68,9 +70,9 @@ class CreateDeliverPackingListLogic extends AbstractControllerLogic
         $reference_number = $this->generatesPackingListReferenceNumber->execute();
 
         $packingListObject = new PackingListObject(
-            $reference_number, 
-            null, 
-            PackingListType::DELIVERY_PACKING_LIST, 
+            $reference_number,
+            null,
+            PackingListType::DELIVERY_PACKING_LIST,
             ApprovalStatus::PENDING_SUBMISSION
         );
 
@@ -82,6 +84,12 @@ class CreateDeliverPackingListLogic extends AbstractControllerLogic
 
         $deliverPackingList->packing_list_owner()->sync($packing_list_id);
 
+        //no relationships required
+  /*      return fractal()
+            ->item($deliverPackingList, new DeliverPackingListTransformer())
+            ->respond(200, [], JSON_PRETTY_PRINT);*/
+
+
         return $this->resourceResponse(new DeliverPackingListResource($deliverPackingList));
     }
 

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

@@ -129,7 +129,7 @@ class FetchContainersFromYdPortalProcessor
                 try {
                     $container = $this->fetchesContainer->execute(['reference' => $containerReference]);
                     $container->packingLists()->detach($packingList);
-                    $container->packingLists()->attach($packingList);
+                    $container->packingLists()->attach($packingList, ['created_at' => now(), 'updated_at' => now()]);
                 } catch (ResourceNotFoundException $exception){
 
                     if(!($packingList->owner instanceof Order)) continue;
@@ -143,7 +143,7 @@ class FetchContainersFromYdPortalProcessor
                     $container = $this->createContainerProcessor->execute($containerObject, $originWarehouse);
 
                     $container->packingLists()->detach($packingList);
-                    $container->packingLists()->attach($packingList);
+                    $container->packingLists()->attach($packingList, ['created_at' => now(), 'updated_at' => now()]);
 
                     if(config('perfexcrm.is_enabled') == 'true'){
                         $this->packingListToPerfexCRMProcessor->execute($packingList, PerfexCRMTasksYDStages::LOAD_CONTAINER);

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

@@ -274,7 +274,7 @@ class FetchLoadedContainersFromVTPortalProcessor
                     }
 
                     $container->packingLists()->detach($packingList);
-                    $container->packingLists()->attach($packingList);
+                    $container->packingLists()->attach($packingList, ['created_at' => now(), 'updated_at' => now()]);
                     $packingList->packages()->delete();
 
                     $replica = $packingList->packingLists()->where('type', PackingListType::SHIPPING_PACKING_LIST_REPLICA)->first();

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

@@ -385,7 +385,7 @@ class FetchOrderListsFromYdPortalProcessor
                         try {
                             $container = $this->fetchesContainer->execute(['reference' => $containerReference]);
                             $container->packingLists()->detach($packingList);
-                            $container->packingLists()->attach($packingList);
+                            $container->packingLists()->attach($packingList, ['created_at' => now(), 'updated_at' => now()]);
                         } catch (ResourceNotFoundException $exception){
 
                             if (!$allow_contract) {

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

@@ -129,9 +129,12 @@ class FetchPackingListsFromYdPortalProcessor
 
                 $rows = $this->fetchesDataFRomYDPortal->getResponseBody($orderRequest);
 
+                dump('Row Count: ' . count($rows->data));
+
                 if(!$rows->data) continue;
 
                 foreach($rows->data as $row){
+                    dump($row);
                     if(!is_numeric($row->goodcount)) continue;
 
                     $time_start = microtime(true);

app/Classes/Modules/Remarks/DataTransferObjects/RemarkObject.php

@@ -13,10 +13,14 @@ class RemarkObject implements DataTransferObject
     /** @var string*/
     private $content;
 
-    public function __construct(string $content, int $commenterID)
+    /** @var int|null */
+    private $type;
+
+    public function __construct(string $content, int $commenterID, int $type = null)
     {
         $this->commenterID = $commenterID;
         $this->content = $content;
+        $this->type = $type;
     }
 
     /**
@@ -35,4 +39,12 @@ class RemarkObject implements DataTransferObject
         return $this->content;
     }
 
+    /**
+     * @return int|null
+     */
+    public function getType(): ?int
+    {
+        return $this->type;
+    }
+
 }

app/Classes/Modules/Remarks/Services/CreatesRemark.php

@@ -24,6 +24,7 @@ class CreatesRemark extends AbstractUpdateRelationshipRecord
 
         $model->commenter_id = $object->getCommenterId();
         $model->content = $object->getContent();
+        $model->type = $object->getType();
 
         return $this->handler($remarkable->remarks(), $model);
 

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

@@ -0,0 +1,104 @@
+<?php
+
+namespace App\Classes\Modules\Transactions\ControllersLogic;
+
+
+use App\Classes\Notifications\InvoiceIssuedEmail;
+use Illuminate\Http\Request;
+
+
+use Illuminate\Http\JsonResponse;
+use Meneses\LaravelMpdf\Facades\LaravelMpdf;
+use App\Classes\ValueObjects\Constants\DocumentType;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Classes\Modules\Documents\Services\CreatesFiles;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Documents\Services\CreatesDocument;
+use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
+use App\Classes\Modules\PackingLists\Services\FetchesPackingList;
+use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
+use App\Classes\Modules\Transactions\ControllersLogic\Document;
+
+class CreateCombinedInvoicesLogic extends AbstractControllerLogic
+{
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Shipping Invoice Status',
+            'message' => 'You have successfully updated multiple shipping invoices status'
+        ];
+    }
+
+    /** @var FetchesPackingList */
+    private $fetchesPackingList;
+
+    /** @var UpdatesTransactionStatus */
+    private $updatesTransactionStatus;
+
+    /** @var CreatesDocument */
+    private $createsDocument;
+
+    /** @var CreatesFiles */
+    private $createsFiles;
+
+    /**
+     * ApprovePaymentVerificationLogic constructor.
+     * @param FetchesPackingList $fetchesPackingList
+     * @param UpdatesTransactionStatus $updatesTransactionStatus
+     * @param CreatesDocument $createsDocument
+     * @param CreatesFiles $createsFiles
+     * @param CreateInvoiceTransactionProcessor $createInvoiceTransactionProcessor
+     */
+    public function __construct(FetchesPackingList $fetchesPackingList, UpdatesTransactionStatus $updatesTransactionStatus, CreatesDocument $createsDocument, CreatesFiles $createsFiles)
+    {
+        $this->fetchesPackingList = $fetchesPackingList;
+        $this->updatesTransactionStatus = $updatesTransactionStatus;
+        $this->createsDocument = $createsDocument;
+        $this->createsFiles = $createsFiles;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $items = $request->input('ids');
+        $invoice_transactions=array();
+        foreach($items as $item){
+
+            $packing_list = $this->fetchesPackingList->execute(['id' => $item['id']]);
+
+            $invoice_transaction = $packing_list->transactions()->where('transactions.type', TransactionType::SHIPPING_INVOICE)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::PENDING_SUBMISSION])->first();
+            array_push($invoice_transactions, $invoice_transaction);
+
+            // $this->updatesTransactionStatus->execute($invoice_transaction, ApprovalStatus::APPROVED);
+        }
+
+        $transaction_invoice_pdf = LaravelMpdf::loadView('pages.pdfs.shipping_invoices_combined', ['invoice_transactions' => $invoice_transactions]);
+
+        $document_object = new DocumentObject(
+            DocumentType::SHIPPING_INVOICE,
+            [chunk_split('data:application/pdf;base64,'.base64_encode($transaction_invoice_pdf->output()))],
+            '',
+            ApprovalStatus::COMPLETED,
+            'shipping_invoice'
+        );
+
+        /** @var Document $document */
+        $document = $this->createsDocument->execute($invoice_transaction, $document_object);
+
+        $this->createsFiles->execute($document, $document_object);
+        $user = $packing_list->owner->companyModule->employees()->first();
+        if(app()->environment(['production'])) {
+            $user->notify(new InvoiceIssuedEmail($user, $packing_list));
+        }
+
+        return $this->response([]);
+    }
+
+}

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

@@ -22,7 +22,7 @@ use App\Models\GroupTransaction;
 use App\Http\Resources\WalletTransactionResource;
 use App\Models\Wallet;
 use App\Classes\Modules\Transactions\Processors\ReleaseGoodsToCustomerProcessor;
-
+use Illuminate\Support\Facades\Log;
 
 class CreateGroupsLogic extends AbstractControllerLogic
 {
@@ -200,7 +200,9 @@ class CreateGroupsLogic extends AbstractControllerLogic
 
         if (in_array($payment_method, [PaymentMethodType::PAYMENT_GATEWAY, PaymentMethodType::CASH])) {
             // create only one billplz payment for wallet top up
-            $amount = floatval(str_replace(',', '', $reqAmount));
+            $amount2 = floatval(str_replace(',', '', $reqAmount));
+            Log::channel('storage_invoices')->info('CreateGroupsLogic reqAmount from client: ' .$amount2);
+            Log::channel('storage_invoices')->info('CreateGroupsLogic amount from backend: ' .$amount); //the real amount should always be from backend
             $companyModuleId = $invoice->receiver;
             $companyModule = $this->fetchesCompanyModule->execute(['id' => $companyModuleId]);
 

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

@@ -5,6 +5,7 @@ namespace App\Classes\Modules\Transactions\ControllersLogic;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Transactions\Services\ListsGroups;
 use App\Http\Resources\GroupResource;
+use App\Transformers\GroupTransformer;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
@@ -22,7 +23,8 @@ class ListGroupsLogic extends AbstractControllerLogic
     /**
      * @return array
      */
-    protected function notification():array {
+    protected function notification(): array
+    {
         return [
             'title' => 'Retrieved Groups',
             'message' => 'You have successfully retrieved a list of groups'
@@ -32,10 +34,15 @@ class ListGroupsLogic extends AbstractControllerLogic
     /** @var ListsGroups */
     private $listsGroups;
 
-    public function logic(Request $request) : JsonResponse
+    public function logic(Request $request): JsonResponse
     {
         $query = $this->listsGroups->execute($this->listsGroups->deserializeFilters($request->input('filters')));
 
+        //no relationship needed
+   /*     return fractal()
+            ->collection($query, new GroupTransformer())
+            ->respond(200, [], JSON_PRETTY_PRINT);*/
+
         return $this->collectionResponse(GroupResource::collection($query));
     }
 

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

@@ -32,7 +32,8 @@ class UpdateGroupLogic extends AbstractControllerLogic
     /**
      * @return array
      */
-    protected function notification():array {
+    protected function notification(): array
+    {
         return [
             'title' => 'Update Group Transaction',
             'message' => 'You have successfully updated this Group Transaction'
@@ -86,7 +87,7 @@ class UpdateGroupLogic extends AbstractControllerLogic
      * @return JsonResponse
      * @throws \App\Classes\Exceptions\MalformedRequestException
      */
-    public function logic(Request $request) : JsonResponse
+    public function logic(Request $request): JsonResponse
     {
         $group = $this->fetchesGroup->execute(['id' => $request->route('id')]);
 
@@ -100,7 +101,7 @@ class UpdateGroupLogic extends AbstractControllerLogic
 //        $group->transactions()->update(['amount' => DB::raw('(original_amount * (1 / currency_rate)) + service_charge + tax')]);
 
 
-        foreach($transactions as $transaction) {
+        foreach ($transactions as $transaction) {
 
             $constant = SegmentConstant::where('reference', SegmentConstants::SERVICE_CHARGE)->where('detail->id', $supplier->id)->first();
             $serviceCharge = $this->calculatesTransactionServiceCharge->execute($transaction->original_amount, $rate, $constant);
@@ -169,7 +170,7 @@ class UpdateGroupLogic extends AbstractControllerLogic
 
         $object = new DocumentObject(
             DocumentType::CURRENCY_VENDOR_ORDER,
-            [chunk_split('data:application/pdf;base64,'.base64_encode($pdf->output()))],
+            [chunk_split('data:application/pdf;base64,' . base64_encode($pdf->output()))],
             '',
             ApprovalStatus::COMPLETED,
             'currency_vendor_order'
@@ -179,6 +180,11 @@ class UpdateGroupLogic extends AbstractControllerLogic
         $document = $this->createsDocument->execute($group, $object);
         $this->createsFile->execute($document, $object);
 
+        //no relationship needed
+        /*            return fractal()
+          ->item($group, new GroupTransformer())
+          ->respond(200, [], JSON_PRETTY_PRINT);*/
+
         return $this->resourceResponse(new GroupResource($group));
     }
 

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

@@ -4,6 +4,7 @@
 namespace App\Classes\Modules\Transactions\Processors;
 
 use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\General\Eloquent\Filters\PaymentMethodType as FiltersPaymentMethodType;
 use App\Classes\Modules\Orders\Services\FetchesOrder;
 use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
 use App\Classes\Modules\Transactions\Services\CreatesTransaction;
@@ -123,7 +124,7 @@ class CheckStorageInvoiceTransactionProcessor
                         $result =  $this->processSingleTransactionOfTypeShippingInvoice($invoice_transaction, $packingList, $order->company_module_id, $eta);
                     }
                     else{
-                        $result =  $this->isPaidOrWaivedStorageInvoiceExist($invoice_transaction, $packingList, $eta);
+                        $result =  $this->isExistPaidOrWaivedStorageInvoice($invoice_transaction, $packingList, $eta);
                     }
                     if($result){
                         $results[] = $result;
@@ -205,8 +206,9 @@ class CheckStorageInvoiceTransactionProcessor
         $price_cbm = $pricePerCBM * $cbm * $resultNumberOfDaysExceeded;
         $dateToCompare = Carbon::parse(env('SST_START_DATE', '2024-04-01 00:00:00'));
 
+
         Log::channel('storage_invoices')->info('dateToCompare: '.json_encode($dateToCompare));
-        if(!$storageInvoice && $resultNumberOfDaysExceeded  > 0 && $transaction->status != ApprovalStatus::COMPLETED){
+        if(!$storageInvoice && $resultNumberOfDaysExceeded  > 0 && $transaction->status !== ApprovalStatus::COMPLETED){
             Log::channel('storage_invoices')->info('Created $transaction->id: '.$transaction->id);
             $billNumber = $this->generatesTransactionBillNumber->execute('STOR-');
 
@@ -252,7 +254,7 @@ class CheckStorageInvoiceTransactionProcessor
 
             $proceedToUpdate = false;
 
-            if(abs($price_cbm - $amount) > $epsilon && $storageInvoice->status !== ApprovalStatus::COMPLETED){
+            if(abs($price_cbm - $amount) > $epsilon && $storageInvoice->status !== ApprovalStatus::COMPLETED && !$this->isExistPendingVerificationManualPayment($storageInvoice)){
                 $paymentTransactions = $storageInvoice->transactions()->where('transactions.type', TransactionType::PAYMENT)->where('transactions.status', ApprovalStatus::PENDING_SUBMISSION)->get();
                 // if(!$isBackDoorCheck){
                 if(count($paymentTransactions) > 0){
@@ -294,7 +296,7 @@ class CheckStorageInvoiceTransactionProcessor
 
     }
 
-    private function isPaidOrWaivedStorageInvoiceExist($transaction, $packingList, $eta){
+    private function isExistPaidOrWaivedStorageInvoice($transaction, $packingList, $eta){
         $pricePerCBM = 3;
         $resultNumberOfDaysFree = 10;
         $dt1 = $eta->copy()->addDay()->startOfDay();
@@ -349,6 +351,21 @@ class CheckStorageInvoiceTransactionProcessor
         return [];
     }
 
+    private function isExistPendingVerificationManualPayment($storageInvoice){
+        $g = $storageInvoice->groups()->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::COMPLETED, ApprovalStatus::SUSPENDED])->where('payment_method', PaymentMethodType::CASH)->latest('updated_at')->first();
+        Log::channel('storage_invoices')->info('group: ' .json_encode($g));
+        if($g){
+            $gr = $g->reference;
+            $manualPaymentTransaction =Transaction::where('payment_reference', $gr)->first();
+            Log::channel('storage_invoices')->info('manualPaymentTransaction: ' .json_encode($manualPaymentTransaction));
+            if($manualPaymentTransaction->status === ApprovalStatus::PENDING_SUBMISSION || $manualPaymentTransaction->status === ApprovalStatus::PENDING_VERIFICATION){
+                Log::channel('storage_invoices')->info('isExistPendingVerificationManualPayment');
+                return true;
+            }
+        }
+        return false;
+    }
+
     private function updatePaymentTransactionViaGroupPayment($storageInvoice){
         Log::channel('storage_invoices')->info('updatePaymentTransactionViaGroupPayment');
         $groups = $storageInvoice->groups()->whereNotIn('status', [ApprovalStatus::COMPLETED, ApprovalStatus::SUSPENDED])->get();
@@ -362,7 +379,8 @@ class CheckStorageInvoiceTransactionProcessor
                 $this->updatesTransactionStatus->execute($walletTransaction, ApprovalStatus::EXPIRED);
                 if($walletTransaction->payment_reference){
                     $deletedBillplzBill = $this->deletesBillplzBill->execute($walletTransaction->payment_reference);
-                    Log::channel('storage_invoices')->info('deletedBillplzBill TransactionType::WALLET: '.json_encode($deletedBillplzBill));
+                    Log::channel('storage_invoices')->info('deletedBillplzBill with reference: '.$walletTransaction->payment_reference);
+                    Log::channel('storage_invoices')->info('deletedBillplzBill return response: '.json_encode($deletedBillplzBill));
                 }
             }
         }

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

@@ -109,6 +109,7 @@ class CreateInvoiceTransactionProcessor
         $base_price_constant = $this->fetchesSegmentConstant->execute(['segment_id' => 1, 'reference' => SegmentConstants::BASE_PRICE]);
         $warehouse_rate_constant = $this->fetchesSegmentConstant->execute(['segment_id' => 1, 'reference' => SegmentConstants::WAREHOUSE_RATE]);
         $state_rate_constant = $this->fetchesSegmentConstant->execute(['segment_id' => 1, 'reference' => SegmentConstants::STATE_RATE]);
+        Log::channel('priceCbmLog')->info(json_encode($state_rate_constant));
         $center_postcode_constant = $this->fetchesSegmentConstant->execute(['segment_id' => 1, 'reference' => SegmentConstants::CENTER_POSTCODE]);
         $outstation_postcode_constant = $this->fetchesSegmentConstant->execute(['segment_id' => 1, 'reference' => SegmentConstants::OUTSTATION_POSTCODE]);
 
@@ -136,13 +137,18 @@ class CreateInvoiceTransactionProcessor
         $warehouse_rate = is_object($selected_warehouse_rate) ? $selected_warehouse_rate->amount : 0;
 
         $stateId = $address->state_id;
+        Log::channel('priceCbmLog')->info('stateId: ' . $stateId);
         $state_rate_constant = $this->getConstantByKey($state_rate_constant, $stateId);
+        Log::channel('priceCbmLog')->info('state_rate_constant: ' . json_encode($state_rate_constant));
 
         // get $state_rate
         $postcode = $address->postcode;
         $this->checkPostcodeExistInConstant($center_postcode_constant, $postcode) === true ? $state_select = 'center' : '' ;
+        Log::channel('priceCbmLog')->info('state_select: ' . $state_select);
         $this->checkPostcodeExistInConstant($outstation_postcode_constant, $postcode) === true ? $state_select = 'outstation' : '' ;
+        Log::channel('priceCbmLog')->info('state_select: ' . $state_select);
         $state_rate_constant = (array)$state_rate_constant;
+        Log::channel('priceCbmLog')->info('state_rate_constant: ' . json_encode($state_rate_constant));
         $state_rate = $state_select == '' ? 0 : $state_rate_constant[$state_select];
 
         $container = $packing_list->containers()->first();
@@ -181,7 +187,13 @@ class CreateInvoiceTransactionProcessor
             $minimum_charge = 0;
         }
 
+        Log::channel('priceCbmLog')->info('$base_price: ' . $base_price);
+        Log::channel('priceCbmLog')->info('$segment_price: ' . $segment_price);
+        Log::channel('priceCbmLog')->info('$warehouse_rate: ' . $warehouse_rate);
+        Log::channel('priceCbmLog')->info('$state_rate: ' . $state_rate);
         $price_cbm = $base_price + $segment_price + $warehouse_rate + $state_rate;
+        Log::channel('priceCbmLog')->info('$price_cbm: ' . $price_cbm);
+        Log::channel('priceCbmLog')->info('');
 
         $total_cbm = $price_cbm * ($cbm + $minimum_charge + $over_weight_cbm);
 

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

@@ -21,6 +21,7 @@ use App\Classes\Modules\Orders\Processors\UpdateDoFromVTPortalProcessor;
 use App\Classes\Modules\Orders\Processors\UpdateDoFromYDPortalProcessor;
 use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
 use Illuminate\Support\Facades\Log;
+use App\Classes\Modules\Wallets\Processors\CreditWalletProcessor;
 
 class CreatePaymentTransactionProcessor
 {
@@ -49,6 +50,9 @@ class CreatePaymentTransactionProcessor
     /** @var UpdatesTransactionStatus */
     private $updatesTransactionStatus ;
 
+    /** @var CreditWalletProcessor */
+    private $creditWalletProcessor ;
+
     /**
      * @param FetchesTransaction $fetchesTransaction,
      * @param GeneratesTransactionBillNumber $generatesTransactionBillNumber,
@@ -60,6 +64,7 @@ class CreatePaymentTransactionProcessor
      * @param UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor
      * @param UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor
      * @param UpdatesTransactionStatus $updatesTransactionStatus
+     * @param CreditWalletProcessor $creditWalletProcessor
      */
     public function __construct(
         GeneratesTransactionBillNumber $generatesTransactionBillNumber,
@@ -69,6 +74,7 @@ class CreatePaymentTransactionProcessor
         UpdatesWalletBalance $updatesWalletBalance,
         UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor,
         UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor,
+        CreditWalletProcessor $creditWalletProcessor,
         UpdatesTransactionStatus $updatesTransactionStatus
     )
     {
@@ -79,6 +85,7 @@ class CreatePaymentTransactionProcessor
         $this->updatesWalletBalance = $updatesWalletBalance;
         $this->updateDoFromVTPortalProcessor = $updateDoFromVTPortalProcessor;
         $this->updateDoFromYDPortalProcessor = $updateDoFromYDPortalProcessor;
+        $this->creditWalletProcessor = $creditWalletProcessor;
         $this->updatesTransactionStatus = $updatesTransactionStatus;
     }
 
@@ -174,6 +181,11 @@ class CreatePaymentTransactionProcessor
 
         $payment_transaction = $this->createsPaymentTransaction->execute($invoice, $object);
 
+        // cief coins
+        if ($approvalStatus == ApprovalStatus::APPROVED) {
+            $wallet = $this->creditWalletProcessor->execute($company_module, transactionType::CIEF_COINS_CREDIT, $amount, 'Cief Coins Credit', 3); // TODO-cief-coins: pls confirm the reference
+        }
+
         return $payment_transaction;
     }
 }

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

@@ -44,24 +44,33 @@ class ReleaseGoodsToCustomerProcessor
     /**
      * @param $packingList
      * @param $invoice
+     * @param $processCompletedInvoices
      * @throws \App\Classes\Exceptions\MalformedRequestException
      */
-    public function execute($packingList, $invoice = null)
+    public function execute($packingList, $invoice = null, $processCompletedInvoices = false)
     {
         $result = false;
         $totalInvoicesAmountPaid = 0.00;
         $totalInvoicesAmount = 0.00;
-        $invoiceTransactions = $packingList->transactions()->where('status', [ApprovalStatus::APPROVED])->whereIn('type', [TransactionType::SHIPPING_INVOICE, TransactionType::STORAGE_INVOICE])->get();
+        if($processCompletedInvoices){
+            //processCompletedInvoices, for manual processing of invoices, e.g. incomplete payment gateway finish with storage invoice
+            $invoiceTransactions = $packingList->transactions()->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->whereIn('type', [TransactionType::SHIPPING_INVOICE, TransactionType::STORAGE_INVOICE])->get();
+        }
+        else{
+            $invoiceTransactions = $packingList->transactions()->where('status', ApprovalStatus::APPROVED)->whereIn('type', [TransactionType::SHIPPING_INVOICE, TransactionType::STORAGE_INVOICE])->get();
+        }
 
-        //Part 1: Process each single invoice type and get the total of all invoices
+        //Part 1: Process each single invoice type and get the total of all invoices (STORAGE + SHIPPING)
         foreach($invoiceTransactions as $invoiceTransaction){
-
             $totalInvoiceAmountPaid = $invoiceTransaction->transactions->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->sum('amount');
             if ($invoice && $invoice->type == $invoiceTransaction->type) {
                 if(($invoice->amount - $totalInvoiceAmountPaid) < 0.01){
+                    Log::channel('storage_invoices')->info('ReleaseGoodsToCustomerProcessor updatesTransactionStatus');
                     $this->updatesTransactionStatus->execute($invoice, ApprovalStatus::COMPLETED);
 
-                    if($invoice->type == TransactionType::STORAGE_INVOICE){
+                    //cief todo: remove the following if block
+                    if($invoice->type === TransactionType::STORAGE_INVOICE){
+                        Log::channel('storage_invoices')->info('ReleaseGoodsToCustomerProcessor createStorageInvoiceDocTransactionProcessor');
                         $this->createStorageInvoiceDocTransactionProcessor->execute($packingList);
                     }
                 }

app/Classes/Modules/Wallets/ControllersLogic/ListWalletLogic.php

@@ -3,16 +3,12 @@
 namespace App\Classes\Modules\Wallets\ControllersLogic;
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
-
-use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
-use App\Classes\Modules\Wallets\Services\ListsWallet;
 use App\Classes\Modules\Wallets\Standards\Rules\CanListWallet;
 use App\Http\Resources\WalletResource;
-
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
+use App\Classes\Modules\Wallets\Services\ListsWallets;
 
 class ListWalletLogic extends AbstractControllerLogic
 {
@@ -26,8 +22,8 @@ class ListWalletLogic extends AbstractControllerLogic
         ];
     }
 
-    /** @var ListWallet  */
-   private $listsWallet;
+    /** @var ListsWallets */
+   private $listsWallets;
 
    /** @var CanCreateCompanyWallet */
    private $canListWallet;
@@ -38,10 +34,10 @@ class ListWalletLogic extends AbstractControllerLogic
      * @param GeneratesWalletCode $generatesWalletCode
      * @param CanCreateCompanyWallet $canCreateCompanyWallet
      */
-    public function __construct(CanListWallet $canListWallet, ListsWallet $listsWallet)
+    public function __construct(CanListWallet $canListWallet, ListsWallets $listsWallets)
     {
         $this->canListWallet = $canListWallet;
-        $this->listsWallet = $listsWallet;
+        $this->listsWallets = $listsWallets;
     }
 
     /**
@@ -53,7 +49,7 @@ class ListWalletLogic extends AbstractControllerLogic
     {
         //$this->canListWallet->passes();
 
-        $query = $this->listsWallet->execute($this->listsWallet->deserializeFilters($request->input('filters')));
+        $query = $this->listsWallets->execute($this->listsWallets->deserializeFilters($request->input('filters')));
 
         return $this->collectionResponse(WalletResource::collection($query));
     }

app/Classes/Modules/Wallets/Processors/CreditWalletProcessor.php

@@ -79,19 +79,40 @@ class CreditWalletProcessor
      * @return \Illuminate\Database\Eloquent\Model
      * @throws \App\Classes\Exceptions\MalformedRequestException
      */
-    public function execute(CompanyModule $companyModule, int $transactionType, float $amount, string $reference)
+    public function execute(CompanyModule $companyModule, int $transactionType, float $amount, string $reference, ?int $currencyId = 1)
     {
-        if (!$companyModule->wallets()->first()) {
-            $object = new WalletObject($companyModule->id, 1, $this->generatesWalletCode->execute());
+        /** @var Wallet $wallet */
+        $wallet = $companyModule->wallets()->where('currency_id', $currencyId)->first();
+
+        if (!$wallet) {
+            $object = new WalletObject($companyModule->id, $currencyId, $this->generatesWalletCode->execute());
             $this->createsWallet->execute($object, $companyModule);
+            $wallet = $companyModule->wallets()->where('currency_id', $currencyId)->first();
         }
 
-        /** @var Wallet $wallet */
-        $wallet = $companyModule->wallets()->first();
+        $billNumberPrefix = null;
+        $transaction_object_transaction_type = $transactionType;
+        switch ($transactionType) {
+            case TransactionType::PAYMENT:
+                $billNumberPrefix = 'DEBIT-NOTE-';
+                $transaction_object_transaction_type =  TransactionType::DEBIT_NOTE;
+                break;
+            case TransactionType::CIEF_COINS_CREDIT:
+                $billNumberPrefix = 'COINS-CREDIT-'; // TODO-cief-coins: pls confirm the prefix
+                break;
+            case TransactionType::CIEF_COINS_DEBIT:
+                $billNumberPrefix = 'COINS-DEBIT-'; // TODO-cief-coins: pls confirm the prefix
+                break;
+            default:
+                $billNumberPrefix = 'CREDIT-NOTE-';
+                $transaction_object_transaction_type =  TransactionType::CREDIT_NOTE;
+                break;
+        }
 
-        $billNumber = $this->generatesTransactionBillNumber->execute($transactionType === 2 ? 'DEBIT-NOTE-' : 'CREDIT-NOTE-');
+        $billNumber = $this->generatesTransactionBillNumber->execute($billNumberPrefix);
+
+        $transaction_object = new TransactionObject($billNumber, $transaction_object_transaction_type, 1, $wallet->owner->id, 1, PaymentMethodType::CASH, $amount, $amount, 1, 1, 1, 0, 0, null, ApprovalStatus::APPROVED, [], $reference);
         
-        $transaction_object = new TransactionObject($billNumber, $transactionType === 2 ? TransactionType::DEBIT_NOTE : TransactionType::CREDIT_NOTE, 1,  $wallet->owner->id,  1, PaymentMethodType::CASH,  $amount,  $amount,  1,  1,  1,  0,  0,  null,  ApprovalStatus::APPROVED,  [], $reference);
         $transaction = $this->createsTransactionableTransaction->execute($wallet, $transaction_object);
         
         $this->updatesWalletBalance->execute($wallet, $transaction->amount);

app/Classes/Modules/Wallets/Services/ListsWallets.php

@@ -2,28 +2,31 @@
 
 namespace App\Classes\Modules\Wallets\Services;
 
-use Illuminate\Database\Eloquent\Builder;
+
 use App\Classes\General\Eloquent\AbstractListRecord;
+use Illuminate\Database\Eloquent\Builder;
 use App\Models\Wallet;
 
-class ListsWallet extends AbstractListRecord
+class ListsWallets extends AbstractListRecord
 {
-    /** @var Booking */
+
+    /** @var Wallet */
     private $repository;
 
     /**
-     * ListsBookings constructor.
-     * @param Booking $repository
+     * Wallet constructor.
+     * @param Wallet $repository
      */
     public function __construct(Wallet $repository)
     {
         $this->repository = $repository;
     }
 
+
     /**
      * @return Builder
      */
-    public function getRepository(): Builder
+    function getRepository(): Builder
     {
         return $this->repository->newQuery();
     }

app/Classes/Modules/Wallets/Services/UpdatesWalletBalance.php

@@ -27,11 +27,15 @@ class UpdatesWalletBalance extends AbstractUpdateRecord
 
         foreach ($model->transactions as $transaction) {
             if (!in_array((int) $transaction->status, [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])) continue;
-            if ((int) $transaction->type === TransactionType::TOP_UP)           $topups     += (float) $transaction->amount;
-            if ((int) $transaction->type === TransactionType::GROUP_PAYMENT)    $topups     += (float) $transaction->amount;
-            if ((int) $transaction->type === TransactionType::CREDIT_NOTE)      $credit     += (float) $transaction->amount;
-            if ((int) $transaction->type === TransactionType::PAYMENT)          $payments   += (float) $transaction->amount;
-            if ((int) $transaction->type === TransactionType::DEBIT_NOTE)       $debit      += (float) $transaction->amount;
+            if ((int) $transaction->type === TransactionType::TOP_UP)               $topups     += (float) $transaction->amount;
+            if ((int) $transaction->type === TransactionType::GROUP_PAYMENT)        $topups     += (float) $transaction->amount;
+            if ((int) $transaction->type === TransactionType::CREDIT_NOTE)          $credit     += (float) $transaction->amount;
+            if ((int) $transaction->type === TransactionType::PAYMENT)              $payments   += (float) $transaction->amount;
+            if ((int) $transaction->type === TransactionType::DEBIT_NOTE)           $debit      += (float) $transaction->amount;
+
+            // cief coins
+            if ((int) $transaction->type === TransactionType::CIEF_COINS_CREDIT)    $credit     += (float) $transaction->amount;
+            if ((int) $transaction->type === TransactionType::CIEF_COINS_DEBIT)     $debit     += (float) $transaction->amount;
         }
         $auditBalance = ($topups + $credit) - ($payments + $debit);
 

app/Classes/Modules/WePost/ControllersLogic/ProcessWePostNotificationLogic.php

@@ -0,0 +1,167 @@
+<?php
+
+namespace App\Classes\Modules\WePost\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\General\WePostHelper;
+use App\Classes\Modules\WePost\Services\CreatesWePostNotification;
+use App\Classes\Modules\WePost\DataTransferObjects\WePostNotificationObject;
+use App\Classes\Modules\WePost\DataTransferObjects\WePostProcessNotificationObject;
+use App\Classes\Modules\WePost\Standards\Rules\CanProcessWePostNotification;
+use App\Http\Resources\WePostNotificationResource;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ProcessWePostNotificationLogic extends AbstractControllerLogic
+{
+ /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Process WePost Notification',
+            'message' => 'Payload proccessed'
+        ];
+    }
+
+    /** @var CreatesWePostNotification */
+    private $createsWePostNotification;
+
+    /** @var CanProcessWePostNotification */
+    private $canProcessWePostNotification;
+
+    /**
+     * ProcessWePostNotificationLogic constructor.
+     * @param CreatesWePostNotification $createsWePostNotification
+     * @param CanProcessWePostNotification $canProcessWePostNotification
+     */
+    public function __construct(
+        CreatesWePostNotification $createsWePostNotification, CanProcessWePostNotification $canProcessWePostNotification)
+    {
+        $this->createsWePostNotification = $createsWePostNotification;
+        $this->canProcessWePostNotification = $canProcessWePostNotification;
+    }
+
+    /**
+     * @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
+    {
+        $request->merge([
+            'isApiPub' => true,
+        ]);
+
+        $object = new WePostProcessNotificationObject($request->query('api-key'));
+        $this->canProcessWePostNotification->passes($object);
+
+        $result = null;
+        $code = 0;
+
+        $logisticsOrderCode = "";
+        $executeTime = "";
+        $timeZone = "";
+        $status = "";
+        $packageInfo = [];
+        $clientId = "";
+        $type = "";
+        $timestamp = 0;
+        $sign = "";
+        $orderCode = "";
+        $bizAction = "";
+        $bizActionDesc= "";
+        $segmentCode = "";
+        $isSplitOut = "";
+        $packageInfos = [];
+
+
+        if($request->has('type')){
+            $type = $request->input('type');
+            if($type === 'wepost.service.conso.inbound'){
+                $logisticsOrderCode = $request->input('logisticsOrderCode');
+                $executeTime = $request->input('executeTime');
+                $timeZone = $request->input('timeZone');
+                $status = $request->input('status');
+                $packageInfo = $request->input('packageInfo');
+                $clientId = $request->input('client_id');
+                $type = $request->input('type');
+                $timestamp = $request->input('timestamp');
+                $sign = $request->input('sign');
+            }
+            else if($type === 'wepost.service.conso.co.biz.action.notify'){
+                $executeTime = $request->input('executeTime');
+                $timeZone = $request->input('timeZone');
+                $clientId = $request->input('client_id');
+                $type = $request->input('type');
+                $timestamp = $request->input('timestamp');
+                $sign = $request->input('sign');
+                $orderCode = $request->input('orderCode');
+                $bizAction = $request->input('bizAction');
+                $bizActionDesc = $request->input('bizActionDesc');
+            }
+            else if($type === 'wepost.service.conso.outbound'){
+                $executeTime = $request->input('executeTime');
+                $timeZone = $request->input('timeZone');
+                $clientId = $request->input('client_id');
+                $type = $request->input('type');
+                $timestamp = $request->input('timestamp');
+                $sign = $request->input('sign');
+                $orderCode = $request->input('orderCode');
+                $segmentCode = $request->input('segmentCode');
+                $isSplitOut = $request->input('isSplitOut');
+                $packageInfos = $request->input('packageInfos');
+            }
+            else{
+                $code = 1202; //Missing required fields
+            }
+        }
+        else{
+            $code = 1202; //Missing required fields
+        }
+
+        if(!$sign){
+            $code = 1100; //Signature is empty
+        }
+
+        if($code == 0){
+            if($this->verifySignature($type, $sign)){
+                $object = new WePostNotificationObject(
+                    $logisticsOrderCode, $executeTime, $timeZone, $status,$packageInfo,
+                    $clientId, $type, $timestamp, $sign,
+                    $orderCode, $segmentCode,  $bizAction, $bizActionDesc, $isSplitOut, $packageInfos);
+                $result =  $this->createsWePostNotification->execute($object);
+            }
+            else{
+                $code = 1101; //Signature verification failed
+            }
+        }
+
+        if($code != 0){
+            $request->merge([
+                'code' => $code,
+            ]);
+        }
+        // $result = [];
+        // $result['logisticsOrderCode'] = $notification->logistics_order_code;
+        // return $this->collectionResponse(OrderItemResource::collection($order->orderItems));
+        // return $this->resourceResponse(new OrderResource($order));
+        //return $this->response(['data' => $result]);
+
+        return $this->resourceResponse(new WePostNotificationResource($result));
+    }
+
+    private function verifySignature($type, $sign){
+        $result = false;
+
+        $signToCompare = WePostHelper::generateSignature(config('wepost.client_id'), config('wepost.client_secret'), $type);
+        // dd($signToCompare);
+
+        if($sign == $signToCompare){
+            $result = true;
+        }
+        return $result;
+    }
+}

app/Classes/Modules/WePost/DataTransferObjects/WePostNotificationObject.php

@@ -0,0 +1,226 @@
+<?php
+
+namespace App\Classes\Modules\WePost\DataTransferObjects;
+
+use App\Classes\General\Interfaces\DataTransferObject;
+
+
+class WePostNotificationObject implements DataTransferObject
+{
+    /** @var string */
+    private string $logisticsOrderCode;
+
+    /** @var string */
+    private string $executeTime;
+
+    /** @var string */
+    private string $timeZone;
+
+    /** @var string */
+    private string $status;
+
+    /** @var array */
+    private array $packageInfo;
+
+    /** @var string */
+    private string $clientId;
+
+    /** @var string */
+    private string $type;
+
+    /** @var int */
+    private int $timestamp;
+
+    /** @var string */
+    private string $sign;
+
+    /** @var string */
+    private string $orderCode;
+
+    /** @var string */
+    private string $bizAction;
+
+    /** @var string */
+    private string $bizActionDesc;
+
+    /** @var string */
+    private string $segmentCode;
+
+    /** @var string */
+    private string $isSplitOut;
+
+    /** @var array */
+    private array $packageInfos;
+
+    /**
+     * WePostNotificationObject constructor.
+     * @param string $logisticsOrderCode
+     * @param string $executeTime,
+     * @param string $timeZone,
+     * @param string $status,
+     * @param array $packageInfo,
+     * @param string $clientId,
+     * @param string $type,
+     * @param int $timestamp,
+     * @param string $sign
+     * @param string $orderCode
+     * @param string $bizAction
+     * @param string $bizActionDesc
+     * @param string $segmentCode
+     * @param string $isSplitOut
+     * @param array $packageInfos
+     */
+    public function __construct(
+        string $logisticsOrderCode,
+        string $executeTime,
+        string $timeZone,
+        string $status,
+        array $packageInfo,
+        string $clientId,
+        string $type,
+        int $timestamp,
+        string $sign,
+        string $orderCode = "",
+        string $bizAction = "",
+        string $bizActionDesc = "",
+        string $segmentCode = "",
+        string $isSplitOut = "",
+        array $packageInfos = []
+    ) {
+        $this->logisticsOrderCode = $logisticsOrderCode;
+        $this->executeTime = $executeTime;
+        $this->timeZone = $timeZone;
+        $this->status = $status;
+        $this->packageInfo = $packageInfo;
+        $this->clientId = $clientId;
+        $this->type = $type;
+        $this->timestamp = $timestamp;
+        $this->sign = $sign;
+        $this->orderCode = $orderCode;
+        $this->bizAction = $bizAction;
+        $this->bizActionDesc = $bizActionDesc;
+        $this->segmentCode = $segmentCode;
+        $this->isSplitOut = $isSplitOut;
+        $this->packageInfos = $packageInfos;
+    }
+
+    /**
+     * @return string
+     */
+    public function getLogisticsOrderCode(): string
+    {
+        return $this->logisticsOrderCode;
+    }
+
+    /**
+     * @return string
+     */
+    public function getExecuteTime(): string
+    {
+        return $this->executeTime;
+    }
+
+    /**
+     * @return string
+     */
+    public function getTimeZone(): string
+    {
+        return $this->timeZone;
+    }
+
+    /**
+     * @return string
+     */
+    public function getStatus(): string
+    {
+        return $this->status;
+    }
+
+    /**
+     * @return array
+     */
+    public function getPackageInfo(): array
+    {
+        return $this->packageInfo;
+    }
+
+    /**
+     * @return string
+     */
+    public function getClientId(): string
+    {
+        return $this->clientId;
+    }
+
+    /**
+     * @return string
+     */
+    public function getType(): string
+    {
+        return $this->type;
+    }
+
+    /**
+     * @return int
+     */
+    public function getTimestamp(): int
+    {
+        return $this->timestamp;
+    }
+
+    /**
+     * @return string
+     */
+    public function getSign(): string
+    {
+        return $this->sign;
+    }
+
+    /**
+     * @return string
+     */
+    public function getOrderCode(): string
+    {
+        return $this->orderCode;
+    }
+
+    /**
+     * @return string
+     */
+    public function getBizAction(): string
+    {
+        return $this->bizAction;
+    }
+
+    /**
+     * @return string
+     */
+    public function getBizActionDesc(): string
+    {
+        return $this->bizActionDesc;
+    }
+
+    /**
+     * @return string
+     */
+    public function getSegmentCode(): string
+    {
+        return $this->segmentCode;
+    }
+
+    /**
+     * @return string
+     */
+    public function getIsSplitOut(): string
+    {
+        return $this->isSplitOut;
+    }
+
+    /**
+     * @return string
+     */
+    public function getPackageInfos(): string
+    {
+        return json_encode($this->packageInfos);
+    }
+}

app/Classes/Modules/WePost/DataTransferObjects/WePostProcessNotificationObject.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Classes\Modules\WePost\DataTransferObjects;
+
+use App\Classes\General\Interfaces\DataTransferObject;
+
+
+class WePostProcessNotificationObject implements DataTransferObject
+{
+    /** @var string */
+    private string $token;
+
+    /**
+     * WePostProcessNotificationObject constructor.
+     * @param string $token
+     */
+    public function __construct(
+        string $token
+    ) {
+        $this->token = $token;
+    }
+
+    /**
+     * @return string
+     */
+    public function getToken(): string
+    {
+        return $this->token;
+    }
+}

app/Classes/Modules/WePost/Services/CreatesWePostNotification.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Classes\Modules\WePost\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\Modules\WePost\DataTransferObjects\WePostNotificationObject;
+use App\Models\WePostNotification;
+
+
+class CreatesWePostNotification extends AbstractUpdateRecord
+{
+    /**
+     * @param WePostNotificationObject $object
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(WePostNotificationObject $object)
+    {
+        $model = new WePostNotification();
+        $model->logistics_order_code = $object->getLogisticsOrderCode();
+        $model->execute_time = $object->getExecuteTime();
+        $model->timezone = $object->getTimeZone();
+        $model->status = $object->getStatus();
+        $model->package_info = $object->getPackageInfo();
+        $model->client_id = $object->getClientId();
+        $model->type = $object->getType();
+        $model->timestamp = $object->getTimestamp();
+        $model->sign = $object->getSign();
+        $model->order_code = $object->getOrderCode();
+        $model->biz_action = $object->getBizAction();
+        $model->biz_action_desc = $object->getBizActionDesc();
+        $model->segment_code = $object->getSegmentCode();
+        $model->is_split_out = $object->getIsSplitOut();
+        $model->package_infos = $object->getPackageInfos();
+
+        return $this->handler($model);
+    }
+}

app/Classes/Modules/WePost/Standards/Rules/CanProcessWePostNotification.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace App\Classes\Modules\WePost\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Models\PersonalAccessTokens;
+
+class CanProcessWePostNotification extends AbstractRule
+{
+
+    /**
+     * @return bool
+     */
+    protected function authorized($object): bool
+    {
+        $personalAccessToken = PersonalAccessTokens::where('token', $object->getToken())->first();
+        if($personalAccessToken){
+            $abilities = json_decode($personalAccessToken->abilities, true);
+            if (in_array('process notification', $abilities)|| in_array('*', $abilities)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * @param $object
+     * @return bool
+     */
+    protected function validators($object): bool
+    {
+        return true;
+    }
+
+
+    /**
+     * @param $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}

app/Classes/ValueObjects/Constants/RemarkTypes.php

@@ -10,4 +10,6 @@ final class RemarkTypes
 
     public const EXTERNAL = 1;
 
-}
+    public const ADDRESS_EXTRA_COLUMNS = 2;
+    
+}

app/Classes/ValueObjects/Constants/RouteType.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Classes\ValueObjects\Constants;
+
+final class RouteType {
+
+    public const WEB = 1;
+
+    public const API = 2;
+
+}

app/Classes/ValueObjects/Constants/TransactionType.php

@@ -42,4 +42,9 @@ final class TransactionType {
     ];
 
     public const STORAGE_INVOICE = 16;
+
+    public const CIEF_COINS_DEBIT = 17;
+
+    public const CIEF_COINS_CREDIT = 18;
+
 }

app/Console/Commands/OneTimeTransactionFixBillplzFailedCallback.php

@@ -4,6 +4,7 @@ namespace App\Console\Commands;
 
 
 use App\Classes\Modules\Billplzs\Processors\CallbackBillplzProcessor;
+use App\Classes\Modules\Billplzs\Processors\CallbackBillplzDataPatchProcessor;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Models\Transaction;
 use Carbon\Carbon;
@@ -32,15 +33,19 @@ class OneTimeTransactionFixBillplzFailedCallback extends Command
      /** @var CallbackBillplzProcessor */
      private $callbackBillplzProcessor;
 
+    /** @var CallbackBillplzDataPatchProcessor */
+    private $callbackBillplzDataPatchProcessor;
+
     /**
      * Create a new command instance.
      *
      * @return void
      */
-    public function __construct(CallbackBillplzProcessor $callbackBillplzProcessor)
+    public function __construct(CallbackBillplzProcessor $callbackBillplzProcessor, CallbackBillplzDataPatchProcessor $callbackBillplzDataPatchProcessor)
     {
         parent::__construct();
         $this->callbackBillplzProcessor = $callbackBillplzProcessor;
+        $this->callbackBillplzDataPatchProcessor = $callbackBillplzDataPatchProcessor;
     }
 
     /**
@@ -55,20 +60,22 @@ class OneTimeTransactionFixBillplzFailedCallback extends Command
         $this->outputArray = [];
         $start   = new Carbon();
 
-        //Transaction fix with this one time fix command: 15205, 16803
+        //Transaction fix with this one time fix command: 15205, 16803, 17310
         //This transaction, 16803 has approve payment but not its owner, shipping invoice
-        $transaction = Transaction::whereIn('id', [16803])->first();
-        $this->info(Carbon::now() . ' : One time fix failled callback from billplz for transaction with id 16803 cron started.');
+        $transaction = Transaction::whereIn('id', [17310])->first();
+        $this->info(Carbon::now() . ' : One time fix failled callback from billplz for transaction with id 17310 cron started.');
 
-        if($transaction && $transaction->id == 16803){
+        if($transaction && $transaction->id == 17310){
 
+            $this->info(Carbon::now() . ' : 17310.');
             $status = ApprovalStatus::APPROVED;
-            $this->callbackBillplzProcessor->execute($transaction, $status);
+            // $this->callbackBillplzProcessor->execute($transaction, $status);
+            $this->callbackBillplzDataPatchProcessor->execute($transaction, $status);
         }
 
 
         $end = new Carbon();
         $elapsedTime = $start->diff($end)->format('%H:%I:%S');
-        $this->info(Carbon::now() . ' : One time fix failled callback from billplz for transaction with id 16803 cron ended. ElapsedTime: ' . $elapsedTime);
+        $this->info(Carbon::now() . ' : One time fix failled callback from billplz for transaction with id 17310 cron ended. ElapsedTime: ' . $elapsedTime);
     }
 }

app/Console/Kernel.php

@@ -28,15 +28,15 @@ class Kernel extends ConsoleKernel
     protected function schedule(Schedule $schedule)
     {
 
-        $schedule->command('command:curlVTCommand')
-            ->cron('0 8 * * *')
-            ->withoutOverlapping()
-            ->appendOutputTo (storage_path().'/logs/curlvt.log');
+        // $schedule->command('command:curlVTCommand')
+        //     ->cron('0 8 * * *')
+        //     ->withoutOverlapping()
+        //     ->appendOutputTo (storage_path().'/logs/curlvt.log');
 
-        $schedule->command('command:curlYdOrderListCommand')
-            ->cron('0 9-18/3 * * *')
-            ->withoutOverlapping()
-            ->appendOutputTo (storage_path().'/logs/curlyd.log');
+        // $schedule->command('command:curlYdOrderListCommand')
+        //     ->cron('30 9-18/3 * * *')
+        //     ->withoutOverlapping()
+        //     ->appendOutputTo (storage_path().'/logs/curlyd.log');
 
         $schedule->command('fix-packinglist')
             ->cron('30 9-18/3 * * *')
@@ -58,6 +58,11 @@ class Kernel extends ConsoleKernel
             ->withoutOverlapping()
             ->appendOutputTo (storage_path().'/logs/auto_generate_invoice.log');
 
+        $schedule->command('approve:invoice')
+            ->hourly()
+            ->withoutOverlapping()
+            ->appendOutputTo (storage_path().'/logs/approve_invoice.log');
+
         $schedule->command('billplz-failed-callback:fix')
             ->hourly()
             ->withoutOverlapping()

app/Http/Controllers/Accounts/LoginThroughExchangeController.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Http\Controllers\Accounts;
+
+use App\Classes\Modules\Accounts\ControllersLogic\LoginThroughExchangeLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class LoginThroughExchangeController
+{
+
+    /**
+     * @param Request $request
+     * @param LoginThroughExchangeLogic $logic
+     * @return JsonResponse
+     */
+    public function authenticate(Request $request, LoginThroughExchangeLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}

app/Http/Controllers/Companies/LinkExchangeCompanyController.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Http\Controllers\Companies;
+
+use App\Classes\Modules\Companies\ControllersLogic\LinkExchangeCompanyLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class LinkExchangeCompanyController
+{
+
+    /**
+     * @param Request $request
+     * @param LinkExchangeCompanyLogic $logic
+     * @return JsonResponse
+     */
+    public function authenticate(Request $request, LinkExchangeCompanyLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}

app/Http/Controllers/Exports/ExportCustomersToExcelController.php

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Exports;
 
 use App\Classes\Modules\Exports\Services\ExportsCustomersOrderLatestDate;
 use App\Classes\Modules\Exports\Services\ExportsCustomerTotalOrderByYear;
+use App\Classes\Modules\Exports\Services\ExportsGroupTransactions;
 use App\Classes\Modules\Exports\Services\ExportsPaymentTransactions;
 use App\Models\User;
 use Illuminate\Http\Request;
@@ -33,6 +34,13 @@ class ExportCustomersToExcelController
         return $response;
     }
 
+    public function groupTransaction(Request $request){
+        $exportsTransactions = new ExportsGroupTransactions($request);
+        $response = $exportsTransactions->download('group-transactions.xls', Excel::XLS, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']);
+        ob_end_clean();
+        return $response;
+    }
+
     public function totalOrders(Request $request){
         $exportsTotalOrders = new ExportsCustomerTotalOrderByYear($request);
         $response = $exportsTotalOrders->download('total-orders-' . $request->route('year') . '.xls', Excel::XLS, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']);

app/Http/Controllers/Reports/MonthlyReportController.php

@@ -19,7 +19,39 @@ use Illuminate\Http\Request;
 
 class MonthlyReportController
 {
-    public function salesReport(Request $request): JsonResponse {
+
+    /**
+     * Get Containers
+     * @param $from
+     * @param $to
+     * @return mixed
+     */
+    private function getContainersByLoadingDate($from, $to)
+    {
+        return Container::whereBetween('loading_date', [$from, $to])->orderBy('loading_date')->get();
+
+    }
+
+    private function getPackages($from, $to)
+    {
+
+        $containers = $this->getContainersByLoadingDate($from, $to);
+
+        $packingLists = $containers->flatMap(function ($container) {
+            return $container->packingLists;
+        });
+
+        return $packingLists->map(function ($packingList) {
+            $replica = in_array(Auth()->user()->type, [RoleTypes::SHADOW_ADMIN, RoleTypes::SUPER_ADMIN]) ? $packingList : $packingList->packingLists()->where('type', PackingListType::SHIPPING_PACKING_LIST_REPLICA)->first();
+            return $replica ? $replica : $packingList;
+        })->flatMap(function ($packingList) {
+            return $packingList->packages;
+        });
+
+    }
+
+    public function salesReport(Request $request): JsonResponse
+    {
         $from = $request->route('from') ? Carbon::parse($request->route('from')) : Carbon::now()->startOfMonth();
         $to = $request->route('to') ? Carbon::parse($request->route('to')) : Carbon::now()->endOfMonth();
 
@@ -39,16 +71,18 @@ class MonthlyReportController
             return $container->orders;
         })->unique();
 
-        $packingLists = $containers->flatMap(function ($container) {
-            return $container->packingLists;
-        });
+        $packages = $this->getPackages($from, $to);
 
-        $packages = $packingLists->map(function ($packingList) {
-            $replica = in_array(Auth()->user()->type, [RoleTypes::SHADOW_ADMIN, RoleTypes::SUPER_ADMIN]) ? $packingList : $packingList->packingLists()->where('type', PackingListType::SHIPPING_PACKING_LIST_REPLICA)->first();
-            return $replica ? $replica : $packingList;
-        })->flatMap(function ($packingList) {
-            return $packingList->packages;
-        });
+        /* $packingLists = $containers->flatMap(function ($container) {
+             return $container->packingLists;
+         });
+
+         $packages = $packingLists->map(function ($packingList) {
+             $replica = in_array(Auth()->user()->type, [RoleTypes::SHADOW_ADMIN, RoleTypes::SUPER_ADMIN]) ? $packingList : $packingList->packingLists()->where('type', PackingListType::SHIPPING_PACKING_LIST_REPLICA)->first();
+             return $replica ? $replica : $packingList;
+         })->flatMap(function ($packingList) {
+             return $packingList->packages;
+         });*/
 
         $totalCbm = $packages->sum(function($package){
             return (( (float) $package->width / 100) * ( (float) $package->length / 100) * ( (float) $package->height / 100)) * $package->quantity;
@@ -89,19 +123,18 @@ class MonthlyReportController
         $model = (int) $request->route('model');
         $value = (float) $request->route('value');
 
+        $packages = $this->getPackages($from, $to);
 
-        $containers = Container::whereBetween('loading_date', [$from, $to])->orderBy('loading_date')->get();
+        /* $packingLists = $containers->flatMap(function ($container) {
+             return $container->packingLists;
+         });
 
-        $packingLists = $containers->flatMap(function ($container) {
-            return $container->packingLists;
-        });
-
-        $packages = $packingLists->map(function ($packingList) {
-            $replica = in_array(Auth()->user()->type, [RoleTypes::SHADOW_ADMIN, RoleTypes::SUPER_ADMIN]) ? $packingList : $packingList->packingLists()->where('type', PackingListType::SHIPPING_PACKING_LIST_REPLICA)->first();
-            return $replica ? $replica : $packingList;
-        })->flatMap(function ($packingList) {
-            return $packingList->packages;
-        });
+         $packages = $packingLists->map(function ($packingList) {
+             $replica = in_array(Auth()->user()->type, [RoleTypes::SHADOW_ADMIN, RoleTypes::SUPER_ADMIN]) ? $packingList : $packingList->packingLists()->where('type', PackingListType::SHIPPING_PACKING_LIST_REPLICA)->first();
+             return $replica ? $replica : $packingList;
+         })->flatMap(function ($packingList) {
+             return $packingList->packages;
+         });*/
 
         $totalCbm = $packages->sum(function($package){
             return (( (float) $package->width / 100) * ( (float) $package->length / 100) * ( (float) $package->height / 100)) * $package->quantity;
@@ -142,18 +175,20 @@ class MonthlyReportController
         $from = $request->route('from') ? Carbon::parse($request->route('from')) : Carbon::parse('01-01-2018');
         $to = $request->route('to') ? Carbon::parse($request->route('to')) : Carbon::now();
 
-        $containers = Container::whereBetween('loading_date', [$from, $to])->orderBy('loading_date')->get();
+        /*   $containers = $this->getContainersByLoadingDate($from, $to);
 
-        $packingLists = $containers->flatMap(function ($container) {
-            return $container->packingLists;
-        });
+           $packingLists = $containers->flatMap(function ($container) {
+               return $container->packingLists;
+           });
 
-        $packages = $packingLists->map(function ($packingList) {
-            $replica = in_array(Auth()->user()->type, [RoleTypes::SHADOW_ADMIN, RoleTypes::SUPER_ADMIN]) ? $packingList : $packingList->packingLists()->where('type', PackingListType::SHIPPING_PACKING_LIST_REPLICA)->first();
-            return $replica ? $replica : $packingList;
-        })->flatMap(function ($packingList) {
-            return $packingList->packages;
-        });
+           $packages = $packingLists->map(function ($packingList) {
+               $replica = in_array(Auth()->user()->type, [RoleTypes::SHADOW_ADMIN, RoleTypes::SUPER_ADMIN]) ? $packingList : $packingList->packingLists()->where('type', PackingListType::SHIPPING_PACKING_LIST_REPLICA)->first();
+               return $replica ? $replica : $packingList;
+           })->flatMap(function ($packingList) {
+               return $packingList->packages;
+           });*/
+
+        $packages = $this->getPackages($from, $to);
 
         $packages = $packages->filter(function($package) use ($id) {
             return $package->companyModule->id === $id;
@@ -210,17 +245,19 @@ class MonthlyReportController
         $minCbm = $request->input('cbm');
         $minOrders = $request->input('minOrders');
 
-        $activeCompanies = CompanyModule::where('type', \App\Classes\ValueObjects\Constants\BusinessType::IMPORTER)->whereHas('orderPackingLists', function($query) use($inactive_start, $inactive_end) {
-            return $query->where('packing_lists.type', \App\Classes\ValueObjects\Constants\PackingListType::WAREHOUSE_RECEIVE_LIST)->whereHas('transports', function ($query) use ($inactive_start, $inactive_end) {
-                return $query->where('drop_date', '>=', \Carbon\Carbon::parse($inactive_start))->where('drop_date', '<=', \Carbon\Carbon::parse($inactive_end)->addDay());
-            });
-        })->pluck('id');
+        /*   $activeCompanies = CompanyModule::where('type', BusinessType::IMPORTER)->whereHas('orderPackingLists', function ($query) use ($inactive_start, $inactive_end) {
+               return $query->where('packing_lists.type', PackingListType::WAREHOUSE_RECEIVE_LIST)->whereHas('transports', function ($query) use ($inactive_start, $inactive_end) {
+                   return $query->where('drop_date', '>=', Carbon::parse($inactive_start))->where('drop_date', '<=', Carbon::parse($inactive_end)->addDay());
+               });
+           })->pluck('id');
 
-        $companies = CompanyModule::where('type', \App\Classes\ValueObjects\Constants\BusinessType::IMPORTER)->whereHas('orderPackingLists', function($query) use($active_start, $active_end) {
-            return $query->where('packing_lists.type', \App\Classes\ValueObjects\Constants\PackingListType::WAREHOUSE_RECEIVE_LIST)->whereHas('transports', function ($query) use ($active_start, $active_end) {
-                return $query->whereDate('drop_date', '>=', \Carbon\Carbon::parse($active_start))->whereDate('drop_date', '<=', \Carbon\Carbon::parse($active_end)->addDay());
-            });
-        })->whereNotIn('id', $activeCompanies)->get();
+           $companies = CompanyModule::where('type', BusinessType::IMPORTER)->whereHas('orderPackingLists', function ($query) use ($active_start, $active_end) {
+               return $query->where('packing_lists.type', PackingListType::WAREHOUSE_RECEIVE_LIST)->whereHas('transports', function ($query) use ($active_start, $active_end) {
+                   return $query->whereDate('drop_date', '>=', Carbon::parse($active_start))->whereDate('drop_date', '<=', Carbon::parse($active_end)->addDay());
+               });
+           })->whereNotIn('id', $activeCompanies)->get();*/
+
+        $companies = getActiveCompanies($inactive_start, $inactive_end, $active_start, $active_end);
 
         $customerActivityData = [];
         $counter = 1;
@@ -240,7 +277,7 @@ class MonthlyReportController
             if ($minOrders != 'null' && $packingList->count() < $minOrders) { continue; }
 
             array_push($customerActivityData, array(
-                'key' => $counter, 
+                'key' => $counter,
                 'marking' => $marking,
                 'packingListCount'=> $packingList->count(),
                 'totalCbm'=> $totalCbm,

app/Http/Controllers/Transactions/CreateCombinedInvoicesController.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Http\Controllers\Transactions;
+
+use App\Classes\Modules\Transactions\ControllersLogic\CreateCombinedInvoicesLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreateCombinedInvoicesController
+{
+
+    public function combine(Request $request, CreateCombinedInvoicesLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+}