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

# Conflicts:
#	routes/apipub.php

.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
@@ -39,7 +39,7 @@ MAIL_FROM_NAME="${APP_NAME}"
 AWS_ACCESS_KEY_ID=
 AWS_SECRET_ACCESS_KEY=
 AWS_DEFAULT_REGION=us-east-1
-AWS_BUCKET=shipping-portal-localhost
+AWS_BUCKET=
 AWS_USE_PATH_STYLE_ENDPOINT=false
 
 PUSHER_APP_ID=
@@ -56,13 +56,16 @@ MIX_EXCHANGE_URL="${EXCHANGE_URL}"
 
 YD_API_CODE=''
 
+JWT_SECRET=Btj63iMEleEaww6Bb2IBECkxWn7YHPhhPFluAkg9DfcQik0qDRy6QW75ABGmPT2h
+
 PERFEXCRM_BASE_URL=""
 PERFEXCRM_API_KEY=""
 PERFEXCRM_IS_ENABLED="false"
 
-VAPOR_ENV=local
-LARAVEL_VAPOR_ENABLED=false
-COMMANDS_V2_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
@@ -25,7 +27,3 @@ package-lock.json
 public/*
 /public/*
 storage/framework/laravel-excel/*
-.vapor/
-.env.production
-.env.staging
-.env.development

.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 =~ /.*/'
+
+
+
+

Jenkinsfile

@@ -1,118 +0,0 @@
-// Webhook + Gitlab git pull + Vapor
-
-// def payload = readJSON text: "${payload}"
-// String userName = payload.user_name
-// String userEmail = payload.user_email
-// String httpUrl = payload.project.http_url
-
-
-pipeline {
-    agent {
-        docker {
-            args '--group-add 992 -v /var/run/docker.sock:/var/run/docker.sock'
-            image '303644228504.dkr.ecr.ap-southeast-1.amazonaws.com/jenkins-pipeline-agent:latest'
-            registryCredentialsId "ecr:ap-southeast-1:aws-ec2-instance-iam-role"
-            registryUrl "https://303644228504.dkr.ecr.ap-southeast-1.amazonaws.com"
-        }
-    }
-    environment {
-        HOME = '.'
-    }
-    stages {
-        stage('Download source code from Git') {
-            steps {
-                script{
-                    currentBuild.description = 'Step 1 of 6 Completed'
-                    println("GIT GIT_BRANCH: " + GIT_BRANCH)
-                    switch(GIT_BRANCH) {
-                        case "vapor/production":
-                        case "vapor/staging":
-                        case "vapor/development":
-                            git(
-                                url: 'https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal.git',
-                                credentialsId: 'gitlab-jenkins-localhost',
-                                branch: GIT_BRANCH
-                            )
-                        break
-                        case "origin/dillon/34-jenkins-vapor":
-                            git(
-                                url: 'https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal.git',
-                                credentialsId: 'gitlab-jenkins-localhost',
-                                branch: 'dillon/34-jenkins-vapor'
-                            )
-                        break
-                    }
-                    currentBuild.description = 'Step 2 of 6 Completed'
-                }
-            }
-        }
-
-        stage('Install') {
-            steps {
-                sh 'composer update'
-                script{
-                    currentBuild.description = 'Step 3 of 6 Completed'
-                }
-            }
-        }
-
-        stage('Tests') {
-            steps {
-                //sh 'vendor/bin/phpunit tests/Unit'
-                script{
-                    currentBuild.description = 'Step 4 of 6 Completed'
-                }
-            }
-        }
-
-        stage('Deploy') {
-            steps {
-                script{
-                    String gitCommitMessage = getCommitMessage()
-                    println("GIT CommitMessage: " + gitCommitMessage)
-                    println("GIT GIT_BRANCH: " + GIT_BRANCH)
-                    switch(GIT_BRANCH) {
-                        case "vapor/production":
-                            sh "vendor/bin/vapor deploy production --message='${gitCommitMessage}'"
-                        break
-                        case "vapor/staging":
-                            sh "vendor/bin/vapor deploy staging --message='${gitCommitMessage}'"
-                        break
-                        case "vapor/development":
-                            sh "vendor/bin/vapor deploy development --message='${gitCommitMessage}'"
-                        break
-                        case "origin/dillon/34-jenkins-vapor":
-                            sh "vendor/bin/vapor deploy development --message='${gitCommitMessage}'"
-                        break
-                    }
-                    currentBuild.description = 'Step 5 of 6 Completed'
-                }
-            }
-        }
-
-        stage('Cleanup') {
-            steps {
-                script {
-                    try {
-                        sh 'docker image prune -a -f'
-                    } catch (Exception e) {
-                        echo "Error during cleanup: ${e.message}"
-                    }
-                    currentBuild.description = 'Step 6 of 6 Completed'
-                }
-            }
-        }
-    }
-}
-
-@NonCPS
-String getCommitMessage(){
-    commitMessage = " "
-    for ( changeLogSet in currentBuild.changeSets){
-        for (entry in changeLogSet.getItems()){
-            commitMessage = entry.msg
-        }
-    }
-    commitMessage = commitMessage.replace("'", "`")
-    return commitMessage
-}

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/AWSS3Helper.php

@@ -1,48 +0,0 @@
-<?php
-namespace App\Classes\General;
-
-use Illuminate\Support\Facades\Storage;
-use Carbon\Carbon;
-use Maatwebsite\Excel\Concerns\Exportable;
-
-class AWSS3Helper
-{
-    /**
-     * @param string $exportFileName
-     * @param Exportable $exportableObject
-     * @return string
-     */
-    static function S3Exportable($exportFileName, $exportableObject){
-        //Step 1: Upload to S3
-        $filePathForS3 = 'temp/' . $exportFileName;
-        $exportableObject->store($filePathForS3, 's3');
-
-        //Step 2: Return temporary URL from S3
-        $temporaryUrl = Storage::disk('s3')->temporaryUrl(
-            $filePathForS3,
-            Carbon::now()->addMinutes(10)
-        );
-
-        return $temporaryUrl;
-    }
-
-    /**
-     * @param string $exportFileName
-     * @param  string|resource  $contents
-     * @return string
-     */
-    static function S3PDF($exportFileName, $contents){
-        //Step 1: Upload to S3
-        $filePathForS3 = 'temp/' . $exportFileName;
-        Storage::disk('s3')->put($filePathForS3, $contents);
-
-        //Step 2: Return temporary URL from S3
-        $temporaryUrl = Storage::disk('s3')->temporaryUrl(
-            $filePathForS3,
-            Carbon::now()->addMinutes(10)
-        );
-
-        return $temporaryUrl;
-    }
-
-}

app/Classes/General/Abstracts/AbstractControllerLogic.php

@@ -16,7 +16,6 @@ use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Http\Resources\Json\ResourceCollection;
 use Illuminate\Support\Facades\DB;
 use App\Classes\Exceptions\JobResourceNotFoundException;
-use App\Classes\General\LogHelper;
 use Illuminate\Support\Facades\Log;
 
 abstract class AbstractControllerLogic
@@ -65,22 +64,28 @@ abstract class AbstractControllerLogic
             return $response;
 
         } catch (ErrorException|GeneralExceptions|TypeError  $exception){
-            if ($exception instanceof JobResourceNotFoundException) {
-                LogHelper::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/HasInvoiceStatusIn.php

@@ -17,4 +17,4 @@ class HasInvoiceStatusIn implements Filter
             $query->where('type', 1)->whereIn('status', $value);
         });
     }
-}
+}

app/Classes/General/ExcelHandel.php

@@ -3,8 +3,6 @@ namespace App\Classes\General;
 
 use Illuminate\Support\Str;
 use Illuminate\Support\Facades\Cache;
-use Illuminate\Support\Facades\Storage;
-use Carbon\Carbon;
 
 class ExcelHandel
 {
@@ -69,23 +67,9 @@ class ExcelHandel
 	public static function generateExcel($path = '', $exceldata = '', $filename = '', $extension = '')
     {
         $file_info = [];
-        $filesystemDriver = Storage::getDefaultDriver();
-        if($filesystemDriver === 's3'){
-            $filePathForS3 = 'public/excels/' . $path . '/' . $filename . '.' . $extension;
-            Storage::disk('s3')->put($filePathForS3, $exceldata);
-
-            $temporaryUrl = Storage::disk('s3')->temporaryUrl(
-                $filePathForS3,
-                Carbon::now()->addMinutes(10)
-            );
-
-            $file_info['original']['file'] = $temporaryUrl; //REMINDER: This is a path to AWS S3 URL (HTTPS) as a public anonymous user, NOT an internal system path
-        }
-        else{
-            $file = Storage::disk('public')->put('excels/' . $path . '/' . $filename . '.' . $extension, $exceldata);
-            $file_info['original']['file'] = storage_path('app/public/excels/' . $path . '/' . $filename . '.' . $extension);
-        }
-
+        $file = \Storage::disk('public')->put('excels/' . $path . '/' . $filename . '.' . $extension, $exceldata);
+        $file_info['original']['file'] = storage_path('app/public/excels/' . $path . '/' . $filename . '.' . $extension);
+        
         return $file_info;
     }
 
@@ -100,4 +84,4 @@ class ExcelHandel
         return true;
     }
 
-}
+}

app/Classes/General/Helper.php

@@ -49,12 +49,4 @@ class Helper
     static function collectionResponse(ResourceCollection $collection){
         return json_decode($collection->response()->getContent(), true);
     }
-
-    /**
-     * @param null|string $json
-     * @return array
-     */
-    static function deserializeFilters(?string $json): array {
-        return $json !== null ? collect(json_decode($json))->toArray() : [];
-    }
 }

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/LogHelper.php

@@ -1,54 +0,0 @@
-<?php
-
-namespace App\Classes\General;
-
-use Illuminate\Support\Facades\Log;
-
-class LogHelper
-{
-    private String $channelName;
-
-    public static function channel($channelName): self
-    {
-        $logHelper = new self;
-        $logHelper->channelName = $channelName;
-        return $logHelper;
-    }
-
-    public function info($message)
-    {
-        $envVar = env('LARAVEL_VAPOR_ENABLED');
-        $isLocal = env('VAPOR_ENV') === 'local';
-        Log::info("LogHelper.info: {$message}， channelName： {$this->channelName},  envVar {$envVar}");
-        if ($envVar && !$isLocal) {
-            Log::channel($this->channelName.'_vapor')->info($message);
-        }
-        else{
-            Log::channel($this->channelName)->info($message);
-        }
-    }
-
-    public function warning($message)
-    {
-        $envVar = env('LARAVEL_VAPOR_ENABLED');
-        $isLocal = env('VAPOR_ENV') === 'local';
-        Log::info("LogHelper.warning: {$message}， channelName： {$this->channelName},  envVar {$envVar}");
-        if ($envVar && !$isLocal) {
-            Log::channel($this->channelName . '_vapor')->warning($message);
-        } else {
-            Log::channel($this->channelName)->warning($message);
-        }
-    }
-
-    public function error($message)
-    {
-        $envVar = env('LARAVEL_VAPOR_ENABLED');
-        $isLocal = env('VAPOR_ENV') === 'local';
-        Log::info("LogHelper.error: {$message}， channelName： {$this->channelName},  envVar {$envVar}");
-        if ($envVar && !$isLocal) {
-            Log::channel($this->channelName . '_vapor')->error($message);
-        } else {
-            Log::channel($this->channelName)->error($message);
-        }
-    }
-}

