Disable help menu

CRM invoice decimal problem fix + fetch invoice fail fix + debug log update

See merge request CIEFWorldwideSdnBhd/shipping-portal!170

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

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Classes\Exceptions;
+
+use App\Classes\ValueObjects\Constants\HttpStatus;
+use Illuminate\Support\Facades\Log;
+
+final class ConnectionErrorException extends ServiceApiException {
+    public function __construct(?string $message = null, ?string $exceptionMessage = null, ?string $payload = null, ?string $exceptionTrace = null) {
+        Log::error($message. ": ". $exceptionMessage);
+        if($payload){
+            Log::error('Payload: '.$payload);
+        }
+        if($exceptionTrace){
+            Log::error($exceptionTrace);
+        }
+        parent::__construct($message ?? 'A connection error has occurred. Please check application logs for more information.',
+            HttpStatus::SERVER_ERROR);
+    }
+}

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

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

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

@@ -4,7 +4,7 @@ namespace App\Classes\General\Eloquent\Filters;
 
 use Illuminate\Database\Eloquent\Builder;
 
-class OwnerType implements Filter
+class ShortUrl 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('short_url', $value);
     }
 
-}
+}

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

@@ -131,10 +131,10 @@ class CallbackBillplzLogic
 
             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/Companies/ControllersLogic/ListCompaniesLogic.php

@@ -3,16 +3,13 @@
 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\ListsCompanies;
 use App\Classes\Modules\Companies\Standards\Rules\CanListCompanies;
-use App\Transformers\CompanyTransformer;
+use App\Http\Resources\CompanyResource;
+use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
-use Spatie\Fractalistic\ArraySerializer;
 
 class ListCompaniesLogic extends AbstractControllerLogic
 {
@@ -48,24 +45,16 @@ class ListCompaniesLogic 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
     {
         $this->canListCompanies->passes();
 
         $query = $this->listsCompanies->execute($this->listsCompanies->deserializeFilters($request->input('filters')));
-      //  return $this->collectionResponse(CompanyResource::collection($query));
-
-      return   fractal()
-            ->parseIncludes(['owner'])
-            ->collection($query, new CompanyTransformer(), "data")
-            ->serializeWith(new ArraySerializer())
-            ->respond(200, [], JSON_PRETTY_PRINT);
-
-
+        return $this->collectionResponse(CompanyResource::collection($query));
 
     }
 

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

@@ -3,21 +3,13 @@
 namespace App\Classes\Modules\Documents\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\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\Serializer\ArraySerializer;
-use League\Fractal;
-
 
 class ListDocumentLogic extends AbstractControllerLogic
 {
@@ -25,8 +17,7 @@ class ListDocumentLogic extends AbstractControllerLogic
     /**
      * @return array
      */
-    protected function notification(): array
-    {
+    protected function notification():array {
         return [
             'title' => 'Retrieved Document',
             'message' => 'You have successfully retrieved a list of Document'
@@ -54,29 +45,19 @@ class ListDocumentLogic 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->canListDocuments->passes();
 
         $query = $this->listsDocuments->execute(array_merge($this->listsDocuments->deserializeFilters($request->input('filters')), ['with_owner' => true]));
 
-        $data = fractal()
-            ->parseIncludes(['owner'])
-            ->collection($query, new DocumentTransformer, "data")
-            ->serializeWith(new ArraySerializer())
-            ->respond(200, [], JSON_PRETTY_PRINT);
-
-        return $data;
-
-
-
+        return $this->collectionResponse(DocumentResource::collection($query));
 
     }
 
-
 }

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

@@ -2,7 +2,6 @@
 
 namespace App\Classes\Modules\Documents\DataTransferObjects;
 
-use App\Classes\Exceptions\MalformedRequestException;
 use App\Classes\General\Interfaces\DataTransferObject;
 use App\Classes\Modules\Documents\Services\ConvertsBase64ToFile;
 
@@ -69,7 +68,7 @@ class DocumentObject implements DataTransferObject
 
     /**
      * @return array
-     * @throws MalformedRequestException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
      */
     public function getFiles(): array
     {

app/Classes/Modules/Documents/Processors/UploadDocumentForHelpMenuProcessor.php

@@ -32,12 +32,12 @@ class UploadDocumentForHelpMenuProcessor
 
 
     /**
-     * @param Request $request
+     * @param $filesUpload
      * @param QAUserAnswerSelected qaUserAnswerSelected
      * @throws \App\Classes\Exceptions\MalformedRequestException
      */
-    public function execute(Request $request, QAUserAnswerSelected $qaUserAnswerSelected) {
-        $object = new DocumentObject("HELP_MENU", $request->input('files'),
+    public function execute($filesUpload, QAUserAnswerSelected $qaUserAnswerSelected) {
+        $object = new DocumentObject("HELP_MENU", $filesUpload,
             '123456', ApprovalStatus::PENDING_VERIFICATION, 'help_menu'); //cief todo: 123456 cannot be hardcoded
 
         /** @var Document $document */

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

@@ -97,8 +97,7 @@ class ConvertsBase64ToFile
      * @return string
      * @throws MalformedRequestException
      */
-    private function generateFile(FileObject $file, string $suffix = ''): string
-    {
+    private function generateFile(FileObject $file, string $suffix = '') {
 
         $filePath = $this->path.'/'.$file->getFileName().$suffix.'.'.$file->getExtension();
 

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

@@ -15,9 +15,17 @@ use App\Classes\ValueObjects\Constants\OrderRoleTypes;
 
 class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize, FromQuery
 {
-
     use Exportable;
 
+    private $start_date;
+    private $end_date;
+
+    public function __construct($start_date = null, $end_date = null)
+    {
+        $this->start_date = $start_date;
+        $this->end_date = $end_date;
+    }
+
     public function headings(): array
     {
         return [
@@ -26,38 +34,49 @@ class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping,
             'Warehouse',
             'Cbm',
             'Description',
-            'quantity',
+            'Quantity',
             'Received Date',
+            'Recorded On',
+            'Days to Record',
             'Remarks'
         ];
     }
 
-    /**
-     * @return \Illuminate\Support\Collection|mixed
-     */
     public function query()
     {
-        return PackingList::where('type', '=', 1)->where('status', '=', 2)->where('owner_type', Order::class);
+        $query = PackingList::with([
+            'owner.companyModule.inviters',
+            'owner.orderRoles',
+            'packages',
+            'transports'
+        ])
+            ->where('type', '=', 1)
+            ->where('status', '=', 2)
+            ->where('owner_type', Order::class);
+
+        if (!is_null($this->start_date) && !is_null($this->end_date)) {
+            $query->whereHas('transports', function ($q) {
+                $q->whereBetween('drop_date', [
+                    Carbon::parse($this->start_date)->startOfDay(),
+                    Carbon::parse($this->end_date)->endOfDay()
+                ]);
+            });
+        }
+
+        return $query;
     }
 
-    /**
-     * @param $packingList
-     * @return array
-     */
     public function map($packingList): array
     {
         $order = $packingList->owner;
-
-        $connection = $order->companyModule()->first()->inviters()->withPivot('invitee_reference')->first();
-        $marking = $connection ? $connection->pivot->invitee_reference:'';
-
-        $warehouse = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee;
-
-        $cbm = $packingList->packages->sum(function($package){
-           return (($package->width / 100) * ($package->height / 100) * ($package->length / 100)) * $package->quantity;
+        $marking = $order->companyModule->getMarking();
+        $warehouse = $order->orderRoles->firstWhere('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->appointee;
+        $cbm = $packingList->packages->sum(function ($package) {
+            return (($package->width / 100) * ($package->height / 100) * ($package->length / 100)) * $package->quantity;
         });
-
-        $arrival_date = $packingList->transports()->first()->drop_date->format('d-m-Y');
+        $arrival_date = $packingList->transports->first()->drop_date->format('d-m-Y');
+        $recorded_on = $packingList->created_at->format('d-m-Y');
+        $days_to_record = Carbon::parse($arrival_date)->diffInDays(Carbon::parse($recorded_on));
 
         return [
             $packingList->owner->reference,
@@ -67,7 +86,9 @@ class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping,
             $packingList->packages->implode('description', ', '),
             $packingList->packages->sum('quantity'),
             $arrival_date,
+            $recorded_on,
+            $days_to_record,
             ''
         ];
     }
-}
+}

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

@@ -32,7 +32,7 @@ class ExportsPaymentTransactions implements FromQuery, WithHeadings, WithHeading
             'DocNo',
             'DocDate',
             'DebtorCode',
-            'DebtorCode',
+            'Ref',
             'ShipInfo',
             'AccNo',
             'DetailDescription',

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

@@ -1,62 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\HelpMenu\ControllersLogic;
-
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\HelpMenu\Standards\Rules\CanFetchHelpMenuQuestionList;
-use App\Classes\Modules\HelpMenu\Processors\FetchFirstHelpMenuQuestionProcessor;
-use App\Http\Resources\HelpMenuQuestionResource;
-use ErrorException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-
-class FetchHelpMenuQuestionLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Retrieved Help Menu First Question',
-            'message' => 'You have successfully retrieved a Help Menu First Question'
-        ];
-    }
-
-    /** @var CanFetchHelpMenuQuestionList */
-    private $canFetchHelpMenuQuestionList;
-
-    /** @var FetchFirstHelpMenuQuestionProcessor */
-    private $fetchFirstHelpMenuQuestionProcessor;
-
-    /**
-     * FetchHelpMenuQuestionLogic constructor.
-     * @param CanFetchHelpMenuQuestionList $canFetchHelpMenuQuestionList
-     * @param FetchFirstHelpMenuQuestionProcessor $fetchFirstHelpMenuQuestionProcessor
-     */
-    public function __construct(CanFetchHelpMenuQuestionList $canFetchHelpMenuQuestionList, FetchFirstHelpMenuQuestionProcessor $fetchFirstHelpMenuQuestionProcessor)
-    {
-        $this->canFetchHelpMenuQuestionList = $canFetchHelpMenuQuestionList;
-        $this->fetchFirstHelpMenuQuestionProcessor = $fetchFirstHelpMenuQuestionProcessor;
-    }
-
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws ErrorException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        $this->canFetchHelpMenuQuestionList->passes();
-
-        $userId = Auth::user()->id;
-
-        $query = $this->fetchFirstHelpMenuQuestionProcessor->execute($request);
-
-        return $this->resourceResponse(new HelpMenuQuestionResource($query, $userId));
-    }
-
-}

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

@@ -0,0 +1,62 @@
+<?php
+
+namespace App\Classes\Modules\HelpMenu\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\HelpMenu\Standards\Rules\CanFetchHelpMenuQuestion;
+use App\Classes\Modules\HelpMenu\Processors\FetchFirstQuestionQAProcessor;
+use App\Http\Resources\HelpMenuQuestionResource;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+
+class FetchQuestionQALogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Retrieved Help Menu First Question',
+            'message' => 'You have successfully retrieved a Help Menu First Question'
+        ];
+    }
+
+    /** @var CanFetchHelpMenuQuestion */
+    private $canFetchHelpMenuQuestion;
+
+    /** @var FetchFirstQuestionQAProcessor */
+    private $fetchFirstQuestionQAProcessor;
+
+    /**
+     * FetchQuestionQALogic constructor.
+     * @param CanFetchHelpMenuQuestion $canFetchHelpMenuQuestion
+     * @param FetchFirstQuestionQAProcessor $fetchFirstQuestionQAProcessor
+     */
+    public function __construct(CanFetchHelpMenuQuestion $canFetchHelpMenuQuestion, FetchFirstQuestionQAProcessor $fetchFirstQuestionQAProcessor)
+    {
+        $this->canFetchHelpMenuQuestion = $canFetchHelpMenuQuestion;
+        $this->fetchFirstQuestionQAProcessor = $fetchFirstQuestionQAProcessor;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $this->canFetchHelpMenuQuestion->passes();
+
+        $userId = Auth::user()->id;
+
+        $query = $this->fetchFirstQuestionQAProcessor->execute($request);
+
+        return $this->resourceResponse(new HelpMenuQuestionResource($query, $userId));
+    }
+
+}

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

@@ -0,0 +1,67 @@
+<?php
+
+namespace App\Classes\Modules\HelpMenu\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\HelpMenu\DataTransferObjects\UrlObject;
+use App\Classes\Modules\HelpMenu\Standards\Rules\CanGenerateFeedbackUrl;
+use App\Classes\Modules\HelpMenu\Services\CreatesUrl;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Crypt;
+use Illuminate\Support\Str;
+
+class GenerateFeedbackUrlLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Generate Feedback Url',
+            'message' => 'You have successfully generated a feedback url'
+        ];
+    }
+
+    /** @var CanGenerateFeedbackUrl */
+    private $canGenerateFeedbackUrl;
+
+    /** @var CreatesUrl */
+    private $createsUrl;
+
+    /**
+     * GenerateFeedbackUrlLogic constructor.
+     * @param CanGenerateFeedbackUrl $canGenerateFeedbackUrl
+     * @param CreatesUrl $createsUrl
+     */
+    public function __construct(CanGenerateFeedbackUrl $canGenerateFeedbackUrl, CreatesUrl $createsUrl)
+    {
+        $this->canGenerateFeedbackUrl = $canGenerateFeedbackUrl;
+        $this->createsUrl = $createsUrl;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $this->canGenerateFeedbackUrl->passes();
+
+        $shortUrl = Str::random(20);
+        $originalText = $request->input('system') . '|' . $request->input('customer_marking'). '|' . $request->input('email'). '|' . $request->input('question_set') . '|' . $shortUrl;
+        $originalUrl =  Crypt::encryptString($originalText);
+
+
+        $url = $this->createsUrl->execute(new UrlObject('feedback', $shortUrl, $originalUrl));
+        $resource = ['token' => $url->short_url];
+
+        return $this->response(['data' => $resource]);
+    }
+
+}

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

@@ -0,0 +1,60 @@
+<?php
+
+namespace App\Classes\Modules\HelpMenu\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\HelpMenu\Services\ListsHelpMenuUserAnswerSelected;
+use App\Classes\Modules\HelpMenu\Standards\Rules\CanListHelpMenuQuestions;
+use App\Http\Resources\HelpMenuQuestionsAnswersResource;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ListQuestionsAnswersQALogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Retrieved Questions Answers',
+            'message' => 'You have successfully retrieved a list of questions and answers'
+        ];
+    }
+
+    /** @var CanListHelpMenuQuestions */
+    private $canListHelpMenuQuestions;
+
+    /** @var ListsHelpMenuUserAnswerSelected */
+    private $listsHelpMenuUserAnswerSelected;
+
+    /**
+     * ListQuestionsAnswersQALogic constructor.
+     * @param CanListHelpMenuQuestions $canListHelpMenuQuestions
+     * @param ListsHelpMenuUserAnswerSelected $listsHelpMenuUserAnswerSelected
+     */
+    public function __construct(CanListHelpMenuQuestions $canListHelpMenuQuestions, ListsHelpMenuUserAnswerSelected $listsHelpMenuUserAnswerSelected)
+    {
+        $this->canListHelpMenuQuestions = $canListHelpMenuQuestions;
+        $this->listsHelpMenuUserAnswerSelected = $listsHelpMenuUserAnswerSelected;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $this->canListHelpMenuQuestions->passes();
+
+        $query = $this->listsHelpMenuUserAnswerSelected->execute($this->listsHelpMenuUserAnswerSelected->deserializeFilters($request->input('filters')));
+
+        return $this->collectionResponse(HelpMenuQuestionsAnswersResource::collection($query));
+    }
+
+}

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

