Exchange-2.0 code sync for crm changes

# Conflicts:
# app/Classes/Modules/Segments/ControllersLogic/UpdateConstantPostcodeLogic.php
# app/Classes/ValueObjects/Constants/TransactionType.php
# routes/api.php
# routes/web.php

.env.example

@@ -10,9 +10,9 @@ LOG_LEVEL=debug
 DB_CONNECTION=mysql
 DB_HOST=127.0.0.1
 DB_PORT=3306
-DB_DATABASE=shpping_portal
+DB_DATABASE=laravel
 DB_USERNAME=root
-DB_PASSWORD=root
+DB_PASSWORD=
 
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file
@@ -56,8 +56,6 @@ MIX_EXCHANGE_URL="${EXCHANGE_URL}"
 
 YD_API_CODE=''
 
-JWT_SECRET=Btj63iMEleEaww6Bb2IBECkxWn7YHPhhPFluAkg9DfcQik0qDRy6QW75ABGmPT2h
-
 PERFEXCRM_BASE_URL=""
 PERFEXCRM_API_KEY=""
 PERFEXCRM_IS_ENABLED="false"

.env.testing

@@ -1,59 +0,0 @@
-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,8 +2,6 @@
 /public/hot
 /public/storage
 /storage/*.key
-/tests/_output
-/tests/_support
 /vendor
 **/.idea/
 .env

.gitlab-ci.yml

@@ -1,120 +0,0 @@
-image: php:7.4
-stages:
-  - service_build
-  - node
-  - building_assets
-  - database
-  - unit_test
-  - acceptance_test
-  - code_quality
-
-# Variables
-variables:
-  MYSQL_ROOT_PASSWORD: root
-  MYSQL_USER: mysql_password
-  MYSQL_PASSWORD: mysql_password
-  MYSQL_DATABASE: shpping_portal
-  DB_HOST: mysql
-
-
-before_script:
-  - apt-get update -yqq
-  - apt-get install -yqq
-  - apt-get install -y  libonig-dev
-  - apt-get install -y libxml2-dev
-  - apt-get install -y libzip-dev
-  - apt-get install -y libgd-dev
-  - apt-get install -y libgd-dev
-
-# Install PDO MySQL extension
-  - docker-php-ext-install pdo_mysql
-
-  #install php dependencies
-  - docker-php-ext-install mbstring xml zip gd
-
-  #  Install composer package manager
-  - curl --location --output /usr/local/bin/composer https://getcomposer.org/download/latest-stable/composer.phar
-  - chmod +x /usr/local/bin/composer
-
-  # Install MySQL client
-  - apt-get install -y default-mysql-client
-
-  #install node js
-  - apt-get update && apt-get install -y  nodejs npm
-
-  #install gulp Js
-  - npm install -g gulp-cli
-
-
-#jobs
-
-#buld the backend
-composer_php:
-  stage: service_build
-  script:
-    - composer install
-    - cp .env.example .env
-    - php artisan key:generate
-  rules:
-    - if: '$CI_COMMIT_BRANCH =~ /.*/'
-
-#build the UI
-#node installation
-npm:
-  stage: node
-  script:
-    - npm install # Install npm dependencies
-  rules:
-    - if: '$CI_COMMIT_BRANCH =~ /.*/'
-
-#building assets
-building_assets:
-  stage: building_assets
- # dependencies:
-   # - npm
-  script:
-    - npm install # Install npm dependencies
-    - gulp build # Build assets
-  rules:
-    - if: '$CI_COMMIT_BRANCH =~ /.*/'
-
-#mysql
-database:
-  stage: database
-  services:
-    - name: mysql:8.0
-      command: [ "--default-authentication-plugin=mysql_native_password" ]
-  #dependencies:
-   # - composer_php
-  script:
-    - composer install
-    - cp .env.example .env
-    - php artisan key:generate
-    - php artisan migrate:fresh
-    - php artisan db:seed
-  rules:
-    - if: '$CI_COMMIT_BRANCH =~ /.*/'
-
-#mysql
-unit_test:
-  stage: unit_test
-  services:
-    - name: mysql:8.0
-      command: [ "--default-authentication-plugin=mysql_native_password" ]
-  #dependencies:
-  #  - database
-  script:
-    - npm install # Install npm dependencies
-    - gulp build # Build assets
-    - composer install
-    - cp .env.example .env
-    - php artisan key:generate
-    - php artisan migrate:fresh
-    - php artisan db:seed
-    - php artisan test
-  rules:
-    - if: '$CI_COMMIT_BRANCH =~ /.*/'
-
-
-
-

README.md

@@ -1,39 +1,62 @@
-## Shipping portal documentation
+<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>
 
-simple documentation on how to install, run, test, commit and deploy application
+<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>
 
-## creating and running unit tests
+## About Laravel
 
-Required Tools
+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:
 
-- Chromium Driver / selenium
-- add running and setting selenium  on all OS if possible
+- [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).
 
-Required Packages :
+Laravel is accessible, powerful, and provides tools required for large, robust applications.
 
-- laravel/legacy-factories
+## Learning Laravel
 
-- codeception/codeception
+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.
 
-Or Simply Run
+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.
 
-``Composer install``
+## Laravel Sponsors
 
-To create a unit test
+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).
 
-``php artisan make test: Test Example --unit``
+### Premium Partners
 