app/Classes/General/UrlHelper.php

@@ -1,25 +0,0 @@
-<?php
-
-namespace App\Classes\General;
-
-use Illuminate\Support\Facades\Route;
-use Illuminate\Http\Request;
-
-class UrlHelper {
-    public static function getRouteParametersFromUrl($url) {
-        $parsedUrl = parse_url($url);
-        $path = $parsedUrl['path'];
-
-        $routes = Route::getRoutes();
-
-        foreach ($routes as $route) {
-            $request = Request::create($path, 'GET');
-            $route->bind($request);
-            if ($route->matches($request)) {
-                return $route->parameters();
-            }
-        }
-
-        return [];
-    }
-}

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/Commands/V2/ApproveInvoiceV2CommandJob.php

@@ -1,46 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2;
-
-use Carbon\Carbon;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use Illuminate\Support\Facades\Log;
-use App\Classes\Modules\Transactions\Processors\ApproveShippingInvoiceTransactionProcessor;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Models\Transaction;
-use Exception;
-
-class ApproveInvoiceV2CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-
-    public function handle()
-    {
-        Log::info(Carbon::now() . ': Start job - Approve Invoice Command.');
-        $start   = new Carbon();
-
-        $invoices = Transaction::where('type', TransactionType::SHIPPING_INVOICE)->where('status', ApprovalStatus::PENDING_SUBMISSION)->get();
-
-        foreach ($invoices as $invoice) {
-            $packingList = $invoice->owner;
-            $order = $packingList->owner;
-
-            try {
-                (App()->make(ApproveShippingInvoiceTransactionProcessor::class))->execute($packingList);
-                Log::info('Invoice Approved for reference ' . $order->reference . '.');
-            } catch (Exception $exception) {
-                Log::info('Failed to Approve invoice for reference ' . $order->reference . '. Exception: ' . $exception->getMessage());
-            }
-        }
-
-        $end = new Carbon();
-        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
-        Log::info(Carbon::now() . ': End job - Approve Invoice Command. ElapsedTime: ' . $elapsedTime . '.');
-    }
-}

app/Classes/Jobs/Commands/V2/AuditBillplzInvoiceV2CommandJob.php

@@ -1,53 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2;
-
-use Carbon\Carbon;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\PaymentMethodType;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Models\Transaction;
-use Illuminate\Support\Facades\Log;
-
-
-class AuditBillplzInvoiceV2CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-
-    public function handle()
-    {
-        Log::info(Carbon::now() . ': Start job - Audit Billplz Invoice.');
-        $start   = new Carbon();
-
-        // ini_set('memory_limit', '-1');
-
-        $transactions = Transaction::where('type', TransactionType::SHIPPING_INVOICE)->where('status', ApprovalStatus::COMPLETED)->whereHas('transactions', function($query){
-            return $query->where('type', TransactionType::PAYMENT)->where('payment_method', PaymentMethodType::PAYMENT_GATEWAY)->where('status', ApprovalStatus::REJECTED);
-        })->get();
-
-        $totalTransactions = count($transactions);
-        $counter = 1;
-        $totalAmount = 0;
-        foreach ($transactions as $transaction){
-            $payment_transaction = $transaction->transactions->sortByDesc('created_at')->first();
-
-            if ($payment_transaction->status === ApprovalStatus::REJECTED) {
-                Log::info($counter . ' of ' . $totalTransactions . '. Order Marking: '. $payment_transaction->owner->owner->owner->reference . '. Transaction Id: '. $payment_transaction->id . '. Invoice Id: '. $transaction->id . ' - Date: '.$payment_transaction->created_at->format('d-m-Y').' - Amount: '. $payment_transaction->amount);
-
-                $totalAmount += $transaction->amount;
-
-                $counter++;
-            }
-        }
-
-        $end = new Carbon();
-        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
-        Log::info(Carbon::now() . ': End job - Audit Billplz Invoice. ElapsedTime: ' . $elapsedTime . '. Total: ' . $totalAmount);
-    }
-}

app/Classes/Jobs/Commands/V2/AuditBillplzPaymentV2CommandJob.php

@@ -1,55 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2;
-
-use Carbon\Carbon;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\PaymentMethodType;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Models\Transaction;
-use Illuminate\Support\Facades\Http;
-use Illuminate\Support\Facades\Log;
-
-class AuditBillplzPaymentV2CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-
-    public function handle()
-    {
-        Log::info(Carbon::now() . ': Start job - Audit Billplz Payment.');
-        $start   = new Carbon();
-
-        // ini_set('memory_limit', '-1');
-
-        $transactions = Transaction::where('type', TransactionType::PAYMENT)->where('payment_method', PaymentMethodType::PAYMENT_GATEWAY)->whereIn('status', [ApprovalStatus::COMPLETED, ApprovalStatus::APPROVED])->get();
-        $totalTransactions = count($transactions);
-        $counter = 1;
-        $totalAmount = 0;
-        foreach ($transactions as $transaction){
-            $response = Http::withBasicAuth(config('billplz.api_key').':', '')->get(config('billplz.base_url').'/api/v3/bills/'.$transaction->payment_reference);
-
-            if($response->successful()){
-                $data = $response->json();
-                if($data['paid']){
-
-                } else {
-                    $totalAmount += $transaction->amount;
-                    Log::info($counter . ' of ' . $totalTransactions . '. Order: '. $transaction->owner->owner->owner->reference . ' - Date: '.$transaction->owner->created_at->format('d-m-Y').' - Amount: '. $transaction->amount);
-                }
-            }else{
-                Log::info("billplz error</br>");
-            }
-            $counter++;
-        }
-
-        $end = new Carbon();
-        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
-        Log::info(Carbon::now() . ': End job - Audit Billplz Payment. ElapsedTime: ' . $elapsedTime . '. Total: ' . $totalAmount);
-    }
-}

app/Classes/Jobs/Commands/V2/AutoGenerateInvoiceV2CommandJob.php

@@ -1,64 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2;
-
-use Carbon\Carbon;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use App\Classes\Modules\PackingLists\Services\ListsPackingLists;
-use App\Classes\Modules\Transactions\Processors\CreateInvoiceTransactionProcessor;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Models\Order;
-use Exception;
-use Illuminate\Support\Facades\Log;
-
-class AutoGenerateInvoiceV2CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-
-    public function handle()
-    {
-        Log::info(Carbon::now() . ': Start job - Auto generate invoice.');
-        $start   = new Carbon();
-
-        $packingLists = (App()->make(ListsPackingLists::class))->execute(['does_not_have_transaction_type' => 1, 'type' => 2]);
-
-        if (count($packingLists)) {
-
-            foreach ($packingLists as $packingList) {
-                $order = $packingList->owner;
-                if (!($order instanceof Order)) {
-                    Log::info('Failed to generate invoice for reference' . $order->reference . '. It is not an instance of Order.');
-                    continue;
-                }
-
-                $companyModule = $order->companyModule;
-                $billingAddress = $companyModule->addresses()->where('type', \App\Classes\ValueObjects\Constants\AddressType::BILLING)->first();
-                $deliveryAddress = $order->addresses()->where('status', ApprovalStatus::APPROVED)->first();
-
-                $postCodes = \App\Models\SegmentConstant::whereIn('reference', ['CENTER_POSTCODE', 'OUTSTATION_POSTCODE'])->get()->pluck('value')->flatten();
-
-                if (!!$billingAddress && in_array($deliveryAddress->postcode, $postCodes->toArray())) {
-                    try {
-                        (App()->make(CreateInvoiceTransactionProcessor::class))->execute($packingList);
-                        Log::info('Invoice generated for reference ' . $order->reference . '.');
-                    } catch (Exception $exception) {
-                        Log::info('Failed to generate invoice for reference ' . $order->reference . '. Exception: ' . $exception->getMessage());
-                    }
-                }
-                else{
-                    Log::info('Failed to generate invoice for reference ' . $order->reference . '. Billing Address is not defined / Postcode area is not defined.');
-                }
-            }
-        }
-
-
-        $end = new Carbon();
-        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
-        Log::info(Carbon::now() . ': End job - Auto generate invoice. ElapsedTime: ' . $elapsedTime . '.');
-    }
-}

app/Classes/Jobs/Commands/V2/CheckDeletedInvoiceButPaidV2CommandJob.php

@@ -1,63 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2;
-
-use Carbon\Carbon;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use App\Classes\ValueObjects\Constants\PaymentMethodType;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Models\Transaction;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Support\Facades\Http;
-use Illuminate\Support\Facades\Log;
-
-class CheckDeletedInvoiceButPaidV2CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-
-    public function handle()
-    {
-        Log::info(Carbon::now() . ': Start job - Check all deleted invoice but has completed payment.');
-        $start   = new Carbon();
-
-        // ini_set('memory_limit', '-1');
-
-        $totalAmount = 0;
-
-        $softDeletedTransactions = Transaction::onlyTrashed()->where('type', TransactionType::SHIPPING_INVOICE)->whereHas('transactions', function (Builder $query) {
-            $query->where('type', TransactionType::PAYMENT)->where('payment_method', PaymentMethodType::PAYMENT_GATEWAY);
-        })->get();
-
-        foreach ($softDeletedTransactions as $invoice) {
-            $invoice_payments = $invoice->transactions()->payments()->get();
-
-            foreach($invoice_payments as $invoice_payment) {
-
-                $response = Http::withBasicAuth(config('billplz.api_key').':', '')->get(config('billplz.base_url').'/api/v3/bills/'.$invoice_payment->payment_reference);
-
-                if($response->successful()){
-                    $data = $response->json();
-
-                    $orderReference = $invoice->owner->owner->reference ?? null;
-
-                    if($data['paid']){
-                        Log::info('Invoice id: ' . $invoice->id. '. Payment id: ' . $invoice_payment->id . '. Order: ' . $orderReference);
-                    } else {
-
-                    }
-                }else{
-                    Log::info("billplz error</br>");
-                }
-            }
-        }
-
-        $end = new Carbon();
-        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
-        Log::info(Carbon::now() . ': End job - Check all deleted invoice but has completed payment. ElapsedTime: ' . $elapsedTime  . '. Total: ' . $totalAmount);
-    }
-}

app/Classes/Jobs/Commands/V2/CheckStorageInvoicesGroupTransactionsV2CommandJob.php

@@ -1,48 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2;
-
-use Carbon\Carbon;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use App\Classes\Modules\Transactions\Services\ListsGroups;
-use App\Classes\Modules\Transactions\Processors\CheckStorageInvoiceTransactionProcessor;
-use App\Models\Order;
-use Illuminate\Support\Facades\Log;
-
-class CheckStorageInvoicesGroupTransactionsV2CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    public function handle()
-    {
-        Log::info(Carbon::now() . ': Start job - Check all pending group payment with storage invoice is valid.');
-        $start   = new Carbon();
-
-
-        $newfilters['order_by_updated_at_desc'] = true;
-        $newfilters['status_in'] = [0, 1];
-        $groups = (App()->make(ListsGroups::class))->execute($newfilters);
-
-        foreach ($groups as $group){
-            Log::info('CheckForStorageInvoiceByTransactions group: '.json_encode($group));
-            foreach ($group->groupTransactions as $groupTransaction) {
-                $invoice = $groupTransaction->transaction;
-                $packingList = $invoice->owner()->first();
-                if($packingList){
-                    $order = $packingList->owner()->first();
-                    if($order instanceof Order){
-                        $storages = (App()->make(CheckStorageInvoiceTransactionProcessor::class))->executeOrder($order);
-                    }
-                }
-            }
-        }
-
-        $end = new Carbon();
-        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
-        Log::info(Carbon::now() . ': End job - Check all pending group payment with storage invoice is valid. ElapsedTime: ' . $elapsedTime . '.');
-    }
-}