@@ -0,0 +1,66 @@
+<?php
+
+namespace App\Classes\Modules\HelpMenu\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\HelpMenu\Services\ListsHelpMenuQuestions;
+use App\Classes\Modules\HelpMenu\Services\FetchesUrl;
+use App\Http\Resources\HelpMenuQuestionResource;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Crypt;
+use App\Classes\Exceptions\ResourceNotFoundException;
+
+class ListQuestionsQALogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Retrieved Questions',
+            'message' => 'You have successfully retrieved a list of Questions'
+        ];
+    }
+
+    /** @var ListsHelpMenuQuestions */
+    private $listsHelpMenuQuestions;
+
+    /** @var FetchesUrl */
+    private $fetchesUrl;
+
+    /**
+     * ListQuestionsQALogic constructor.
+     * @param ListsHelpMenuQuestions $listsHelpMenuQuestions
+     * @param FetchesUrl $fetchesUrl
+     */
+    public function __construct(ListsHelpMenuQuestions $listsHelpMenuQuestions, FetchesUrl $fetchesUrl)
+    {
+        $this->listsHelpMenuQuestions = $listsHelpMenuQuestions;
+        $this->fetchesUrl = $fetchesUrl;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     * @throws \App\Classes\Exceptions\ResourceNotFoundException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $url = $this->fetchesUrl->execute(['short_url' => $request->input('token')]);
+        $token = $url->original_url;
+        $decriptedToken = Crypt::decryptString($token);
+        $delimiter = "|";
+        $parts = explode($delimiter, $decriptedToken);
+        $questionSet = $parts[3];
+        $query = $this->listsHelpMenuQuestions->execute(['questionnaire_set_id' => $questionSet]);
+        return $this->collectionResponse(HelpMenuQuestionResource::collection($query));
+    }
+
+}

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

@@ -0,0 +1,89 @@
+<?php
+
+namespace App\Classes\Modules\HelpMenu\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\HelpMenu\Processors\SaveAnswerProcessor;
+use App\Classes\Modules\HelpMenu\Processors\UserSourceForQAProcessor;
+use App\Classes\Modules\HelpMenu\Services\FetchesUrl;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Crypt;
+
+class SubmitQAQuestionsLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Feedback Submission',
+            'message' => 'You have successfully submitted yours answers'
+        ];
+    }
+
+    /** @var SaveAnswerProcessor */
+    private $saveAnswerProcessor;
+
+    /** @var UserSourceForQAProcessor */
+    private $userSourceForQAProcessor;
+
+    /** @var FetchesUrl */
+    private $fetchesUrl;
+
+    /**
+     * SubmitQAQuestionsLogic constructor.
+     * @param SaveAnswerProcessor $saveAnswerProcessor
+     * @param UserSourceForQAProcessor $userSourceForQAProcessor
+     * @param FetchesUrl $fetchesUrl
+     */
+    public function __construct(SaveAnswerProcessor $saveAnswerProcessor, UserSourceForQAProcessor $userSourceForQAProcessor, FetchesUrl $fetchesUrl)
+    {
+        $this->saveAnswerProcessor = $saveAnswerProcessor;
+        $this->userSourceForQAProcessor = $userSourceForQAProcessor;
+        $this->fetchesUrl = $fetchesUrl;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $originalToken = '';
+        $shortToken = $request->input('token');
+        $userId = 0;
+        $sourceId = 0;
+        try {
+            $url = $this->fetchesUrl->execute(['short_url' => $shortToken]);
+            $originalToken = $url->original_url;
+            $decriptedToken = Crypt::decryptString($originalToken);
+            $delimiter = "|";
+            $parts = explode($delimiter, $decriptedToken);
+            $system = $parts[0];
+            $customerMarking = $parts[1];
+            $email = $parts[2];
+
+            $result = $this->userSourceForQAProcessor->execute($system, $customerMarking, $email);
+            $userId = $result['userId'];
+            $sourceId = $result['sourceId'];
+
+        } catch (\Throwable $e) {
+            Log::error($e);
+        }
+
+        $answers = $request->input('answers');
+        foreach ($answers as $answer) {
+            $filesUpload = $request->input('files');
+            $this->saveAnswerProcessor->execute($userId, $sourceId, $answer['questionId'], $answer['answer'], $answer['answerId'], $filesUpload, $shortToken);
+        }
+
+        $response =  ['message' => 'Thank you for your feedback.'];
+        return $this->response(['data' => $response]);
+    }
+}

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