-Running the tests :
+- **[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 a single Test
+## Contributing
 
-`` php artisan test --filter Example``
+Thank you for considering contributing to the Laravel framework! The contribution guide can be found in the [Laravel documentation](https://laravel.com/docs/contributions).
 
-Running Unit tests -
+## Code of Conduct
 
-`` php artisan test ``
+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).
 
-Running Codeception tests -
+## Security Vulnerabilities
 
-``vendor/bin/codecept run``
+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.
 
+## License
+
+The Laravel framework is open-sourced software licensed under the [MIT license](https://opensource.org/licenses/MIT).

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

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

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

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

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

@@ -15,7 +15,7 @@ class DoesNotHaveTransactionType implements Filter
     public static function apply(Builder $builder, $value)
     {
         return $builder->whereDoesntHave('transactions', function (Builder $query) use($value) {
-            $query->where('type', $value)->whereIn('status', [0,1,2,3]);
+            $query->where('type', $value)->whereIn('status', [0,1,2,3,5]);
         })->whereHas('containers', function ($query){
             return $query->whereDate('loading_date', '>=', Carbon::parse('20-09-2022'));
         });

app/Classes/General/Helper.php

@@ -24,12 +24,11 @@ class Helper
         return array_slice(get_class_methods($className), 1);
     }
 
-     /**
+    /**
      * @param $log
-     * @return none
      */
-    static function debugLoggerForPerfexCRM($log){
-        if($log){
+    static function debugLogger($log){
+        if($log && isset($log['message'])){
             $message = $log['message'];
             $substring = 'No data were found';
             if (isset($message)) {

app/Classes/Jobs/UpdatePerfexCRM.php

@@ -3,6 +3,8 @@
 namespace App\Classes\Jobs;
 
 use App\Classes\Modules\PerfexCRM\Processors\UpdatePerfexCRMProcessor;
+use App\Classes\Modules\PerfexCRM\Processors\FetchPerfexCRMInvoiceProcessor;
+use App\Models\Transaction;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
@@ -10,6 +12,8 @@ use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 use App\Classes\Modules\PerfexCRM\DataTransferObjects\UpdatePerfexCRMObject;
 use App\Classes\Modules\PerfexCRM\DataTransferObjects\UpdatePerfexCRMInvoiceObject;
+use App\Classes\Modules\PerfexCRM\DataTransferObjects\FetchPerfexCRMInvoiceObject;
+
 
 class UpdatePerfexCRM implements ShouldQueue
 {
@@ -18,37 +22,51 @@ class UpdatePerfexCRM implements ShouldQueue
     /** @var UpdatePerfexCRMObject */
     private $updatePerfexCRMObject;
 
-    /** @var UpdatePerfexCRMInvoice */
-    private $nextJob;
-
     /** @var */
     private $transaction;
 
+    /** @var bool|null */
+    private $shouldCreateInvoice;
+
     /**
      * UpdatePerfexCRM constructor.
      * @param UpdatePerfexCRMObject $updatePerfexCRMObject
-     * @param UpdatePerfexCRMInvoice $nextJob
-     * @param $transaction
+     * @param Transaction $transaction
+     * @param bool|null $shouldCreateInvoice
      */
-    public function __construct(UpdatePerfexCRMObject $updatePerfexCRMObject, $transaction, $nextJob)
+    public function __construct(UpdatePerfexCRMObject $updatePerfexCRMObject, $transaction, ?bool $shouldCreateInvoice = false)
     {
         $this->updatePerfexCRMObject = $updatePerfexCRMObject;
-        $this->nextJob = $nextJob;
         $this->transaction = $transaction;
+        $this->shouldCreateInvoice = $shouldCreateInvoice;
     }
 
     public function handle()
     {
+        //To use invoice as a reference to decide whether more tasks should be created
+        $this->updatePerfexCRMObject->setInvoiceId($this->getInvoiceIdOrCreateInvoice());
+
         $result = (App()->make(UpdatePerfexCRMProcessor::class))->execute($this->updatePerfexCRMObject);
-        if($this->nextJob != null && $this->transaction != null){
+        if($this->transaction != null && $this->shouldCreateInvoice){
             $updatePerfexCRMInvoiceOject = new UpdatePerfexCRMInvoiceObject(
                 $this->updatePerfexCRMObject->getContactEmail(),
                 $result->projectId,
                 $this->transaction,
                 true
             );
-            /** @var UpdatePerfexCRMInvoice $nextJob */
-            $this->nextJob::dispatch($updatePerfexCRMInvoiceOject);
+            UpdatePerfexCRMInvoice::dispatch($updatePerfexCRMInvoiceOject);
         }
     }
+
+    private function getInvoiceIdOrCreateInvoice(){
+        if($this->transaction != null){
+            $fetchPerfexCRMInvoiceObject = new FetchPerfexCRMInvoiceObject(
+                $this->updatePerfexCRMObject->getContactEmail(),
+                $this->transaction
+            );
+            $invoiceId = (App()->make(FetchPerfexCRMInvoiceProcessor::class))->execute($fetchPerfexCRMInvoiceObject);
+            return $invoiceId;
+        }
+        return 0;
+    }
 }

app/Classes/Jobs/UpdatePerfexCRMInvoice.php

@@ -11,16 +11,14 @@ 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 Illuminate\Support\Facades\Log;
 use Carbon\Carbon;
-
+use Illuminate\Support\Facades\Log;
 use App\Classes\General\Helper;
 
 class UpdatePerfexCRMInvoice implements ShouldQueue
@@ -32,7 +30,7 @@ class UpdatePerfexCRMInvoice implements ShouldQueue
 
     /**
      * CreatePerfexCRMSingleTask constructor.
-     * @param UpdatePerfexCRMInvoiceObject $createTaskPerfexCRMObject
+     * @param UpdatePerfexCRMInvoiceObject $updatePerfexCRMInvoiceObject
      */
     public function __construct(UpdatePerfexCRMInvoiceObject $updatePerfexCRMInvoiceObject)
     {
@@ -49,7 +47,7 @@ class UpdatePerfexCRMInvoice implements ShouldQueue
         $invoiceId = 0;
         $invoiceStatus = 0;
         $invoice = (App()->make(FetchesPerfexCRMInvoice::class))->execute($customer->userid,"INV-", $transaction->owner->bill_no);
-        Log::error(json_encode('UpdatePerfexCRMInvoice debug $transaction->owner->bill_no: '.$transaction->owner->bill_no));
+        Log::error('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());
@@ -57,7 +55,7 @@ class UpdatePerfexCRMInvoice implements ShouldQueue
                 $invoiceId = $result->payload['id'];
             } else {
                 // Log::error(json_encode('UpdatePerfexCRMInvoice CreatePerfexCRMInvoiceProcessor failed'));
-                Helper::debugLoggerForPerfexCRM('UpdatePerfexCRMInvoice CreatePerfexCRMInvoiceProcessor failed');
+                Helper::debugLogger('UpdatePerfexCRMInvoice CreatePerfexCRMInvoiceProcessor failed');
             }
         }
         else{
@@ -66,7 +64,6 @@ class UpdatePerfexCRMInvoice implements ShouldQueue
 
             //This only run when invoice already exist and the invoice does not have a PAID status
             if($invoiceStatus != PerfexCRMInvoiceStatus::PAID){
-                Log::error(json_encode('UpdatePerfexCRMInvoice debug $this->updatePerfexCRMInvoiceObject->getProjectId(): '.$this->updatePerfexCRMInvoiceObject->getProjectId()));
                 //update invoice
                 (App()->make(UpdatesPerfexCRMInvoice::class))->execute($invoice, $this->updatePerfexCRMInvoiceObject->getProjectId());
             }

app/Classes/Jobs/UpdatePerfexCRMPrelude.php

@@ -27,27 +27,22 @@ class UpdatePerfexCRMPrelude implements ShouldQueue
     /** @var UpdatePerfexCRMObject */
     private $updatePerfexCRMObject;
 
-    /** @var UpdatePerfexCRM */
-    private $nextJob1;
-
-    /** @var UpdatePerfexCRMInvoice */
-    private $nextJob2;
+    /** @var bool|null */
+    private $shouldCreateInvoice;
 
     /**
      * UpdatePerfexCRMPrelude constructor.
      * @param $packingList
-     * @param $transaction
+     * @param Transaction $transaction
      * @param UpdatePerfexCRMObject $updatePerfexCRMObject
-     * @param UpdatePerfexCRM $nextJob1
-     * @param UpdatePerfexCRMInvoice $nextJob2
+     * @param bool|null $shouldCreateInvoice
      */
-    public function __construct($packingList, $transaction, UpdatePerfexCRMObject $updatePerfexCRMObject, $nextJob1, $nextJob2)
+    public function __construct($packingList, $transaction, UpdatePerfexCRMObject $updatePerfexCRMObject, ?bool $shouldCreateInvoice = false)
     {
         $this->packingList = $packingList;
         $this->transaction = $transaction;
         $this->updatePerfexCRMObject = $updatePerfexCRMObject;
-        $this->nextJob1 = $nextJob1;
-        $this->nextJob2 = $nextJob2;
+        $this->shouldCreateInvoice = $shouldCreateInvoice;
     }
 
     public function handle()
@@ -69,9 +64,7 @@ class UpdatePerfexCRMPrelude implements ShouldQueue
 
         $result = $this->replacePlaceholders($this->updatePerfexCRMObject->getTasks(), $data);
         $this->updatePerfexCRMObject->setTasks($result);
-        /** @var UpdatePerfexCRM $nextJob1 */
-        /** @var UpdatePerfexCRMInvoice $nextJob2 */
-        $this->nextJob1::dispatch($this->updatePerfexCRMObject, $this->transaction, $this->nextJob2);
+        UpdatePerfexCRM::dispatch($this->updatePerfexCRMObject, $this->transaction, $this->shouldCreateInvoice);
     }
 
     function replacePlaceholders($template, $data, $prefix = '')

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

@@ -3,9 +3,6 @@
 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;
@@ -20,7 +17,6 @@ use App\Classes\Modules\Remarks\Processors\CreateRemarkProcessor;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Http\Resources\AddressResource;
 use App\Models\Address;
-use App\Transformers\AddressTransformer;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -31,8 +27,7 @@ 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'
@@ -79,11 +74,11 @@ class CreateAddressLogic extends AbstractControllerLogic
     /**
      * @param Request $request
      * @return JsonResponse
-     * @throws AccessForbiddenException
-     * @throws MalformedRequestException
-     * @throws RequestValidationException
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @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')]);
@@ -95,22 +90,16 @@ 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);*/
-
-
         return $this->resourceResponse(new AddressResource($address));
 
     }

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

@@ -3,9 +3,6 @@
 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;
@@ -17,7 +14,6 @@ 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;
 
@@ -27,8 +23,7 @@ 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'
@@ -65,35 +60,27 @@ class CreateBillingAddressLogic extends AbstractControllerLogic
     /**
      * @param Request $request
      * @return JsonResponse
-     * @throws AccessForbiddenException
-     * @throws MalformedRequestException
-     * @throws RequestValidationException
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\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')]);
 
-        $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) {
+        if ($address->type !== AddressType::BILLING || $address->id !== $companyModule->addresses->where('type', AddressType::BILLING)->first()->id) {
             // delete all current billing address
             Address::where('owner_type', CompanyModule::class)->where('owner_id', $request->input('company_module_id'))->where('type', AddressType::BILLING)->delete();
 
-            // create new billing addrress
-            $billingAddress = new AddressObject($billingAddressInputed->street_one, $billingAddressInputed->street_two, $billingAddressInputed->country_id, $billingAddressInputed->state_id, $billingAddressInputed->district_id, $billingAddressInputed->postcode, AddressType::BILLING, ApprovalStatus::APPROVED, $billingAddressInputed->reference);
+            // 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);
             $this->canCreateAddress->passes($billingAddress);
             $this->createsAddress->execute($companyModule, $billingAddress);
         }
 
-        //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));
+        return $this->resourceResponse(new AddressResource($address));
     }
 
 }

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

@@ -3,8 +3,6 @@
 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;
@@ -19,8 +17,7 @@ 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'
@@ -48,22 +45,15 @@ class FetchAddressLogic extends AbstractControllerLogic
     /**
      * @param Request $request
      * @return JsonResponse
-     * @throws AccessForbiddenException
-     * @throws RequestValidationException
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\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,14 +3,10 @@
 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;
@@ -21,8 +17,7 @@ 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'
@@ -50,25 +45,17 @@ class ListAddressesLogic extends AbstractControllerLogic
     /**
      * @param Request $request
      * @return JsonResponse
-     * @throws AccessForbiddenException
-     * @throws MalformedRequestException
-     * @throws RequestValidationException
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\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,6 +7,7 @@ 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,6 +7,7 @@ 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,7 +9,6 @@ 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;
 
@@ -34,7 +33,7 @@ class SetAddressToDefaultLogic extends AbstractControllerLogic
     /** @var ResetsAddressesDefault */
     private $resetsAddressesDefault;
 
-    /** @var SetsAddressToDefault */
+    /** @var SetsAddressToDefault*/
     private $setsAddressToDefault;
 
 
@@ -65,15 +64,7 @@ class SetAddressToDefaultLogic extends AbstractControllerLogic
 
         $this->resetsAddressesDefault->execute($address->owner, $address->type);
 
-
-        $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));
+        return $this->resourceResponse(new AddressResource($this->setsAddressToDefault->execute($address)));
 
     }
 }

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

@@ -17,7 +17,6 @@ use App\Classes\ValueObjects\Constants\AddressType;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Http\Resources\AddressResource;
 use App\Models\Address;
-use App\Transformers\AddressTransformer;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
@@ -27,8 +26,7 @@ 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 +77,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,25 +90,18 @@ 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);*/
-
         return $this->resourceResponse(new AddressResource($address));
 
     }

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

@@ -4,29 +4,24 @@ namespace App\Classes\Modules\Billplzs\ControllersLogic;
 
 use App\Classes\Modules\Orders\Processors\UpdateDoFromVTPortalProcessor;
 use App\Classes\Modules\Orders\Processors\UpdateDoFromYDPortalProcessor;
-use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
-use App\Classes\Modules\Wallets\Services\UpdatesWallet;
 
 use App\Classes\Exceptions\ResourceNotFoundException;
 use App\Classes\Modules\Wallets\Services\UpdatesWalletBalance;
-use App\Http\Resources\TransactionResource;
-use App\Models\Booking;
 use App\Models\User;
 use App\Models\Wallet;
 use Illuminate\Http\Request;
-use Illuminate\Http\JsonResponse;
-
 use App\Classes\Exceptions\MalformedRequestException;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\Modules\Billplzs\Services\GetBillplzBill;
 use App\Classes\Modules\Billplzs\DataTransferObjects\BillplzXSignatureObject;
-use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Transactions\Services\FetchesTransaction;
+use App\Classes\Modules\Transactions\Processors\CreatePaymentTransactionProcessor;
 use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
 use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Models\Group;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Log;
 
 class CallbackBillplzLogic
 {
@@ -48,6 +43,9 @@ class CallbackBillplzLogic
     /** @var UpdatesWalletBalance */
     private $updatesWalletBalance;
 
+    /** @var CreatePaymentTransactionProcessor */
+    private $createPaymentTransactionProcessor;
+
     /**
      * CallbackBillplzLogic constructor.
      * @param GetBillplzBill $getBillplzBill
@@ -55,8 +53,9 @@ class CallbackBillplzLogic
      * @param UpdatesTransactionStatus $updatesTransactionStatus
      * @param UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor
      * @param UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor
+     * @param CreatePaymentTransactionProcessor $createPaymentTransactionProcessor
      */
-    public function __construct(GetBillplzBill $getBillplzBill, FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor, UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor, UpdatesWalletBalance $updatesWalletBalance)
+    public function __construct(GetBillplzBill $getBillplzBill, FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor, UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor, UpdatesWalletBalance $updatesWalletBalance, CreatePaymentTransactionProcessor $createPaymentTransactionProcessor)
     {
         $this->getBillplzBill = $getBillplzBill;
         $this->fetchesTransaction = $fetchesTransaction;
@@ -64,6 +63,7 @@ class CallbackBillplzLogic
         $this->updateDoFromVTPortalProcessor = $updateDoFromVTPortalProcessor;
         $this->updateDoFromYDPortalProcessor = $updateDoFromYDPortalProcessor;
         $this->updatesWalletBalance = $updatesWalletBalance;
+        $this->createPaymentTransactionProcessor = $createPaymentTransactionProcessor;
     }
 
 
@@ -111,19 +111,30 @@ class CallbackBillplzLogic
             $this->updatesWalletBalance->execute($transaction->owner, $transaction->amount);
         }
 
+        // group payment
+        if ($transaction->type == TransactionType::GROUP_PAYMENT && $status === ApprovalStatus::APPROVED &&!in_array($transaction->status, [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])) {
+            $group = Group::where('reference', $billplzXSignatureObject->getBillPlzId())->first();
+
+            foreach($group->groupTransactions as $groupTransaction) {
+                $invoice = $groupTransaction->transaction;
+                $this->createPaymentTransactionProcessor->execute($invoice, PaymentMethodType::WALLET, null);
+            }
+
+            $group->status = $status;
+            $group->save();
+        }
+
         $this->updatesTransactionStatus->execute($transaction, $status);
 
-        $totalPaidAmount = $invoice->transactions->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->sum('amount');
-
-        if(($invoice->amount - $totalPaidAmount) < 0.01) {
-            $this->updatesTransactionStatus->execute($invoice, ApprovalStatus::COMPLETED);
+        if (!$transaction->owner instanceof Wallet) {
+            $totalPaidAmount = $invoice->transactions->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->sum('amount');
 
             if(($invoice->amount - $totalPaidAmount) < 0.01) {
                 $this->updatesTransactionStatus->execute($invoice, ApprovalStatus::COMPLETED);
-
+    
                 $packingList->status = ApprovalStatus::APPROVED;
                 $packingList->save();
-
+    
                 if(app()->environment('production')){
                     $this->updateDoFromVTPortalProcessor->execute($packingList);
                     $this->updateDoFromYDPortalProcessor->execute($packingList);

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

@@ -4,6 +4,7 @@ namespace App\Classes\Modules\Billplzs\Services;
 
 use Illuminate\Support\Facades\Http;
 use App\Classes\Exceptions\MalformedRequestException;
+use Illuminate\Support\Facades\App;
 
 class CreatesBillplzBill
 {
@@ -25,7 +26,7 @@ class CreatesBillplzBill
             $response = Http::withBasicAuth(config('billplz.api_key').':', '')->post(config('billplz.base_url').'/api/v3/bills', [
                 'collection_id' => config('billplz.collection_id'),
                 'name' => $name,
-                'email' => $email,
+                'email' => App::environment('production') ? $email : 'development@cief-malaysia.com',
                 'description' => $description,
                 'amount' => $this->finalizeAmount($amount),
                 'redirect_url' => route('online_payment.redirect'),

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

@@ -3,14 +3,10 @@
 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;
@@ -21,8 +17,7 @@ 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'
@@ -50,26 +45,15 @@ class ListCompanyModulesLogic extends AbstractControllerLogic
     /**
      * @param Request $request
      * @return JsonResponse
-     * @throws AccessForbiddenException
-     * @throws MalformedRequestException
-     * @throws RequestValidationException
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\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/Contacts/ControllersLogic/UpdateContactLogic.php

@@ -8,7 +8,6 @@ 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;
@@ -64,13 +63,6 @@ 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,7 +7,6 @@ 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;
 
@@ -53,14 +52,6 @@ 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,12 +172,6 @@ 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,12 +48,6 @@ 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,13 +7,9 @@ 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
 {
@@ -62,11 +58,6 @@ class ListDocumentLogic extends AbstractControllerLogic
 
         return $this->collectionResponse(DocumentResource::collection($query));
 
-
-      /*  return fractal()
-            ->collection($query, new DocumentTransformer)
-            ->respond(200, [], JSON_PRETTY_PRINT);*/
-
     }
 
 }

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

@@ -32,6 +32,7 @@ class ExportsPaymentTransactions implements FromQuery, WithHeadings, WithHeading
             'DocNo',
             'DocDate',
             'DebtorCode',
+            'Ref',
             'ShipInfo',
             'AccNo',
             'DetailDescription',
@@ -126,6 +127,7 @@ class ExportsPaymentTransactions implements FromQuery, WithHeadings, WithHeading
             $transaction->created_at->format('m/d/Y H:m'),
             $company->debtor,
             $order->reference,
+            $order->reference,
             '500-0000',
             'X1 Freight Service Charge',
             $furtherDescription,

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

@@ -5,6 +5,7 @@ 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;
@@ -31,8 +32,10 @@ class ExportsWarehousePackingList implements FromQuery, WithHeadings, WithHeadin
      */
     public function query()
     {
-        return Order::whereHas('addresses', function($address) {
-            $address->where('status', ApprovalStatus::APPROVED);
+        $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);
         })->whereHas('packingLists', function($packingLists) {
             $packingLists->where('type', PackingListType::SHIPPING_PACKING_LIST)->whereDoesntHave('transports');
         });

app/Classes/Modules/Groups/DataTransferObjects/GroupObject.php

@@ -0,0 +1,187 @@
+<?php
+
+namespace App\Classes\Modules\Groups\DataTransferObjects;
+
+use App\Classes\General\Interfaces\DataTransferObject;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use Carbon\Carbon;
+
+class GroupObject implements DataTransferObject
+{
+
+    /** @var int */
+    private $issuer;
+
+    /** @var int */
+    private $receiver;
+
+    /** @var float */
+    private $amount;
+
+    /** @var  float */
+    private $originalAmount;
+
+    /** @var int */
+    private $currencyId;
+
+    /** @var int */
+    private $originalCurrencyId;
+
+    /** @var float */
+    private $currencyRate;
+
+    /** @var float */
+    private $tax;
+
+    /** @var float */
+    private $serviceCharge;
+
+    /** @var int|null */
+    private $status;
+
+    /** @var string */
+    private $reference;
+
+    /** @var int */
+    private $paymentMethod;
+
+    /**
+     * GroupObject constructor.
+     * @param int $issuer
+     * @param int $receiver
+     * @param float $amount
+     * @param float $originalAmount
+     * @param int $currencyId
+     * @param int $originalCurrencyId
+     * @param float $currencyRate
+     * @param float $tax
+     * @param float $serviceCharge
+     * @param string $reference
+     * @param int|null $status
+     * @param int $paymentMethod
+     */
+    public function __construct(
+        int $issuer,
+        int $receiver,
+        float $amount,
+        float $originalAmount,
+        int $currencyId,
+        int $originalCurrencyId,
+        float $currencyRate,
+        float $tax,
+        float $serviceCharge,
+        int $paymentMethod,
+        ?string $reference,
+        ?int $status = ApprovalStatus::PENDING_SUBMISSION
+    )
+    {
+        $this->issuer = $issuer;
+        $this->receiver = $receiver;
+        $this->amount = $amount;
+        $this->originalAmount = $originalAmount;
+        $this->currencyId = $currencyId;
+        $this->originalCurrencyId = $originalCurrencyId;
+        $this->currencyRate = $currencyRate;
+        $this->tax = $tax;
+        $this->serviceCharge = $serviceCharge;
+        $this->paymentMethod = $paymentMethod;
+        $this->reference = $reference;
+        $this->status = $status;
+    }
+
+    /**
+     * @return int
+     */
+    public function getIssuer(): int
+    {
+        return $this->issuer;
+    }
+
+    /**
+     * @return int
+     */
+    public function getReceiver(): int
+    {
+        return $this->receiver;
+    }
+
+    /**
+     * @return float
+     */
+    public function getAmount(): float
+    {
+        return $this->amount;
+    }
+
+    /**
+     * @return float
+     */
+    public function getOriginalAmount(): float
+    {
+        return $this->originalAmount;
+    }
+
+    /**
+     * @return int
+     */
+    public function getCurrencyId(): int
+    {
+        return $this->currencyId;
+    }
+
+    /**
+     * @return int
+     */
+    public function getOriginalCurrencyId(): int
+    {
+        return $this->originalCurrencyId;
+    }
+
+    /**
+     * @return float
+     */
+    public function getCurrencyRate(): float
+    {
+        return $this->currencyRate;
+    }
+
+    /**
+     * @return float
+     */
+    public function getTax(): float
+    {
+        return $this->tax;
+    }
+
+    /**
+     * @return float
+     */
+    public function getServiceCharge(): float
+    {
+        return $this->serviceCharge;
+    }
+
+    /**
+     * @return int
+     */
+    public function getStatus(): ?int
+    {
+        return $this->status;
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getReference(): ?string
+    {
+        return $this->reference;
+    }
+
+    /**
+     * @return int
+     */
+    public function getPaymentMethod(): int
+    {
+        return $this->paymentMethod;
+    }
+}

app/Classes/Modules/Groups/Services/CreatesGroup.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Classes\Modules\Groups\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\Modules\Groups\DataTransferObjects\GroupObject;
+use App\Models\Group;
+
+class CreatesGroup extends AbstractUpdateRecord
+{
+    /**
+     * @param GroupObject $object
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(GroupObject $object) {
+        $model = new Group();
+        $model->issuer                  = $object->getIssuer();
+        $model->receiver                = $object->getReceiver();
+        $model->amount                  = $object->getAmount();
+        $model->original_amount         = $object->getOriginalAmount();
+        $model->currency_id             = $object->getCurrencyId();
+        $model->original_currency_id    = $object->getOriginalCurrencyId();
+        $model->currency_rate           = $object->getCurrencyRate();
+        $model->tax                     = $object->getTax();
+        $model->service_charge          = $object->getServiceCharge();
+        $model->status                  = $object->getStatus();
+        $model->reference               = $object->getReference();
+        $model->payment_method          = $object->getPaymentMethod();
+
+        return $this->handler($model);
+    }
+}

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

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

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

@@ -4,20 +4,14 @@ namespace App\Classes\Modules\Orders\ControllersLogic;
 
 use App\Classes\Exceptions\RequestValidationException;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Addresses\DataTransferObjects\AddressObject;
-use App\Classes\Modules\Addresses\Services\CreatesAddress;
 use App\Classes\Modules\Addresses\Services\FetchesAddress;
 use App\Classes\Modules\Companies\Services\FetchesCompany;
 use App\Classes\Modules\Companies\Services\FetchesCompanyModule;
 use App\Classes\Modules\PerfexCRM\Processors\NewLeadTaskToPerfexCRMProcessor;
 use App\Classes\Modules\Orders\Processors\CreateOrderProcessor;
 use App\Classes\Modules\Orders\Services\GeneratesOrderNumber;
-use App\Classes\ValueObjects\Constants\AddressType;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\WarehouseReferences;
 use App\Http\Resources\OrderResource;
-use App\Classes\Modules\Addresses\Standards\Rules\CanCreateAddress;
-use App\Models\Address;
 use Illuminate\Http\Request;
 use Illuminate\Http\JsonResponse;
 
@@ -47,12 +41,6 @@ class CreateOrderLogic extends AbstractControllerLogic
     /** @var GeneratesOrderNumber */
     private $generatesOrderNumber;
 
-    /** @var CreatesAddress */
-    private $createsAddress;
-
-    /** @var CanCreateAddress */
-    private $canCreateAddress;
-
     /** @var NewLeadTaskToPerfexCRMProcessor */
     private $newLeadTaskToPerfexCRMProcessor;
     /**
@@ -63,18 +51,14 @@ class CreateOrderLogic extends AbstractControllerLogic
      * @param FetchesCompanyModule $fetchesCompanyModule
      * @param GeneratesOrderNumber $generatesOrderNumber
      * @param NewLeadTaskToPerfexCRMProcessor $newLeadTaskToPerfexCRMProcessor
-     * @param CreatesAddress $createsAddress
-     * @param CanCreateAddress $canCreateAddress
      */
-    public function __construct(FetchesCompany $fetchesCompany, FetchesAddress $fetchesAddress, CreateOrderProcessor $createOrderProcessor, FetchesCompanyModule $fetchesCompanyModule, GeneratesOrderNumber $generatesOrderNumber, CreatesAddress $createsAddress, CanCreateAddress $canCreateAddress,  NewLeadTaskToPerfexCRMProcessor $newLeadTaskToPerfexCRMProcessor)
+    public function __construct(FetchesCompany $fetchesCompany, FetchesAddress $fetchesAddress, CreateOrderProcessor $createOrderProcessor, FetchesCompanyModule $fetchesCompanyModule, GeneratesOrderNumber $generatesOrderNumber,  NewLeadTaskToPerfexCRMProcessor $newLeadTaskToPerfexCRMProcessor)
     {
         $this->fetchesCompany = $fetchesCompany;
         $this->fetchesAddress = $fetchesAddress;
         $this->createOrderProcessor = $createOrderProcessor;
         $this->fetchesCompanyModule = $fetchesCompanyModule;
         $this->generatesOrderNumber = $generatesOrderNumber;
-        $this->createsAddress = $createsAddress;
-        $this->canCreateAddress = $canCreateAddress;
         $this->newLeadTaskToPerfexCRMProcessor = $newLeadTaskToPerfexCRMProcessor;
     }
 
@@ -99,11 +83,10 @@ class CreateOrderLogic extends AbstractControllerLogic
         } else {
             $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $request->input('warehouse_id')]);
 
-            if (!in_array($company->companyModules()->importers()->first()->id, WarehouseReferences::YD_EXEMPT_LIST)) {
-                $originWarehouse = $this->fetchesCompanyModule->execute(['reference' =>  $originWarehouse->reference === WarehouseReferences::VT_GUANG_ZHOU ? WarehouseReferences::YD_GUANG_ZHOU : WarehouseReferences::YD_YIWU]);
-            }
+            $originWarehouse = $this->fetchesCompanyModule->execute(['reference' =>  $originWarehouse->reference === WarehouseReferences::VT_GUANG_ZHOU ? WarehouseReferences::YD_GUANG_ZHOU : WarehouseReferences::YD_YIWU]);
+//            if (!in_array($company->companyModules()->importers()->first()->id, WarehouseReferences::YD_EXEMPT_LIST))
         }
-        
+
         if($originWarehouse->reference === WarehouseReferences::YD_YIWU && in_array($address->state_id, [5, 13, 14])) {
             throw new RequestValidationException('Our Yiwu warehouse is unable to ship goods to Sabah & Sarawak at the moment. you can select our Guangzhou warehouse as an alternative.');
         }

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

@@ -6,7 +6,6 @@ use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\PackingLists\Services\Containers\FetchesContainer;
 use App\Classes\Modules\PackingLists\Services\FetchesPackingList;
 use App\Http\Resources\ContainerResource;
-use App\Transformers\ContainerTransformer;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -57,13 +56,6 @@ class AssignPackingListContainerLogic extends AbstractControllerLogic
                 $container->packingLists()->attach($packing_list_item);
             }
 
-            //only return with packing list relationship
-
-      /*      return fractal()
-            ->item($container, new ContainerTransformer())
-            ->parseInclude(['packingLists'])
-            ->respond(200, [], JSON_PRETTY_PRINT);*/
-
             return $this->resourceResponse(new ContainerResource($container));
 
         } catch (\Exception $exception){

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -10,7 +10,6 @@ use App\Classes\Modules\Schedules\DataTransferObjects\ScheduleObject;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 
 use App\Http\Resources\ContainerResource;
-use App\Transformers\ContainerTransformer;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -21,8 +20,7 @@ class RescheduleContainerLogic extends AbstractControllerLogic
     /**
      * @return array
      */
-    protected function notification(): array
-    {
+    protected function notification():array {
         return [
             'title' => 'Reschedule Container',
             'message' => 'You have successfully Reschedule Container'
@@ -56,7 +54,7 @@ class RescheduleContainerLogic extends AbstractControllerLogic
      * @return JsonResponse
      * @throws ErrorException
      */
-    public function logic(Request $request): JsonResponse
+    public function logic(Request $request) : JsonResponse
     {
         try {
             $container = $this->fetchesContainer->execute(['id' => $request->route('id')]);
@@ -67,20 +65,15 @@ class RescheduleContainerLogic extends AbstractControllerLogic
             $this->updatesScheduleStatus->execute($old_sechedule, ApprovalStatus::REJECTED);
 
             $scheduleObject = new ScheduleObject(
-                Carbon::parse($request->input('etd')),
-                Carbon::parse($request->input('eta')),
+                Carbon::parse($request->input('etd')), 
+                Carbon::parse($request->input('eta')), 
                 ApprovalStatus::APPROVED
-            );
+             );
             $schedule = $this->createsSchedule->execute($transport, $scheduleObject);
 
-            //no relationship
-       /*     return fractal()
-                ->item($container, new ContainerTransformer())
-                ->respond(200, [], JSON_PRETTY_PRINT);*/
-
             return $this->resourceResponse(new ContainerResource($container));
 
-        } catch (\Exception $exception) {
+        } catch (\Exception $exception){
             throw new ErrorException($exception->getMessage(), $exception->getCode());
         }
 

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,131 @@
+<?php
+
+namespace App\Classes\Modules\PackingLists\ControllersLogic;
+
+use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\PackingLists\Processors\CreatePackingListProcessor;
+use App\Classes\Modules\PackingLists\Processors\CreatePackageProcessor;
+use App\Classes\Modules\Transports\Services\CreatesTransport;
+use App\Classes\Modules\PackingLists\Services\GeneratesPackingListReferenceNumber;
+use App\Classes\Modules\Schedules\Services\CreatesSchedule;
+use App\Classes\Modules\PackingLists\DataTransferObjects\PackingListObject;
+use App\Classes\Modules\PackingLists\DataTransferObjects\PackageObject;
+use App\Classes\Modules\PackingLists\Services\FetchesPackingList;
+use App\Classes\Modules\Transports\DataTransferObjects\TransportObject;
+use App\Classes\Modules\Schedules\DataTransferObjects\ScheduleObject;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\OrderRoleTypes;
+use App\Classes\ValueObjects\Constants\PackingListType;
+use App\Classes\ValueObjects\Constants\TransportType;
+use App\Http\Resources\PackingListResource;
+use App\Models\PackingList;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Carbon\Carbon;
+
+class CreateWarehouseTransportLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification(): array
+    {
+        return [
+            'title' => 'Created Warehouse PackingList',
+            'message' => 'You have successfully created a Warehouse PackingList'
+        ];
+    }
+
+    /** @var FetchesPackingList */
+    private $fetchesPackingList;
+
+    /** @var CreatePackingListProcessor */
+    private $createPackingListProcessor;
+
+    /** @var GeneratesPackingListReferenceNumber */
+    private $generatesPackingListReferenceNumber;
+
+    /** @var CreatesTransport */
+    private $createsTransport;
+
+    /** @var CreatePackageProcessor */
+    private $createPackageProcessor;
+
+    /** @var CreatesSchedule */
+    private $createsSchedule;
+
+    public function __construct(
+        FetchesPackingList $fetchesPackingList,
+        CreatePackingListProcessor $createPackingListProcessor,
+        CreatesTransport $createsTransport,
+        CreatesSchedule $createsSchedule,
+        CreatePackageProcessor $createPackageProcessor,
+        GeneratesPackingListReferenceNumber $generatesPackingListReferenceNumber
+    ) {
+        $this->fetchesPackingList = $fetchesPackingList;
+        $this->createPackingListProcessor = $createPackingListProcessor;
+        $this->createsTransport = $createsTransport;
+        $this->createsSchedule = $createsSchedule;
+        $this->createPackageProcessor = $createPackageProcessor;
+        $this->generatesPackingListReferenceNumber = $generatesPackingListReferenceNumber;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function logic(Request $request): JsonResponse
+    {
+        $packing_list = $this->fetchesPackingList->execute([
+            'id' => $request->route('id'),
+        ]);
+
+        $count_warehouse_packing_list = PackingList::where('reference', $packing_list->reference)->where('type', PackingListType::WAREHOUSE_RECEIVE_LIST)->count();
+
+        if ($count_warehouse_packing_list) {
+            throw new MalformedRequestException('Warehouse Receive List Exists');
+        }
+
+        $order = $packing_list->owner;
+
+        $reference_number = $this->generatesPackingListReferenceNumber->execute();
+
+        $packingListObject = new PackingListObject(
+            $packing_list->reference,
+            $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee->id,
+            PackingListType::WAREHOUSE_RECEIVE_LIST,
+            ApprovalStatus::PENDING_SUBMISSION
+        );
+        $packingList = $this->createPackingListProcessor->execute($packingListObject, $order);
+
+        $transportObject = new TransportObject(TransportType::LAND, null, $request->input('tracking'), Carbon::parse($request->input('receive_date')), Carbon::parse($request->input('receive_date')), ApprovalStatus::APPROVED);
+        $transport = $this->createsTransport->execute($transportObject, $packingList);
+
+        $scheduleObject = new ScheduleObject(Carbon::parse($request->input('receive_date')), Carbon::parse($request->input('receive_date')), ApprovalStatus::APPROVED);
+        $schedule = $this->createsSchedule->execute($transport, $scheduleObject);
+
+        $packages = $packing_list->packages;
+
+        foreach ($packages as $key => $row) {
+            $packageObject = new PackageObject(
+                $row['type'],
+                $row['description'],
+                $row['width'],
+                $row['height'],
+                $row['length'],
+                $row['weight'],
+                $row['quantity'],
+                ApprovalStatus::APPROVED,
+                $row['reference'],
+            );
+            $this->createPackageProcessor->execute($packageObject, $packingList);
+        }
+
+        return $this->resourceResponse(new PackingListResource($packingList));
+    }
+}

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

@@ -51,7 +51,7 @@ class FetchContainersUpdatesFromYdPortalProcessor
         foreach ($containers as $container) {
             $time_start = microtime(true);
 
-            $packingList = $container->packingLists()->random();
+            $packingList = $container->packingLists()->first();
 
             $trackingRequest = $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/ApiTracking.ashx', 'GET', [
                 'trakingno' => $packingList->reference
@@ -108,6 +108,8 @@ class FetchContainersUpdatesFromYdPortalProcessor
                 }
             }
 
+            dump($delayDate, $unstuffingDate);
+
             if($delayDate){
                 $delayDate = $delayDate->addDays(2);
                 $transport = $container->transports()->first();

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

@@ -42,7 +42,10 @@ class CreateTaskPerfexCRMObject implements DataTransferObject
     /** @var string */
     private $duedate;
 
-    public function __construct(string $email, string $name, string $description, string $leadId, string $projectId, string $milestoneId, string $reference, string $onTaskCompletion, string $status, string $department, string $priority, string $duedate)
+    /** @var int */
+    private $invoiceId;
+
+    public function __construct(string $email, string $name, string $description, string $leadId, string $projectId, string $milestoneId, string $reference, string $onTaskCompletion, string $status, string $department, string $priority, string $duedate, int $invoiceId)
     {
         $this->email = $email;
         $this->name = $name;
@@ -56,6 +59,7 @@ class CreateTaskPerfexCRMObject implements DataTransferObject
         $this->department = $department;
         $this->priority = $priority;
         $this->duedate = $duedate;
+        $this->invoiceId = $invoiceId;
     }
 
     /**
@@ -158,4 +162,12 @@ class CreateTaskPerfexCRMObject implements DataTransferObject
     {
         return $this->duedate;
     }
+
+    /**
+     * @return int
+     */
+    public function getInvoiceId(): int
+    {
+        return $this->invoiceId;
+    }
 }

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

@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Classes\Modules\PerfexCRM\DataTransferObjects;
+
+use App\Classes\General\Interfaces\DataTransferObject;
+use App\Models\Transaction;
+
+class FetchPerfexCRMInvoiceObject implements DataTransferObject
+{
+    /** @var string */
+    private $email;
+
+    /** @var Transaction */
+    private $transaction;
+
+
+    public function __construct(string $email, Transaction $transaction)
+    {
+        $this->email = $email;
+        $this->transaction = $transaction;
+    }
+
+    /**
+     * @return string
+     */
+    public function getEmail(): string
+    {
+        return $this->email;
+    }
+
+    /**
+     * @return Transaction
+     */
+    public function getTransaction(): Transaction
+    {
+        return $this->transaction;
+    }
+}

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

@@ -28,6 +28,9 @@ class UpdatePerfexCRMObject implements DataTransferObject
     /** @var int */
     private $projectStatus;
 
+    /** @var int */
+    private $invoiceId = 0;
+
     /** @var array */
     private $milestoneNames;
 
@@ -35,7 +38,7 @@ class UpdatePerfexCRMObject implements DataTransferObject
     private $tasks;
 
 
-    public function __construct(string $companyName, string $companyReference, string $contactName, string $contactEmail, string $bookingMarking, string $projectName, int $projectStatus, array $milestoneNames, array $tasks)
+    public function __construct(string $companyName, string $companyReference, string $contactName, string $contactEmail, string $bookingMarking, string $projectName, int $projectStatus, int $invoiceId, array $milestoneNames, array $tasks)
     {
 
         $this->companyName = $companyName;
@@ -45,6 +48,7 @@ class UpdatePerfexCRMObject implements DataTransferObject
         $this->bookingMarking = $bookingMarking;
         $this->projectName = $projectName;
         $this->projectStatus = $projectStatus;
+        $this->$invoiceId = $invoiceId;
         $this->milestoneNames = $milestoneNames;
         $this->tasks = $tasks;
     }
@@ -105,6 +109,14 @@ class UpdatePerfexCRMObject implements DataTransferObject
         return $this->projectStatus;
     }
 
+    /**
+     * @return int
+     */
+    public function getInvoiceId(): int
+    {
+        return $this->invoiceId;
+    }
+
     /**
      * @return array
      */
@@ -125,4 +137,9 @@ class UpdatePerfexCRMObject implements DataTransferObject
     {
         $this->tasks = $tasks;
     }
+
+    public function setInvoiceId($invoiceId)
+    {
+        $this->invoiceId = $invoiceId;
+    }
 }

app/Classes/Modules/PerfexCRM/Processors/CreatePerfexCRMTaskProcessor.php

@@ -25,19 +25,7 @@ class CreatePerfexCRMTaskProcessor
     * @throws \App\Classes\Exceptions\MalformedRequestException
     */
    public function execute(CreateTaskPerfexCRMObject $createTaskPerfexCRMObject) {
-        $this->createsPerfexCRMTask->execute(
-            $createTaskPerfexCRMObject->getName(),
-            $createTaskPerfexCRMObject->getDescription(),
-            $createTaskPerfexCRMObject->getLeadId(),
-            $createTaskPerfexCRMObject->getMilestoneId(),
-            $createTaskPerfexCRMObject->getProjectId(),
-            $createTaskPerfexCRMObject->getReference(),
-            $createTaskPerfexCRMObject->getOnTaskCompletion(),
-            $createTaskPerfexCRMObject->getDepartment(),
-            $createTaskPerfexCRMObject->getStatus(),
-            $createTaskPerfexCRMObject->getPriority(),
-            $createTaskPerfexCRMObject->getDuedate()
-        );
+        $this->createsPerfexCRMTask->execute($createTaskPerfexCRMObject);
         return true;
    }
 

app/Classes/Modules/PerfexCRM/Processors/FetchPerfexCRMInvoiceProcessor.php

@@ -0,0 +1,73 @@
+<?php
+
+namespace App\Classes\Modules\PerfexCRM\Processors;
+
+
+use App\Classes\Modules\PerfexCRM\Processors\CreatePerfexCRMInvoiceProcessor;
+use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMCustomer;
+use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMInvoice;
+use App\Classes\Modules\PerfexCRM\DataTransferObjects\FetchPerfexCRMInvoiceObject;
+use Illuminate\Support\Facades\Log;
+use App\Classes\General\Helper;
+
+class FetchPerfexCRMInvoiceProcessor
+{
+    private $fetchesPerfexCRMCustomer;
+    /** @var FetchesPerfexCRMCustomer */
+
+    /** @var FetchesPerfexCRMInvoice */
+    private $fetchesPerfexCRMInvoice;
+
+    /** @var CreatePerfexCRMInvoiceProcessor */
+    private $createPerfexCRMInvoiceProcessor;
+
+    /**
+     *
+     * FetchPerfexCRMInvoiceProcessor constructor.
+    * @param FetchesPerfexCRMCustomer $fetchesPerfexCRMCustomer
+    * @param FetchesPerfexCRMInvoice $fetchesPerfexCRMInvoice
+    * @param CreatePerfexCRMInvoiceProcessor $createPerfexCRMInvoiceProcessor
+    */
+    public function __construct(FetchesPerfexCRMCustomer $fetchesPerfexCRMCustomer,
+        FetchesPerfexCRMInvoice $fetchesPerfexCRMInvoice,
+        CreatePerfexCRMInvoiceProcessor $createPerfexCRMInvoiceProcessor)
+    {
+        $this->fetchesPerfexCRMCustomer = $fetchesPerfexCRMCustomer;
+        $this->fetchesPerfexCRMInvoice = $fetchesPerfexCRMInvoice;
+        $this->createPerfexCRMInvoiceProcessor = $createPerfexCRMInvoiceProcessor;
+    }
+
+    public function execute(FetchPerfexCRMInvoiceObject $fetchPerfexCRMInvoiceObject)
+    {
+        //invoiceId to be returned - fetch or create
+        $invoiceId = 0;
+
+        //get the client id
+        $customer = $this->fetchesPerfexCRMCustomer->execute($fetchPerfexCRMInvoiceObject->getEmail());
+        $transaction = $fetchPerfexCRMInvoiceObject->getTransaction();
+
+        $number = $transaction->bill_no;
+
+        $prefix = "INV-";
+        //This will remove the prefix if prefix already exist in the string
+        if (substr($number, 0, strlen($prefix)) == $prefix) {
+            $number = substr($number, strlen($prefix));
+        }
+
+        $invoice = $this->fetchesPerfexCRMInvoice->execute($customer->userid,"INV-", $number);
+        if(is_null($invoice)){
+            $result = $this->createPerfexCRMInvoiceProcessor->execute($transaction->owner);
+            if ($result) {
+                $invoiceId = $result->payload['id'];
+            } else {
+                $log['message'] = 'FetchPerfexCRMInvoiceProcessor failed for transaction > bill_no: '.$number;
+                Helper::debugLogger($log);
+            }
+        }
+        else{
+            $invoiceId = $invoice->id;
+        }
+
+        return $invoiceId;
+    }
+}

app/Classes/Modules/PerfexCRM/Processors/PackingListToPerfexCRMProcessor.php

@@ -14,10 +14,10 @@ class PackingListToPerfexCRMProcessor
 {
     /**
      * @param PackingList $packingList
-     * @return \Illuminate\Database\Eloquent\Model
+     * @return bool
      * @throws \App\Classes\Exceptions\MalformedRequestException
      */
-    public function execute(PackingList $packingList)
+    public function execute(PackingList $packingList): bool
     {
         try {
             if($packingList->owner instanceof \App\Models\Order) {
@@ -42,13 +42,14 @@ class PackingListToPerfexCRMProcessor
                     "",
                     $projectName,
                     PerfexCRMProjectStatus::NOT_STARTED,
+                    0,
                     [],
                     [
                         PerfexCRMTasks::TASK_LOADED_CONTAINER_1,
                         PerfexCRMTasks::TASK_LOADED_CONTAINER_2,
                     ]
                 );
-                UpdatePerfexCRMPrelude::dispatch($packingList, null, $updatePerfexCRMObject, UpdatePerfexCRM::class, null);
+                UpdatePerfexCRMPrelude::dispatch($packingList, null, $updatePerfexCRMObject, false);
             }
         } catch (\Exception $exception){
             Log::error(json_encode('PackingListToPerfexCRMProcessor debug:'));

app/Classes/Modules/PerfexCRM/Processors/TransactionToPerfexCRMProcessor.php

@@ -1,75 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Processors;
-
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\UpdatePerfexCRMObject;
-use App\Classes\ValueObjects\Constants\PerfexCRMTasks;
-use App\Classes\ValueObjects\Constants\PerfexCRMProjectStatus;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\Jobs\UpdatePerfexCRMInvoice;
-use App\Classes\Jobs\UpdatePerfexCRM;
-use App\Classes\Jobs\UpdatePerfexCRMPrelude;
-use App\Classes\Jobs\CreatePerfexCRMInvoice;
-use App\Models\Transaction;
-use Illuminate\Support\Facades\Log;
-
-class TransactionToPerfexCRMProcessor
-{
-    /**
-     * @param Transaction $model
-     * @param int $status
-     * @return \Illuminate\Database\Eloquent\Model
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(Transaction $model, int $status)
-    {
-        try
-        {
-            if($model->owner instanceof \App\Models\Transaction && $status == ApprovalStatus::APPROVED)
-            {
-                $packingList = $model->owner->owner;
-                $order = $packingList->owner()->first();
-                $companyModule = $order->companyModule()->first();
-                $companyName = $companyModule->name;
-                $companyReference = $companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
-                $employee = $companyModule->employees()->first();
-                $contactEmail = $employee->email;
-                $contactName = $employee->name;
-
-                $orderReference = $order->reference;
-                $packingListReference = $packingList->reference;
-                $projectName = 'IZYIM | X1 Shipping | '.$orderReference.' | '.$packingListReference;
-
-                $bookingMarking = $packingList->id."-".$packingList->owner->id;
-                $updatePerfexCRMObject = new UpdatePerfexCRMObject(
-                    $companyName,
-                    $companyReference,
-                    $contactName,
-                    $contactEmail,
-                    $bookingMarking,
-                    $projectName,
-                    PerfexCRMProjectStatus::IN_PROGRESS,
-                    [],
-                    [
-                        PerfexCRMTasks::TASK_1,
-                        PerfexCRMTasks::TASK_POST_PAYMENT_1,
-                        PerfexCRMTasks::TASK_POST_PAYMENT_2,
-                        PerfexCRMTasks::TASK_POST_PAYMENT_3,
-                        PerfexCRMTasks::TASK_POST_PAYMENT_4,
-                        ]
-                );
-
-                UpdatePerfexCRMPrelude::dispatch(null, $model, $updatePerfexCRMObject, UpdatePerfexCRM::class, UpdatePerfexCRMInvoice::class);
-            }
-            else if($model->owner instanceof \App\Models\PackingList && $model->status == ApprovalStatus::PENDING_SUBMISSION && $status == ApprovalStatus::APPROVED)
-            {
-                CreatePerfexCRMInvoice::dispatch($model);
-            }
-        }
-        catch (\Exception $exception) {
-            Log::error('TransactionToPerfexCRMProcessor debug:');
-            Log::error($exception);
-        }
-        return true;
-    }
-}

app/Classes/Modules/PerfexCRM/Processors/TransactionToPerfexCRMV2Processor.php

@@ -0,0 +1,145 @@
+<?php
+
+namespace App\Classes\Modules\PerfexCRM\Processors;
+
+use App\Classes\Modules\PerfexCRM\DataTransferObjects\UpdatePerfexCRMObject;
+use App\Classes\ValueObjects\Constants\PerfexCRMTasks;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Classes\ValueObjects\Constants\PerfexCRMProjectStatus;
+use App\Classes\ValueObjects\Constants\PerfexCRMTaskStatus;
+use App\Classes\Jobs\UpdatePerfexCRMPrelude;
+use App\Classes\Jobs\CreatePerfexCRMInvoice;
+use App\Models\Booking;
+use App\Models\Transaction;
+use Illuminate\Support\Facades\Log;
+
+class TransactionToPerfexCRMV2Processor
+{
+    public function execute(Transaction $model, int $status)
+    {
+        try {
+            if($model->owner instanceof \App\Models\Transaction && in_array($model->type, [TransactionType::PAYMENT])) {
+                //
+                $transaction = $model;
+                $info = $this->extractInfo($transaction);
+                $tasks = $this->defineTasks($model, $status);
+
+                //if(count($tasks) > 0) { //commented, otherwise when customer paid, invoice payment will not get created at crm because there is no tasks attached
+                    $updatePerfexCRMObject = new UpdatePerfexCRMObject(
+                        $info['companyName'],
+                        $info['companyReference'],
+                        $info['contactName'],
+                        $info['contactEmail'],
+                        $info['bookingMarking'],
+                        $info['projectName'],
+                        PerfexCRMProjectStatus::IN_PROGRESS,
+                        0,      //invoiceId
+                        [],     //milestoneNames
+                        $tasks
+                    );
+
+                    $this->dispatchUpdateJob($transaction, $status, $updatePerfexCRMObject);
+                //}
+            }
+            else if($model->owner instanceof \App\Models\PackingList && $model->status == ApprovalStatus::PENDING_SUBMISSION && $status == ApprovalStatus::APPROVED)
+            {
+                CreatePerfexCRMInvoice::dispatch($model);
+            }
+        } catch (\Exception $exception) {
+            Log::error($exception);
+        }
+        return true;
+    }
+
+    //Level 1
+    private function extractInfo(Transaction $model): array
+    {
+        $packingList = $model->owner->owner;
+        $order = $packingList->owner()->first();
+        $companyModule = $order->companyModule()->first();
+        $employee = $companyModule->employees()->first();
+
+        $info = [];
+        $info['companyName'] = $companyModule->name;
+        $info['companyReference'] = $companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
+        $info['contactName'] = $employee->name;
+        $info['contactEmail'] = $employee->email;
+        $info['bookingMarking'] = $packingList->id."-".$packingList->owner->id;
+        $info['projectName'] = 'IZYIM | X1 Shipping | '.$order->reference.' | '.$packingList->reference;
+
+        return $info;
+    }
+
+    private function defineTasks(Transaction $model, int $status): array
+    {
+        $tasks = [];
+
+        if ($status === ApprovalStatus::PENDING_SUBMISSION) {
+            $tasks = $this->defineTasks_handlePendingVerificationStatus($model);
+        } elseif ($status === ApprovalStatus::APPROVED) {
+            $tasks = $this->defineTasks_handleApprovedStatus($model);
+        }
+
+        return $tasks;
+    }
+
+    private function dispatchUpdateJob(Transaction $model, int $status, UpdatePerfexCRMObject $updatePerfexCRMObject)
+    {
+        $withInvoice = ($model->type === TransactionType::PAYMENT && $model->owner instanceof \App\Models\Transaction && $status == ApprovalStatus::APPROVED);
+        UpdatePerfexCRMPrelude::dispatch(null, $model, $updatePerfexCRMObject, $withInvoice);
+    }
+
+
+
+
+    //Level Others: Nested
+    private function defineTasks_handlePendingVerificationStatus(Transaction $model): array
+    {
+        $tasks = [];
+        switch($model->type) {
+            case TransactionType::PAYMENT:
+                $tasks = $this->definePaymentTasks($model);
+                break;
+        }
+
+        return $tasks;
+    }
+
+    private function defineTasks_handleApprovedStatus(Transaction $model): array
+    {
+        $tasks = [];
+        switch($model->type) {
+            case TransactionType::PAYMENT:
+                $tasks = $this->defineTasks_handleApprovedStatus_handlePaymentApprovedStatus();
+                break;
+        }
+
+        return $tasks;
+    }
+
+
+    private function definePaymentTasks(Transaction $model): array //cief todo: to comfirm what tasks need to be created
+    {
+        $tasks = [];
+        return $tasks;
+    }
+
+    private function defineTasks_handleApprovedStatus_handlePaymentApprovedStatus(): array //cief todo: to comfirm what tasks need to be created
+    {
+        $tasks = [];
+        // $tasks = [
+        //     PerfexCRMTasks::TASK_POST_PAYMENT_1,
+        //     PerfexCRMTasks::TASK_POST_PAYMENT_2,
+        //     PerfexCRMTasks::TASK_POST_PAYMENT_3,
+        //     PerfexCRMTasks::TASK_POST_PAYMENT_4,
+        // ];
+        return $tasks;
+    }
+
+    private function completeTask($startTask, $endTask) {
+        $startTask['status'] = PerfexCRMTaskStatus::COMPLETED;
+        $endTask['status'] = PerfexCRMTaskStatus::IN_PROGRESS;
+        return [$startTask, $endTask];
+    }
+}

app/Classes/Modules/PerfexCRM/Processors/UpdatePerfexCRMProcessor.php

@@ -15,10 +15,11 @@ use App\Classes\Modules\PerfexCRM\Services\UpdatesPerfexCRMTask;
 use App\Classes\Modules\PerfexCRM\Services\UpdatesPerfexCRMCustomer;
 use App\Classes\Modules\PerfexCRM\Services\UpdatesPerfexCRMProject;
 use App\Classes\Modules\PerfexCRM\DataTransferObjects\CustomerContactObject;
-use App\Classes\Exceptions\MalformedRequestException;
 use App\Classes\Modules\PerfexCRM\DataTransferObjects\UpdatePerfexCRMObject;
+use App\Classes\Modules\PerfexCRM\DataTransferObjects\CreateTaskPerfexCRMObject;
 use App\Classes\ValueObjects\Constants\PerfexCRMTaskStatus;
 use App\Classes\ValueObjects\Constants\PerfexCRMProjectStatus;
+use App\Classes\Exceptions\MalformedRequestException;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Http\Request;
@@ -207,18 +208,46 @@ class UpdatePerfexCRMProcessor
                 }
 
                 // Get existing or create task
-                $result = $this->fetchesPerfexCRMTask->execute($tasks[$count]['name'], $milestoneId, 'project', $projectId);
+                $taskName = $tasks[$count]['name'];
+                $taskReference = $tasks[$count]['reference'];
+                $taskOnTaskCompletion = $tasks[$count]['on_task_completion'];
+                $taskIsAllowMultiple = $tasks[$count]['is_allow_multiple'];
+                $taskIsOnTaskCompletionUpdate = $tasks[$count]['is_on_task_completion_update'];
+                if($updatePerfexCRMObject->getInvoiceId() != 0 && $taskIsAllowMultiple){
+                    $taskName = $taskName." (".$updatePerfexCRMObject->getInvoiceId().")";
+                    $taskReference = $taskReference."_".$updatePerfexCRMObject->getInvoiceId();
+                    if($taskOnTaskCompletion && $taskIsOnTaskCompletionUpdate){
+                        $taskOnTaskCompletion = $taskOnTaskCompletion."_".$updatePerfexCRMObject->getInvoiceId();
+                    }
+                }
+
+                $result = $this->fetchesPerfexCRMTask->execute($taskName, $milestoneId, 'project', $projectId, $updatePerfexCRMObject->getInvoiceId());
+
                 if(isset($result->payload)){
-                    break; //Breaking the rest of the tasks in array assuming that they are all created as a batch previously
-                    //The following are code not needed at Shipping Portal, Exchange need certain task's status to be updated dynamically
-                    // if($taskStatus != PerfexCRMTaskStatus::NOT_STARTED && $result->payload[0]['status'] == PerfexCRMTaskStatus::NOT_STARTED)
-                    // {
-                    //     $task = $result->payload[0];
-                    //     $result = $this->updatesPerfexCRMTask->execute($task['id'], $task['name'], $task['milestone'], $task['rel_id'], $taskStatus, $task['startdate'], is_null($task['duedate']) ? '': $task['duedate']);
-                    // }
+                    //  && $result->payload[0]['status'] == PerfexCRMTaskStatus::NOT_STARTED //purpose of this checking is just to make sure that only update task at crm when the status is NOT_STARTED, a double check to prevent unintentional update
+                    if($taskStatus != PerfexCRMTaskStatus::NOT_STARTED)
+                    {
+                        $task = $result->payload[0];
+                        $result = $this->updatesPerfexCRMTask->execute($task['id'], $task['name'], $task['milestone'], $task['rel_id'], $taskStatus, $task['startdate'], is_null($task['duedate']) ? '': $task['duedate']);
+                    }
                 }
                 else{
-                    $result = $this->createsPerfexCRMTask->execute($tasks[$count]['name'], $tasks[$count]['description'], '', $milestoneId, $projectId, $tasks[$count]['reference'], $tasks[$count]['on_task_completion'], $tasks[$count]['department'], $taskStatus, $tasks[$count]['priority'], $tasks[$count]['duedate']);
+                    $createTaskPerfexCRMObject = new CreateTaskPerfexCRMObject(
+                        "",
+                        $taskName,
+                        $tasks[$count]['description'],
+                        "",
+                        $projectId,
+                        $milestoneId,
+                        $taskReference,
+                        $taskOnTaskCompletion,
+                        $taskStatus,
+                        $tasks[$count]['department'],
+                        $tasks[$count]['priority'],
+                        $tasks[$count]['duedate'],
+                        $updatePerfexCRMObject->getInvoiceId()
+                    );
+                    $result = $this->createsPerfexCRMTask->execute($createTaskPerfexCRMObject);
                 }
             }
         }

app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMTask.php

@@ -6,67 +6,47 @@ use Illuminate\Support\Facades\Http;
 use App\Classes\Exceptions\MalformedRequestException;
 use Illuminate\Support\Facades\Log;
 use App\Classes\ValueObjects\Constants\PerfexCRMCustomFields;
+use App\Classes\Modules\PerfexCRM\DataTransferObjects\CreateTaskPerfexCRMObject;
 
 class CreatesPerfexCRMTask
 {
     /**
-     * @param string $taskName
-     * @param string $taskDescription
-     * @param string $leadId
-     * @param string $milestoneId
-     * @param string $projectId
-     * @param string $reference
-     * @param string $on_task_completion
-     * @param string $department
-     * @param string $status
-     * @param string $priority
-     * @param string $duedate
+     * @param CreateTaskPerfexCRMObject $createTaskPerfexCRMObject
      * @return null|object
      * @throws MalformedRequestException
      */
-    public function execute(string $taskName, string $taskDescription, string $leadId, string $milestoneId, string $projectId, string $reference, string $on_task_completion, string $department, string $status, string $priority, string $duedate) {
+
+    public function execute(CreateTaskPerfexCRMObject $createTaskPerfexCRMObject) {
         try{
             $custom_fields = [];
-            if($department != ""){
+            if($createTaskPerfexCRMObject->getDepartment() != ""){
                 $custom_fields = [
                     "tasks" => [
-                        PerfexCRMCustomFields::TASKS_DEPARTMENT => $department
+                        PerfexCRMCustomFields::TASKS_DEPARTMENT => $createTaskPerfexCRMObject->getDepartment()
                     ]
                 ];
             }
 
             $data = [
-                'name' => $taskName,
-                'description' => $taskDescription,
-                'milestone' => $milestoneId,
+                'name' => $createTaskPerfexCRMObject->getName(),
+                'description' => $createTaskPerfexCRMObject->getDescription(),
+                'milestone' => $createTaskPerfexCRMObject->getMilestoneId(),
                 'startdate' => date('Y-m-d'),
                 'rel_type' => 'project',
-                'rel_id' => $projectId,
-                'status' => $status,
+                'rel_id' => $createTaskPerfexCRMObject->getProjectId(),
+                'status' => $createTaskPerfexCRMObject->getStatus(),
                 'is_system_created' => 1,
-                'reference' => $reference,
-                'on_task_completion' => $on_task_completion,
+                'reference' => $createTaskPerfexCRMObject->getReference(),
+                'on_task_completion' => $createTaskPerfexCRMObject->getOnTaskCompletion(),
                 'custom_fields' => $custom_fields,
-                'priority' => $priority,
-                'duedate' => date('Y-m-d', strtotime('+' . $duedate . ' days')),
+                'priority' => $createTaskPerfexCRMObject->getPriority(),
+                'duedate' => date('Y-m-d', strtotime('+' . $createTaskPerfexCRMObject->getDuedate() . ' days')),
+                'invoice_id' => $createTaskPerfexCRMObject->getInvoiceId(),
             ];
 
-            if($leadId != '') {
-                $data = [
-                    'name' => $taskName,
-                    'description' => $taskDescription,
-                    'milestone' => $milestoneId,
-                    'startdate' => date('Y-m-d'),
-                    'rel_type' => 'lead',
-                    'rel_id' => $leadId,
-                    'status' => $status,
-                    'is_system_created' => 1,
-                    'reference' => $reference,
-                    'on_task_completion' => $on_task_completion,
-                    'custom_fields' => $custom_fields,
-                    'priority' => $priority,
-                    'duedate' => date('Y-m-d', strtotime('+' . $duedate . ' days')),
-                ];
+            if($createTaskPerfexCRMObject->getLeadId() != '') {
+                $data['rel_type'] = 'lead';
+                $data['rel_id'] = $createTaskPerfexCRMObject->getLeadId();
             }
 
             $response = Http::asForm()->withHeaders([

app/Classes/Modules/PerfexCRM/Services/FetchesPerfexCRMTask.php

@@ -17,7 +17,7 @@ class FetchesPerfexCRMTask
      * @return null|object
      * @throws MalformedRequestException
      */
-    public function execute(string $taskName, string $milestoneId, string $relType, string $relId) {
+    public function execute(string $taskName, string $milestoneId, string $relType, string $relId, string $invoiceId) {
         try{
             $data = [
                 'name' => $taskName,
@@ -30,6 +30,11 @@ class FetchesPerfexCRMTask
                 $data = array_merge($data, $newItem);
             }
 
+            if($invoiceId != 0) {
+                $newItem = ['invoice_id' =>  $invoiceId ];
+                $data = array_merge($data, $newItem);
+            }
+
             $response = Http::asForm()->withHeaders([
                 'authtoken' => config('perfexcrm.api_key')])
             ->post(config('perfexcrm.base_url').'/api/tasks/customsearch', $data);
@@ -39,7 +44,7 @@ class FetchesPerfexCRMTask
 
                 return (object) $data;
             }else{
-                Helper::debugLoggerForPerfexCRM($response);
+                Helper::debugLogger($response);
                 return null;
             }
         }catch(\Exception $exception){

app/Classes/Modules/PerfexCRM/Services/UpdatesPerfexCRMCustomer.php

@@ -38,7 +38,7 @@ class UpdatesPerfexCRMCustomer
                 $data = $response->json();
                 return (object) $data;
             }else{
-                Helper::debugLoggerForPerfexCRM($response);
+                Helper::debugLogger($response);
                 return null;
             }
         }catch(\Exception $exception){

app/Classes/Modules/Segments/ControllersLogic/UpdateConstantPostcodeLogic.php

@@ -29,7 +29,8 @@ class UpdateConstantPostcodeLogic  extends AbstractControllerLogic
      * @param UpdatePostcodeSegmentProcessor $updatePostcodeSegmentProcessor
      */
     public function __construct(
-        UpdatePostcodeSegmentProcessor $updatePostcodeSegmentProcessor)
+        UpdatePostcodeSegmentProcessor $updatePostcodeSegmentProcessor
+    )
     {
         $this->updatePostcodeSegmentProcessor = $updatePostcodeSegmentProcessor;
     }

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

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

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

@@ -7,24 +7,20 @@ use App\Classes\Exceptions\MalformedRequestException;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Transactions\Services\FetchesTransaction;
 use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
-use App\Classes\Modules\Transactions\Services\CreatesTransactionableTransaction;
-use App\Classes\Modules\Transactions\Services\CreatesPaymentTransaction;
-use App\Classes\Modules\Transactions\Services\CreatesTransaction;
-use App\Classes\Modules\Billplzs\Services\CreatesBillplzBill;
-use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
-use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
-use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Classes\Modules\Companies\Services\FetchesCompanyModule;
+use App\Classes\Modules\Groups\DataTransferObjects\GroupObject;
 use App\Classes\ValueObjects\Constants\PaymentMethodType;
-use App\Classes\Modules\Wallets\Services\UpdatesWalletBalance;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Http\Resources\TransactionResource;
+use App\Classes\Modules\Transactions\Processors\CreatePaymentTransactionProcessor;
 use App\Models\Group;
+use App\Classes\Modules\Groups\Services\CreatesGroup;
 use App\Models\Transaction;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use App\Classes\Modules\Wallets\Processors\CreateWalletTopUpTransactionProcessor;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Models\GroupTransaction;
+use App\Http\Resources\WalletTransactionResource;
 use App\Models\Wallet;
-use App\Classes\Modules\Orders\Processors\UpdateDoFromVTPortalProcessor;
-use App\Classes\Modules\Orders\Processors\UpdateDoFromYDPortalProcessor;
 
 class CreateGroupsLogic extends AbstractControllerLogic
 {
@@ -43,212 +39,141 @@ class CreateGroupsLogic extends AbstractControllerLogic
     /** @var FetchesTransaction */
     private $fetchesTransaction;
 
-
     /** @var GeneratesTransactionBillNumber */
     private $generatesTransactionBillNumber;
 
-    /** @var CreatesTransactionableTransaction */
-    private $createsTransactionableTransaction;
 
-    /** @var CreatesBillplzBill */
-    private $createsBillplzBill;
+    /** @var FetchesCompanyModule  */
+    private $fetchesCompanyModule;
 
-    /** @var UpdatesWalletBalance */
-    private $updatesWalletBalance;
+    /** @var CreateWalletTopUpTransactionProcessor */
+    private $createWalletTopUpTransactionProcessor;
 
-    /** @var CreatesTransaction */
-    private $createsTransaction;
+    /** @var CreatePaymentTransactionProcessor */
+    private $createPaymentTransactionProcessor;
 
-    /** @var CreatesPaymentTransaction */
-    private $createsPaymentTransaction;
-
-    /** @var UpdateDoFromVTPortalProcessor */
-    private $updateDoFromVTPortalProcessor;
-
-    /** @var UpdateDoFromYDPortalProcessor */
-    private $updateDoFromYDPortalProcessor ;
-
-    /** @var UpdatesTransactionStatus */
-    private $updatesTransactionStatus ;
+    /** @var CreatesGroup */
+    private $createsGroup;
 
     public function __construct(
         FetchesTransaction $fetchesTransaction, 
         GeneratesTransactionBillNumber $generatesTransactionBillNumber, 
-        CreatesTransactionableTransaction $createsTransactionableTransaction,
-        CreatesBillplzBill $createsBillplzBill,
-        UpdatesWalletBalance $updatesWalletBalance,
-        CreatesTransaction $createsTransaction,
-        CreatesPaymentTransaction $createsPaymentTransaction,
-        UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor, 
-        UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor,
-        UpdatesTransactionStatus $updatesTransactionStatus
+        FetchesCompanyModule $fetchesCompanyModule,
+        CreateWalletTopUpTransactionProcessor $createWalletTopUpTransactionProcessor,
+        CreatePaymentTransactionProcessor $createPaymentTransactionProcessor,
+        CreatesGroup $createsGroup
     )
     {
         $this->fetchesTransaction = $fetchesTransaction;
         $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
-        $this->createsTransactionableTransaction = $createsTransactionableTransaction;
-        $this->createsBillplzBill = $createsBillplzBill;
-        $this->updatesWalletBalance = $updatesWalletBalance;
-        $this->createsPaymentTransaction = $createsPaymentTransaction;
-        $this->updateDoFromVTPortalProcessor = $updateDoFromVTPortalProcessor;
-        $this->updateDoFromYDPortalProcessor = $updateDoFromYDPortalProcessor;
-        $this->updatesTransactionStatus = $updatesTransactionStatus;
+        $this->fetchesCompanyModule = $fetchesCompanyModule;
+        $this->createWalletTopUpTransactionProcessor = $createWalletTopUpTransactionProcessor;
+        $this->createPaymentTransactionProcessor = $createPaymentTransactionProcessor;
+        $this->createsGroup = $createsGroup;
     }
 
     public function logic(Request $request) : JsonResponse
     {
-        $invoice_ids = json_decode($request->route('transaction_ids'));
-        $billNumber = $this->generatesTransactionBillNumber->execute('PYMT-');
-        $approvalStatus = ApprovalStatus::PENDING_SUBMISSION;
-        $payment_method = PaymentMethodType::PAYMENT_METHODS[$request->input('payment_method')];
+        $payment_method     = PaymentMethodType::PAYMENT_METHODS[$request->input('payment_method')];
+        $groupPyamentStatus = ApprovalStatus::PENDING_VERIFICATION;
 
-        if (count($invoice_ids) > 1) {
-            dd('more than 1 invoice');
-            // creates group transaction 
-            $group = new Group();
+        $invoice_ids    = json_decode($request->route('transaction_ids'));
+        $billNumber     = $this->generatesTransactionBillNumber->execute('PYMT-');
 
-            $issuer = '';
-            $receiver = '';
-            $amount = 0;
-            $original_amount = 0;
-            $currency_id = 0;
-            $original_currency_id = '';
-            $currency_rate = '';
-            $tax = 0;
-            $service_charge = 0;
+        // todo-new: check why is this not working
+        // $invoices = $this->fetchesTransaction->execute(['id_in' => $invoice_ids]);
+        $invoices       = Transaction::whereIn('id', $invoice_ids)->get();
 
-            // todo-new: check why is this not working
-            // $invoices = $this->fetchesTransaction->execute(['id_in' => $invoice_ids]);
-            $invoices = Transaction::whereIn('id', $invoice_ids)->get();
+        if ($payment_method == PaymentMethodType::WALLET) {
 
-            foreach ($invoices as $invoice) {
-                // todo-new: attach transaction to the group id
-                // create one payment for each, then mark as pending_approval
-                $issuer = $invoice->issuer;
-                $receiver = $invoice->receiver;
-                $amount += $invoice->amount;
-                $original_amount += $invoice->original_amount;
-                $currency_id = $invoice->currency_id;
-                $original_currency_id = $invoice->original_currency_id;
-                $currency_rate = $invoice->currency_rate;
-                $tax += $invoice->tax;
-                $service_charge += $invoice->service_charge;
-            }
+            $companyModuleId = $invoices->first()->receiver;
 
-            $group->issuer = $issuer;
-            $group->receiver = $receiver;
-            $group->reference = $billNumber;
-            $group->amount = $amount;
-            $group->original_amount = $original_amount;
-            $group->currency_id = $currency_id;
-            $group->original_currency_id = $original_currency_id;
-            $group->currency_rate = $currency_rate;
-            $group->tax = $tax;
-            $group->service_charge = $service_charge;
+            $wallet = Wallet::where('owner_id', $companyModuleId)->first();
 
-            $group->save();
-
-
-            // attach payment on group transaction            
-            
-            // $invoice_transaction = $this->fetchesTransaction->execute(['id' => $invoice_ids->first()]);
-            // $amount = $request->input('amount');
-            // $company_module = $invoice_transaction->owner()->first()->owner()->first()->companyModule()->first();
-
-            $invoice_transaction = $group;
-            $transferDetails = $billNumber;
-            $company_module = $group->receiverCompany;
-        } else {
-
-            $invoice_transaction = $this->fetchesTransaction->execute(['id' => $invoice_ids[0]]);
-            $amount = $request->input('amount');
-            $company_module = $invoice_transaction->owner()->first()->owner()->first()->companyModule()->first();
-            $transferDetails = $invoice_transaction->bill_no;
-        }
-
-        $payment_reference = null;
-        if ($payment_method == PaymentMethodType::PAYMENT_GATEWAY) {
-
-            // create billplz transaction
-            $payment_method = PaymentMethodType::PAYMENT_GATEWAY;
-            $billPlzBill = $this->createsBillplzBill->execute(
-                $company_module->name, 
-                (app()->environment(['production'])) ? $company_module->employees()->first()->email : 'uldvstar@gmail.com',
-                'This payment is for the invoice number . ' . $transferDetails,
-                $amount,
-                $billNumber, 
-                $request->input('bank_code'), 
-                true
-            );
-
-            $payment_reference = $billPlzBill->id;
-        }
-        else if ($payment_method === PaymentMethodType::WALLET) {
-            /** @var Wallet $wallet */
-            $wallet = $company_module->wallets()->first();
-
-            if((float) number_format(($wallet->amount - $amount),2) < 0){
+            // todo-new: verify currently checking wallet amount based on 'amount' value passed by frontend
+            if((float) number_format(($wallet->amount - $request->input('amount')),2) < 0){
                 throw new MalformedRequestException('Insufficient wallet balance. Please Top up your wallet.');
             }
 
-            $walletPaymentBillNumber = $this->generatesTransactionBillNumber->execute('PYMT-');
-            
-            $transaction_object = new TransactionObject($walletPaymentBillNumber, TransactionType::PAYMENT, 1, $company_module->id, 1, PaymentMethodType::WALLET, $amount, $amount, 1, 1, 1, 0, 0, null, ApprovalStatus::APPROVED, [], '');
-            $transaction = $this->createsTransactionableTransaction->execute($wallet, $transaction_object);
-
-            $payment_reference = $walletPaymentBillNumber;
-
-            $this->updatesWalletBalance->execute($wallet, ($amount * -1));
-
-            if (count($invoice_ids) > 1) {
-                // do one by one
-                // dd($invoices);
-                // todo-new: update all the transaction inside 
-            } else {
-                // $invoice_transaction;
-                $packingList = $invoice_transaction->owner;
-                $order = $packingList->owner;
-                $packingList->status = ApprovalStatus::APPROVED;
-                $packingList->save();
-            }
-
-            if(app()->environment('production')){
-                $this->updateDoFromVTPortalProcessor->execute($packingList);
-                $this->updateDoFromYDPortalProcessor->execute($packingList);
-            }
-
-            $approvalStatus = ApprovalStatus::APPROVED;
-
-            // update invoice to completed
-            $this->updatesTransactionStatus->execute($invoice_transaction, ApprovalStatus::COMPLETED);
-        }
-        else {
-            $payment_method = PaymentMethodType::CASH;
+            $groupPyamentStatus = ApprovalStatus::APPROVED;
         }
 
-        // createsPaymentTransaction
-        $object = new TransactionObject(
-            $billNumber, 
-            TransactionType::PAYMENT, 
-            $company_module->id,
-            1,
-            1, 
+        $issuer                 = 0;
+        $receiver               = 0;
+        $amount                 = 0;
+        $original_amount        = 0;
+        $currency_id            = 0;
+        $original_currency_id   = 0;
+        $currency_rate          = 0;
+        $tax                    = 0;
+        $service_charge         = 0;
+
+        $group = new GroupObject(
+            $issuer,
+            $receiver,
+            $amount,
+            $original_amount,
+            $currency_id,
+            $original_currency_id,
+            $currency_rate,
+            $tax,
+            $service_charge,
             $payment_method,
-            $request->input('amount'),
-            $request->input('amount'),
-            1,
-            1, 
-            0, 
-            0, 
-            0,
-            null, 
-            $approvalStatus,
-            null,
-            $payment_reference
+            '-',
+            $groupPyamentStatus,
         );
 
-        $payment_transaction = $this->createsPaymentTransaction->execute($invoice_transaction, $object);
+        $group = $this->createsGroup->execute($group);
 
-        return $this->resourceResponse(new TransactionResource($payment_transaction));
+        foreach ($invoices as $invoice) {
+            if ($payment_method == PaymentMethodType::WALLET) {
+                $this->createPaymentTransactionProcessor->execute($invoice, PaymentMethodType::WALLET, $request->input('bank_code'));
+            }
+
+            $issuer                 = $invoice->issuer;
+            $receiver               = $invoice->receiver;
+            $amount                 += $invoice->amount;
+            $original_amount        += $invoice->original_amount;
+            $currency_id            = $invoice->currency_id;
+            $original_currency_id   = $invoice->original_currency_id;
+            $currency_rate          = $invoice->currency_rate;
+            $tax                    += $invoice->tax;
+            $service_charge         += $invoice->service_charge;
+
+            // creates group transaction
+            $groupTransaction = new GroupTransaction();
+            $groupTransaction->group_id = $group->id;
+            $groupTransaction->transaction_id = $invoice->id;
+            $groupTransaction->save();
+        }
+
+        if (in_array($payment_method, [PaymentMethodType::PAYMENT_GATEWAY, PaymentMethodType::CASH])) {
+            // create only one billplz payment for wallet top up
+            $amount = floatval(str_replace(',', '', $request->input('amount')));
+            $companyModuleId = $invoice->receiver;
+            $companyModule = $this->fetchesCompanyModule->execute(['id' => $companyModuleId]);
+
+            $topUpTransaction = $this->createWalletTopUpTransactionProcessor->execute($companyModule, $amount, $request->input('bank_code'), true, $payment_method);
+        }
+
+        $group->issuer                  = $issuer;
+        $group->receiver                = $receiver;
+        $group->reference               = $payment_method === PaymentMethodType::PAYMENT_GATEWAY ? $topUpTransaction->payment_reference : $billNumber;
+        $group->amount                  = $amount;
+        $group->original_amount         = $original_amount;
+        $group->currency_id             = $currency_id;
+        $group->original_currency_id    = $original_currency_id;
+        $group->currency_rate           = $currency_rate;
+        $group->tax                     = $tax;
+        $group->service_charge          = $service_charge;
+        $group->status                  = $groupPyamentStatus;
+        $group->save();
+
+        if ($payment_method === PaymentMethodType::PAYMENT_GATEWAY) {
+            return $this->resourceResponse(new WalletTransactionResource($topUpTransaction));
+
+        } else {
+            return $this->response([]);
+        }
     }
 }

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

@@ -5,30 +5,15 @@ namespace App\Classes\Modules\Transactions\ControllersLogic;
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Transactions\Services\FetchesTransaction;
-use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
-use App\Classes\Modules\Transactions\Services\CreatesPaymentTransaction;
-use App\Classes\Modules\Transactions\Services\CreatesTransactionDetail;
-use App\Classes\Modules\Billplzs\Services\CreatesBillplzBill;
-
-use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
-use App\Classes\Modules\Transactions\DataTransferObjects\TransactionDetailObject;
-
-use App\Classes\ValueObjects\Constants\OrderRoleTypes;
-use App\Classes\ValueObjects\Constants\TransactionType;
 use App\Classes\ValueObjects\Constants\PaymentMethodType;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-
 use App\Http\Resources\TransactionResource;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Storage;
-use Illuminate\Support\Str;
-use Mccarlosen\LaravelMpdf\Facades\LaravelMpdf;
+use App\Classes\Modules\Transactions\Processors\CreatePaymentTransactionProcessor;
 
 class CreatePaymentTransactionLogic extends AbstractControllerLogic
 {
 
-
     /**
      * @return array
      */
@@ -42,83 +27,39 @@ class CreatePaymentTransactionLogic extends AbstractControllerLogic
     /** @var FetchesTransaction */
     private $fetchesTransaction;
 
-    /** @var FetchesSegmentConstant */
-    private $fetchesSegmentConstant;
-
-    /** @var GeneratesTransactionBillNumber */
-    private $generatesTransactionBillNumber;
-
-    /** @var CreatesPaymentTransaction */
-    private $createsPaymentTransaction;
-
-    /** @var CreatesBillplzBill */
-    private $createsBillplzBill;
-
-    /** @var CreatesTransactionDetail */
-    private $createsTransactionDetail;
+    /** @var CreatePaymentTransactionProcessor */
+    private $createPaymentTransactionProcessor;
 
     public function __construct(
-        FetchesTransaction $fetchesTransaction, 
-        GeneratesTransactionBillNumber $generatesTransactionBillNumber, 
-        CreatesPaymentTransaction $createsPaymentTransaction,
-        CreatesTransactionDetail $createsTransactionDetail,
-        CreatesBillplzBill $createsBillplzBill
+        FetchesTransaction $fetchesTransaction,
+        CreatePaymentTransactionProcessor $createPaymentTransactionProcessor
     )
     {
         $this->fetchesTransaction = $fetchesTransaction;
-        $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
-        $this->createsPaymentTransaction = $createsPaymentTransaction;
-        $this->createsTransactionDetail = $createsTransactionDetail;
-        $this->createsBillplzBill = $createsBillplzBill;
+        $this->createPaymentTransactionProcessor = $createPaymentTransactionProcessor;
     }
 
     public function logic(Request $request) : JsonResponse
     {
+        $payment_method = PaymentMethodType::PAYMENT_METHODS[$request->input('payment_method')];
+
         $invoice_transaction = $this->fetchesTransaction->execute(['id' => $request->input('transaction_id')]);
-        $amount = $request->input('amount');
-        $company_module = $invoice_transaction->owner()->first()->owner()->first()->companyModule()->first();
 
-        $billNumber = $this->generatesTransactionBillNumber->execute('PYMT-');
-        $payment_reference = null;
-        if ($request->input('payment_method') == 5) {
-            $payment_method = PaymentMethodType::PAYMENT_GATEWAY;
-            $billPlzBill = $this->createsBillplzBill->execute(
-                $company_module->name, 
-                (app()->environment(['production'])) ? $company_module->employees()->first()->email : 'uldvstar@gmail.com',
-                'This payment is for the invoice number . ' . $invoice_transaction->bill_no,
-                $amount,
-                $billNumber, 
-                $request->input('bank_code'), 
-                true
-            );
+        $payment_transaction = $this->createPaymentTransactionProcessor->execute($invoice_transaction, $payment_method , $request->input('bank_code'));
 
-            $payment_reference = $billPlzBill->id;
-        }
-        else {
-            $payment_method = PaymentMethodType::CASH;
-        }
+        //cief todo: at exchange there is a transition step
+        // if(PaymentMethodType::PAYMENT_METHODS[$request->input('payment_method')] == PaymentMethodType::PAYMENT_GATEWAY){
+        //     $this->updatesTransactionStatus->execute($transaction, ApprovalStatus::PENDING_VERIFICATION);
+        // }
 
-        $object = new TransactionObject(
-            $billNumber, 
-            TransactionType::PAYMENT, 
-            $company_module->id,
-            1,
-            1, 
-            $payment_method,
-            $request->input('amount'),
-            $request->input('amount'),
-            1,
-            1, 
-            0, 
-            0, 
-            0,
-            null, 
-            ApprovalStatus::PENDING_SUBMISSION,
-            null,
-            $payment_reference
-        );
+        // if(config('perfexcrm.is_enabled') == 'true'){
+        //     $this->transactionToPerfexCRMV2Processor->execute($transaction, $status);
+        // }
+
+        //To use
+        //ApprovalStatus::PENDING_VERIFICATION;
+        //use this to trigger  $this->transactionToPerfexCRMV2Processor->execute > defineTasks > defineTasks_handlePendingVerificationStatus > definePaymentTasks
 
-        $payment_transaction = $this->createsPaymentTransaction->execute($invoice_transaction, $object);
 
         return $this->resourceResponse(new TransactionResource($payment_transaction));
     }

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

@@ -5,10 +5,8 @@ namespace App\Classes\Modules\Transactions\ControllersLogic;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Transactions\Services\FetchesGroup;
 use App\Classes\Modules\Transactions\Services\DeletesTransaction;
+use App\Classes\Modules\Transactions\Services\DeletesGroup;
 use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Http\Resources\GroupResource;
-use App\Transformers\GroupTransformer;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
@@ -25,14 +23,11 @@ class DeleteGroupLogic extends AbstractControllerLogic
         ];
     }
 
-    /** @var UpdatesTransactionStatus */
-    private $updatesTransactionStatus;
-
     /** @var FetchesGroup */
     private $fetchesGroup;
 
-    /** @var DeletesTransaction */
-    private $deletesTransaction;
+    /** @var DeletesGroup */
+    private $deletesGroup;
 
     /**
      * DeleteGroupLogic constructor.
@@ -40,11 +35,10 @@ class DeleteGroupLogic extends AbstractControllerLogic
      * @param FetchesGroup $fetchesGroup
      * @param DeletesTransaction $deletesTransaction
      */
-    public function __construct(updatesTransactionStatus $updatesTransactionStatus, FetchesGroup $fetchesGroup, DeletesTransaction $deletesTransaction)
+    public function __construct(FetchesGroup $fetchesGroup, DeletesGroup $deletesGroup)
     {
-        $this->updatesTransactionStatus = $updatesTransactionStatus;
         $this->fetchesGroup = $fetchesGroup;
-        $this->deletesTransaction = $deletesTransaction;
+        $this->deletesGroup = $deletesGroup;
     }
 
     /**
@@ -56,24 +50,9 @@ class DeleteGroupLogic extends AbstractControllerLogic
     {
         $group = $this->fetchesGroup->execute(['id' => $request->route('id')]);
 
-        $items = $group->transactions()->get();
+        $this->deletesGroup->execute($group);
 
-        foreach($items as $item) {
-            $bill = $item;
-            $payment = $bill->owner;
-            $group->transactions()->detach($bill->id);
-            $this->updatesTransactionStatus->execute($payment, ApprovalStatus::APPROVED);
-            $this->deletesTransaction->execute($bill);
-        }
-
-        $group->delete();
-
-        //no relationship needed
-          /*            return fractal()
-            ->item($group, new GroupTransformer())
-            ->respond(200, [], JSON_PRETTY_PRINT);*/
-        
-        return $this->resourceResponse(new GroupResource($group));
+        return $this->response([]);
     }
 
 }

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

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

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

@@ -0,0 +1,56 @@
+<?php
+
+
+namespace App\Classes\Modules\Transactions\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Transactions\Services\ListsTransactions;
+use App\Http\Resources\MappableTransactionWithDetailsResource;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Carbon\Carbon;
+
+class ListMappableTransactionWithDetailsLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Retrieved Transactions With Details',
+            'message' => 'You have successfully retrieved a list of transactions'
+        ];
+    }
+
+
+    /** @var ListsTransactions */
+    private $listsTransactions;
+
+    /**
+     * ListTransactionsLogic constructor.
+     * @param ListsTransactions $listsTransactions
+     */
+    public function __construct(ListsTransactions $listsTransactions)
+    {
+        $this->listsTransactions = $listsTransactions;
+    }
+
+
+
+    public function logic(Request $request) : JsonResponse
+    {
+        $filePath     = storage_path('logs/list_mappable_transaction_with_details.log');
+        $textToAppend = Carbon::now()->format('[Y-m-d H:i:s]') . ' ' . $request->input('filters') . PHP_EOL;
+        
+        file_put_contents($filePath, $textToAppend, FILE_APPEND);
+
+        $query = $this->listsTransactions->execute($this->listsTransactions->deserializeFilters($request->input('filters')));
+
+        return $this->collectionResponse(MappableTransactionWithDetailsResource::collection($query));
+
+    }
+
+
+
+}

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

@@ -0,0 +1,53 @@
+<?php
+
+
+namespace App\Classes\Modules\Transactions\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Transactions\Services\ListsTransactions;
+use App\Http\Resources\BookingResource;
+use App\Http\Resources\MappableTransactionResource;
+use App\Http\Resources\TransactionResource;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ListMappableTransactionsLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Retrieved Transactions',
+            'message' => 'You have successfully retrieved a list of transactions'
+        ];
+    }
+
+
+    /** @var ListsTransactions */
+    private $listsTransactions;
+
+    /**
+     * ListTransactionsLogic constructor.
+     * @param ListsTransactions $listsTransactions
+     */
+    public function __construct(ListsTransactions $listsTransactions)
+    {
+        $this->listsTransactions = $listsTransactions;
+    }
+
+
+
+    public function logic(Request $request) : JsonResponse
+    {
+
+        $query = $this->listsTransactions->execute($this->listsTransactions->deserializeFilters($request->input('filters')));
+
+        return $this->collectionResponse(MappableTransactionResource::collection($query));
+
+    }
+
+
+
+}

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

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

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

@@ -0,0 +1,175 @@
+<?php
+
+
+namespace App\Classes\Modules\Transactions\Processors;
+
+use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\Modules\Transactions\Services\FetchesTransaction;
+use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
+use App\Classes\Modules\Transactions\Services\CreatesPaymentTransaction;
+use App\Classes\Modules\Transactions\Services\CreatesTransactionDetail;
+use App\Classes\Modules\Billplzs\Services\CreatesBillplzBill;
+use App\Classes\Modules\Transactions\Services\CreatesTransactionableTransaction;
+use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\Modules\Wallets\Services\UpdatesWalletBalance;
+use App\Models\Transaction;
+use App\Models\Wallet;
+use App\Classes\Modules\Orders\Processors\UpdateDoFromVTPortalProcessor;
+use App\Classes\Modules\Orders\Processors\UpdateDoFromYDPortalProcessor;
+use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
+use Illuminate\Support\Facades\Log;
+
+class CreatePaymentTransactionProcessor
+{
+
+    /** @var GeneratesTransactionBillNumber */
+    private $generatesTransactionBillNumber;
+
+    /** @var CreatesPaymentTransaction */
+    private $createsPaymentTransaction;
+
+    /** @var CreatesBillplzBill */
+    private $createsBillplzBill;
+
+    /** @var CreatesTransactionableTransaction */
+    private $createsTransactionableTransaction;
+
+    /** @var UpdatesWalletBalance */
+    private $updatesWalletBalance;
+
+    /** @var UpdateDoFromVTPortalProcessor */
+    private $updateDoFromVTPortalProcessor;
+
+    /** @var UpdateDoFromYDPortalProcessor */
+    private $updateDoFromYDPortalProcessor ;
+
+    /** @var UpdatesTransactionStatus */
+    private $updatesTransactionStatus ;
+
+    /**
+     * @param FetchesTransaction $fetchesTransaction,
+     * @param GeneratesTransactionBillNumber $generatesTransactionBillNumber,
+     * @param CreatesPaymentTransaction $createsPaymentTransaction
+     * @param CreatesTransactionDetail $createsTransactionDetail
+     * @param CreatesBillplzBill $createsBillplzBil
+     * @param CreatesTransactionableTransaction $createsTransactionableTransaction
+     * @param UpdatesWalletBalance $updatesWalletBalance
+     * @param UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor
+     * @param UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor
+     * @param UpdatesTransactionStatus $updatesTransactionStatus
+     */
+    public function __construct(
+        GeneratesTransactionBillNumber $generatesTransactionBillNumber,
+        CreatesPaymentTransaction $createsPaymentTransaction,
+        CreatesBillplzBill $createsBillplzBill,
+        CreatesTransactionableTransaction $createsTransactionableTransaction,
+        UpdatesWalletBalance $updatesWalletBalance,
+        UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor,
+        UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor,
+        UpdatesTransactionStatus $updatesTransactionStatus
+    )
+    {
+        $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
+        $this->createsPaymentTransaction = $createsPaymentTransaction;
+        $this->createsBillplzBill = $createsBillplzBill;
+        $this->createsTransactionableTransaction = $createsTransactionableTransaction;
+        $this->updatesWalletBalance = $updatesWalletBalance;
+        $this->updateDoFromVTPortalProcessor = $updateDoFromVTPortalProcessor;
+        $this->updateDoFromYDPortalProcessor = $updateDoFromYDPortalProcessor;
+        $this->updatesTransactionStatus = $updatesTransactionStatus;
+    }
+
+    /**
+     * @throws MalformedRequestException
+     */
+    public function execute(Transaction $invoice, $payment_method, $bank_code)
+    {
+        $amount             = $invoice->amount;
+        Log::info($invoice->owner);
+        $company_module     = $invoice->owner->owner->companyModule()->first();
+        $approvalStatus     = ApprovalStatus::PENDING_SUBMISSION;
+        $billNumber         = $this->generatesTransactionBillNumber->execute('PYMT-');
+        $payment_reference  = null;
+
+        if ($payment_method == PaymentMethodType::PAYMENT_GATEWAY) {
+
+            // create billplz transaction
+            $payment_method = PaymentMethodType::PAYMENT_GATEWAY;
+            $billPlzBill = $this->createsBillplzBill->execute(
+                $company_module->name,
+                (app()->environment(['production'])) ? $company_module->employees()->first()->email : 'uldvstar@gmail.com',
+                'This payment is for the invoice number . ' . $billNumber,
+                $amount,
+                $billNumber,
+                $bank_code,
+                true
+            );
+
+            $payment_reference = $billPlzBill->id;
+        }
+        else if ($payment_method === PaymentMethodType::WALLET) {
+            /** @var Wallet $wallet */
+            $wallet = $company_module->wallets()->first();
+
+            if((float) number_format(($wallet->amount - $amount),2) < 0){
+                throw new MalformedRequestException('Insufficient wallet balance. Please Top up your wallet.');
+            }
+
+            $walletPaymentBillNumber = $this->generatesTransactionBillNumber->execute('PYMT-');
+
+            $transaction_object = new TransactionObject($walletPaymentBillNumber, TransactionType::PAYMENT, 1, $company_module->id, 1, PaymentMethodType::WALLET, $amount, $amount, 1, 1, 1, 0, 0, null, ApprovalStatus::APPROVED, [], '');
+            $transaction = $this->createsTransactionableTransaction->execute($wallet, $transaction_object);
+
+            $payment_reference = $walletPaymentBillNumber;
+
+            $this->updatesWalletBalance->execute($wallet, ($amount * -1));
+
+            $packingList = $invoice->owner;
+            $order = $packingList->owner;
+            $packingList->status = ApprovalStatus::APPROVED;
+            $packingList->save();
+
+            if(app()->environment('production')){
+                $this->updateDoFromVTPortalProcessor->execute($packingList);
+                $this->updateDoFromYDPortalProcessor->execute($packingList);
+            }
+
+            // later use this variabke to create a approved payment transaction
+            $approvalStatus = ApprovalStatus::APPROVED;
+
+            // update invoice to completed
+            $this->updatesTransactionStatus->execute($invoice, ApprovalStatus::COMPLETED);
+
+        }
+        else {
+            $payment_method = PaymentMethodType::CASH;
+        }
+
+        $object = new TransactionObject(
+            $billNumber,
+            TransactionType::PAYMENT,
+            $company_module->id,
+            1,
+            1,
+            $payment_method,
+            $amount,
+            $amount,
+            1,
+            1,
+            0,
+            0,
+            0,
+            null,
+            $approvalStatus,
+            null,
+            $payment_reference
+        );
+
+        $payment_transaction = $this->createsPaymentTransaction->execute($invoice, $object);
+
+        return $payment_transaction;
+    }
+}

app/Classes/Modules/Transactions/Services/DeletesGroup.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Classes\Modules\Transactions\Services;
+
+use App\Classes\General\Eloquent\AbstractDeleteRecord;
+use App\Models\Group;
+
+class DeletesGroup extends AbstractDeleteRecord
+{
+
+    /**
+     * @param Group $model
+     * @return mixed
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Group $model) {
+        return $this->handler($model);
+    }
+}

app/Classes/Modules/Transactions/Services/FetchesGroup.php

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

app/Classes/Modules/Transactions/Services/UpdatesTransactionStatus.php

@@ -4,20 +4,20 @@ namespace App\Classes\Modules\Transactions\Services;
 
 use App\Classes\General\Eloquent\AbstractUpdateRecord;
 use App\Models\Transaction;
-use App\Classes\Modules\PerfexCRM\Processors\TransactionToPerfexCRMProcessor;
+use App\Classes\Modules\PerfexCRM\Processors\TransactionToPerfexCRMV2Processor;
 
 class UpdatesTransactionStatus extends AbstractUpdateRecord
 {
-    /** @var TransactionToPerfexCRMProcessor */
-    private $transactionToPerfexCRMProcessor;
+    /** @var TransactionToPerfexCRMV2Processor */
+    private $transactionToPerfexCRMV2Processor;
 
     /**
      * UpdatesTransactionStatus constructor.
-     * @param TransactionToPerfexCRMProcessor $transactionToPerfexCRMProcessor
+     * @param TransactionToPerfexCRMProcessor $transactionToPerfexCRMV2Processor
      */
-    public function __construct(TransactionToPerfexCRMProcessor $transactionToPerfexCRMProcessor)
+    public function __construct(TransactionToPerfexCRMV2Processor $transactionToPerfexCRMV2Processor)
     {
-        $this->transactionToPerfexCRMProcessor = $transactionToPerfexCRMProcessor;
+        $this->transactionToPerfexCRMV2Processor = $transactionToPerfexCRMV2Processor;
     }
 
     /**
@@ -33,7 +33,7 @@ class UpdatesTransactionStatus extends AbstractUpdateRecord
         $result = $this->handler($model);
 
         if(config('perfexcrm.is_enabled') == 'true'){
-            $this->transactionToPerfexCRMProcessor->execute($transaction, $status);
+            $this->transactionToPerfexCRMV2Processor->execute($transaction, $status);
         }
         return $result;
     }

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

@@ -2,21 +2,15 @@
 
 namespace App\Classes\Modules\Wallets\ControllersLogic;
 
-use App\Classes\Exceptions\MalformedRequestException;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
-use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
 use App\Classes\Modules\Companies\Services\FetchesCompanyModule;
 use App\Classes\Modules\Wallets\Services\CreatesWallet;
 use App\Classes\Modules\Wallets\Services\GeneratesWalletCode;
 use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
 use App\Classes\Modules\Billplzs\Services\CreatesBillplzBill;
 use App\Classes\Modules\Transactions\Services\CreatesTransactionableTransaction;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Classes\ValueObjects\Constants\PaymentMethodType;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\Modules\Wallets\Processors\CreateWalletTopUpTransactionProcessor;
 use App\Http\Resources\WalletTransactionResource;
-use App\Models\Wallet;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
@@ -52,6 +46,9 @@ class TopUpWalletLogic extends AbstractControllerLogic
     /** @var CreatesTransactionableTransaction */
     private $createsTransactionableTransaction;
 
+    /** @var CreateWalletTopUpTransactionProcessor */
+    private $createWalletTopUpTransactionProcessor;
+
 
     /**
      * TopUpWalletLogic constructor.
@@ -61,8 +58,9 @@ class TopUpWalletLogic extends AbstractControllerLogic
      * @param GeneratesTransactionBillNumber $generatesTransactionBillNumber
      * @param CreatesBillplzBill $createsBillplzBill
      * @param CreatesTransaction $createsTransaction
+     * @param CreateWalletTopUpTransactionProcessor $createWalletTopUpTransactionProcessor
      */
-    public function __construct(FetchesCompanyModule $fetchesCompanyModule, GeneratesWalletCode $generatesWalletCode, CreatesWallet $createsWallet, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CreatesBillplzBill $createsBillplzBill, CreatesTransactionableTransaction $createsTransactionableTransaction)
+    public function __construct(FetchesCompanyModule $fetchesCompanyModule, GeneratesWalletCode $generatesWalletCode, CreatesWallet $createsWallet, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CreatesBillplzBill $createsBillplzBill, CreatesTransactionableTransaction $createsTransactionableTransaction, CreateWalletTopUpTransactionProcessor $createWalletTopUpTransactionProcessor)
     {
         $this->fetchesCompanyModule = $fetchesCompanyModule;
         $this->generatesWalletCode = $generatesWalletCode;
@@ -70,6 +68,7 @@ class TopUpWalletLogic extends AbstractControllerLogic
         $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
         $this->createsBillplzBill = $createsBillplzBill;
         $this->createsTransactionableTransaction = $createsTransactionableTransaction;
+        $this->createWalletTopUpTransactionProcessor = $createWalletTopUpTransactionProcessor;
     }
 
     /**
@@ -82,27 +81,7 @@ class TopUpWalletLogic extends AbstractControllerLogic
         $amount = floatval(str_replace(',', '', $request->input('amount')));
         $companyModule = $this->fetchesCompanyModule->execute(['id' => $request->input('company_module_id')]);
 
-        /** @var Wallet $wallet */
-        $wallet = $companyModule->wallets()->first();
-
-        if (!$wallet) {
-            $object = new WalletObject($companyModule->id, 1, $this->generatesWalletCode->execute());
-            /** @var Wallet $wallet */
-            $wallet = $this->createsWallet->execute($object, $companyModule);
-        }
-
-        $user = $companyModule->employees()->first();
-        $billNumber = $this->generatesTransactionBillNumber->execute('TOPUP-');
-
-        if($amount < 0) {
-            throw new MalformedRequestException('Top up credit value must be greater than zero.');
-        }
-
-        $billPlzBill = $this->createsBillplzBill->execute($companyModule->name, $user->email, 'This payment is credit topup for company ref. ' . $companyModule->reference, $amount, $billNumber, $request->input('bank_code'), true);
-
-        $transaction_object = new TransactionObject($billNumber, TransactionType::TOP_UP, 1, $companyModule->id, 1, PaymentMethodType::PAYMENT_GATEWAY, $amount, $amount, 1, 1, 1, 0, 0, null, ApprovalStatus::PENDING_SUBMISSION, [], $billPlzBill->id);
-
-        $transaction = $this->createsTransactionableTransaction->execute($wallet, $transaction_object);
+        $transaction = $this->createWalletTopUpTransactionProcessor->execute($companyModule, $amount, $request->input('bank_code'));
 
         return $this->resourceResponse(new WalletTransactionResource($transaction));
     }

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

@@ -0,0 +1,91 @@
+<?php
+
+
+namespace App\Classes\Modules\Wallets\Processors;
+
+use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
+use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
+use App\Classes\Modules\Companies\Services\FetchesCompanyModule;
+use App\Classes\Modules\Wallets\Services\CreatesWallet;
+use App\Classes\Modules\Wallets\Services\GeneratesWalletCode;
+use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
+use App\Classes\Modules\Billplzs\Services\CreatesBillplzBill;
+use App\Classes\Modules\Transactions\Services\CreatesTransactionableTransaction;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Models\CompanyModule;
+use App\Models\Wallet;
+use PhpOffice\PhpSpreadsheet\Calculation\Logical\Boolean;
+
+class CreateWalletTopUpTransactionProcessor
+{
+    /** @var GeneratesWalletCode */
+    private $generatesWalletCode;
+
+    /** @var CreatesWallet  */
+    private $createsWallet;
+
+    /** @var GeneratesTransactionBillNumber  */
+    private $generatesTransactionBillNumber;
+
+    /** @var CreatesBillplzBill */
+    private $createsBillplzBill;
+
+    /** @var CreatesTransactionableTransaction */
+    private $createsTransactionableTransaction;
+
+    /**
+     * @param GeneratesWalletCode $generatesWalletCode
+     * @param CreatesWallet $createsWallet
+     * @param GeneratesTransactionBillNumber $generatesTransactionBillNumber
+     * @param CreatesBillplzBill $createsBillplzBill
+     * @param CreatesTransaction $createsTransaction
+     */
+    public function __construct(
+        GeneratesWalletCode $generatesWalletCode, 
+        CreatesWallet $createsWallet, 
+        GeneratesTransactionBillNumber $generatesTransactionBillNumber, 
+        CreatesBillplzBill $createsBillplzBill, 
+        CreatesTransactionableTransaction $createsTransactionableTransaction
+    ) 
+    {
+        $this->generatesWalletCode = $generatesWalletCode;
+        $this->createsWallet = $createsWallet;
+        $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
+        $this->createsBillplzBill = $createsBillplzBill;
+        $this->createsTransactionableTransaction = $createsTransactionableTransaction;
+    }
+
+    /**
+     * @throws MalformedRequestException
+     */
+    public function execute(CompanyModule $companyModule, $amount, $bank_code, ?bool $groupTransaction = false)
+    {
+        /** @var Wallet $wallet */
+        $wallet = $companyModule->wallets()->first();
+
+        if (!$wallet) {
+            $object = new WalletObject($companyModule->id, 1, $this->generatesWalletCode->execute());
+            /** @var Wallet $wallet */
+            $wallet = $this->createsWallet->execute($object, $companyModule);
+        }
+
+        $user = $companyModule->employees()->first();
+        $billNumber = $this->generatesTransactionBillNumber->execute('TOPUP-');
+
+        if($amount < 0) {
+            throw new MalformedRequestException('Top up credit value must be greater than zero.');
+        }
+
+        $billPlzBill = $this->createsBillplzBill->execute($companyModule->name, $user->email, 'This payment is credit topup for company ref. ' . $companyModule->reference, $amount, $billNumber, $bank_code, true);
+
+        // IF $groupTransaction, transaction type is GROUP_PAYMENT
+        $transaction_object = new TransactionObject($billNumber, $groupTransaction? TransactionType::GROUP_PAYMENT: TransactionType::TOP_UP, 1, $companyModule->id, 1, PaymentMethodType::PAYMENT_GATEWAY, $amount, $amount, 1, 1, 1, 0, 0, null, ApprovalStatus::PENDING_SUBMISSION, [], $billPlzBill->id);
+
+        $transaction = $this->createsTransactionableTransaction->execute($wallet, $transaction_object);
+
+        return $transaction;
+    }
+}

app/Classes/Notifications/InvoiceIssuedEmail.php

@@ -6,7 +6,6 @@ namespace App\Classes\Notifications;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\TransactionType;
 use App\Models\PackingList;
-use App\Models\PasswordReset;
 use App\Models\User;
 use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Support\Facades\Storage;
@@ -39,7 +38,7 @@ class InvoiceIssuedEmail extends AbstractEmail
 
         return (new MailMessage)
             ->subject('Att: '.$this->user->name.' - Invoice for order no.'. $this->packingList->owner->reference)
-            ->attach(Storage::disk('documents')->get($invoiceDocument->file->file_info->original->file), [
+            ->attach(Storage::disk('documents')->get($invoiceDocument->first()->file->file_info->original->file), [
                 'as' => 'name.pdf',
                 'mime' => 'application/pdf',
             ])->view('emails.shipment.invoice', ['user' => $this->user, 'packingList' => $this->packingList]);

app/Classes/Notifications/ShipmentDepartureEmail.php

@@ -9,6 +9,7 @@ use App\Models\PackingList;
 use App\Models\PasswordReset;
 use App\Models\User;
 use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Support\Facades\Storage;
 
 class ShipmentDepartureEmail extends AbstractEmail
 {
@@ -42,7 +43,7 @@ class ShipmentDepartureEmail extends AbstractEmail
 
         return (new MailMessage)
             ->subject('Your packages are on the way to malaysia - Invoice pending payment for order no.'. $this->packingList->owner->reference)
-            ->attach(Storage::disk('documents')->get($invoiceDocument->file->file_info->original->file), [
+            ->attach(Storage::disk('documents')->get($invoiceDocument->first()->file->file_info->original->file), [
                 'as' => 'name.pdf',
                 'mime' => 'application/pdf',
             ])->bcc(['email_test@cief-malaysia.com'])->view('emails.shipment.ETD', ['user' => $this->user, 'packingList' => $this->packingList]);

app/Classes/ValueObjects/Constants/PerfexCRMTasks.php

@@ -16,7 +16,9 @@ class PerfexCRMTasks
         'department' => '',
         'status' => PerfexCRMTaskStatus::COMPLETED,
         'priority' => PerfexCRMTaskPriority::DEFAULT,
-        'duedate' => 0
+        'duedate' => 0,
+        'is_allow_multiple' => false,
+        'is_on_task_completion_update' => false
     ];
 
     public const TASK_POST_PAYMENT_1 = [
@@ -35,7 +37,9 @@ class PerfexCRMTasks
         'department' => 'Accounts',
         'status' => PerfexCRMTaskStatus::IN_PROGRESS,
         'priority' => PerfexCRMTaskPriority::HIGH,
-        'duedate' => 0
+        'duedate' => 0,
+        'is_allow_multiple' => false,
+        'is_on_task_completion_update' => false
     ];
     public const TASK_POST_PAYMENT_2 = [
         'name' => 'Approve Payment',
@@ -47,7 +51,9 @@ class PerfexCRMTasks
         'department' => 'Accounts',
         'status' => '',
         'priority' => PerfexCRMTaskPriority::HIGH,
-        'duedate' => 0
+        'duedate' => 0,
+        'is_allow_multiple' => false,
+        'is_on_task_completion_update' => false
     ];
     public const TASK_POST_PAYMENT_3 = [
         'name' => 'Issue Shipping Autocount Invoince',
@@ -65,7 +71,9 @@ class PerfexCRMTasks
         'department' => 'Accounts',
         'status' => '',
         'priority' => PerfexCRMTaskPriority::MEDIUM,
-        'duedate' => 1
+        'duedate' => 1,
+        'is_allow_multiple' => false,
+        'is_on_task_completion_update' => false
     ];
     public const TASK_POST_PAYMENT_3_1 = [
         'name' => 'Issue Shipping Autocount OR',
@@ -78,7 +86,9 @@ class PerfexCRMTasks
         'department' => 'Accounts',
         'status' => '',
         'priority' => PerfexCRMTaskPriority::DEFAULT,
-        'duedate' => 0
+        'duedate' => 0,
+        'is_allow_multiple' => false,
+        'is_on_task_completion_update' => false
     ];
     public const TASK_POST_PAYMENT_4 = [
         'name' => 'Knockoff Invoice',
@@ -96,7 +106,9 @@ class PerfexCRMTasks
         'department' => 'Accounts',
         'status' => '',
         'priority' => PerfexCRMTaskPriority::MEDIUM,
-        'duedate' => 1
+        'duedate' => 1,
+        'is_allow_multiple' => false,
+        'is_on_task_completion_update' => false
     ];
 
     public const TASK_LOADED_CONTAINER_1 = [
@@ -109,7 +121,9 @@ class PerfexCRMTasks
         'department' => 'Operations',
         'status' => PerfexCRMTaskStatus::IN_PROGRESS,
         'priority' => PerfexCRMTaskPriority::HIGH,
-        'duedate' => 1
+        'duedate' => 1,
+        'is_allow_multiple' => false,
+        'is_on_task_completion_update' => false
     ];
 
     public const TASK_LOADED_CONTAINER_2 = [
@@ -122,7 +136,9 @@ class PerfexCRMTasks
         'department' => 'Customer Services',
         'status' => '',
         'priority' => PerfexCRMTaskPriority::HIGH,
-        'duedate' => 1
+        'duedate' => 1,
+        'is_allow_multiple' => false,
+        'is_on_task_completion_update' => false
     ];
 
 
@@ -142,6 +158,8 @@ class PerfexCRMTasks
         'department' => 'Operations',
         'status' => PerfexCRMTaskStatus::IN_PROGRESS,
         'priority' => PerfexCRMTaskPriority::DEFAULT,
-        'duedate' => 0
+        'duedate' => 0,
+        'is_allow_multiple' => false,
+        'is_on_task_completion_update' => false
     ];
 }

app/Classes/ValueObjects/Constants/RouteType.php

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

app/Classes/ValueObjects/Constants/TransactionType.php

@@ -4,15 +4,12 @@ namespace App\Classes\ValueObjects\Constants;
 
 final class TransactionType {
 
+    // public const PAYMENT_ATTEMPT = 0;
+    
     public const SHIPPING_INVOICE = 1;
     
     public const PAYMENT = 2;
 
-    // public const PAYMENT_ATTEMPT = 0;
-
-
-    // public const INVOICE = 2;
-
     // public const BILL = 3;
 
     // public const PERFORMA = 4;
@@ -36,6 +33,9 @@ final class TransactionType {
     public const CASH_BACK = 13;
 
     // public const SHIPPING_COST = 14;
+
+    public const GROUP_PAYMENT = 15;
+    
     public const TRANSACTION_TYPE_ID = [
         self::SHIPPING_INVOICE   => "Shipping Invoice",
         self::PAYMENT            => "Payment",

app/Console/Commands/FixBillplzFailedCallbackPayment.php

@@ -77,7 +77,6 @@ class FixBillplzFailedCallbackPayment extends Command
     {
         ini_set('memory_limit', '-1'); 
 
-        $this->info(Carbon::now() . ' : Fix failled callback from billplz cron started.');
         $this->outputArray = []; 
         $start   = new Carbon();
 
@@ -85,6 +84,11 @@ class FixBillplzFailedCallbackPayment extends Command
 
         $transactions = Transaction::where('type', TransactionType::PAYMENT)->where('payment_method', PaymentMethodType::PAYMENT_GATEWAY)->whereNotIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->get();
         $totalTransactions = count($transactions);
+
+        if ($totalTransactions) {
+            $this->info(Carbon::now() . ' : Fix failled callback from billplz cron started.');
+        }
+
         $counter = 1;
         $totalAmount = 0;
         foreach ($transactions as $transaction){
@@ -180,6 +184,9 @@ class FixBillplzFailedCallbackPayment extends Command
         $end = new Carbon();
         $elapsedTime = $start->diff($end)->format('%H:%I:%S');
 
-        $this->info(Carbon::now() . ' : Done Billplz Failled Callback. ElapsedTime: ' . $elapsedTime . '. Total: ' . $totalAmount);
+        if ($totalTransactions) {
+            $this->info(Carbon::now() . ' : Done Billplz Failled Callback. ElapsedTime: ' . $elapsedTime . '. Total: ' . $totalAmount);
+        }
+
     }
 }

app/Console/Commands/FixDuplicateContainerReference.php

@@ -0,0 +1,77 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\Container;
+use App\Models\ContainerPackingList;
+use Carbon\Carbon;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;
+
+class FixDuplicateContainerReference extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'fix-duplicate-container-reference';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Fix all duplicated container reference';
+
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        ini_set('memory_limit', '-1');
+
+        $this->info(Carbon::now() . ' : Started.');
+        $start   = new Carbon();
+
+        $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();
+                $this->info('Deleted container ' . $container->id);
+                $container->delete();
+            }
+        }
+
+        $end = new Carbon();
+        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
+
+        $this->info(Carbon::now() . ' : Done. ElapsedTime: ' . $elapsedTime);
+    }
+}

app/Console/Commands/FixPackingList.php

@@ -0,0 +1,88 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\PackingList;
+use Carbon\Carbon;
+use Illuminate\Console\Command;
+
+class FixPackingList extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'fix-packinglist';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Fix PackingList';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        $packingLists = PackingList::whereDoesntHave('packages')->get();
+
+        if ($packingLists->isNotEmpty()) {
+            $this->info(Carbon::now() . ' : ' . $this->description . ' cron started.');
+            $start = Carbon::now();
+
+            $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();
+                            $this->info('Package ID: ' . $latestPackage->id . ' has been restored');
+                            $restoredPackagesCount++;
+                            $restoredPackagesIds[] = $latestPackage->id;
+                        }
+                    }
+                }
+            }
+
+            $end = Carbon::now();
+            $elapsedTime = $start->diff($end)->format('%H:%I:%S');
+
+            $this->info(Carbon::now() . ' : Done ' . $this->description . '. ElapsedTime: ' . $elapsedTime . '.');
+            $this->info('Restored Packages Count: ' . $restoredPackagesCount);
+        }
+    }
+}

app/Console/Kernel.php

@@ -28,35 +28,40 @@ class Kernel extends ConsoleKernel
     protected function schedule(Schedule $schedule)
     {
 
-        // $schedule->command('command:curlVTCommand')
-        //     ->cron('0 8 * * *')
-        //     ->withoutOverlapping()
-        //     ->appendOutputTo (storage_path().'/logs/curlvt.log');
+        $schedule->command('command:curlVTCommand')
+            ->cron('0 8 * * *')
+            ->withoutOverlapping()
+            ->appendOutputTo (storage_path().'/logs/curlvt.log');
 
-        // $schedule->command('command:curlYdOrderListCommand')
-        //     ->cron('30 9-18/3 * * *')
-        //     ->withoutOverlapping()
-        //     ->appendOutputTo (storage_path().'/logs/curlyd.log');
+        $schedule->command('command:curlYdOrderListCommand')
+            ->cron('0 9-18/3 * * *')
+            ->withoutOverlapping()
+            ->appendOutputTo (storage_path().'/logs/curlyd.log');
+
+        $schedule->command('fix-packinglist')
+            ->cron('30 9-18/3 * * *')
+            ->withoutOverlapping()
+            ->appendOutputTo (storage_path().'/logs/fix_packinglist.log');
 
         // $schedule->command('command:curlYdOrderListCommand')
         //     ->cron('0 9 * * *')
         //     ->withoutOverlapping()
         //     ->appendOutputTo (storage_path().'/logs/departure_email.log');
 
+        $schedule->command('fix-duplicate-container-reference')
+            ->cron('0 1 * * *')
+            ->withoutOverlapping()
+            ->appendOutputTo (storage_path().'/logs/fix_duplicate_container_reference.log');
+
         $schedule->command('invoice:generate')
             ->hourly()
             ->withoutOverlapping()
             ->appendOutputTo (storage_path().'/logs/auto_generate_invoice.log');
 
-        $schedule->command('approve:invoice')
+        $schedule->command('billplz-failed-callback:fix')
             ->hourly()
             ->withoutOverlapping()
-            ->appendOutputTo (storage_path().'/logs/approve_invoice.log');
-
-        $schedule->command('billplz-failed-callback:fix')
-            ->dailyAt('00:00')
-            ->withoutOverlapping()
-            ->appendOutputTo (storage_path().'/logs/dix_failed_callback_from_billplz.log');
+            ->appendOutputTo (storage_path().'/logs/fix_failed_callback_from_billplz.log');
     }
 
     /**

app/Http/Controllers/PackingLists/CreateWarehouseTransportController.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\PackingLists;
+
+use App\Classes\Modules\PackingLists\ControllersLogic\CreateWarehouseTransportLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreateWarehouseTransportController
+{
+    /**
+     * @param Request $request
+     * @param CreateContainerLogic $logic
+     * @return JsonResponse
+     */
+    public function create(Request $request, CreateWarehouseTransportLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}

app/Http/Controllers/Reports/MonthlyReportController.php

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

app/Http/Controllers/Transactions/CreateCombinedInvoicesController.php

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

app/Http/Controllers/Transactions/ListMappableTransactionWithDetailsController.php

@@ -0,0 +1,20 @@
+<?php
+
+
+namespace App\Http\Controllers\Transactions;
+
+use App\Classes\Modules\Transactions\ControllersLogic\ListMappableTransactionWithDetailsLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+
+class ListMappableTransactionWithDetailsController
+{
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     */
+    public function list(Request $request, ListMappableTransactionWithDetailsLogic $logic) : JsonResponse {
+        return $logic->execute($request);
+    }
+}

app/Http/Controllers/Transactions/ListMappableTransactionsController.php

@@ -0,0 +1,20 @@
+<?php
+
+
+namespace App\Http\Controllers\Transactions;
+
+use App\Classes\Modules\Transactions\ControllersLogic\ListMappableTransactionsLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+
+class ListMappableTransactionsController
+{
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     */
+    public function list(Request $request, ListMappableTransactionsLogic $logic) : JsonResponse {
+        return $logic->execute($request);
+    }
+}

app/Http/Kernel.php

@@ -38,13 +38,11 @@ class Kernel extends HttpKernel
             \Illuminate\View\Middleware\ShareErrorsFromSession::class,
             \App\Http\Middleware\VerifyCsrfToken::class,
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
-            // \App\Http\Middleware\WebRouteLogs::class,
         ],
 
         'api' => [
             'throttle:300,1',
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
-            // \App\Http\Middleware\ApiRouteLogs::class,
         ],
 
         'apipub' => [

app/Http/Middleware/ApiRouteLogs.php

@@ -1,64 +0,0 @@
-<?php
-
-namespace App\Http\Middleware;
-
-use Closure;
-use Illuminate\Support\Str;
-use Illuminate\Http\Request;
-use App\Models\RouteLog;
-use App\Classes\ValueObjects\Constants\RouteType;
-use Illuminate\Support\Facades\Auth;
-
-class ApiRouteLogs
-{
-	/**
-	 * Handle an incoming request.
-	 *
-	 * @param  \Illuminate\Http\Request  $request
-	 * @param  \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse)  $next
-	 * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse
-	 */
-	public function handle(Request $request, Closure $next)
-	{
-		$ip_address = getenv('REMOTE_ADDR') == '::1' ? '127.0.0.1' : getenv('REMOTE_ADDR');
-		$url = urldecode($request->fullUrl());
-		$request_method = $request->method();
-		$platform = $request->header('sec-ch-ua-platform');
-		$browser = Str::after($request->header('sec-ch-ua'), 'Not?A_Brand";v="8", "Chromium";v="108", "');
-		$geo = unserialize(file_get_contents("http://www.geoplugin.net/php.gp?ip=$ip_address"));
-		$longitude = $geo["geoplugin_longitude"];
-		$latitude = $geo["geoplugin_latitude"];
-		$last_page = url()->previous();
-		$countryName = $geo["geoplugin_countryName"];
-
-		$user_id = Auth::user() ? Auth::user()->id : 0;
-
-		// if ($user_id != 0) {
-		// 	// $ip_address
-		// 	$webRouteLogWithSameIp = RouteLog::where('ip_address', $ip_address)->where('user_id', 0)->get();
-		// 	dd($webRouteLogWithSameIp);
-		// 	foreach($webRouteLogWithSameIp as $result){
-		// 		$result
-		// 	}
-		// }
-
-		$route_log = [
-		    'user_id' => $user_id,
-		    // 'ip_address' => $request->ip(),
-		    'ip_address' => $ip_address,
-		    'url' => $url,
-		    'request_method' => $request_method,
-		    'browser' => $browser,
-		    'platform' => $platform,
-		    'longitude' => $longitude,
-		    'latitude' => $latitude,
-		    'last_page' => $last_page,
-		    'countryname' => $countryName,
-		    'route_type' => RouteType::API,
-		];
-
-		RouteLog::create($route_log);
-
-		return $next($request);
-	}
-}

app/Http/Middleware/WebRouteLogs.php

@@ -1,55 +0,0 @@
-<?php
-
-namespace App\Http\Middleware;
-
-use Closure;
-use Illuminate\Support\Str;
-use Illuminate\Http\Request;
-use App\Models\RouteLog;
-use App\Classes\ValueObjects\Constants\RouteType;
-use Illuminate\Support\Facades\Auth;
-
-class WebRouteLogs
-{
-	/**
-	 * Handle an incoming request.
-	 *
-	 * @param  \Illuminate\Http\Request  $request
-	 * @param  \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse)  $next
-	 * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse
-	 */
-	public function handle(Request $request, Closure $next)
-	{
-		$ip_address = getenv('REMOTE_ADDR') == '::1' ? '127.0.0.1' : getenv('REMOTE_ADDR');
-		$url = $request->fullUrl();
-		$request_method = $request->method();
-		$platform = $request->header('sec-ch-ua-platform');
-		$browser = Str::after($request->header('sec-ch-ua'), 'Not?A_Brand";v="8", "Chromium";v="108", "');
-		$geo = unserialize(file_get_contents("http://www.geoplugin.net/php.gp?ip=$ip_address"));
-		$longitude = $geo["geoplugin_longitude"];
-		$latitude = $geo["geoplugin_latitude"];
-		$last_page = url()->previous();
-		$countryName = $geo["geoplugin_countryName"];
-
-		$route_log = [
-		    'user_id' => Auth::user() ? Auth::user()->id : 0,
-		    // 'ip_address' => $request->ip(),
-		    'ip_address' => $ip_address,
-		    'url' => $url,
-		    'request_method' => $request_method,
-		    'browser' => $browser,
-		    'platform' => $platform,
-		    'longitude' => $longitude,
-		    'latitude' => $latitude,
-		    'last_page' => $last_page,
-		    'countryname' => $countryName,
-		    'route_type' => RouteType::WEB,
-		];
-
-		// dd($route_log);
-
-		RouteLog::create($route_log);
-
-		return $next($request);
-	}
-}

app/Http/Resources/AirShipmentItemPriceResource.php

@@ -2,7 +2,6 @@
 
 namespace App\Http\Resources;
 
-use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 class AirShipmentItemPriceResource extends JsonResource
@@ -10,10 +9,10 @@ class AirShipmentItemPriceResource extends JsonResource
     /**
      * Transform the resource into an array.
      *
-     * @param  Request  $request
+     * @param  \Illuminate\Http\Request  $request
      * @return array
      */
-    public function toArray($request): array
+    public function toArray($request)
     {
         $object = $this->resource;
         $detailsArray = (array)json_decode($object['details']);

app/Http/Resources/AnnouncementResource.php

@@ -2,7 +2,6 @@
 
 namespace App\Http\Resources;
 
-use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 use Carbon\Carbon;
 
@@ -11,10 +10,10 @@ class AnnouncementResource extends JsonResource
     /**
      * Transform the resource into an array.
      *
-     * @param  Request  $request
+     * @param  \Illuminate\Http\Request  $request
      * @return array
      */
-    public function toArray($request): array
+    public function toArray($request)
     {
         return [
             'id' => $this->id,

app/Http/Resources/BankResource.php

@@ -2,7 +2,6 @@
 
 namespace App\Http\Resources;
 
-use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 class BankResource extends JsonResource
@@ -10,10 +9,10 @@ class BankResource extends JsonResource
     /**
      * Transform the resource into an array.
      *
-     * @param  Request  $request
+     * @param  \Illuminate\Http\Request  $request
      * @return array
      */
-    public function toArray($request): array
+    public function toArray($request)
     {
         return [
             'id' => $this->id,

app/Http/Resources/BookingResource.php

@@ -11,7 +11,6 @@ use App\Classes\ValueObjects\Constants\DocumentType;
 use Carbon\Carbon;
 use Illuminate\Http\Resources\Json\JsonResource;
 
-/*todo delete this*/
 class BookingResource extends JsonResource
 {
 

app/Http/Resources/CompanyModuleResource.php

@@ -50,6 +50,7 @@ class CompanyModuleResource extends JsonResource
             'warehouseCharges' => array_key_exists($this->id, $segmentConstant) ? $segmentConstant[$this->id] : null,
             'connections' => $this->connections,
             'contact' => new ContactResource ($this->when($this->has('contacts'), $this->contacts->first())),
+            'debtor' => $this->company->debtor,
         ];
 
     }

app/Http/Resources/DocumentResource.php

@@ -28,16 +28,4 @@ class DocumentResource extends JsonResource
             'created_at' => Carbon::parse($this->created_at)->format('d-m-Y h:i:s A')
         ];
     }
-
-    /**
-     * include only when should include file, to be loaded if needed in the UI
-     * @param bool $includeFile
-     * @return bool
-     */
-    private function shouldIncludeFiles(bool $includeFile): bool
-    {
-        return $includeFile;
-    }
-
-
 }

app/Http/Resources/GroupResource.php

@@ -3,12 +3,8 @@
 namespace App\Http\Resources;
 
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\DocumentType;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Models\Booking;
-use App\Models\Transaction;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
 use Carbon\Carbon;
-use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 class GroupResource extends JsonResource
@@ -22,9 +18,8 @@ class GroupResource extends JsonResource
     public function toArray($request)
     {
 
-        if(!$this->issuerCompany){
-            dd($this->id);
-        }
+        // dd($this->groupTransactions);
+
         return [
             'id' => $this->id,
             'original_amount' => (float) $this->original_amount,
@@ -36,18 +31,12 @@ class GroupResource extends JsonResource
             'currency' => new CurrencyResource($this->currency),
             'created_at' => Carbon::parse($this->created_at)->format('d-m-Y h:i:s A'),
             'currency_rate' => (float) $this->currency_rate,
-            'transactions' => $this->transactions()->get()->pluck('owner.owner.marking'),
-            'complete_transactions' => $this->transactions()->whereHasMorph('owner', [Transaction::class], function($query){
-                return $query->whereHas('booking', function($query){
-                    return $query->whereHas('transactions', function($query){
-                        return $query->where('type', TransactionType::PURCHASE_ORDER)->where('status', '=', ApprovalStatus::APPROVED);
-                    });
-                });
-            })->get()->pluck('owner.owner.marking'),
-            'documents' => [
-                'currency_order' => new DocumentResource($this->documents()->where('document_type', DocumentType::CURRENCY_VENDOR_ORDER)->first()),
-                'purchase_order' => new DocumentResource($this->documents()->where('document_type', DocumentType::BULK_PURCHASE_ORDER)->first())
-            ]
+            'status' => $this->status,
+            'status_name' => ApprovalStatus::APPROVAL_STATUS_ID[$this->status],
+            'payment_method' => $this->payment_method,
+            'payment_method_name' => ucwords(PaymentMethodType::PAYMENT_METHODS_ID[$this->payment_method]),
+            'invoices' => GroupTransactionResource::collection($this->groupTransactions),
+            'reference' => $this->reference,
         ];
     }
 }