app/Classes/Jobs/Commands/V2/CheckStorageInvoicesOrdersV2CommandJob.php

@@ -1,45 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2;
-
-use Carbon\Carbon;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use App\Classes\Modules\Orders\Services\ListsOrders;
-use App\Classes\Modules\Transactions\Processors\CheckStorageInvoiceTransactionProcessor;
-use App\Classes\ValueObjects\Constants\OrderType;
-use Illuminate\Support\Facades\Log;
-
-class CheckStorageInvoicesOrdersV2CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    public function handle()
-    {
-        Log::info(Carbon::now() . ': Start job - Check all orders for storage invoice.');
-        $start   = new Carbon();
-
-        $orders = (App()->make(ListsOrders::class))->execute(['with_parcels' => true, 'type_in' => [OrderType::SHARED_CONTAINER, OrderType::DEDICATED_CONTAINER]]);
-
-        $count = 0;
-        foreach ($orders as $order){
-            try{
-                $storages = (App()->make(CheckStorageInvoiceTransactionProcessor::class))->executeOrder($order);
-                $count =  $count + 1;
-                Log::info('Order '.$count);
-            }
-            catch(\Exception $ex){
-                Log::info('Exception '.$ex->getMessage());
-                break;
-            }
-        }
-
-
-        $end = new Carbon();
-        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
-        Log::info(Carbon::now() . ': End job - Check all orders for storage invoice. ElapsedTime: ' . $elapsedTime . '.');
-    }
-}

app/Classes/Jobs/Commands/V2/DummyJob.php

@@ -1,29 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2;
-
-use Carbon\Carbon;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use Illuminate\Support\Facades\Log;
-
-class DummyJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-
-    public function handle()
-    {
-        Log::info(Carbon::now() . ': Start job - Dummy.');
-        $start   = new Carbon();
-
-
-
-        $end = new Carbon();
-        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
-        Log::info(Carbon::now() . ': End job - Dummy. ElapsedTime: ' . $elapsedTime . '.');
-    }
-}

app/Classes/Jobs/Commands/V2/FixApprovedPaymentFailedGroupV2CommandJob.php

@@ -1,70 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2;
-
-use Carbon\Carbon;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use App\Classes\Modules\Billplzs\Processors\CallbackBillplzProcessor;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Models\Group;
-use Illuminate\Support\Facades\Http;
-use Illuminate\Support\Facades\Log;
-
-class FixApprovedPaymentFailedGroupV2CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    public function handle()
-    {
-        Log::info(Carbon::now() . ': Start job - Fix all payment is approved or completed but group failed to be updated.');
-        $start   = new Carbon();
-
-        // ini_set('memory_limit', '-1');
-
-        // $this->outputArray = [];
-
-        $groups = Group::whereNotIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])
-            ->whereHas('payment', function ($query) {
-                $query->whereIn('status', [2, 3]);
-            })->get();
-
-        foreach ($groups as $group) {
-            $transaction = $group->payment;
-
-            $response = Http::withBasicAuth(config('billplz.api_key') . ':', '')->get(config('billplz.base_url') . '/api/v3/bills/' . $transaction->payment_reference);
-
-            dump($transaction->payment_reference);
-
-            if ($response->successful()) {
-                $data = $response->json();
-                if ($data['paid']) {
-                    $status = ApprovalStatus::PENDING_VERIFICATION;
-
-                    if ($data['state'] === 'paid') {
-                        $status = ApprovalStatus::APPROVED;
-                    }
-
-                    Log::info(Carbon::now() . ' : Fixing ' . $transaction->payment_reference);
-                    (App()->make(CallbackBillplzProcessor::class))->execute($transaction, $status);
-                }
-            } else {
-                Log::info("billplz error");
-            }
-        }
-
-        $end = new Carbon();
-        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
-
-        // if ($groups) {
-        //     $this->info(Carbon::now() . ' : Done . ElapsedTime: ' . $elapsedTime);
-        // }
-
-        $end = new Carbon();
-        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
-        Log::info(Carbon::now() . ': End job - Fix all payment is approved or completed but group failed to be updated. ElapsedTime: ' . $elapsedTime  . '.');
-    }
-}

app/Classes/Jobs/Commands/V2/FixBillplzFailedCallbackPaymentV2CommandJob.php

@@ -1,67 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2;
-
-use Carbon\Carbon;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use App\Classes\Modules\Billplzs\Processors\CallbackBillplzProcessor;
-use App\Classes\Modules\Billplzs\Services\GetBillplzBill;
-use App\Classes\Modules\Orders\Processors\UpdateDoFromVTPortalProcessor;
-use App\Classes\Modules\Orders\Processors\UpdateDoFromYDPortalProcessor;
-use App\Classes\Modules\Transactions\Services\FetchesTransaction;
-use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\PaymentMethodType;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Models\Transaction;
-use Illuminate\Support\Facades\Http;
-use Illuminate\Support\Facades\Log;
-
-class FixBillplzFailedCallbackPaymentV2CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    protected $transactionId;
-
-    public function __construct(int $transactionId)
-    {
-        $this->transactionId = $transactionId;
-    }
-
-
-    public function handle()
-    {
-        Log::info(Carbon::now() . ': Start job - Fix failled callback from billplz.');
-        $start   = new Carbon();
-
-        $transaction = Transaction::where('id', $this->transactionId)->first();
-
-        Log::info('Billplz Url: '.config('billplz.base_url').'/api/v3/bills/'.$transaction->payment_reference);
-        $response = Http::withBasicAuth(config('billplz.api_key').':', '')->get(config('billplz.base_url').'/api/v3/bills/'.$transaction->payment_reference);
-
-        if($response->successful()){
-            $data = $response->json();
-            if($data['paid']) {
-                $status = ApprovalStatus::PENDING_VERIFICATION;
-
-                if($data['state'] === 'paid') {
-                    $status = ApprovalStatus::APPROVED;
-                }
-
-                Log::info(Carbon::now() . ' : Fixing ' . $transaction->payment_reference);
-                (App()->make(CallbackBillplzProcessor::class))->execute($transaction, $status);
-            }
-        }
-        else{
-            Log::info("billplz error");
-        }
-
-        $end = new Carbon();
-        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
-        Log::info(Carbon::now() . ': End job - Fix failled callback from billplz. ElapsedTime: ' . $elapsedTime  . '.');
-    }
-}

app/Classes/Jobs/Commands/V2/FixDuplicateContainerReferenceV2CommandJob.php

@@ -1,56 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2;
-
-use Carbon\Carbon;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use App\Models\Container;
-use App\Models\ContainerPackingList;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Log;
-
-class FixDuplicateContainerReferenceV2CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-
-    public function handle()
-    {
-        Log::info(Carbon::now() . ': Start job - Fix Duplicate Container Reference.');
-        $start   = new Carbon();
-
-        // ini_set('memory_limit', '-1');
-
-
-        $duplicatedContainers = Container::select('reference', DB::raw('COUNT(reference) as count'))
-            ->groupBy('reference')
-            ->having('count', '>', 1)
-            ->get();
-
-        foreach ($duplicatedContainers as $duplicatedContainer) {
-            $containers = Container::where('reference', $duplicatedContainer->reference)->get();
-
-            $containers = $containers->sortByDesc(function ($container) {
-                return $container->packingLists->count();
-            });
-
-            $firstContainer = $containers->shift();
-
-            foreach ($containers as $container) {
-                $firstContainer->packingLists()->syncWithoutDetaching($container->packingLists);
-                $container->packingLists()->detach();
-                Log::info('Deleted container ' . $container->id);
-                $container->delete();
-            }
-        }
-
-
-        $end = new Carbon();
-        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
-        Log::info(Carbon::now() . ': End job - Fix Duplicate Container Reference. ElapsedTime: ' . $elapsedTime . '.');
-    }
-}

app/Classes/Jobs/Commands/V2/FixGroupPaymentProblemV2CommandJob.php

@@ -1,52 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2;
-
-use Carbon\Carbon;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use App\Classes\Modules\Orders\Services\FetchesOrder;
-use App\Classes\Modules\Transactions\Processors\CreateStorageInvoiceDocTransactionFixProcessor;
-use Illuminate\Support\Facades\Log;
-
-class FixGroupPaymentProblemV2CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    public function handle()
-    {
-        Log::info(Carbon::now() . ': Start job - Fix Group Payment Problem.');
-        $start   = new Carbon();
-
-        // ini_set('memory_limit', '-1');
-
-        /*
-        $group = $this->fetchesGroup->execute(['id' => 325]);
-        $this->info('FixGroupPaymentProblem group: '.json_encode($group));
-        if ($group) {
-            foreach ($group->groupTransactions as $groupTransaction) {
-                $invoice = $groupTransaction->transaction;
-                $this->info('FixGroupPaymentProblem group: '.json_encode($invoice));
-                $pL = $invoice->owner;
-                $this->releaseGoodsToCustomerProcessor->execute($pL, $invoice);
-            }
-        }
-        */
-
-        $order = (App()->make(FetchesOrder::class))->execute(['reference' => '729251424']);
-        $packingLists = $order->destinationWarehousePackages;
-
-        foreach ($packingLists as $packingList){
-            (App()->make(CreateStorageInvoiceDocTransactionFixProcessor::class))->execute($packingList, true);
-            dd(json_encode($packingList));
-        }
-
-
-        $end = new Carbon();
-        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
-        Log::info(Carbon::now() . ': End job - Fix Group Payment Problem. ElapsedTime: ' . $elapsedTime  . '.');
-    }
-}

app/Classes/Jobs/Commands/V2/FixInvoiceV2CommandJob.php