@@ -1,124 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\HelpMenu\ControllersLogic;
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\PerfexCRM\Services\CreatesPerfexCRMSupportTicket;
-use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMCustomer;
-use App\Classes\Modules\HelpMenu\Standards\Rules\CanFetchHelpMenuQuestionList;
-use App\Classes\Modules\HelpMenu\Processors\SaveHelpMenuAnswerProcessor;
-use App\Classes\Modules\HelpMenu\Processors\DeleteHelpMenuAnswerProcessor;
-use App\Classes\Modules\HelpMenu\Processors\FetchNextHelpMenuQuestionProcessor;
-use App\Classes\Modules\HelpMenu\Processors\FetchFirstHelpMenuQuestionProcessor;
-use App\Http\Resources\HelpMenuQuestionResource;
-use ErrorException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Log;
-use Illuminate\Support\Facades\Auth;
-use App\Classes\ValueObjects\Constants\QAType;
-
-class UpdateHelpMenuNextQuestionLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Retrieved Help Menu Next Question',
-            'message' => 'You have successfully retrieved a Help Menu Next Question'
-        ];
-    }
-
-    /** @var CanFetchHelpMenuQuestionList */
-    private $canFetchHelpMenuQuestionList;
-
-    /** @var SaveHelpMenuAnswerProcessor */
-    private $saveHelpMenuAnswerProcessor;
-
-    /** @var DeleteHelpMenuAnswerProcessor */
-    private $deleteHelpMenuAnswerProcessor;
-
-    /** @var FetchNextHelpMenuQuestionProcessor */
-    private $fetchNextHelpMenuQuestionProcessor;
-
-    /** @var FetchFirstHelpMenuQuestionProcessor */
-    private $fetchFirstHelpMenuQuestionProcessor;
-
-    /** @var CreatesPerfexCRMSupportTicket */
-    private $createsPerfexCRMSupportTicket;
-
-    /** @var FetchesPerfexCRMCustomer */
-    private $fetchesPerfexCRMCustomer;
-
-    /**
-     * UpdateHelpMenuNextQuestionLogic constructor.
-     * @param CanFetchHelpMenuQuestionList $canFetchHelpMenuQuestionList
-     * @param SaveHelpMenuAnswerProcessor $saveHelpMenuAnswerProcessor
-     * @param FetchNextHelpMenuQuestionProcessor $fetchNextHelpMenuQuestionProcessor
-     * @param FetchFirstHelpMenuQuestionProcessor $fetchFirstHelpMenuQuestionProcessor
-     * @param DeleteHelpMenuAnswerProcessor $deleteHelpMenuAnswerProcessor
-     */
-    public function __construct(CanFetchHelpMenuQuestionList $canFetchHelpMenuQuestionList, SaveHelpMenuAnswerProcessor $saveHelpMenuAnswerProcessor, FetchNextHelpMenuQuestionProcessor $fetchNextHelpMenuQuestionProcessor, FetchFirstHelpMenuQuestionProcessor $fetchFirstHelpMenuQuestionProcessor,  CreatesPerfexCRMSupportTicket $createsPerfexCRMSupportTicket, FetchesPerfexCRMCustomer $fetchesPerfexCRMCustomer, DeleteHelpMenuAnswerProcessor $deleteHelpMenuAnswerProcessor)
-    {
-        $this->canFetchHelpMenuQuestionList = $canFetchHelpMenuQuestionList;
-        $this->saveHelpMenuAnswerProcessor = $saveHelpMenuAnswerProcessor;
-        $this->fetchNextHelpMenuQuestionProcessor = $fetchNextHelpMenuQuestionProcessor;
-        $this->fetchFirstHelpMenuQuestionProcessor = $fetchFirstHelpMenuQuestionProcessor;
-        $this->createsPerfexCRMSupportTicket = $createsPerfexCRMSupportTicket;
-        $this->fetchesPerfexCRMCustomer = $fetchesPerfexCRMCustomer;
-        $this->deleteHelpMenuAnswerProcessor = $deleteHelpMenuAnswerProcessor;
-    }
-
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws ErrorException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        $questionId = 0;
-        $userId = Auth::user()->id;
-        $currentQuestion = $request->question;
-        $questionId = $currentQuestion['id'];
-        $questionType = $currentQuestion['question_type'];
-
-        $this->canFetchHelpMenuQuestionList->passes();
-
-        //Delete answer
-        $this->deleteHelpMenuAnswerProcessor->execute($userId, $questionId, $request);
-
-        //Save answer given by user
-        if (!$request->has('isPrevious')) {
-            $this->saveHelpMenuAnswerProcessor->execute($userId, $questionId, $request);
-        }
-
-        //Create ticket at crm
-        if (!$request->has('isPrevious')) {
-            if($questionType == QAType::TICKET_CRM){
-                $email = Auth::user()->email;
-                $customer = $this->fetchesPerfexCRMCustomer->execute($email);
-                $subject = "test subject 3";
-                $department = 1;
-                $contactid = 0;
-                $userid = 0;
-                if($customer){
-                    $contactid = $customer->id;
-                    $userid = $customer->userid;
-                }
-                $this->createsPerfexCRMSupportTicket->execute($subject, $department, $contactid, $userid);
-            }
-        }
-
-        //Get returned question (previous or next)
-        $returnQuestion = $this->fetchNextHelpMenuQuestionProcessor->execute($request);
-        //When a questionnaire ended, return back the first question
-        if(is_null($returnQuestion)){
-            $returnQuestion = $this->fetchFirstHelpMenuQuestionProcessor->execute($request);
-        }
-
-        return $this->resourceResponse(new HelpMenuQuestionResource($returnQuestion, $userId));
-    }
-}

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

@@ -0,0 +1,131 @@
+<?php
+
+namespace App\Classes\Modules\HelpMenu\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\PerfexCRM\Services\CreatesPerfexCRMSupportTicket;
+use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMCustomer;
+use App\Classes\Modules\HelpMenu\Standards\Rules\CanFetchHelpMenuQuestion;
+use App\Classes\Modules\HelpMenu\Processors\SaveAnswerProcessor;
+use App\Classes\Modules\HelpMenu\Processors\DeleteAnswerQAProcessor;
+use App\Classes\Modules\HelpMenu\Processors\FetchNextQuestionQAProcessor;
+use App\Classes\Modules\HelpMenu\Processors\FetchFirstQuestionQAProcessor;
+use App\Http\Resources\HelpMenuQuestionResource;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Auth;
+use App\Classes\ValueObjects\Constants\QAType;
+
+class UpdateNextQuestionQALogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Retrieved Help Menu Next Question',
+            'message' => 'You have successfully retrieved a Help Menu Next Question'
+        ];
+    }
+
+    /** @var CanFetchHelpMenuQuestion */
+    private $canFetchHelpMenuQuestion;
+
+    /** @var SaveAnswerProcessor */
+    private $saveAnswerProcessor;
+
+    /** @var DeleteAnswerQAProcessor */
+    private $deleteAnswerQAProcessor;
+
+    /** @var FetchNextQuestionQAProcessor */
+    private $fetchNextQuestionQAProcessor;
+
+    /** @var FetchFirstQuestionQAProcessor */
+    private $fetchFirstQuestionQAProcessor;
+
+    /** @var CreatesPerfexCRMSupportTicket */
+    private $createsPerfexCRMSupportTicket;
+
+    /** @var FetchesPerfexCRMCustomer */
+    private $fetchesPerfexCRMCustomer;
+
+    /**
+     * UpdateNextQuestionQALogic constructor.
+     * @param CanFetchHelpMenuQuestion $canFetchHelpMenuQuestion
+     * @param SaveAnswerProcessor $saveAnswerProcessor
+     * @param FetchNextQuestionQAProcessor $fetchNextQuestionQAProcessor
+     * @param FetchFirstQuestionQAProcessor $fetchFirstQuestionQAProcessor
+     * @param DeleteAnswerQAProcessor $deleteAnswerQAProcessor
+     */
+    public function __construct(CanFetchHelpMenuQuestion $canFetchHelpMenuQuestion, SaveAnswerProcessor $saveAnswerProcessor, FetchNextQuestionQAProcessor $fetchNextQuestionQAProcessor, FetchFirstQuestionQAProcessor $fetchFirstQuestionQAProcessor,  CreatesPerfexCRMSupportTicket $createsPerfexCRMSupportTicket, FetchesPerfexCRMCustomer $fetchesPerfexCRMCustomer, DeleteAnswerQAProcessor $deleteAnswerQAProcessor)
+    {
+        $this->canFetchHelpMenuQuestion = $canFetchHelpMenuQuestion;
+        $this->saveAnswerProcessor = $saveAnswerProcessor;
+        $this->fetchNextQuestionQAProcessor = $fetchNextQuestionQAProcessor;
+        $this->fetchFirstQuestionQAProcessor = $fetchFirstQuestionQAProcessor;
+        $this->createsPerfexCRMSupportTicket = $createsPerfexCRMSupportTicket;
+        $this->fetchesPerfexCRMCustomer = $fetchesPerfexCRMCustomer;
+        $this->deleteAnswerQAProcessor = $deleteAnswerQAProcessor;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws MalformedRequestException
+     * @throws ResourceNotFoundException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $questionId = 0;
+        $userId = Auth::user()->id;
+        $currentQuestion = $request->question;
+        $questionId = $currentQuestion['id'];
+        $questionType = $currentQuestion['question_type'];
+
+        $this->canFetchHelpMenuQuestion->passes();
+
+        //Delete answer
+        $this->deleteAnswerQAProcessor->execute($userId, $questionId, $request);
+
+        //Save answer given by user
+        if (!$request->has('isPrevious')) {
+            $filesUpload = $request->input('files');
+            $answerOptionId = 0;
+            if ($request->has('answerObj')) {
+                $answerOptionId = intval($request->answerObj['id']);
+            }
+            $answerInText = $request->answer;
+            $this->saveAnswerProcessor->execute($userId, 0, $questionId, $answerInText, $answerOptionId, $filesUpload);
+        }
+
+        //Create ticket at crm
+        if (!$request->has('isPrevious')) {
+            if($questionType == QAType::TICKET_CRM){
+                $email = Auth::user()->email;
+                $customer = $this->fetchesPerfexCRMCustomer->execute($email);
+                $subject = "test subject 3";
+                $department = 1;
+                $contactid = 0;
+                $userid = 0;
+                if($customer){
+                    $contactid = $customer->id;
+                    $userid = $customer->userid;
+                }
+                $this->createsPerfexCRMSupportTicket->execute($subject, $department, $contactid, $userid);
+            }
+        }
+
+        //Get returned question (previous or next)
+        $returnQuestion = $this->fetchNextQuestionQAProcessor->execute($request);
+        //When a questionnaire ended, return back the first question
+        if(is_null($returnQuestion)){
+            $returnQuestion = $this->fetchFirstQuestionQAProcessor->execute($request);
+        }
+
+        return $this->resourceResponse(new HelpMenuQuestionResource($returnQuestion, $userId));
+    }
+}

app/Classes/Modules/HelpMenu/DataTransferObjects/QAUserSourceObject.php

@@ -0,0 +1,55 @@
+<?php
+
+namespace App\Classes\Modules\HelpMenu\DataTransferObjects;
+
+use App\Classes\General\Interfaces\DataTransferObject;
+
+class QAUserSourceObject implements DataTransferObject
+{
+    /** @var string */
+    private $system;
+
+    /** @var string */
+    private $marking;
+
+    /** @var string */
+    private $email;
+
+    /**
+     * QAUserSourceObject constructor.
+     * @param string $system
+     * @param string $marking
+     * @param string $email
+     */
+    public function __construct(string $system, string $marking, string $email)
+    {
+        $this->system = $system;
+        $this->marking = $marking;
+        $this->email = $email;
+    }
+
+    /**
+     * @return string
+     */
+    public function getSystem(): string
+    {
+        return $this->system;
+    }
+
+    /**
+     * @return string
+     */
+    public function getMarking(): string
+    {
+        return $this->marking;
+    }
+
+    /**
+     * @return string
+     */
+    public function getEmail(): string
+    {
+        return $this->email;
+    }
+
+}

app/Classes/Modules/HelpMenu/DataTransferObjects/UrlObject.php