@@ -1,85 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2;
-
-use Carbon\Carbon;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
-use App\Classes\Modules\Documents\Services\CreatesDocument;
-use App\Classes\Modules\Documents\Services\CreatesFiles;
-use App\Classes\Modules\Jobs\DataTransferObjects\FixInvoiceV2CommandObject;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\DocumentType;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Models\CompanyConnection;
-use App\Models\Order;
-use Mccarlosen\LaravelMpdf\Facades\LaravelMpdf;
-use Illuminate\Support\Facades\Log;
-
-class FixInvoiceV2CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    /** @var FixInvoiceV2CommandObject*/
-    private $fixInvoiceV2CommandObject;
-
-    /**
-     * FixInvoiceV2CommandJob constructor.
-     * @param FixInvoiceV2CommandObject $fixInvoiceV2CommandObject
-     */
-    public function __construct(FixInvoiceV2CommandObject $fixInvoiceV2CommandObject)
-    {
-        $this->fixInvoiceV2CommandObject = $fixInvoiceV2CommandObject;
-    }
-
-    public function handle()
-    {
-        Log::info(Carbon::now() . ': Start job - Fix invoice.');
-        $start   = new Carbon();
-
-        $connection = CompanyConnection::where('invitee_reference', $this->fixInvoiceV2CommandObject->getMarking())->first();
-        $company_module_id = $connection->invitee->id;
-
-        $orders = Order::where('company_module_id', $company_module_id)->get();
-
-        foreach ($orders as $order){
-            $invoices = $order->transactions()->where('transactions.type', TransactionType::SHIPPING_INVOICE)->get();
-            foreach ($invoices as $invoice){
-
-                dump($invoice->id);
-
-                $invoice->documents()->delete();
-
-                $view = 'pages.pdfs.shipping_invoice';
-                $dateToCompare = Carbon::parse(env('SST_START_DATE', '2024-04-01 00:00:00'));
-                $shippingInvoiceTransactionCreatedDate = Carbon::parse($invoice->created_at);
-                if ($shippingInvoiceTransactionCreatedDate->isAfter($dateToCompare) && $invoice->tax > 0) {
-                    $view = 'pages.pdfs.shipping_invoice_sst';
-                }
-
-                $transaction_invoice_pdf = LaravelMpdf::loadView($view, ['invoice_transaction' => $invoice]);
-
-                $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 = (App()->make(CreatesDocument::class))->execute($invoice, $document_object);
-
-                (App()->make(CreatesFiles::class))->execute($document, $document_object);
-            }
-        }
-
-        $end = new Carbon();
-        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
-        Log::info(Carbon::now() . ': End job - Fix invoice. ElapsedTime: ' . $elapsedTime . '.');
-    }
-}

app/Classes/Jobs/Commands/V2/FixMissingPackingListV2CommandJob.php

@@ -1,40 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2;
-
-use Carbon\Carbon;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use App\Classes\Modules\PackingLists\Processors\FetchPackingListsFromYdPortalProcessor;
-use Illuminate\Support\Facades\Log;
-
-class FixMissingPackingListV2CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    public function handle()
-    {
-        Log::info(Carbon::now() . ': Start job - Fix Missing PackingList.');
-        $start   = new Carbon();
-
-        $start_date = '2024-05-05';
-        $end_date = '2024-05-05';
-
-        $start = $start_date ? Carbon::parse($start_date) : null;
-        $end = $end_date ? Carbon::parse($end_date) : null;
-
-        if (!$start || !$end) {
-            return;
-        }
-
-        (App()->make(FetchPackingListsFromYdPortalProcessor::class))->execute($start, $end);
-
-
-        $end = new Carbon();
-        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
-        Log::info(Carbon::now() . ': End job - Fix Missing PackingList. ElapsedTime: ' . $elapsedTime  . '.');
-    }
-}

app/Classes/Jobs/Commands/V2/FixPackingListV2CommandJob.php

@@ -1,68 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2;
-
-use Carbon\Carbon;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use App\Models\PackingList;
-use Illuminate\Support\Facades\Log;
-
-class FixPackingListV2CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-
-    public function handle()
-    {
-        Log::info(Carbon::now() . ': Start job - Fix PackingList.');
-        $start   = new Carbon();
-
-        $packingLists = PackingList::whereDoesntHave('packages')->get();
-
-        if ($packingLists->isNotEmpty()) {
-
-            $restoredPackagesCount = 0;
-            $restoredPackagesIds = [];
-
-            // Eager loading packages for all packing lists
-            $packingLists->load(['packages' => function ($query) {
-                $query->onlyTrashed();
-            }]);
-
-            foreach ($packingLists as $packingList) {
-                $deletedPackages = $packingList->packages->filter(function ($package) use ($restoredPackagesIds) {
-                    // Filter out packages that have already been restored
-                    return !in_array($package->id, $restoredPackagesIds);
-                });
-
-                if ($deletedPackages->isNotEmpty()) {
-                    $groupedPackages = $deletedPackages->groupBy(function ($item) {
-                        return $item->only(['type', 'description', 'width', 'height', 'length', 'weight', 'quantity']);
-                    });
-
-                    foreach ($groupedPackages as $group) {
-                        $latestPackage = $group->sortByDesc('created_at')->first();
-
-                        // Check if the package ID is already restored before attempting to restore it
-                        if (!in_array($latestPackage->id, $restoredPackagesIds)) {
-                            $latestPackage->restore();
-                            Log::info('Package ID: ' . $latestPackage->id . ' has been restored');
-                            $restoredPackagesCount++;
-                            $restoredPackagesIds[] = $latestPackage->id;
-                        }
-                    }
-                }
-            }
-
-            Log::info('Restored Packages Count: ' . $restoredPackagesCount);
-        }
-
-        $end = new Carbon();
-        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
-        Log::info(Carbon::now() . ': End job - Fix PackingList. ElapsedTime: ' . $elapsedTime . '.');
-    }
-}

app/Classes/Jobs/Commands/V2/HouseKeepingS3FilesV2CommandJob.php

@@ -1,52 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2;
-
-
-use Carbon\Carbon;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use Illuminate\Support\Facades\File;
-use Illuminate\Support\Facades\Log;
-use Illuminate\Support\Facades\Storage;
-
-class HouseKeepingS3FilesV2CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-
-    public function handle()
-    {
-        Log::info(Carbon::now() . ': Start job - Housekeeping temporary files in S3 Bucket.');
-        $start   = new Carbon();
-
-        $s3 = Storage::disk('s3');
-        $directories = [
-            'temp',
-        ];
-        foreach ($directories as $directory) {
-            $startInner = Carbon::now();
-            Log::info(Carbon::now() . ' [HouseKeepingS3FilesV2] Start cleaning - ' . $directory);
-
-            $objects = $s3->allFiles($directory);
-
-            foreach ($objects as $object) {
-                $s3->delete($object);
-                Log::info('[HouseKeepingS3FilesV2] Deleted object: ' . $object);
-            }
-
-            Log::info('[HouseKeepingS3FilesV2] All files have been deleted.');
-
-            $endInner = Carbon::now();
-            $elapsedTime = $startInner->diff($endInner)->format('%H:%I:%S');
-            Log::info(Carbon::now() . ' [HouseKeepingS3FilesV2] Process ended. ElapsedTime: ' . $elapsedTime);
-        }
-
-        $end = new Carbon();
-        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
-        Log::info(Carbon::now() . ': End job - Housekeeping temporary files in S3 Bucket. ElapsedTime: ' . $elapsedTime . '.');
-    }
-}

app/Classes/Jobs/Commands/V2/NewUserRegistrationExpireCheckV2CommandJob.php

@@ -1,38 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2;
-
-use App\Classes\Modules\Accounts\Services\ExpiresEmailVerificationAttempt;
-use App\Models\UserEmailVerification;
-use Carbon\Carbon;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use Illuminate\Support\Facades\Log;
-
-class NewUserRegistrationExpireCheckV2CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    public function handle()
-    {
-        Log::info(Carbon::now() . ': Start job - New user email verification expiration check.');
-        $start   = new Carbon();
-
-        $attempts = UserEmailVerification::active()->twoDaysOld()->get();
-
-        Log::info('NewUser Carbon now()->subHours(48): '. Carbon::now()->subHours(48));
-        Log::info('NewUser Attempts count: '.count($attempts));
-
-        foreach ($attempts as $attempt){
-            (new ExpiresEmailVerificationAttempt())->execute($attempt);
-            Log::info('NewUser Expired: '.$attempt->id.', '.$attempt->created_at);
-        }
-
-        $end = new Carbon();
-        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
-        Log::info(Carbon::now() . ': End job - New user email verification expiration check. ElapsedTime: ' . $elapsedTime . '.');
-    }
-}

app/Classes/Jobs/Commands/V2/OneTimeTransactionFixBillplzFailedCbV2CommandJob.php

@@ -1,44 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2;
-
-use Carbon\Carbon;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use App\Classes\Modules\Billplzs\Processors\CallbackBillplzDataPatchProcessor;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Models\Transaction;
-use Illuminate\Support\Facades\Log;
-
-class OneTimeTransactionFixBillplzFailedCbV2CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    public function handle()
-    {
-        Log::info(Carbon::now() . ': Start job - One time fix failled callback from billplz for transaction with id 17310 cron ended.');
-        $start   = new Carbon();
-
-        // ini_set('memory_limit', '-1');
-
-        //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', [17310])->first();
-        Log::info(Carbon::now() . ' : One time fix failled callback from billplz for transaction with id 17310 cron started.');
-
-        if($transaction && $transaction->id == 17310){
-
-            Log::info(Carbon::now() . ' : 17310.');
-            $status = ApprovalStatus::APPROVED;
-            // $this->callbackBillplzProcessor->execute($transaction, $status);
-            (App()->make(CallbackBillplzDataPatchProcessor::class))->execute($transaction, $status);
-        }
-
-        $end = new Carbon();
-        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
-        Log::info(Carbon::now() . ': End job - One time fix failled callback from billplz for transaction with id 17310 cron ended. ElapsedTime: ' . $elapsedTime  . '.');
-    }
-}

app/Classes/Jobs/Commands/V2/PasswordResetTokenExpirationV2CommandJob.php

@@ -1,38 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2;
-
-use App\Classes\Modules\Accounts\Services\ExpiresPasswordReset;
-use App\Models\PasswordReset;
-use Carbon\Carbon;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use Illuminate\Support\Facades\Log;
-
-class PasswordResetTokenExpirationV2CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    public function handle()
-    {
-        Log::info(Carbon::now() . ': Start job - Password reset token expiration check.');
-        $start   = new Carbon();
-
-        $attempts = PasswordReset::active()->oneDayOld()->get();
-
-        Log::info('PasswordReset Carbon now()->subHours(24): '. Carbon::now()->subHours(24));
-        Log::info('PasswordReset Attempts count: '.count($attempts));
-
-        foreach ($attempts as $attempt){
-            (new ExpiresPasswordReset())->execute($attempt);
-            Log::info('PasswordReset Expired: '.$attempt->id.', '.$attempt->created_at);
-        }
-
-        $end = new Carbon();
-        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
-        Log::info(Carbon::now() . ': End job - Password reset token expiration check. ElapsedTime: ' . $elapsedTime . '.');
-    }
-}

app/Classes/Jobs/Commands/V2/SendContainerDepartureEmailV2CommandJob.php

@@ -1,44 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2;
-
-use Carbon\Carbon;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use App\Classes\Notifications\ShipmentDepartureEmail;
-use App\Models\Order;
-use App\Models\Container;
-use Illuminate\Support\Facades\Log;
-
-class SendContainerDepartureEmailV2CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-
-    public function handle()
-    {
-        Log::info(Carbon::now() . ': Start job - Send Container Departure Email.');
-        $start   = new Carbon();
-
-        $containers = Container::whereHas('transports', function ($transport){
-            return $transport->whereDate('dispatch_date', '=', Carbon::today());
-         })->get();
-
-         foreach ($containers as $container){
-             foreach ($container->packingLists as $packingList){
-                 if(!($packingList->owner instanceof Order)) continue;
-                 $user = $packingList->owner->companyModule->employees()->first();
-                 if(app()->environment(['production'])) {
-                     $user->notify(new ShipmentDepartureEmail($user, $packingList));
-                 }
-             }
-         }
-
-        $end = new Carbon();
-        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
-        Log::info(Carbon::now() . ': End job - Send Container Departure Email. ElapsedTime: ' . $elapsedTime . '.');
-    }
-}

app/Classes/Jobs/Commands/V2/SendPermitsReminderEmailsV2CommandJob.php