@@ -0,0 +1,55 @@
+<?php
+
+namespace App\Classes\Modules\HelpMenu\DataTransferObjects;
+
+use App\Classes\General\Interfaces\DataTransferObject;
+
+class UrlObject implements DataTransferObject
+{
+    /** @var string */
+    private $type;
+
+    /** @var string */
+    private $shortUrl;
+
+    /** @var string */
+    private $originalUrl;
+
+    /**
+     * UrlObject constructor.
+     * @param string $type
+     * @param string $shortUrl
+     * @param string $originalUrl
+     */
+    public function __construct(string $type, string $shortUrl, string $originalUrl)
+    {
+        $this->type = $type;
+        $this->shortUrl = $shortUrl;
+        $this->originalUrl = $originalUrl;
+    }
+
+    /**
+     * @return string
+     */
+    public function getType(): string
+    {
+        return $this->type;
+    }
+
+    /**
+     * @return string
+     */
+    public function getShortUrl(): string
+    {
+        return $this->shortUrl;
+    }
+
+    /**
+     * @return string
+     */
+    public function getOriginalUrl(): string
+    {
+        return $this->originalUrl;
+    }
+
+}

app/Classes/Modules/HelpMenu/Processors/DeleteAnswerQAProcessor.php

@@ -4,32 +4,40 @@ namespace App\Classes\Modules\HelpMenu\Processors;
 
 use App\Models\QAUserAnswerSelected;
 use App\Classes\Modules\HelpMenu\Services\FetchesHelpMenuUserAnswerSelected;
-use App\Classes\Modules\HelpMenu\Services\FetchesHelpMenuUserAnswerSelectedList;
+use App\Classes\Modules\HelpMenu\Services\ListsHelpMenuUserAnswerSelected;
 