@@ -1,68 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2;
-
-use Carbon\Carbon;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use App\Classes\Notifications\PermitsReminderEmail;
-use App\Models\PermitsReminder;
-use App\Models\User;
-use Illuminate\Support\Facades\Log;
-
-class SendPermitsReminderEmailsV2CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-
-    public function handle()
-    {
-        Log::info(Carbon::now() . ': Start job - Send Permits Reminders Email.');
-        $start   = new Carbon();
-
-        $currentDateTime = now();
-        $startRange = $currentDateTime->subDays(3)->startOfDay();
-        $endRange = $currentDateTime->copy()->addDays(6)->endOfDay();
-
-        $reminders = PermitsReminder::whereDate('reminder_date', '>=', $startRange)
-            ->whereDate('reminder_date', '<=', $endRange)
-            ->orWhere('reminder_date', '<', now())
-            ->pluck('model');
-
-        if ($reminders->isEmpty()) {
-            Log::info('No reminders expiring within the specified range.');
-            return;
-        }
-
-        Log::info($this->getTimeStamp() . 'Reminders: ' . $reminders->toJson());
-
-        $users = User::whereIn('email', $this->getEmailList())->get();
-
-        foreach ($users as $user) {
-            Log::info($this->getTimeStamp() . 'Reminder email sent to ' . $user->email);
-            if (app()->environment('production')) {
-                $user->notify(new PermitsReminderEmail($user, $reminders));
-            }
-        }
-
-        $end = new Carbon();
-        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
-        Log::info(Carbon::now() . ': End job - Send Permits Reminders Email. ElapsedTime: ' . $elapsedTime . '.');
-    }
-
-    public function getTimeStamp()
-    {
-        return '[' . Carbon::now()->format('Y-m-d H:i:s') . '] - ';
-    }
-
-    protected function getEmailList(): array
-    {
-        return [
-            // 'edmond.wuiming2021@gmail.com',
-            'anithagurl96@gmail.com'
-        ];
-    }
-}

app/Classes/Jobs/Commands/V2/ShowBillplzPaymentStatusV2CommandJob.php

@@ -1,57 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2;
-
-use App\Classes\Modules\Jobs\DataTransferObjects\ShowBillplzPaymentStatusV2CommandObject;
-use Carbon\Carbon;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use Illuminate\Support\Facades\Http;
-use Illuminate\Support\Facades\Log;
-
-class ShowBillplzPaymentStatusV2CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-
-    /** @var ShowBillplzPaymentStatusV2CommandObject*/
-    private $showBillplzPaymentStatusV2CommandObject;
-
-    /**
-     * ShowBillplzPaymentStatusV2CommandJob constructor.
-     * @param ShowBillplzPaymentStatusV2CommandObject $showBillplzPaymentStatusV2CommandObject
-     */
-    public function __construct(ShowBillplzPaymentStatusV2CommandObject $showBillplzPaymentStatusV2CommandObject)
-    {
-        $this->showBillplzPaymentStatusV2CommandObject = $showBillplzPaymentStatusV2CommandObject;
-    }
-
-    public function handle()
-    {
-        Log::info(Carbon::now() . ': Start job - Show Billplz payment status.');
-        $start   = new Carbon();
-
-        // ini_set('memory_limit', '-1');
-
-        $billplz_id = $this->showBillplzPaymentStatusV2CommandObject->getBillplzId();
-        $billplz_id = explode(",", $billplz_id);
-
-        foreach ($billplz_id as $payment) {
-            $response = Http::withBasicAuth(config('billplz.api_key').':', '')->get(config('billplz.base_url').'/api/v3/bills/'.$payment);
-            if($response->successful()){
-                $data = $response->json();
-                dump($data);
-            }else{
-                Log::info("billplz error</br>");
-            }
-        }
-
-
-        $end = new Carbon();
-        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
-        Log::info(Carbon::now() . ': End job - Show Billplz payment status. ElapsedTime: ' . $elapsedTime . '.');
-    }
-}

app/Classes/Jobs/Commands/V2/ShowFailediBllplzCallbackV2CommandJob.php

@@ -1,63 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2;
-
-use Carbon\Carbon;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\PaymentMethodType;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Models\Transaction;
-use Illuminate\Support\Facades\Http;
-use Illuminate\Support\Facades\Log;
-
-class ShowFailediBllplzCallbackV2CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-
-    public function handle()
-    {
-        Log::info(Carbon::now() . ': Start job - Show all failled callback from billplz.');
-        $start   = new Carbon();
-
-        // ini_set('memory_limit', '-1');
-
-        $transactions = Transaction::whereIn('type', [TransactionType::PAYMENT, TransactionType::TOP_UP, TransactionType::GROUP_PAYMENT])->where('payment_method', PaymentMethodType::PAYMENT_GATEWAY)->whereNotIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->get();
-        $totalTransactions = count($transactions);
-
-        if ($totalTransactions) {
-            Log::info(Carbon::now() . ' totalTransactions : ' . $totalTransactions);
-        }
-
-        $counter = 1;
-        $totalAmount = 0;
-        foreach ($transactions as $transaction){
-            $response = Http::withBasicAuth(config('billplz.api_key').':', '')->get(config('billplz.base_url').'/api/v3/bills/'.$transaction->payment_reference);
-
-            if($response->successful()){
-                $data = $response->json();
-                if($data['paid']){
-                    dump($transaction->payment_reference);
-                    dump($transaction->id);
-                }
-            }else{
-                Log::info("billplz error</br>");
-            }
-            $counter++;
-        }
-
-        // if ($totalTransactions) {
-        //     Log::info(Carbon::now() . ' : Done Billplz Failled Callback. ElapsedTime: ' . $elapsedTime . '. Total: ' . $totalAmount);
-        // }
-
-
-        $end = new Carbon();
-        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
-        Log::info(Carbon::now() . ': End job - Show all failled callback from billplz. ElapsedTime: ' . $elapsedTime . '. Total: ' . $totalAmount);
-    }
-}

app/Classes/Jobs/Commands/V2/ShowFixBillplzFailedCallbackPaymentV2CommandJob.php

@@ -1,82 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2;
-
-use Carbon\Carbon;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\PaymentMethodType;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Models\Order;
-use App\Models\Transaction;
-use Illuminate\Support\Facades\Http;
-use Illuminate\Support\Facades\Log;
-
-class ShowFixBillplzFailedCallbackPaymentV2CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    public function handle()
-    {
-        Log::info(Carbon::now() . ': Start job - Show Billplz Failled Callback.');
-        $start   = new Carbon();
-
-        // ini_set('memory_limit', '-1');
-        // $this->outputArray = [];
-
-        $approvalStatusArray = ApprovalStatus::APPROVAL_STATUS_ID;
-
-        $transactions = Transaction::where('type', TransactionType::PAYMENT)->where('payment_method', PaymentMethodType::PAYMENT_GATEWAY)->whereNotIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->get();
-        $totalTransactions = count($transactions);
-        $counter = 1;
-        $totalAmount = 0;
-        foreach ($transactions as $transaction){
-            $response = Http::withBasicAuth(config('billplz.api_key').':', '')->get(config('billplz.base_url').'/api/v3/bills/'.$transaction->payment_reference);
-
-            if($response->successful()){
-                $data = $response->json();
-                if($data['paid']){
-                    $totalAmount += $transaction->amount;
-                    $invoiceStatus = null;
-
-                    switch($transaction->owner->status) {
-                        case 3:
-                        $invoiceStatus = 'Payment Completed';
-                        break;
-                        case 5:
-                        $invoiceStatus = 'Dispute in progress';
-                        break;
-                        case 6:
-                        $invoiceStatus = 'Cancelled Invoice';
-                        break;
-                        default:
-                        $invoiceStatus = 'Pending Payment';
-                    }
-
-                    $order = $transaction->owner->owner->owner;
-
-                    if(!$order instanceof Order) {
-                        Log::info("Error transaction id:" . $transaction->id . 'Type: ' . get_class($order));
-                    } else {
-                        Log::info($counter . ' of ' . $totalTransactions . '. Order: '. $order->reference . ' - Date: '.$transaction->owner->created_at->format('d-m-Y').' - Amount: '. $transaction->amount . '. Status: ' . $approvalStatusArray[$transaction->status] . '. Invoice Status: ' . $invoiceStatus);
-                    }
-
-                } else {
-                    // $totalAmount += $transaction->amount;
-                    // $this->appendToOutput($counter . ' of ' . $totalTransactions . '. Order: '. $transaction->owner->owner->owner->reference . ' - Date: '.$transaction->owner->created_at->format('d-m-Y').' - Amount: '. $transaction->amount);
-                }
-            }else{
-                Log::info("billplz error</br>");
-            }
-            $counter++;
-        }
-
-        $end = new Carbon();
-        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
-        Log::info(Carbon::now() . ': End job - Show Billplz Failled Callback. ElapsedTime: ' . $elapsedTime . '. Total: ' . $totalAmount);
-    }
-}

app/Classes/Jobs/Commands/V2/SuccessUpdatePaymentStatusV2CommandJob.php

@@ -1,88 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2;
-
-
-use Carbon\Carbon;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use App\Classes\Modules\Billplzs\Services\GetBillplzBill;
-use App\Classes\Modules\Orders\Processors\UpdateDoFromVTPortalProcessor;
-use App\Classes\Modules\Orders\Processors\UpdateDoFromYDPortalProcessor;
-use App\Classes\Modules\Transactions\Services\FetchesTransaction;
-use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\PaymentMethodType;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Models\Transaction;
-use Illuminate\Support\Facades\Log;
-
-class SuccessUpdatePaymentStatusV2CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    public function handle()
-    {
-        Log::info(Carbon::now() . ': Start job - Success Updated Payment Status.');
-        $start   = new Carbon();
-
-        // ini_set('memory_limit', '-1');
-        // $this->outputArray = [];
-
-        $approvalStatusArray = ApprovalStatus::APPROVAL_STATUS_ID;
-
-        $transactions = Transaction::where('type', TransactionType::PAYMENT)
-        ->where('payment_method', PaymentMethodType::PAYMENT_GATEWAY)
-        ->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])
-        ->get();
-
-        foreach ($transactions as $payment) {
-            $invoice = $payment->owner ?? null;
-            if (!$invoice) {
-                Log::info('Payment has no owner. Payment ID: ' . $payment->id);
-                continue;
-            }
-
-            $packingList = $invoice->owner ?? null;
-            if (!$packingList) {
-                Log::info('Invoice has no owner. Invoice ID: ' . $invoice->id);
-                continue;
-            }
-
-            $order = $packingList->owner;
-            if (!$invoice) {
-                Log::info('PackingList has no owner. PackingList ID: ' . $packingList->id);
-                continue;
-            }
-
-            if ($invoice->status == ApprovalStatus::APPROVED) {
-
-                $totalPaidAmount = $invoice->transactions->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->sum('amount');
-
-                if(($invoice->amount - $totalPaidAmount) < 0.01) {
-                    (App()->make(UpdatesTransactionStatus::class))->execute($invoice, ApprovalStatus::COMPLETED);
-
-                    $packingList->status = ApprovalStatus::APPROVED;
-                    $packingList->save();
-
-                    if(app()->environment('production')){
-                        (App()->make(UpdateDoFromVTPortalProcessor::class))->execute($packingList);
-                        (App()->make(UpdateDoFromYDPortalProcessor::class))->execute($packingList);
-                    }
-
-                    dump('Updated invoice ' . $invoice->id . '. Order: '. $order->reference);
-                } else {
-                    Log::info('Failed Update invoice ' . $invoice->id . ' because payment not enough. Invoice Amount: ' . $invoice->amount . ' . Paid Amount: ' . $totalPaidAmount . ' . Order: '. $order->reference);
-                }
-            }
-        }
-
-
-        $end = new Carbon();
-        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
-        Log::info(Carbon::now() . ': End job - Success Updated Payment Status. ElapsedTime: ' . $elapsedTime . '.');
-    }
-}

app/Classes/Jobs/Commands/V2/TestAttachingS3FileAndSendEmailV2CommandJob.php

@@ -1,59 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2;
-
-use Carbon\Carbon;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use Illuminate\Support\Facades\Log;
-use App\Models\Container;
-use App\Models\Order;
-use App\Models\User;
-use App\Classes\Notifications\ShipmentDepartureEmail;
-
-class TestAttachingS3FileAndSendEmailV2CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-
-    public function handle()
-    {
-        Log::info(Carbon::now() . ': Start job - Test to attach a file from S3 bucket and trigger an email send.');
-        $start   = new Carbon();
-
-        $containers = Container::whereHas('transports', function ($transport){
-            return $transport->whereDate('dispatch_date', '<', Carbon::today())->whereDate('dispatch_date', '>', Carbon::now()->subdays(30));
-        })->get();
-
-        Log::info("[TESTING] total containers: " . count($containers));
-
-        $sent = false;
-        foreach ($containers as $container){
-        if($sent){
-            break;
-        }
-            foreach ($container->packingLists as $packingList){
-            if($sent){
-                break;
-            }
-
-                if(!($packingList->owner instanceof Order)) continue;
-                $user = $packingList->owner->companyModule->employees()->first();
-                $user = User::where('email', 'dillonngoweijoon@gmail.com')->first();
-
-                Log::info("[TESTING] user: " . json_encode($user));
-                Log::info("[TESTING] packingList: " . json_encode($packingList));
-
-                $user->notify(new ShipmentDepartureEmail($user, $packingList));
-                $sent = true;
-            }
-        }
-
-        $end = new Carbon();
-        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
-        Log::info(Carbon::now() . ': End job - Test to attach a file from S3 bucket and trigger an email send. ElapsedTime: ' . $elapsedTime . '.');
-    }
-}

app/Classes/Jobs/Commands/V2/TestExportExcelToS3BucketV2CommandJob.php

@@ -1,82 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2;
-
-use Carbon\Carbon;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use Illuminate\Support\Facades\Log;
-use App\Classes\Modules\Exports\Services\ExportsNullDebtors;
-use Illuminate\Support\Facades\Storage;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\BusinessType;
-use App\Models\Company;
-
-class TestExportExcelToS3BucketV2CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-
-    public function handle()
-    {
-        Log::info(Carbon::now() . ': Start job - Test Export Excel File to S3 Bucket.');
-        $start   = new Carbon();
-
-        Log::info('company 0');
-
-        $company = Company::where(function($query){
-            $query->whereNull('debtor')->orWhere('debtor', '');
-        })->get();
-
-        Log::info('company 1: ' . json_encode($company));
-
-        $company = Company::where(function($query){
-            $query->whereNull('debtor')->orWhere('debtor', '');
-        })->whereHas('companyModules', function($query){
-            $query->where('type', BusinessType::IMPORTER);
-        })->get();
-
-        Log::info('company 2: ' . json_encode($company));
-
-        $company = Company::where(function($query){
-            $query->whereNull('debtor')->orWhere('debtor', '');
-        })->whereHas('companyModules', function($query){
-            $query->where('type', BusinessType::IMPORTER);
-        })->whereHas('parcels', function ($query) {
-            $query->where('packages.status', ApprovalStatus::APPROVED);
-
-        })
-        ->with(['companyModules', 'parcels'])
-        ->get();
-
-        Log::info('company 3: ' . json_encode($company));
-
-        $company = Company::where(function($query){
-            $query->whereNull('debtor')->orWhere('debtor', '');
-        })->whereHas('companyModules', function($query){
-            $query->where('type', BusinessType::IMPORTER);
-        })->whereHas('parcels')->where('status', ApprovalStatus::APPROVED)->get();
-
-        Log::info('company 4: ' . json_encode($company));
-
-        $export = new ExportsNullDebtors();
-        $filesystemDriver = Storage::getDefaultDriver();
-
-        if ($filesystemDriver === 's3') {
-            $filePathForS3 = 'temp/nullDebtor.xlsx'; //documents/exports
-            $excelFile = $export->store($filePathForS3, 's3');
-            $temporaryUrl = Storage::disk('s3')->temporaryUrl(
-                $filePathForS3,
-                Carbon::now()->addMinutes(10)
-            );
-            Log::info('temporaryUrl: ' . $temporaryUrl);
-        }
-
-        $end = new Carbon();
-        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
-        Log::info(Carbon::now() . ': End job - Test Export Excel File to S3 Bucket. ElapsedTime: ' . $elapsedTime . '.');
-    }
-}

app/Classes/Jobs/Commands/V2/TestReadDataFromYDAPIV2CommandJob.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2;
-
-use Carbon\Carbon;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use Illuminate\Support\Facades\Log;
-use App\Classes\Modules\PackingLists\Processors\TestFetchPackingListsFromYdPortalProcessor;
-
-class TestReadDataFromYDAPIV2CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-
-    public function handle()
-    {
-        Log::info(Carbon::now() . ': Start job - Test to read data from YD API.');
-        $start   = new Carbon();
-
-        (App()->make(TestFetchPackingListsFromYdPortalProcessor::class))->execute();
-
-        $end = new Carbon();
-        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
-        Log::info(Carbon::now() . ': End job - Test to read data from YD API. ElapsedTime: ' . $elapsedTime . '.');
-    }
-}

app/Classes/Jobs/Commands/V2/YD/FetchContainersFromYdPortalV2CommandJob.php

@@ -1,37 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2\YD;
-
-use App\Classes\Modules\PackingLists\Processors\V2\FetchContainersFromYdPortalV2Processor;
-use App\Classes\Modules\PackingLists\Processors\FetchContainersUpdatesFromYdPortalProcessor;
-use App\Classes\Modules\PackingLists\Processors\FetchDeliveryUpdatesFromYdPortalProcessor;
-use App\Classes\Modules\PackingLists\Processors\FetchOrderListsFromYdPortalProcessor;
-use App\Models\PackingList;
-
-use Carbon\Carbon;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use Illuminate\Support\Facades\Log;
-
-class FetchContainersFromYdPortalV2CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    protected $packingList;
-
-    public function __construct(PackingList $packingList)
-    {
-        $this->packingList = $packingList;
-    }
-
-
-    public function handle()
-    {
-        Log::info('Processing FetchContainersFromYdPortalV2CommandJob');
-        $processor = app(FetchContainersFromYdPortalV2Processor::class);
-        $processor->execute($this->packingList);
-    }
-}

app/Classes/Jobs/Commands/V2/YD/FetchContainersUpdatesFromYdPortalV2CommandJob.php

@@ -1,36 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2\YD;
-
-use App\Classes\Modules\PackingLists\Processors\FetchContainersFromYdPortalProcessor;
-use App\Classes\Modules\PackingLists\Processors\V2\FetchContainersUpdatesFromYdPortalV2Processor;
-use App\Classes\Modules\PackingLists\Processors\FetchDeliveryUpdatesFromYdPortalProcessor;
-use App\Classes\Modules\PackingLists\Processors\FetchOrderListsFromYdPortalProcessor;
-use App\Models\Container;
-
-use Carbon\Carbon;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use Illuminate\Support\Facades\Log;
-
-class FetchContainersUpdatesFromYdPortalV2CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    protected $container;
-
-    public function __construct(Container $container)
-    {
-        $this->container = $container;
-    }
-
-    public function handle()
-    {
-        Log::info('Processing FetchContainersUpdatesFromYdPortalV2CommandJob');
-        $processor = app(FetchContainersUpdatesFromYdPortalV2Processor::class);
-        $processor->execute($this->container);
-    }
-}

app/Classes/Jobs/Commands/V2/YD/FetchDeliveryUpdatesFromYdPortalV2CommandJob.php

@@ -1,36 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2\YD;
-
-use App\Classes\Modules\PackingLists\Processors\FetchContainersFromYdPortalProcessor;
-use App\Classes\Modules\PackingLists\Processors\FetchContainersUpdatesFromYdPortalProcessor;
-use App\Classes\Modules\PackingLists\Processors\V2\FetchDeliveryUpdatesFromYdPortalV2Processor;
-use App\Classes\Modules\PackingLists\Processors\FetchOrderListsFromYdPortalProcessor;
-use App\Models\PackingList;
-
-use Carbon\Carbon;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use Illuminate\Support\Facades\Log;
-
-class FetchDeliveryUpdatesFromYdPortalV2CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    protected $packingListId;
-
-    public function __construct(int $packingListId)
-    {
-        $this->packingListId = $packingListId;
-    }
-
-    public function handle()
-    {
-        Log::info('Processing FetchDeliveryUpdatesFromYdPortalV2CommandJob');
-        $processor = app(FetchDeliveryUpdatesFromYdPortalV2Processor::class);
-        $processor->execute($this->packingListId);
-    }
-}

app/Classes/Jobs/Commands/V2/YD/FetchOrderListsFromYdPortalV2CommandJob.php

@@ -1,34 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2\YD;
-
-use App\Classes\Modules\PackingLists\Processors\V2\FetchOrderListsFromYdPortalV2Processor;
-
-use Carbon\Carbon;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use Illuminate\Support\Facades\Log;
-
-class FetchOrderListsFromYdPortalV2CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    protected $startDate;
-    protected $endDate;
-
-    public function __construct(?Carbon $startDate, ?Carbon $endDate)
-    {
-        $this->startDate = $startDate;
-        $this->endDate = $endDate;
-    }
-
-    public function handle()
-    {
-        Log::info('Processing FetchOrderListsFromYdPortalV2CommandJob for start date: ' . $this->startDate. ', and end date: ' . $this->endDate);
-        $processor = app(FetchOrderListsFromYdPortalV2Processor::class);
-        $processor->execute($this->startDate, $this->endDate);
-    }
-}

app/Classes/Jobs/Commands/V2/YD/FetchPackingListsFromYdPortalV2CommandJob.php

@@ -1,34 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2\YD;
-
-use App\Classes\Modules\PackingLists\Processors\V2\FetchPackingListsFromYdPortalV2Processor;
-
-use Carbon\Carbon;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use Illuminate\Support\Facades\Log;
-
-class FetchPackingListsFromYdPortalV2CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    protected $startDate;
-    protected $endDate;
-
-    public function __construct(?Carbon $startDate, ?Carbon $endDate)
-    {
-        $this->startDate = $startDate;
-        $this->endDate = $endDate;
-    }
-
-    public function handle()
-    {
-        Log::info('Processing FetchPackingListsFromYdPortalV2CommandJob for start date: ' . $this->startDate. ', and end date: ' . $this->endDate);
-        $processor = app(FetchPackingListsFromYdPortalV2Processor::class);
-        $processor->execute($this->startDate, $this->endDate);
-    }
-}