-class DeleteHelpMenuAnswerProcessor
+class DeleteAnswerQAProcessor
 {
     /** @var FetchesHelpMenuUserAnswerSelected */
     private $fetchesHelpMenuUserAnswerSelected;
 
-    /** @var FetchesHelpMenuUserAnswerSelectedList */
-    private $fetchesHelpMenuUserAnswerSelectedList;
+    /** @var ListsHelpMenuUserAnswerSelected */
+    private $listsHelpMenuUserAnswerSelected;
 
     /**
-     * DeleteHelpMenuAnswerProcessor constructor.
+     * DeleteAnswerQAProcessor constructor.
      * @param FetchesHelpMenuUserAnswerSelected $fetchesHelpMenuUserAnswerSelected
-     * @param FetchesHelpMenuUserAnswerSelectedList $fetchesHelpMenuUserAnswerSelectedList
+     * @param ListsHelpMenuUserAnswerSelected $listsHelpMenuUserAnswerSelected
      */
-    public function __construct(FetchesHelpMenuUserAnswerSelected $fetchesHelpMenuUserAnswerSelected, FetchesHelpMenuUserAnswerSelectedList $fetchesHelpMenuUserAnswerSelectedList)
+    public function __construct(FetchesHelpMenuUserAnswerSelected $fetchesHelpMenuUserAnswerSelected, ListsHelpMenuUserAnswerSelected $listsHelpMenuUserAnswerSelected)
     {
         $this->fetchesHelpMenuUserAnswerSelected = $fetchesHelpMenuUserAnswerSelected;
-        $this->fetchesHelpMenuUserAnswerSelectedList = $fetchesHelpMenuUserAnswerSelectedList;
+        $this->listsHelpMenuUserAnswerSelected = $listsHelpMenuUserAnswerSelected;
     }
 
+
+    /**
+     * @param int $userId
+     * @param int $questionId
+     * @param Request $request
+     * @return void
+     * @throws ResourceNotFoundException
+     */
     public function execute($userId, $questionId, $request){
         if ($request->has('isPrevious')) {
             //Get current and previous question's answer
             try{
-                $selectedAnswer = $this->fetchesHelpMenuUserAnswerSelectedList->execute(['user_id' => $userId, 'question_id' => $questionId, 'order_by' => (object)['column' => 'id','DESC' => true]])[0];
+                $selectedAnswer = $this->listsHelpMenuUserAnswerSelected->execute(['user_id' => $userId, 'question_id' => $questionId, 'order_by' => (object)['column' => 'id','DESC' => true]])[0];
             } catch (\Exception $exception){
                 $selectedAnswer = null;
             }

app/Classes/Modules/HelpMenu/Processors/FetchFirstQuestionQAProcessor.php

@@ -7,13 +7,13 @@ use ErrorException;
 use Illuminate\Http\Request;
 
 
-class FetchFirstHelpMenuQuestionProcessor
+class FetchFirstQuestionQAProcessor
 {
     /** @var FetchesHelpMenuQuestion */
     private $fetchesHelpMenuQuestion;
 
     /**
-     * FetchFirstHelpMenuQuestionProcessor constructor.
+     * FetchFirstQuestionQAProcessor constructor.
      * @param FetchesHelpMenuQuestion $fetchesHelpMenuQuestion
      */
     public function __construct(FetchesHelpMenuQuestion $fetchesHelpMenuQuestion)
@@ -23,7 +23,7 @@ class FetchFirstHelpMenuQuestionProcessor
 
     public function execute(Request $request){
         try {
-            $query = $this->fetchesHelpMenuQuestion->execute(['questionnaire_set_id' => 1]);
+            $query = $this->fetchesHelpMenuQuestion->execute(['questionnaire_set_id' => $request->route('set_id')]);
             return $query;
         } catch (\Exception $exception){
             throw new ErrorException($exception->getMessage(), $exception->getCode());

app/Classes/Modules/HelpMenu/Processors/FetchNextQuestionQAProcessor.php

@@ -4,12 +4,12 @@ namespace App\Classes\Modules\HelpMenu\Processors;
 
 use App\Classes\Modules\HelpMenu\Services\FetchesHelpMenuQuestion;
 use App\Classes\Modules\HelpMenu\Services\FetchesHelpMenuUserAnswerSelected;
-use App\Classes\Modules\HelpMenu\Services\FetchesHelpMenuUserAnswerSelectedList;
+use App\Classes\Modules\HelpMenu\Services\ListsHelpMenuUserAnswerSelected;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use App\Classes\ValueObjects\Constants\QAType;
 
-class FetchNextHelpMenuQuestionProcessor
+class FetchNextQuestionQAProcessor
 {
     /** @var FetchesHelpMenuQuestion */
     private $fetchesHelpMenuQuestion;
@@ -17,19 +17,19 @@ class FetchNextHelpMenuQuestionProcessor
     /** @var FetchesHelpMenuUserAnswerSelected */
     private $fetchesHelpMenuUserAnswerSelected;
 
-    /** @var FetchesHelpMenuUserAnswerSelectedList */
-    private $fetchesHelpMenuUserAnswerSelectedList;
+    /** @var ListsHelpMenuUserAnswerSelected */
+    private $listsHelpMenuUserAnswerSelected;
     /**
-     * FetchNextHelpMenuQuestionProcessor constructor.
+     * FetchNextQuestionQAProcessor constructor.
      * @param FetchesHelpMenuQuestion $fetchesHelpMenuQuestion
      * @param FetchesHelpMenuUserAnswerSelected $fetchesHelpMenuUserAnswerSelected
-     * @param FetchesHelpMenuUserAnswerSelectedList $fetchesHelpMenuUserAnswerSelectedList
+     * @param ListsHelpMenuUserAnswerSelected $listsHelpMenuUserAnswerSelected
      */
-    public function __construct(FetchesHelpMenuQuestion $fetchesHelpMenuQuestion, FetchesHelpMenuUserAnswerSelected $fetchesHelpMenuUserAnswerSelected, FetchesHelpMenuUserAnswerSelectedList $fetchesHelpMenuUserAnswerSelectedList)
+    public function __construct(FetchesHelpMenuQuestion $fetchesHelpMenuQuestion, FetchesHelpMenuUserAnswerSelected $fetchesHelpMenuUserAnswerSelected, ListsHelpMenuUserAnswerSelected $listsHelpMenuUserAnswerSelected)
     {
         $this->fetchesHelpMenuQuestion = $fetchesHelpMenuQuestion;
         $this->fetchesHelpMenuUserAnswerSelected = $fetchesHelpMenuUserAnswerSelected;
-        $this->fetchesHelpMenuUserAnswerSelectedList = $fetchesHelpMenuUserAnswerSelectedList;
+        $this->listsHelpMenuUserAnswerSelected = $listsHelpMenuUserAnswerSelected;
     }
 
     public function execute(Request $request){
@@ -38,6 +38,7 @@ class FetchNextHelpMenuQuestionProcessor
         $nextQuestionNumber = 0;
         $nextNestedQuestion = 0;
         $nextMainQuestion= 0;
+        $questionnaireSetId = 0;
         $currentQuestion = $request->question;
         $questionType = QAType::DEFAULT;
         $returnQuestion = null;
@@ -48,17 +49,19 @@ class FetchNextHelpMenuQuestionProcessor
             $questionType = $currentQuestion['question_type'];
             $nextNestedQuestion = $currentQuestion['next_nested_question'];
             $nextMainQuestion = $currentQuestion['next_main_question'];
+            $questionnaireSetId = $currentQuestion['questionnaire_set_id'];
         }
+
         if ($request->has('answerObj')) {
             $nextQuestionNumber = $request->answerObj['next_question_number'];
         }
 
         if ($request->has('isPrevious')) {
             $userId = Auth::user()->id;
-            $previousAnswer = $this->fetchesHelpMenuUserAnswerSelectedList->execute(['user_id' => $userId, 'order_by' => (object)['column' => 'id','DESC' => true]])[0];
+            $previousAnswer = $this->listsHelpMenuUserAnswerSelected->execute(['user_id' => $userId, 'order_by' => (object)['column' => 'id','DESC' => true]])[0];
 
             //Get previous question
-            $previousQuestion = $this->fetchesHelpMenuQuestion->execute(['questionnaire_set_id' => 1, 'id' => $previousAnswer['question_id']]);
+            $previousQuestion = $this->fetchesHelpMenuQuestion->execute(['questionnaire_set_id' => $questionnaireSetId, 'id' => $previousAnswer['question_id']]);
             $returnQuestion = $previousQuestion;
         }
         else{
@@ -79,11 +82,11 @@ class FetchNextHelpMenuQuestionProcessor
                 $returnQuestion = null;
             }
             else if($question_number != 0){
-                $nextQuestion = $this->fetchesHelpMenuQuestion->execute(['questionnaire_set_id' => 1, 'question_number' => $question_number]);
+                $nextQuestion = $this->fetchesHelpMenuQuestion->execute(['questionnaire_set_id' => $questionnaireSetId, 'question_number' => $question_number]);
                 $returnQuestion =  $nextQuestion;
             }
             else if (array_key_exists('id', $request->input('question'))) {
-                $nextQuestion = $this->fetchesHelpMenuQuestion->execute(['questionnaire_set_id' => 1, 'id_next' => $questionId, 'next_main_question' => null]);
+                $nextQuestion = $this->fetchesHelpMenuQuestion->execute(['questionnaire_set_id' => $questionnaireSetId, 'id_next' => $questionId, 'next_main_question' => null]);
                 $returnQuestion = $nextQuestion;
             }
         }

app/Classes/Modules/HelpMenu/Processors/SaveAnswerProcessor.php

@@ -7,7 +7,7 @@ use App\Classes\Modules\HelpMenu\Services\FetchesHelpMenuUserAnswerSelected;
 use App\Classes\Modules\Documents\Processors\UploadDocumentForHelpMenuProcessor;
 
 
-class SaveHelpMenuAnswerProcessor
+class SaveAnswerProcessor
 {
     /** @var FetchesHelpMenuUserAnswerSelected */
     private $fetchesHelpMenuUserAnswerSelected;
@@ -16,7 +16,7 @@ class SaveHelpMenuAnswerProcessor
     private $uploadDocumentForHelpMenuProcessor;
 
     /**
-     * SaveHelpMenuAnswerProcessor constructor.
+     * SaveAnswerProcessor constructor.
      * @param FetchesHelpMenuUserAnswerSelected $fetchesHelpMenuUserAnswerSelected
      * @param UploadDocumentForHelpMenuProcessor $uploadDocumentForHelpMenuProcessor
      */
@@ -26,30 +26,32 @@ class SaveHelpMenuAnswerProcessor
         $this->uploadDocumentForHelpMenuProcessor = $uploadDocumentForHelpMenuProcessor;
     }
 
-    public function execute($userId, $questionId, $request){
-        $filesUpload = $request->input('files');
+    public function execute($userId, $sourceId, $questionId, $answerInText, $answerOptionId, $filesUpload, $reference = null){
+
         $answer = null;
-        try{
-             // $answer = $this->fetchesHelpMenuUserAnswerSelected->execute(['user_id' => $userId, 'question_id' => $questionId, 'order_by' => ['column' => 'id','DESC' => 1]]);
-            $answer = $this->fetchesHelpMenuUserAnswerSelected->execute(['user_id' => $userId, 'question_id' => $questionId]);
-        } catch (\Exception $exception){
-            $answer = null;
-        }
+        // try{
+        //      // $answer = $this->fetchesHelpMenuUserAnswerSelected->execute(['user_id' => $userId, 'question_id' => $questionId, 'order_by' => ['column' => 'id','DESC' => 1]]);
+        //     $answer = $this->fetchesHelpMenuUserAnswerSelected->execute(['user_id' => $userId, 'user_id' => $sourceId, 'question_id' => $questionId]);
+        // } catch (\Exception $exception){
+        //     $answer = null;
+        // }
 
         if(is_null($answer))
         {
             $answer = new QAUserAnswerSelected;
         }
         $answer->user_id = $userId;
+        $answer->source_id = $sourceId;
         $answer->question_id = $questionId;
-        if ($request->has('answerObj')) {
-            $answer->answer_option_id = intval($request->answerObj['id']);
+        $answer->answer_option_id = intval($answerOptionId);
+        $answer->free_text_answer = $answerInText;
+        if($reference){
+            $answer->reference = $reference;
         }
-        $answer->free_text_answer = $request->answer;
         $answer->save();
 
         if($filesUpload){
-            $result = $this->uploadDocumentForHelpMenuProcessor->execute($request, $answer);
+            $result = $this->uploadDocumentForHelpMenuProcessor->execute($filesUpload, $answer);
             $newData = array_map(function ($item) {
                 return [
                     'document_id' => $item->document_id,

app/Classes/Modules/HelpMenu/Processors/UserSourceForQAProcessor.php

@@ -0,0 +1,70 @@
+<?php
+
+namespace App\Classes\Modules\HelpMenu\Processors;
+
+use App\Classes\Modules\Accounts\Services\FetchesUser;
+use App\Classes\Modules\HelpMenu\Services\FetchesQAUserSource;
+use App\Classes\Modules\HelpMenu\Services\CreatesQAUserSource;
+use App\Classes\ValueObjects\Constants\QASystemSourceType;
+use App\Classes\Exceptions\ResourceNotFoundException;
+use App\Classes\Modules\HelpMenu\DataTransferObjects\QAUserSourceObject;
+
+class UserSourceForQAProcessor
+{
+    /** @var FetchesUser */
+    private $fetchesUser;
+
+    /** @var FetchesQAUserSource */
+    private $fetchesQAUserSource;
+
+    /** @var CreatesQAUserSource */
+    private $createsQAUserSource;
+
+
+    /**
+     * UserSourceForQAProcessor constructor.
+     * @param FetchesUser $fetchesUser
+     * @param FetchesQAUserSource $fetchesQAUserSource
+     * @param CreatesQAUserSource $createsQAUserSource
+     */
+    public function __construct(FetchesUser $fetchesUser, FetchesQAUserSource $fetchesQAUserSource, CreatesQAUserSource $createsQAUserSource)
+    {
+        $this->fetchesUser = $fetchesUser;
+        $this->fetchesQAUserSource = $fetchesQAUserSource;
+        $this->createsQAUserSource = $createsQAUserSource;
+    }
+
+    public function execute($system, $customerMarking, $email){
+        $result = [];
+        $isFound = false;
+        if((int)$system === QASystemSourceType::IZYIM){
+            try{
+                $query = $this->fetchesUser->execute(['email' => $email]);
+                $result['userId'] = $query->id;
+                $result['sourceId'] = 0;
+                $isFound = true;
+            } catch (ResourceNotFoundException $exception){
+                $isFound = false;
+            }
+        }
+
+        if(!$isFound){
+            try{
+                $query = $this->fetchesQAUserSource->execute(['email' => $email]);
+                $result['userId'] = 0;
+                $result['sourceId'] = $query->id;
+            } catch (ResourceNotFoundException $exception){
+                $result['sourceId'] = 0;
+            }
+
+            if($result['sourceId'] === 0){
+                $new_object = new QAUserSourceObject($system, $customerMarking, $email);
+                $query = $this->createsQAUserSource->execute($new_object);
+                $result['userId'] = 0;
+                $result['sourceId'] = $query->id;
+            }
+        }
+
+        return $result;
+    }
+}

app/Classes/Modules/HelpMenu/Services/CreatesQAUserSource.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Classes\Modules\HelpMenu\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\Modules\HelpMenu\DataTransferObjects\QAUserSourceObject;
+use App\Models\QAUserSource;
+
+class CreatesQAUserSource extends AbstractUpdateRecord
+{
+    /**
+     * @param QAUserSourceObject $object
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(QAUserSourceObject $object) {
+        $model = new QAUserSource();
+        $model->system = $object->getSystem();
+        $model->marking = $object->getMarking();
+        $model->email = $object->getEmail();
+
+        return $this->handler($model);
+
+    }
+}

app/Classes/Modules/HelpMenu/Services/CreatesUrl.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Classes\Modules\HelpMenu\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\Modules\HelpMenu\DataTransferObjects\UrlObject;
+use App\Models\Url;
+
+class CreatesUrl extends AbstractUpdateRecord
+{
+    /**
+     * @param UrlObject $object
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(UrlObject $object) {
+        $model = new Url();
+        $model->type = $object->getType();
+        $model->short_url = $object->getShortUrl();
+        $model->original_url = $object->getOriginalUrl();
+
+        return $this->handler($model);
+
+    }
+}

app/Classes/Modules/HelpMenu/Services/FetchesHelpMenuQuestion.php

@@ -2,7 +2,6 @@
 
 namespace App\Classes\Modules\HelpMenu\Services;
 
-
 use App\Classes\General\Eloquent\AbstractFetchRecord;
 use Illuminate\Database\Eloquent\Builder;
 use App\Models\QAQuestions;

app/Classes/Modules/HelpMenu/Services/FetchesQAUserSource.php

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

app/Classes/Modules/HelpMenu/Services/FetchesUrl.php

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

app/Classes/Modules/HelpMenu/Services/ListsHelpMenuQuestions.php

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

app/Classes/Modules/HelpMenu/Services/ListsHelpMenuUserAnswerSelected.php

@@ -6,14 +6,14 @@ use App\Classes\General\Eloquent\AbstractListRecord;
 use Illuminate\Database\Eloquent\Builder;
 use App\Models\QAUserAnswerSelected;
 
-class FetchesHelpMenuUserAnswerSelectedList extends AbstractListRecord
+class ListsHelpMenuUserAnswerSelected extends AbstractListRecord
 {
 
     /** @var QAUserAnswerSelected */
     private $repository;
 
     /**
-     * FetchesHelpMenuUserAnswerSelectedList constructor.
+     * ListsHelpMenuUserAnswerSelected constructor.
      * @param QAUserAnswerSelected $repository
      */
     public function __construct(QAUserAnswerSelected $repository)

app/Classes/Modules/HelpMenu/Standards/Rules/CanFetchHelpMenuQuestion.php

@@ -5,8 +5,9 @@ namespace App\Classes\Modules\HelpMenu\Standards\Rules;
 
 use App\Classes\General\Abstracts\AbstractRule;
 
-class CanFetchHelpMenuQuestionList extends AbstractRule
+class CanFetchHelpMenuQuestion extends AbstractRule
 {
+
     /**
      * @return bool
      */
@@ -17,7 +18,7 @@ class CanFetchHelpMenuQuestionList extends AbstractRule
     }
 
     /**
-     * @param  $object
+     * @param $object
      * @return bool
      */
     protected function validators($object): bool
@@ -26,7 +27,7 @@ class CanFetchHelpMenuQuestionList extends AbstractRule
     }
 
     /**
-     * @param  $object
+     * @param $object
      * @return bool
      */
     protected function criteria($object): bool

app/Classes/Modules/HelpMenu/Standards/Rules/CanGenerateFeedbackUrl.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Classes\Modules\HelpMenu\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\ValueObjects\Constants\RoleTypes;
+
+class CanGenerateFeedbackUrl extends AbstractRule
+{
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        $roleToCheck = Auth()->user()->type;
+        if (in_array($roleToCheck, RoleTypes::ADMIN_ROLES)) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * @param $object
+     * @return bool
+     */
+    protected function validators($object): bool
+    {
+        return true;
+    }
+
+    /**
+     * @param $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}

app/Classes/Modules/HelpMenu/Standards/Rules/CanListHelpMenuQuestions.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace App\Classes\Modules\HelpMenu\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\ValueObjects\Constants\RoleTypes;
+
+class CanListHelpMenuQuestions extends AbstractRule
+{
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        $roleToCheck = Auth()->user()->type;
+        if (in_array($roleToCheck, RoleTypes::ADMIN_ROLES)) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * @param $object
+     * @return bool
+     */
+    protected function validators($object): bool
+    {
+        return true;
+
+    }
+
+
+    /**
+     * @param $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}

app/Classes/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/Orders/ControllersLogic/ListOrdersV2Logic.php

@@ -8,20 +8,16 @@ use App\Classes\Modules\Orders\Services\ListsOrders;
 use App\Classes\Modules\Orders\Standards\Rules\CanListOrders;
 use App\Classes\ValueObjects\Constants\OrderType;
 use App\Http\Resources\OrderV2Resource;
-use App\Transformers\DocumentTransformer;
-use App\Transformers\OrderTransformer;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
-use League\Fractal\Serializer\ArraySerializer;
 
 class ListOrdersV2Logic extends AbstractControllerLogic
 {
     /**
      * @return array
      */
-    protected function notification(): array
-    {
+    protected function notification():array {
         return [
             'title' => 'Retrieved Orders',
             'message' => 'You have successfully retrieved a list of Orders'
@@ -45,23 +41,16 @@ class ListOrdersV2Logic extends AbstractControllerLogic
         $this->listsOrders = $listsOrders;
     }
 
-    public function logic(Request $request): JsonResponse
+    public function logic(Request $request) : JsonResponse
     {
         $this->canListOrders->passes();
 
         $query = $this->listsOrders->execute(array_merge($this->listsOrders->deserializeFilters($request->input('filters')), ['with_parcels' => true, 'type_in' => [OrderType::SHARED_CONTAINER, OrderType::DEDICATED_CONTAINER]]));
 
-
-        //   return $this->collectionResponse(OrderV2Resource::collection($query));
-
-        return fractal()
-            ->parseIncludes(['remarks', 'warehouse', 'address'])
-            ->collection($query, new OrderTransformer(), "data")
-            ->serializeWith(new ArraySerializer())
-            ->respond(200, [], JSON_PRETTY_PRINT);
-
+        return $this->collectionResponse(OrderV2Resource::collection($query));
 
     }
 
 
+
 }

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

@@ -32,6 +32,7 @@ class FetchesDataFromYDPortal
         $content =  str_replace("\r",'', $content);
         $content =  str_replace("\n",'', $content);
         $content =  str_replace("\t",'', $content);
+        $content = str_replace('"data":}', '"data":""}', $content);
         return json_decode($content);
     }
 }

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

@@ -8,11 +8,9 @@ use App\Classes\Modules\PackingLists\Services\ListsPackingLists;
 use App\Classes\Modules\PackingLists\Standards\Rules\CanListPackingLists;
 use App\Http\Resources\PackingListNullOrderResource;
 use App\Http\Resources\PackingListResource;
-use App\Transformers\PackageListTransformer;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
-use Spatie\Fractalistic\ArraySerializer;
 
 class ListPackingListsLogic extends AbstractControllerLogic
 {
@@ -20,8 +18,7 @@ class ListPackingListsLogic extends AbstractControllerLogic
     /**
      * @return array
      */
-    protected function notification(): array
-    {
+    protected function notification():array {
         return [
             'title' => 'Retrieved PackingLists',
             'message' => 'You have successfully retrieved a list of PackingLists'
@@ -51,22 +48,13 @@ class ListPackingListsLogic extends AbstractControllerLogic
      * @return JsonResponse
      * @throws ErrorException
      */
-    public function logic(Request $request): JsonResponse
+    public function logic(Request $request) : JsonResponse
     {
         $this->canListPackingLists->passes();
 
         $query = $this->listsPackingLists->execute($this->listsPackingLists->deserializeFilters($request->input('filters')));
 
-        return fractal()
-            ->parseIncludes(['transport', 'packages'])
-            ->collection($query, new PackageListTransformer(), "data")
-            ->serializeWith(new ArraySerializer())
-            ->respond(200, [], JSON_PRETTY_PRINT);
-
-
-        //return $this->collectionResponse(PackingListResource::collection($query));
-
-
+        return $this->collectionResponse(PackingListResource::collection($query));
     }
 
 }

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

@@ -11,6 +11,7 @@ use App\Classes\Modules\PackingLists\Standards\Rules\CanCreatePackingList;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\OrderRoleTypes;
 use App\Classes\ValueObjects\Constants\PackingListType;
+use App\Classes\ValueObjects\Constants\PerfexCRMTasksYDStages;
 use App\Classes\ValueObjects\Constants\WarehouseReferences;
 use App\Models\Order;
 use App\Models\PackingList;
@@ -65,7 +66,7 @@ class CreatePackingListProcessor
         $this->createsPackingList->execute($object, $packingList);
 
         if(config('perfexcrm.is_enabled') == 'true'){
-            $this->packingListToPerfexCRMProcessor->execute($packingList);
+            $this->packingListToPerfexCRMProcessor->execute($packingList, PerfexCRMTasksYDStages::DEFAULT);
         }
 
         return $packingList;

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

@@ -26,6 +26,7 @@ use App\Classes\Modules\Unity\Processors\AssignContractEntityProcessor;
 use App\Classes\Modules\Unity\Processors\CreateContractEntityProcessor;
 use App\Classes\Modules\Unity\Services\CreatesContract;
 use App\Classes\Modules\Unity\Services\UpdatesContractObligation;
+use App\Classes\Modules\PerfexCRM\Processors\PackingListToPerfexCRMProcessor;
 use App\Classes\Notifications\ShipmentDepartureEmail;
 use App\Classes\Notifications\ShipmentRescheduleEmail;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
@@ -35,6 +36,7 @@ use App\Classes\ValueObjects\Constants\PackageType;
 use App\Classes\ValueObjects\Constants\PackingListType;
 use App\Classes\ValueObjects\Constants\TransportType;
 use App\Classes\ValueObjects\Constants\WarehouseReferences;
+use App\Classes\ValueObjects\Constants\PerfexCRMTasksYDStages;
 use App\Models\Container;
 use App\Models\Order;
 use App\Models\PackingList;
@@ -62,20 +64,25 @@ class FetchContainersFromYdPortalProcessor
     /** @var CreateContainerProcessor */
     private $createContainerProcessor;
 
+    /** @var PackingListToPerfexCRMProcessor */
+    private $packingListToPerfexCRMProcessor;
+
     /**
      * @param FetchesDataFromYDPortal $fetchesDataFRomYDPortal
      * @param CreatesTransport $createsTransport
      * @param CreatesSchedule $createsSchedule
      * @param FetchesContainer $fetchesContainer
      * @param CreateContainerProcessor $createContainerProcessor
+     * @param PackingListToPerfexCRMProcessor $packingListToPerfexCRMProcessor
      */
-    public function __construct(FetchesDataFromYDPortal $fetchesDataFRomYDPortal, CreatesTransport $createsTransport, CreatesSchedule $createsSchedule, FetchesContainer $fetchesContainer, CreateContainerProcessor $createContainerProcessor)
+    public function __construct(FetchesDataFromYDPortal $fetchesDataFRomYDPortal, CreatesTransport $createsTransport, CreatesSchedule $createsSchedule, FetchesContainer $fetchesContainer, CreateContainerProcessor $createContainerProcessor, PackingListToPerfexCRMProcessor $packingListToPerfexCRMProcessor)
     {
         $this->fetchesDataFRomYDPortal = $fetchesDataFRomYDPortal;
         $this->createsTransport = $createsTransport;
         $this->createsSchedule = $createsSchedule;
         $this->fetchesContainer = $fetchesContainer;
         $this->createContainerProcessor = $createContainerProcessor;
+        $this->packingListToPerfexCRMProcessor = $packingListToPerfexCRMProcessor;
     }
 
 
@@ -87,7 +94,8 @@ class FetchContainersFromYdPortalProcessor
      */
     public function execute()
     {
-        $packingLists = PackingList::where('type', PackingListType::SHIPPING_PACKING_LIST)->doesntHave('containers')->get();
+        $maxFetchTime = Carbon::now()->subMonths(4);
+        $packingLists = PackingList::where('type', PackingListType::SHIPPING_PACKING_LIST)->whereDate('created_at', '>=', $maxFetchTime)->doesntHave('containers')->get();
 
         foreach ($packingLists as $packingList) {
             $time_start = microtime(true);
@@ -137,6 +145,10 @@ class FetchContainersFromYdPortalProcessor
                     $container->packingLists()->detach($packingList);
                     $container->packingLists()->attach($packingList);
 
+                    if(config('perfexcrm.is_enabled') == 'true'){
+                        $this->packingListToPerfexCRMProcessor->execute($packingList, PerfexCRMTasksYDStages::LOAD_CONTAINER);
+                    }
+
                     $transport = $container->transports()->first();
 
                     if(!$transport){

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

@@ -8,9 +8,11 @@ use App\Classes\Modules\Orders\Services\FetchesDataFromYDPortal;
 use App\Classes\Modules\Schedules\DataTransferObjects\ScheduleObject;
 use App\Classes\Modules\Schedules\Services\CreatesSchedule;
 use App\Classes\Modules\Unity\Services\UpdatesContractObligation;
+use App\Classes\Modules\PerfexCRM\Processors\PackingListToPerfexCRMProcessor;
 use App\Classes\Notifications\ShipmentRescheduleEmail;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\OrderRoleTypes;
+use App\Classes\ValueObjects\Constants\PerfexCRMTasksYDStages;
 use App\Models\Container;
 use App\Models\Order;
 use App\Models\PackingList;
@@ -27,16 +29,21 @@ class FetchContainersUpdatesFromYdPortalProcessor
     /** @var CreatesSchedule */
     private $createsSchedule;
 
+    /** @var PackingListToPerfexCRMProcessor */
+    private $packingListToPerfexCRMProcessor;
+
     /**
      * @param FetchesDataFromYDPortal $fetchesDataFRomYDPortal
      * @param UpdatesContractObligation $updatesContractObligations
      * @param CreatesSchedule $createsSchedule
+     * @param PackingListToPerfexCRMProcessor $packingListToPerfexCRMProcessor
      */
-    public function __construct(FetchesDataFromYDPortal $fetchesDataFRomYDPortal, UpdatesContractObligation $updatesContractObligations, CreatesSchedule $createsSchedule)
+    public function __construct(FetchesDataFromYDPortal $fetchesDataFRomYDPortal, UpdatesContractObligation $updatesContractObligations, CreatesSchedule $createsSchedule, PackingListToPerfexCRMProcessor $packingListToPerfexCRMProcessor)
     {
         $this->fetchesDataFRomYDPortal = $fetchesDataFRomYDPortal;
         $this->updatesContractObligations = $updatesContractObligations;
         $this->createsSchedule = $createsSchedule;
+        $this->packingListToPerfexCRMProcessor = $packingListToPerfexCRMProcessor;
     }
 
 
@@ -65,10 +72,14 @@ class FetchContainersUpdatesFromYdPortalProcessor
 
             $unstuffingDate = null;
             $delayDate = null;
+            $checkShipSailDate = null;
+            $checkShipArrivalDate = null;
 
             foreach (array_reverse($rows->data) as $trackingRow) {
                 $rescheduleETD = strpos($trackingRow->remark, '开') || strpos($trackingRow->remark, '到港');
                 $rescheduleETA = strpos($trackingRow->remark, '到港');
+
+
                 if (($rescheduleETD !== false || $rescheduleETA !== false) && strpos($trackingRow->tracking, '货物装柜完成。') === false) {
                     preg_match_all('/([0-9]+.{3})/', $trackingRow->remark, $matches);
                     $dates = collect();
@@ -97,10 +108,12 @@ class FetchContainersUpdatesFromYdPortalProcessor
 
                 if ($trackingRow->tracking === '到港') {
                     $delayDate = Carbon::parse($trackingRow->trackingtime);
+                    $checkShipArrivalDate = Carbon::parse($trackingRow->trackingtime);
                 }
 
                 if ($trackingRow->tracking === '已开船') {
                     $delayDate = Carbon::parse($trackingRow->trackingtime)->addDays('5');
+                    $checkShipSailDate = Carbon::parse($trackingRow->trackingtime);
                 }
 
                 if ($trackingRow->tracking === '货物已进目的港仓库') {
@@ -110,7 +123,30 @@ class FetchContainersUpdatesFromYdPortalProcessor
 
             dump($delayDate, $unstuffingDate);
 
+            if($checkShipSailDate){
+                //check if ship has sailed
+                if($checkShipSailDate->isPast()){
+                    foreach ($container->packingLists as $packingList){
+                        if(config('perfexcrm.is_enabled') == 'true'){
+                            $this->packingListToPerfexCRMProcessor->execute($packingList, PerfexCRMTasksYDStages::SHIP_SAILED);
+                        }
+                    }
+                }
+            }
+
+            if($checkShipArrivalDate){
+                //check if ship has arrived at destination
+                if($checkShipArrivalDate->isPast()){
+                    foreach ($container->packingLists as $packingList){
+                        if(config('perfexcrm.is_enabled') == 'true'){
+                            $this->packingListToPerfexCRMProcessor->execute($packingList, PerfexCRMTasksYDStages::SHIP_ARRIVED);
+                        }
+                    }
+                }
+            }
+
             if($delayDate){
+
                 $delayDate = $delayDate->addDays(2);
                 $transport = $container->transports()->first();
 
@@ -126,7 +162,6 @@ class FetchContainersUpdatesFromYdPortalProcessor
                         }
                     }
                 }
-
             }
 
             if($unstuffingDate){
@@ -148,7 +183,9 @@ class FetchContainersUpdatesFromYdPortalProcessor
                         $this->updatesContractObligations->execute($signature, $step->obligation_hash_id);
                         $step->update(['status' => ApprovalStatus::COMPLETED]);
                     }
-
+                    if(config('perfexcrm.is_enabled') == 'true'){
+                        $this->packingListToPerfexCRMProcessor->execute($packingList, PerfexCRMTasksYDStages::UNSTUFFING);
+                    }
                 }
             }
 

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

@@ -8,6 +8,8 @@ use App\Classes\Modules\Schedules\Services\CreatesSchedule;
 use App\Classes\Modules\Transports\DataTransferObjects\TransportObject;
 use App\Classes\Modules\Transports\Services\CreatesTransport;
 use App\Classes\Modules\Unity\Services\UpdatesContractObligation;
+use App\Classes\Modules\PerfexCRM\Processors\PackingListToPerfexCRMProcessor;
+use App\Classes\ValueObjects\Constants\PerfexCRMTasksYDStages;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\OrderRoleTypes;
 use App\Classes\ValueObjects\Constants\PackingListType;
@@ -34,16 +36,21 @@ class FetchDeliveryUpdatesFromYdPortalProcessor
     /** @var CreatesSchedule */
     private $createsSchedule;
 
+    /** @var PackingListToPerfexCRMProcessor */
+    private $packingListToPerfexCRMProcessor;
+
     /**
      * @param UpdatesContractObligation $updatesContractObligations
      * @param CreatesTransport $createsTransport
      * @param CreatesSchedule $createsSchedule
+     * @param PackingListToPerfexCRMProcessor $packingListToPerfexCRMProcessor
      */
-    public function __construct(UpdatesContractObligation $updatesContractObligations, CreatesTransport $createsTransport, CreatesSchedule $createsSchedule)
+    public function __construct(UpdatesContractObligation $updatesContractObligations, CreatesTransport $createsTransport, CreatesSchedule $createsSchedule, PackingListToPerfexCRMProcessor $packingListToPerfexCRMProcessor)
     {
         $this->updatesContractObligations = $updatesContractObligations;
         $this->createsTransport = $createsTransport;
         $this->createsSchedule = $createsSchedule;
+        $this->packingListToPerfexCRMProcessor = $packingListToPerfexCRMProcessor;
     }
 
 
@@ -99,6 +106,9 @@ class FetchDeliveryUpdatesFromYdPortalProcessor
                     $this->updatesContractObligations->execute($signature, $deliveryStep->obligation_hash_id);
                     $deliveryStep->update(['status' => ApprovalStatus::COMPLETED]);
 
+                    if(config('perfexcrm.is_enabled') == 'true'){
+                        $this->packingListToPerfexCRMProcessor->execute($packingList, PerfexCRMTasksYDStages::DELIVERY);
+                    }
                 }
 
                 $time_end = microtime(true);

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

@@ -121,6 +121,7 @@ class FetchPackingListsFromYdPortalProcessor
                 }
 
                 $endDate = Carbon::today()->subDays($x - 1);
+
                 $orderRequest = $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/GetOrderList.ashx', 'GET', [
                     'begintime' => $startDate->timestamp,
                     'endtime' => $endDate->timestamp,
@@ -131,6 +132,7 @@ class FetchPackingListsFromYdPortalProcessor
                 if(!$rows->data) continue;
 
                 foreach($rows->data as $row){
+                    if(!is_numeric($row->goodcount)) continue;
 
                     $time_start = microtime(true);
 

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

@@ -151,7 +151,8 @@ class CreatePerfexCRMInvoiceProcessor
             array_push($invoiceItems, $invoiceSingleItem);
         }
 
-        $total = $transaction->amount;
+        // $total = $transaction->amount;
+        $total = number_format($transaction->amount, 2,'.','') * 1;
 
         //This setting is similar to Setup > Leads > Sources, Setup > Leads > Statuses
         //Can be found at Finance > Payment Modes

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->owner->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/NewLeadTaskToPerfexCRMProcessor.php

@@ -7,6 +7,8 @@ use App\Classes\Jobs\CreatePerfexCRMSingleTask;
 use App\Classes\ValueObjects\Constants\PerfexCRMTaskPriority;
 use App\Classes\ValueObjects\Constants\PerfexCRMTasks;
 use App\Models\Company;
+use Illuminate\Support\Facades\Log;
+
 
 class NewLeadTaskToPerfexCRMProcessor
 {
@@ -17,26 +19,32 @@ class NewLeadTaskToPerfexCRMProcessor
      */
     public function execute(Company $company)
     {
-        $companyModule = $company->companyModules()->first();
-        $employee = $companyModule->employees()->first();
-        $contactEmail = $employee->email;
+        try {
+            $companyModule = $company->companyModules()->first();
+            $employee = $companyModule->employees()->first();
+            $contactEmail = $employee->email;
 
-        $createTaskPerfexCRMObject = new CreateTaskPerfexCRMObject(
-            $contactEmail,
-            PerfexCRMTasks::TASK_IDENTIFICATION_1['name'],
-            PerfexCRMTasks::TASK_IDENTIFICATION_1['description'],
-            "",
-            "",
-            "",
-            "",
-            "",
-            PerfexCRMTasks::TASK_IDENTIFICATION_1['status'],
-            PerfexCRMTasks::TASK_IDENTIFICATION_1['department'],
-            PerfexCRMTaskPriority::DEFAULT,
-            "0"
-        );
+            $createTaskPerfexCRMObject = new CreateTaskPerfexCRMObject(
+                $contactEmail,
+                PerfexCRMTasks::TASK_IDENTIFICATION_1['name'],
+                PerfexCRMTasks::TASK_IDENTIFICATION_1['description'],
+                "",
+                "",
+                "",
+                "",
+                "",
+                PerfexCRMTasks::TASK_IDENTIFICATION_1['status'],
+                PerfexCRMTasks::TASK_IDENTIFICATION_1['department'],
+                PerfexCRMTaskPriority::DEFAULT,
+                "0",
+                0
+            );
 
-        CreatePerfexCRMSingleTask::dispatch($createTaskPerfexCRMObject);
+            CreatePerfexCRMSingleTask::dispatch($createTaskPerfexCRMObject);
+
+        } catch (\Exception $exception){
+            Log::error($exception);
+        }
         return true;
     }
 

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

@@ -4,57 +4,160 @@ namespace App\Classes\Modules\PerfexCRM\Processors;
 
 use App\Classes\Modules\PerfexCRM\DataTransferObjects\UpdatePerfexCRMObject;
 use App\Classes\ValueObjects\Constants\PerfexCRMTasks;
-use App\Classes\Jobs\UpdatePerfexCRM;
 use App\Classes\Jobs\UpdatePerfexCRMPrelude;
 use App\Models\PackingList;
 use App\Classes\ValueObjects\Constants\PerfexCRMProjectStatus;
+use App\Classes\ValueObjects\Constants\PerfexCRMTasksYDStages;
+use App\Classes\ValueObjects\Constants\PerfexCRMTaskStatus;
 use Illuminate\Support\Facades\Log;
 
 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, int $stage = PerfexCRMTasksYDStages::DEFAULT): bool
     {
         try {
             if($packingList->owner instanceof \App\Models\Order) {
-                $order = $packingList->owner;
-                $companyModule  = $order->companyModule()->first();
-                $connection = $companyModule->inviters()->withPivot('invitee_reference')->first();
-                $companyName = $companyModule->name;
-                $companyReference = $connection ? $connection->pivot->invitee_reference:'';
-                $employee = $companyModule->employees()->first();
-                $contactEmail = $employee->email;
-                $contactName = $employee->name;
-
-                $orderReference = $packingList->owner->reference;
-                $packingListReference = $packingList->reference;
-                $projectName = 'IZYIM | X1 Shipping | '.$orderReference.' | '.$packingListReference;
+                $info = $this->extractInfo($packingList);
+                $tasks = $this->defineTasks($stage);
 
                 $updatePerfexCRMObject = new UpdatePerfexCRMObject(
-                    $companyName,
-                    $companyReference,
-                    $contactName,
-                    $contactEmail,
-                    "",
-                    $projectName,
+                    $info['companyName'],
+                    $info['companyReference'],
+                    $info['contactName'],
+                    $info['contactEmail'],
+                    $info['bookingMarking'], //For Exchange-2.0
+                    $info['projectName'],
                     PerfexCRMProjectStatus::NOT_STARTED,
+                    0,
                     [],
-                    [
-                        PerfexCRMTasks::TASK_LOADED_CONTAINER_1,
-                        PerfexCRMTasks::TASK_LOADED_CONTAINER_2,
-                    ]
+                    $tasks
                 );
-                UpdatePerfexCRMPrelude::dispatch($packingList, null, $updatePerfexCRMObject, UpdatePerfexCRM::class, null);
+                $this->dispatchUpdateJob($packingList, $updatePerfexCRMObject);
             }
         } catch (\Exception $exception){
-            Log::error(json_encode('PackingListToPerfexCRMProcessor debug:'));
-            Log::error(json_encode($packingList));
+            Log::error('PackingListToPerfexCRMProcessor: ' . json_encode($packingList));
             Log::error($exception);
         }
         return true;
     }
+
+     //Level 1
+    private function extractInfo(PackingList $packingList): array
+    {
+        $order = $packingList->owner;
+        $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'] = ''; //For Exchange-2.0
+        $info['projectName'] = 'IZYIM | X1 Shipping | '.$packingList->owner->reference.' | '.$packingList->reference;
+
+        return $info;
+    }
+
+    private function defineTasks(int $stage): array
+    {
+        $tasks = [];
+
+        if ($stage === PerfexCRMTasksYDStages::DEFAULT) {
+            $tasks = $this->defineAllYDStagesTasks();
+        }
+        else if ($stage === PerfexCRMTasksYDStages::LOAD_CONTAINER) {
+            $tasks = $this->updateLoadContainerTasks();
+        }
+        else if ($stage === PerfexCRMTasksYDStages::SHIP_SAILED) {
+            $tasks = $this->updateShipSailedTasks();
+        }
+        else if ($stage === PerfexCRMTasksYDStages::SHIP_ARRIVED) {
+            $tasks = $this->updateShipArrivedTasks();
+        }
+        else if ($stage === PerfexCRMTasksYDStages::UNSTUFFING) {
+            $tasks = $this->updateUnstuffingTasks();
+        }
+        else if ($stage === PerfexCRMTasksYDStages::DELIVERY) {
+            $tasks = $this->updateDeliveryTasks();
+        }
+
+        return $tasks;
+    }
+
+    private function dispatchUpdateJob(PackingList $packingList, UpdatePerfexCRMObject $updatePerfexCRMObject)
+    {
+        UpdatePerfexCRMPrelude::dispatch($packingList, null, $updatePerfexCRMObject, false);
+    }
+
+
+     //Level Others: Nested
+    private function defineAllYDStagesTasks(): array
+    {
+        $tasks = [
+            PerfexCRMTasks::TASK_YD_LOADED_CONTAINER_1,
+            PerfexCRMTasks::TASK_YD_LOADED_CONTAINER_2,
+            PerfexCRMTasks::TASK_YD_LOADED_CONTAINER_3,
+            PerfexCRMTasks::TASK_YD_SHIPPING_1,
+            PerfexCRMTasks::TASK_YD_UNSTUFFING_1,
+            PerfexCRMTasks::TASK_YD_DELIVERY_1,
+        ];
+
+        return $tasks;
+    }
+
+    private function updateLoadContainerTasks(): array
+    {
+        $tasks = [];
+        $tasks = $this->completeTask(null, PerfexCRMTasks::TASK_YD_LOADED_CONTAINER_3);
+        return $tasks;
+    }
+
+    private function updateShipSailedTasks(): array
+    {
+        $tasks = [];
+        $tasks = $this->completeTask(PerfexCRMTasks::TASK_YD_LOADED_CONTAINER_3, PerfexCRMTasks::TASK_YD_SHIPPING_1);
+        return $tasks;
+    }
+
+    private function updateShipArrivedTasks(): array
+    {
+        $tasks = [];
+        $tasks = $this->completeTask(PerfexCRMTasks::TASK_YD_SHIPPING_1, PerfexCRMTasks::TASK_YD_UNSTUFFING_1);
+        return $tasks;
+    }
+
+    private function updateUnstuffingTasks(): array
+    {
+        $tasks = [];
+        $tasks = $this->completeTask(PerfexCRMTasks::TASK_YD_UNSTUFFING_1, PerfexCRMTasks::TASK_YD_DELIVERY_1);
+        return $tasks;
+    }
+
+    private function updateDeliveryTasks(): array
+    {
+        $tasks = [];
+        $tasks = $this->completeTask(PerfexCRMTasks::TASK_YD_DELIVERY_1, null);
+        return $tasks;
+    }
+
+    private function completeTask($startTask, $endTask) {
+        $resultArray = [];
+        if($startTask){
+            $startTask['status'] = PerfexCRMTaskStatus::COMPLETED;
+            array_push($resultArray, $startTask);
+        }
+        if($endTask){
+            $endTask['status'] = PerfexCRMTaskStatus::IN_PROGRESS;
+            array_push($resultArray, $endTask);
+        }
+
+        return $resultArray;
+    }
+
 }

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 at crm
+    {
+        $tasks = [];
+        return $tasks;
+    }
+
+    private function defineTasks_handleApprovedStatus_handlePaymentApprovedStatus(): array //cief todo: to comfirm what tasks need to be created at crm
+    {
+        $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']);
-                    // }
+                    //Check to make sure that task that is already completed do not get updated again
+                    if($taskStatus != PerfexCRMTaskStatus::NOT_STARTED && $result->payload[0]['status'] != PerfexCRMTaskStatus::COMPLETED && $result->payload[0]['status'] != $taskStatus)
+                    {
+                        $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/ConvertsPerfexCRMLeadToCustomer.php

@@ -4,6 +4,7 @@ namespace App\Classes\Modules\PerfexCRM\Services;
 
 use Illuminate\Support\Facades\Http;
 use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\Exceptions\ConnectionErrorException;
 use Illuminate\Support\Facades\Log;
 
 class ConvertsPerfexCRMLeadToCustomer
@@ -24,11 +25,16 @@ class ConvertsPerfexCRMLeadToCustomer
 
                 return (object) $data;
             }else{
-                Log::error($response);
+                Log::error('ConvertsPerfexCRMLeadToCustomer: '.$response);
                 return null;
             }
-        }catch(\Exception $exception){
-            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server' . $exception->getMessage());
+        }
+        catch(\Illuminate\Http\Client\ConnectionException $exception){
+            $error = 'Failed to connect to CRM';
+            throw new ConnectionErrorException($error, $exception->getMessage(), $email, $exception->getTraceAsString());
+        }
+        catch(\Exception $exception){
+            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server: ' . $exception->getMessage());
         }
     }
 }

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

@@ -4,6 +4,7 @@ namespace App\Classes\Modules\PerfexCRM\Services;
 
 use Illuminate\Support\Facades\Http;
 use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\Exceptions\ConnectionErrorException;
 use Illuminate\Support\Facades\Log;
 
 class CreatesPerfexCRMCustomer
@@ -27,11 +28,16 @@ class CreatesPerfexCRMCustomer
                 $data = $response->json();
                 return (object) $data;
             }else{
-                Log::error($response);
+                Log::error('CreatesPerfexCRMCustomer: '.$response);
                 return null;
             }
-        }catch(\Exception $exception){
-            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server' . $exception->getMessage());
+        }
+        catch(\Illuminate\Http\Client\ConnectionException $exception){
+            $error = 'Failed to connect to CRM';
+            throw new ConnectionErrorException($error, $exception->getMessage(), $companyName, $exception->getTraceAsString());
+        }
+        catch(\Exception $exception){
+            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server: ' . $exception->getMessage());
         }
     }
 }

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

@@ -5,6 +5,7 @@ namespace App\Classes\Modules\PerfexCRM\Services;
 use App\Classes\Modules\PerfexCRM\DataTransferObjects\CustomerContactObject;
 use Illuminate\Support\Facades\Http;
 use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\Exceptions\ConnectionErrorException;
 use Illuminate\Support\Facades\Log;
 
 class CreatesPerfexCRMCustomerContact
@@ -34,11 +35,16 @@ class CreatesPerfexCRMCustomerContact
                 $data = $response->json();
                 return (object) $data;
             }else{
-                Log::error($response);
+                Log::error('CreatesPerfexCRMCustomerContact: '.$response);
                 return null;
             }
-        }catch(\Exception $exception){
-            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server' . $exception->getMessage());
+        }
+        catch(\Illuminate\Http\Client\ConnectionException $exception){
+            $error = 'Failed to connect to CRM';
+            throw new ConnectionErrorException($error, $exception->getMessage(), "", $exception->getTraceAsString());
+        }
+        catch(\Exception $exception){
+            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server: ' . $exception->getMessage());
         }
     }
 }

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

@@ -4,6 +4,7 @@ namespace App\Classes\Modules\PerfexCRM\Services;
 
 use Illuminate\Support\Facades\Http;
 use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\Exceptions\ConnectionErrorException;
 use Illuminate\Support\Facades\Log;
 
 class CreatesPerfexCRMCustomerProject
@@ -33,11 +34,16 @@ class CreatesPerfexCRMCustomerProject
                 $data = $response->json();
                 return (object) $data;
             }else{
-                Log::error($response);
+                Log::error('CreatesPerfexCRMCustomerProject: '.$response);
                 return null;
             }
-        }catch(\Exception $exception){
-            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server' . $exception->getMessage());
+        }
+        catch(\Illuminate\Http\Client\ConnectionException $exception){
+            $error = 'Failed to connect to CRM';
+            throw new ConnectionErrorException($error, $exception->getMessage(), "", $exception->getTraceAsString());
+        }
+        catch(\Exception $exception){
+            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server: ' . $exception->getMessage());
         }
     }
 }

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