app/Classes/Jobs/ListPackingListsJob.php

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

app/Classes/Jobs/MonthlyReportJob.php

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

app/Classes/Jobs/UpdatePerfexCRMInvoice.php

@@ -11,16 +11,17 @@ 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;
-use App\Classes\General\LogHelper;
 
 class UpdatePerfexCRMInvoice implements ShouldQueue
 {
@@ -48,7 +49,7 @@ class UpdatePerfexCRMInvoice implements ShouldQueue
         $invoiceId = 0;
         $invoiceStatus = 0;
         $invoice = (App()->make(FetchesPerfexCRMInvoice::class))->execute($customer->userid,"INV-", $transaction->owner->bill_no);
-        LogHelper::channel('perfex_crm')->info('UpdatePerfexCRMInvoice debug bill_no: ' . $transaction->owner->bill_no . ', Project Id: ' . $this->updatePerfexCRMInvoiceObject->getProjectId());
+        Log::channel('perfex_crm')->info('UpdatePerfexCRMInvoice debug bill_no: ' . $transaction->owner->bill_no . ', Project Id: ' . $this->updatePerfexCRMInvoiceObject->getProjectId());
 
         if(is_null($invoice)){
             $result = (App()->make(CreatePerfexCRMInvoiceProcessor::class))->execute($transaction->owner, $this->updatePerfexCRMInvoiceObject->getIsPaid());
@@ -56,7 +57,7 @@ class UpdatePerfexCRMInvoice implements ShouldQueue
                 $invoiceId = $result->payload['id'];
             } else {
                 // Log::error(json_encode('UpdatePerfexCRMInvoice CreatePerfexCRMInvoiceProcessor failed'));
-                LogHelper::channel('perfex_crm')->info('UpdatePerfexCRMInvoice CreatePerfexCRMInvoiceProcessor failed');
+                Log::channel('perfex_crm')->info('UpdatePerfexCRMInvoice CreatePerfexCRMInvoiceProcessor failed');
             }
         }
         else{

app/Classes/Jobs/UpdatePerfexCRMPrelude.php

@@ -32,12 +32,12 @@ class UpdatePerfexCRMPrelude implements ShouldQueue
 
     /**
      * UpdatePerfexCRMPrelude constructor.
-     * @param PackingList $packingList
+     * @param $packingList
      * @param Transaction $transaction
      * @param UpdatePerfexCRMObject $updatePerfexCRMObject
      * @param bool|null $shouldCreateInvoice
      */
-    public function __construct(?PackingList $packingList, $transaction, UpdatePerfexCRMObject $updatePerfexCRMObject, ?bool $shouldCreateInvoice = false)
+    public function __construct($packingList, $transaction, UpdatePerfexCRMObject $updatePerfexCRMObject, ?bool $shouldCreateInvoice = false)
     {
         $this->packingList = $packingList;
         $this->transaction = $transaction;
@@ -47,12 +47,6 @@ class UpdatePerfexCRMPrelude implements ShouldQueue
 
     public function handle()
     {
-        Log::info('UpdatePerfexCRMPrelude packingList: ' . json_encode($this->packingList));
-
-        if(env('APP_ENV') !== 'production'){
-            return;
-        }
-
         if(is_null($this->packingList)){
             $this->packingList = $this->transaction->owner->owner;
         }

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

@@ -1,87 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Accounts\ControllersLogic;
-
-use App\Classes\Exceptions\ResourceConflictException;
-use App\Classes\Exceptions\ResourceNotFoundException;
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Accounts\Processors\GenerateEmailVerificationAttemptProcessor;
-use App\Classes\Modules\Companies\DataTransferObjects\EmploymentObject;
-use App\Classes\Modules\Companies\Processors\AssignEmployeeProcessor;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Http\Resources\UserResource;
-use App\Models\User;
-use Illuminate\Database\QueryException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Log;
-
-class AdminAddNewMemberLogic extends AbstractControllerLogic
-{
-
-    public function notification(): array
-    {
-        return [
-            'title' => 'Admin Updated Email',
-            'message' => 'Successfully updated email'
-        ];
-    }
-
-    /**
-     * @var AssignEmployeeProcessor
-     */
-    private $assignEmployeeProcessor;
-
-    /**
-     * @var GenerateEmailVerificationAttemptProcessor
-     */
-    private $generateEmailVerificationAttemptProcessor;
-
-    /**
-     * AddNewMemberLogic constructor.
-     * @param AssignEmployeeProcessor $assignEmployeeProcessor
-     * @param GenerateEmailVerificationAttemptProcessor $generateEmailVerificationAttemptProcessor
-     */
-    public function __construct(AssignEmployeeProcessor $assignEmployeeProcessor, GenerateEmailVerificationAttemptProcessor $generateEmailVerificationAttemptProcessor)
-    {
-        $this->assignEmployeeProcessor = $assignEmployeeProcessor;
-        $this->generateEmailVerificationAttemptProcessor = $generateEmailVerificationAttemptProcessor;
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws ResourceConflictException
-     * @throws \App\Classes\Exceptions\AccessForbiddenException
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     * @throws \App\Classes\Exceptions\RequestValidationException
-     */
-    public function logic(Request $request): JsonResponse
-    {
-        Log::info($request->input('employeeId'));
-
-        try {
-            if (!$authUser = User::find($request->input('employeeId'))) {
-                throw new ResourceNotFoundException('User not found.');
-            }
-        
-            $user = $authUser->replicate();
-            $user->email = $request->input('email');
-            $user->status = ApprovalStatus::PENDING_VERIFICATION;
-            $user->save();
-            
-        } catch (QueryException $e) {
-            throw new ResourceConflictException('Email already exists.');
-        }
-
-        Log::info($request->input('email'));
-        
-        if ($company = $authUser->companyModule()->first()) {
-            $this->assignEmployeeProcessor->execute(new EmploymentObject($company, $user));
-        }
-        
-        $this->generateEmailVerificationAttemptProcessor->execute($user);
-        
-        return $this->resourceResponse(new UserResource($user));
-    }
-}

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/GeneratePasswordResetLogic.php

@@ -77,11 +77,11 @@ class GeneratePasswordResetLogic extends AbstractControllerLogic
 
             $attempt = $this->generatesPasswordReset->execute($user);
 
-            // $this->passwordResetTokenExpiration::dispatch($attempt)->delay(now()->addHours(24)); //converted to schedule task
+            $this->passwordResetTokenExpiration::dispatch($attempt)->delay(now()->addHours(24));
             $this->sendResetPasswordEmail::dispatch($user, $attempt);
 
             return $this->response(['email' => $object->getEmail()]);
         }
     }
 
-}
+}

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/GenerateEmailVerificationAttemptProcessor.php

@@ -50,7 +50,7 @@ class GenerateEmailVerificationAttemptProcessor
 
         $attempt = $this->generatesEmailVerificationAttempt->execute($user);
 
-        //$this->emailVerificationAttemptExpiration::dispatch($attempt)->delay(now()->addHours(48));  //converted to schedule task
+        $this->emailVerificationAttemptExpiration::dispatch($attempt)->delay(now()->addHours(48));
 
         $this->sendUserVerificationEmail::dispatch($user, $attempt);
 

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

@@ -18,6 +18,7 @@ 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;
@@ -28,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'
@@ -79,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')]);
 
@@ -92,18 +94,25 @@ 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([
@@ -113,6 +122,7 @@ class UpdateAddressLogic extends AbstractControllerLogic
 
         $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'),
@@ -120,7 +130,7 @@ class UpdateAddressLogic extends AbstractControllerLogic
 
         $address->addressExtraFields()->delete();
         $addressExtraFieldsObject = new RemarkObject(json_encode($addressExtraFields), Auth()->user()->id, RemarkTypes::ADDRESS_EXTRA_COLUMNS);
-        $remark = $this->createRemarkProcessor->execute($address, $addressExtraFieldsObject);
+        $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

@@ -130,8 +130,8 @@ class CallbackBillplzDataPatchProcessor
 
             }
             else{
-                Log::channel('storage_invoices')->info('Total amount from current transaction: '.$totalAmountToBePaid);
-                Log::channel('storage_invoices')->info('Total amount from paid transaction: '.$transaction->amount);
+                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;
             }
         }

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

@@ -2,7 +2,6 @@
 
 namespace App\Classes\Modules\Billplzs\Processors;
 
-use App\Classes\General\LogHelper;
 use Illuminate\Http\Request;
 use App\Models\Wallet;
 use App\Models\Group;
@@ -122,8 +121,8 @@ class CallbackBillplzProcessor
 
             }
             else{
-                LogHelper::channel('storage_invoices')->info('Total amount from current transaction: '.$totalAmountToBePaid);
-                LogHelper::channel('storage_invoices')->info('Total amount from paid transaction: '.$transaction->amount);
+                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;
             }
         }

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

@@ -4,7 +4,6 @@ namespace App\Classes\Modules\Billplzs\Services;
 
 use Illuminate\Support\Facades\Http;
 use App\Classes\Exceptions\MalformedRequestException;
-use App\Classes\General\LogHelper;
 use Illuminate\Support\Facades\Log;
 
 class DeletesBillplzBill
@@ -17,7 +16,7 @@ class DeletesBillplzBill
     public function execute(string $billID) {
         try{
             $response = Http::withBasicAuth(config('billplz.api_key').':', '')->delete(config('billplz.base_url').'/api/v3/bills/'.$billID);
-            LogHelper::channel('storage_invoices')->info('DeletesBillplzBill response: '.json_encode($response));
+            Log::channel('storage_invoices')->info('DeletesBillplzBill response: '.json_encode($response));
 
             if($response->successful()){
                 $data = $response->json();

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/ControllersLogic/RenderDocumentLogic.php

@@ -54,20 +54,11 @@ class RenderDocumentLogic extends AbstractControllerLogic
 
         $this->canRenderDocument->passes();
 
-        $filesystemDriver = Storage::getDefaultDriver();
-        if($filesystemDriver === 's3'){
-            if(!Storage::disk('s3')->exists($file))
-            {
-                throw new ResourceNotFoundException();
-            }
-            return $this->response(['src' => explode('.', $file)[1] == 'pdf' ? chunk_split(base64_encode(Storage::disk('s3')->get($file))) : Storage::disk('s3')->get($file) ]);
-        }
-        else{
-            if(!Storage::disk('documents')->exists($file))
-            {
-                throw new ResourceNotFoundException();
-            }
-            return $this->response(['src' => explode('.', $file)[1] == 'pdf' ? chunk_split(base64_encode(Storage::disk('documents')->get($file))) : Storage::disk('documents')->get($file) ]);
+        if(!Storage::disk('documents')->exists($file))
+        {
+            throw new ResourceNotFoundException();
         }
+
+        return $this->response(['src' => explode('.', $file)[1] == 'pdf' ? chunk_split(base64_encode(Storage::disk('documents')->get($file))) : Storage::disk('documents')->get($file) ]);
     }
-}
+}

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/ConvertsBase64ToFile.php

@@ -98,17 +98,13 @@ class ConvertsBase64ToFile
      * @throws MalformedRequestException
      */
     private function generateFile(FileObject $file, string $suffix = '') {
-        $filesystemDriver = Storage::getDefaultDriver();
-        if($filesystemDriver === 's3'){
-            $filePath = 'documents/'.$this->path.'/'.$file->getFileName().$suffix.'.'.$file->getExtension();
-            Storage::put($filePath, $file->getDecodedData(), 's3');
-            return $filePath;
-        }
-        else{
-            $filePath = $this->path.'/'.$file->getFileName().$suffix.'.'.$file->getExtension();
-            Storage::disk('documents')->put($filePath, $file->getDecodedData());
-            return $filePath;
-        }
+
+        $filePath = $this->path.'/'.$file->getFileName().$suffix.'.'.$file->getExtension();
+
+        Storage::disk('documents')->put($filePath, $file->getDecodedData());
+
+        return $filePath;
+
     }
 
     /**

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/ControllersLogic/ExportFeedbackDataLogic.php

@@ -3,17 +3,14 @@
 namespace App\Classes\Modules\Exports\ControllersLogic;
 
 
-use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\General\Abstracts\Abstract2ControllerLogic;
 use App\Classes\Modules\Exports\Services\ExportsFeedback;
 use App\Classes\Modules\Exports\Standards\Rules\CanExportFeedback;
 use Illuminate\Http\Request;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
 use Maatwebsite\Excel\Excel;
-use App\Classes\General\AWSS3Helper;
-use Illuminate\Support\Facades\Storage;
-use Illuminate\Http\JsonResponse;
 
-
-class ExportFeedbackDataLogic extends AbstractControllerLogic
+class ExportFeedbackDataLogic extends Abstract2ControllerLogic
 {
     /**
      * @return array
@@ -47,17 +44,14 @@ class ExportFeedbackDataLogic extends AbstractControllerLogic
      * @param Request $request
      * @return Response
      */
-    public function logic(Request $request) : JsonResponse
+    public function logic(Request $request) : BinaryFileResponse
     {
         $this->canExportFeedback->passes();
 
-        $exportFileName = 'feedback.xls';
-        $filesystemDriver = Storage::getDefaultDriver();
-        if($filesystemDriver === 's3'){
-            return $this->response([ 'src' =>  AWSS3Helper::S3Exportable($exportFileName, $this->exportsFeedback) ]);
-        }
+        $response = $this->exportsFeedback->download('feedback.xls', Excel::XLS, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']);
+        ob_end_clean();
 
-        return $this->response([ 'src' => null ]);
+        return $response;
     }
 
 }

app/Classes/Modules/Exports/ControllersLogic/ExportFeedbackDataReturnsBinaryLogic.php

@@ -1,67 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Exports\ControllersLogic;
-
-
-use App\Classes\General\Abstracts\Abstract2ControllerLogic;
-use App\Classes\Modules\Exports\Services\ExportsFeedback;
-use App\Classes\Modules\Exports\Standards\Rules\CanExportFeedback;
-use Illuminate\Http\Request;
-use Symfony\Component\HttpFoundation\BinaryFileResponse;
-use Maatwebsite\Excel\Excel;
-use App\Classes\General\AWSS3Helper;
-use Illuminate\Support\Facades\Storage;
-
-
-class ExportFeedbackDataReturnsBinaryLogic extends Abstract2ControllerLogic
-{
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Retrieved Feedback',
-            'message' => 'You have successfully exported feedback data'
-        ];
-    }
-
-    /** @var ExportsFeedback */
-    private $exportsFeedback;
-
-    /** @var CanExportFeedback */
-    private $canExportFeedback;
-
-    /**
-     * ExportFeedbackDataLogic constructor.
-     * @param ExportsFeedback $exportsFeedback
-     * @param CanExportFeedback $canExportFeedback
-     */
-    public function __construct(ExportsFeedback $exportsFeedback, CanExportFeedback $canExportFeedback)
-    {
-        $this->exportsFeedback = $exportsFeedback;
-        $this->canExportFeedback = $canExportFeedback;
-    }
-
-
-    /**
-     * @param Request $request
-     * @return Response
-     */
-    public function logic(Request $request) : BinaryFileResponse
-    {
-        $this->canExportFeedback->passes();
-
-        $exportFileName = 'feedback.xls';
-        $filesystemDriver = Storage::getDefaultDriver();
-        if($filesystemDriver === 's3'){
-            return response([ 'src' =>  AWSS3Helper::S3Exportable($exportFileName, $this->exportsFeedback) ]);
-        }
-        else{
-            $response = $this->exportsFeedback->download($exportFileName, Excel::XLS, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']);
-            ob_end_clean();
-        }
-
-        return $response;
-    }
-
-}

app/Classes/Modules/Exports/ControllersLogic/ExportPackingListLogic.php

@@ -3,16 +3,15 @@
 namespace App\Classes\Modules\Exports\ControllersLogic;
 
 
-use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\General\Abstracts\Abstract2ControllerLogic;
 use App\Classes\Modules\Exports\Standards\Rules\CanExportPackingList;
 use App\Classes\Modules\Exports\Services\ExportsOnHoldPackingList;
 use App\Classes\Modules\Exports\Services\ExportsPendingArrangementDeliveryList;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Storage;
-use App\Classes\General\AWSS3Helper;
-use Illuminate\Http\JsonResponse;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
+use Maatwebsite\Excel\Excel;
 
-class ExportPackingListLogic extends AbstractControllerLogic
+class ExportPackingListLogic extends Abstract2ControllerLogic
 {
     /**
      * @return array
@@ -51,24 +50,19 @@ class ExportPackingListLogic extends AbstractControllerLogic
      * @param Request $request
      * @return Response
      */
-    public function logic(Request $request) : JsonResponse
+    public function logic(Request $request) : BinaryFileResponse
     {
         $this->canExportPackingList->passes();
         $isSetPendingArrangement = $request->header('PendingArrangement');
-
-        $filesystemDriver = Storage::getDefaultDriver();
-        if($filesystemDriver === 's3'){
-            if($isSetPendingArrangement){
-                $exportFileName = 'packing-list-delivery.xls';
-                return $this->response([ 'src' => AWSS3Helper::S3Exportable($exportFileName, $this->exportsPendingArrangementDeliveryList) ]);
-            }
-            else{
-                $exportFileName = 'packing-list-on-hold.xls';
-                return $this->response([ 'src' => AWSS3Helper::S3Exportable($exportFileName, $this->exportsOnHoldPackingList) ]);
-            }
+        if($isSetPendingArrangement){
+            $response = $this->exportsPendingArrangementDeliveryList->download('packing-list-delivery.xls', Excel::XLS, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']);
+        }
+        else {
+            $response = $this->exportsOnHoldPackingList->download('packing-list-on-hold.xls', Excel::XLS, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']);
         }
 
-        return $this->response([ 'src' => null ]);
+        ob_end_clean();
+        return $response;
     }
 
 }

app/Classes/Modules/Exports/ControllersLogic/ExportPackingListReturnsBinaryLogic.php

@@ -1,84 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Exports\ControllersLogic;
-
-
-use App\Classes\General\Abstracts\Abstract2ControllerLogic;
-use App\Classes\Modules\Exports\Standards\Rules\CanExportPackingList;
-use App\Classes\Modules\Exports\Services\ExportsOnHoldPackingList;
-use App\Classes\Modules\Exports\Services\ExportsPendingArrangementDeliveryList;
-use Illuminate\Http\Request;
-use Symfony\Component\HttpFoundation\BinaryFileResponse;
-use Maatwebsite\Excel\Excel;
-use Illuminate\Support\Facades\Storage;
-use App\Classes\General\AWSS3Helper;
-
-class ExportPackingListReturnsBinaryLogic extends Abstract2ControllerLogic
-{
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Retrieved PackingList',
-            'message' => 'You have successfully exported PackingList'
-        ];
-    }
-
-    /** @var ExportsOnHoldPackingList */
-    private $exportsOnHoldPackingList;
-
-    /** @var ExportsPendingArrangementDeliveryList */
-    private $exportsPendingArrangementDeliveryList;
-
-    /** @var CanExportPackingList */
-    private $canExportPackingList;
-
-    /**
-     * ExportPackingListLogic constructor.
-     * @param ExportsPendingArrangementDeliveryList $exportsPendingArrangementDeliveryList
-     * @param ExportsOnHoldPackingList $exportsOnHoldPackingList
-     * @param CanExportPackingList $canExportPackingList
-     */
-    public function __construct(ExportsPendingArrangementDeliveryList $exportsPendingArrangementDeliveryList, ExportsOnHoldPackingList $exportsOnHoldPackingList, CanExportPackingList $canExportPackingList)
-    {
-        $this->exportsPendingArrangementDeliveryList = $exportsPendingArrangementDeliveryList;
-        $this->exportsOnHoldPackingList = $exportsOnHoldPackingList;
-        $this->canExportPackingList = $canExportPackingList;
-    }
-
-
-    /**
-     * @param Request $request
-     * @return Response
-     */
-    public function logic(Request $request) : BinaryFileResponse
-    {
-        $this->canExportPackingList->passes();
-        $isSetPendingArrangement = $request->header('PendingArrangement');
-
-        $filesystemDriver = Storage::getDefaultDriver();
-        if($filesystemDriver === 's3'){
-            if($isSetPendingArrangement){
-                $exportFileName = 'packing-list-delivery.xls';
-                return response([ 'src' =>  AWSS3Helper::S3Exportable($exportFileName, $this->exportsPendingArrangementDeliveryList) ]);
-            }
-            else{
-                $exportFileName = 'packing-list-on-hold.xls';
-                return response([ 'src' =>  AWSS3Helper::S3Exportable($exportFileName, $this->exportsOnHoldPackingList) ]);
-            }
-        }
-        else{
-            if($isSetPendingArrangement){
-                $response = $this->exportsPendingArrangementDeliveryList->download('packing-list-delivery.xls', Excel::XLS, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']);
-            }
-            else {
-                $response = $this->exportsOnHoldPackingList->download('packing-list-on-hold.xls', Excel::XLS, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']);
-            }
-
-            ob_end_clean();
-            return $response;
-        }
-    }
-
-}

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

@@ -52,8 +52,7 @@ class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping,
         ])
             ->where('type', '=', 1)
             ->where('status', '=', 2)
-            ->where('owner_type', Order::class)
-            ->whereBetween('created_at', [Carbon::now()->subMonths(12), Carbon::now()]); //Limit, 'expensive' query
+            ->where('owner_type', Order::class);
 
         if (!is_null($this->start_date) && !is_null($this->end_date)) {
             $query->whereHas('transports', function ($q) {

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

@@ -4,7 +4,6 @@ namespace App\Classes\Modules\Exports\Services;
 
 use App\Classes\ValueObjects\Constants\PackingListType;
 use App\Models\CompanyModule;
-use Carbon\Carbon;
 use Maatwebsite\Excel\Concerns\Exportable;
 use Maatwebsite\Excel\Concerns\FromQuery;
 use Maatwebsite\Excel\Concerns\WithHeadingRow;
@@ -30,7 +29,7 @@ class ExportsCustomersOrderLatestDate implements FromQuery, WithHeadingRow, With
      */
     public function query()
     {
-        return CompanyModule::where('type', '=', 1)->whereBetween('created_at', [Carbon::now()->subMonths(12), Carbon::now()]); //Limit, 'expensive' query;
+        return CompanyModule::where('type', '=', 1);
     }
 
     /**
@@ -58,4 +57,4 @@ class ExportsCustomersOrderLatestDate implements FromQuery, WithHeadingRow, With
             $order ? $order->drop_date : ''
         ];
     }
-}
+}

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');
         });