@@ -4,6 +4,7 @@ namespace App\Classes\Modules\PerfexCRM\Services;
 
 use Illuminate\Support\Facades\Http;
 use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\Exceptions\ConnectionErrorException;
 use Illuminate\Support\Facades\Log;
 use App\Classes\Modules\PerfexCRM\DataTransferObjects\InvoicePerfexCRMObject;
 
@@ -53,11 +54,16 @@ class CreatesPerfexCRMInvoice
                 $data = $response->json();
                 return (object) $data;
             }else{
-                Log::error($response);
+                Log::error('CreatesPerfexCRMInvoice: '.$response);
                 return null;
             }
-        }catch(\Exception $exception){
-            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server' . $exception->getMessage());
+        }
+        catch(\Illuminate\Http\Client\ConnectionException $exception){
+            $error = 'Failed to connect to CRM';
+            throw new ConnectionErrorException($error, $exception->getMessage(), "", $exception->getTraceAsString());
+        }
+        catch(\Exception $exception){
+            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server: ' . $exception->getMessage());
         }
     }
 }

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

@@ -4,6 +4,7 @@ namespace App\Classes\Modules\PerfexCRM\Services;
 
 use Illuminate\Support\Facades\Http;
 use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\Exceptions\ConnectionErrorException;
 use Illuminate\Support\Facades\Log;
 use App\Classes\Modules\PerfexCRM\DataTransferObjects\InvoicePaymentPerfexCRMObject;
 
@@ -33,11 +34,16 @@ class CreatesPerfexCRMInvoicePayment
                 $data = $response->json();
                 return (object) $data;
             }else{
-                Log::error($response);
+                Log::error('CreatesPerfexCRMInvoicePayment: '.$response);
                 return null;
             }
-        }catch(\Exception $exception){
-            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server' . $exception->getMessage());
+        }
+        catch(\Illuminate\Http\Client\ConnectionException $exception){
+            $error = 'Failed to connect to CRM';
+            throw new ConnectionErrorException($error, $exception->getMessage(), "", $exception->getTraceAsString());
+        }
+        catch(\Exception $exception){
+            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server: ' . $exception->getMessage());
         }
     }
 }