Debug Pipeline Failed

# Conflicts:
#	app/Classes/Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php
#	app/Classes/ValueObjects/Constants/TransactionType.php
#	routes/web.php

.env.example

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

.env.testing

@@ -0,0 +1,59 @@
+APP_NAME=Laravel
+APP_ENV=local
+APP_KEY=base64:rIar2fvNeRzQdvKOgLUg03detGDMx6ym2SYFRjawrAc=
+APP_DEBUG=true
+APP_URL=http://localhost
+
+LOG_CHANNEL=stack
+LOG_LEVEL=debug
+
+DB_CONNECTION=mysql
+DB_HOST=127.0.0.1
+DB_PORT=3306
+DB_DATABASE=shpping_portal
+DB_USERNAME=root
+DB_PASSWORD=P@ssw0rd
+
+BROADCAST_DRIVER=log
+CACHE_DRIVER=file
+FILESYSTEM_DRIVER=local
+QUEUE_CONNECTION=sync
+SESSION_DRIVER=file
+SESSION_LIFETIME=120
+
+MEMCACHED_HOST=127.0.0.1
+
+REDIS_HOST=127.0.0.1
+REDIS_PASSWORD=null
+REDIS_PORT=6379
+
+MAIL_MAILER=smtp
+MAIL_HOST=mailhog
+MAIL_PORT=1025
+MAIL_USERNAME=null
+MAIL_PASSWORD=null
+MAIL_ENCRYPTION=null
+MAIL_FROM_ADDRESS=null
+MAIL_FROM_NAME="${APP_NAME}"
+
+AWS_ACCESS_KEY_ID=
+AWS_SECRET_ACCESS_KEY=
+AWS_DEFAULT_REGION=us-east-1
+AWS_BUCKET=
+AWS_USE_PATH_STYLE_ENDPOINT=false
+
+PUSHER_APP_ID=
+PUSHER_APP_KEY=
+PUSHER_APP_SECRET=
+PUSHER_APP_CLUSTER=mt1
+
+MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
+MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
+
+UNITY_APP_URL="https://unity.izyim.com"
+EXCHANGE_URL=https://dev.exchange.cief-malaysia.com/
+MIX_EXCHANGE_URL="${EXCHANGE_URL}"
+
+YD_API_CODE=''
+
+JWT_SECRET=Btj63iMEleEaww6Bb2IBECkxWn7YHPhhPFluAkg9DfcQik0qDRy6QW75ABGmPT2h

.gitignore

@@ -2,6 +2,8 @@
 /public/hot
 /public/storage
 /storage/*.key
+/tests/_output
+/tests/_support
 /vendor
 **/.idea/
 .env
@@ -25,3 +27,6 @@ package-lock.json
 public/*
 /public/*
 storage/framework/laravel-excel/*
+.vapor/
+.env.production
+.env.staging

.gitlab-ci.yml

@@ -0,0 +1,48 @@
+image: php:7.4
+stages:
+  - deploy
+
+#jobs
+#deploy
+deploy:
+  stage: deploy
+  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 node js
+    - apt-get update && apt-get install -y  nodejs npm
+
+    # Install docker
+    - apt-get update
+    - apt-get install -y apt-transport-https ca-certificates curl gnupg lsb-release software-properties-common
+    - curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add -
+    - add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/debian $(lsb_release -cs) stable"
+    - apt-get update
+    - apt-get install -y docker-ce docker-ce-cli containerd.io
+    - service docker start
+
+    # Install gulp Js
+    - npm install -g gulp-cli
+  script:
+    - composer install
+    - vendor/bin/vapor deploy production --message="$CI_COMMIT_MESSAGE"
+  only:
+    - test
+
+

README.md

@@ -1,62 +1,39 @@
-<p align="center"><a href="https://laravel.com" target="_blank"><img src="https://raw.githubusercontent.com/laravel/art/master/logo-lockup/5%20SVG/2%20CMYK/1%20Full%20Color/laravel-logolockup-cmyk-red.svg" width="400"></a></p>
+## Shipping portal documentation
 
-<p align="center">
-<a href="https://travis-ci.org/laravel/framework"><img src="https://travis-ci.org/laravel/framework.svg" alt="Build Status"></a>
-<a href="https://packagist.org/packages/laravel/framework"><img src="https://img.shields.io/packagist/dt/laravel/framework" alt="Total Downloads"></a>
-<a href="https://packagist.org/packages/laravel/framework"><img src="https://img.shields.io/packagist/v/laravel/framework" alt="Latest Stable Version"></a>
-<a href="https://packagist.org/packages/laravel/framework"><img src="https://img.shields.io/packagist/l/laravel/framework" alt="License"></a>
-</p>
+simple documentation on how to install, run, test, commit and deploy application
 
-## About Laravel
+## creating and running unit tests
 
-Laravel is a web application framework with expressive, elegant syntax. We believe development must be an enjoyable and creative experience to be truly fulfilling. Laravel takes the pain out of development by easing common tasks used in many web projects, such as:
+Required Tools
 
-- [Simple, fast routing engine](https://laravel.com/docs/routing).
-- [Powerful dependency injection container](https://laravel.com/docs/container).
-- Multiple back-ends for [session](https://laravel.com/docs/session) and [cache](https://laravel.com/docs/cache) storage.
-- Expressive, intuitive [database ORM](https://laravel.com/docs/eloquent).
-- Database agnostic [schema migrations](https://laravel.com/docs/migrations).
-- [Robust background job processing](https://laravel.com/docs/queues).
-- [Real-time event broadcasting](https://laravel.com/docs/broadcasting).
+- Chromium Driver / selenium
+- add running and setting selenium  on all OS if possible
 
-Laravel is accessible, powerful, and provides tools required for large, robust applications.
+Required Packages :
 
-## Learning Laravel
+- laravel/legacy-factories
 
-Laravel has the most extensive and thorough [documentation](https://laravel.com/docs) and video tutorial library of all modern web application frameworks, making it a breeze to get started with the framework.
+- codeception/codeception
 
-If you don't feel like reading, [Laracasts](https://laracasts.com) can help. Laracasts contains over 1500 video tutorials on a range of topics including Laravel, modern PHP, unit testing, and JavaScript. Boost your skills by digging into our comprehensive video library.
+Or Simply Run
 
-## Laravel Sponsors
+``Composer install``
 
-We would like to extend our thanks to the following sponsors for funding Laravel development. If you are interested in becoming a sponsor, please visit the Laravel [Patreon page](https://patreon.com/taylorotwell).
+To create a unit test
 
-### Premium Partners
+``php artisan make test: Test Example --unit``
 
-- **[Vehikl](https://vehikl.com/)**
-- **[Tighten Co.](https://tighten.co)**
-- **[Kirschbaum Development Group](https://kirschbaumdevelopment.com)**
-- **[64 Robots](https://64robots.com)**
-- **[Cubet Techno Labs](https://cubettech.com)**
-- **[Cyber-Duck](https://cyber-duck.co.uk)**
-- **[Many](https://www.many.co.uk)**
-- **[Webdock, Fast VPS Hosting](https://www.webdock.io/en)**
-- **[DevSquad](https://devsquad.com)**
-- **[Curotec](https://www.curotec.com/services/technologies/laravel/)**
-- **[OP.GG](https://op.gg)**
+Running the tests :
 
-## Contributing
+Running a single Test
 
-Thank you for considering contributing to the Laravel framework! The contribution guide can be found in the [Laravel documentation](https://laravel.com/docs/contributions).
+`` php artisan test --filter Example``
 
-## Code of Conduct
+Running Unit tests -
 
-In order to ensure that the Laravel community is welcoming to all, please review and abide by the [Code of Conduct](https://laravel.com/docs/contributions#code-of-conduct).
+`` php artisan test ``
 
-## Security Vulnerabilities
+Running Codeception tests -
 
-If you discover a security vulnerability within Laravel, please send an e-mail to Taylor Otwell via [taylor@laravel.com](mailto:taylor@laravel.com). All security vulnerabilities will be promptly addressed.
+``vendor/bin/codecept run``
 
-## License
-
-The Laravel framework is open-sourced software licensed under the [MIT license](https://opensource.org/licenses/MIT).

app/Classes/Exceptions/ConnectionErrorException.php

@@ -1,20 +0,0 @@
-<?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/DoesNotHaveTransactionType.php

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

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

@@ -1,22 +0,0 @@
-<?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/OwnerType.php

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

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

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

app/Classes/General/Helper.php

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

app/Classes/Jobs/UpdatePerfexCRM.php

@@ -3,8 +3,6 @@
 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;
@@ -12,8 +10,6 @@ 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
 {
@@ -22,51 +18,37 @@ 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 Transaction $transaction
-     * @param bool|null $shouldCreateInvoice
+     * @param UpdatePerfexCRMInvoice $nextJob
+     * @param $transaction
      */
-    public function __construct(UpdatePerfexCRMObject $updatePerfexCRMObject, $transaction, ?bool $shouldCreateInvoice = false)
+    public function __construct(UpdatePerfexCRMObject $updatePerfexCRMObject, $transaction, $nextJob)
     {
         $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->transaction != null && $this->shouldCreateInvoice){
+        if($this->nextJob != null && $this->transaction != null){
             $updatePerfexCRMInvoiceOject = new UpdatePerfexCRMInvoiceObject(
                 $this->updatePerfexCRMObject->getContactEmail(),
                 $result->projectId,
                 $this->transaction,
                 true
             );
-            UpdatePerfexCRMInvoice::dispatch($updatePerfexCRMInvoiceOject);
+            /** @var UpdatePerfexCRMInvoice $nextJob */
+            $this->nextJob::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,14 +11,16 @@ use App\Classes\Modules\PerfexCRM\Services\UpdatesPerfexCRMInvoice;
 use App\Classes\Modules\PerfexCRM\DataTransferObjects\UpdatePerfexCRMInvoiceObject;
 use App\Classes\Modules\PerfexCRM\DataTransferObjects\InvoicePaymentPerfexCRMObject;
 use App\Classes\ValueObjects\Constants\PerfexCRMInvoiceStatus;
+use App\Models\PackingList;
 use App\Models\Transaction;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
-use Carbon\Carbon;
 use Illuminate\Support\Facades\Log;
+use Carbon\Carbon;
+
 use App\Classes\General\Helper;
 
 class UpdatePerfexCRMInvoice implements ShouldQueue
@@ -30,7 +32,7 @@ class UpdatePerfexCRMInvoice implements ShouldQueue
 
     /**
      * CreatePerfexCRMSingleTask constructor.
-     * @param UpdatePerfexCRMInvoiceObject $updatePerfexCRMInvoiceObject
+     * @param UpdatePerfexCRMInvoiceObject $createTaskPerfexCRMObject
      */
     public function __construct(UpdatePerfexCRMInvoiceObject $updatePerfexCRMInvoiceObject)
     {
@@ -47,7 +49,7 @@ class UpdatePerfexCRMInvoice implements ShouldQueue
         $invoiceId = 0;
         $invoiceStatus = 0;
         $invoice = (App()->make(FetchesPerfexCRMInvoice::class))->execute($customer->userid,"INV-", $transaction->owner->bill_no);
-        Log::error('UpdatePerfexCRMInvoice debug bill_no: ' . $transaction->owner->bill_no . ', Project Id: ' . $this->updatePerfexCRMInvoiceObject->getProjectId());
+        Log::error(json_encode('UpdatePerfexCRMInvoice debug $transaction->owner->bill_no: '.$transaction->owner->bill_no));
 
         if(is_null($invoice)){
             $result = (App()->make(CreatePerfexCRMInvoiceProcessor::class))->execute($transaction->owner, $this->updatePerfexCRMInvoiceObject->getIsPaid());
@@ -55,7 +57,7 @@ class UpdatePerfexCRMInvoice implements ShouldQueue
                 $invoiceId = $result->payload['id'];
             } else {
                 // Log::error(json_encode('UpdatePerfexCRMInvoice CreatePerfexCRMInvoiceProcessor failed'));
-                Helper::debugLogger('UpdatePerfexCRMInvoice CreatePerfexCRMInvoiceProcessor failed');
+                Helper::debugLoggerForPerfexCRM('UpdatePerfexCRMInvoice CreatePerfexCRMInvoiceProcessor failed');
             }
         }
         else{
@@ -64,6 +66,7 @@ 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,22 +27,27 @@ class UpdatePerfexCRMPrelude implements ShouldQueue
     /** @var UpdatePerfexCRMObject */
     private $updatePerfexCRMObject;
 
-    /** @var bool|null */
-    private $shouldCreateInvoice;
+    /** @var UpdatePerfexCRM */
+    private $nextJob1;
+
+    /** @var UpdatePerfexCRMInvoice */
+    private $nextJob2;
 
     /**
      * UpdatePerfexCRMPrelude constructor.
      * @param $packingList
-     * @param Transaction $transaction
+     * @param $transaction
      * @param UpdatePerfexCRMObject $updatePerfexCRMObject
-     * @param bool|null $shouldCreateInvoice
+     * @param UpdatePerfexCRM $nextJob1
+     * @param UpdatePerfexCRMInvoice $nextJob2
      */
-    public function __construct($packingList, $transaction, UpdatePerfexCRMObject $updatePerfexCRMObject, ?bool $shouldCreateInvoice = false)
+    public function __construct($packingList, $transaction, UpdatePerfexCRMObject $updatePerfexCRMObject, $nextJob1, $nextJob2)
     {
         $this->packingList = $packingList;
         $this->transaction = $transaction;
         $this->updatePerfexCRMObject = $updatePerfexCRMObject;
-        $this->shouldCreateInvoice = $shouldCreateInvoice;
+        $this->nextJob1 = $nextJob1;
+        $this->nextJob2 = $nextJob2;
     }
 
     public function handle()
@@ -64,7 +69,9 @@ class UpdatePerfexCRMPrelude implements ShouldQueue
 
         $result = $this->replacePlaceholders($this->updatePerfexCRMObject->getTasks(), $data);
         $this->updatePerfexCRMObject->setTasks($result);
-        UpdatePerfexCRM::dispatch($this->updatePerfexCRMObject, $this->transaction, $this->shouldCreateInvoice);
+        /** @var UpdatePerfexCRM $nextJob1 */
+        /** @var UpdatePerfexCRMInvoice $nextJob2 */
+        $this->nextJob1::dispatch($this->updatePerfexCRMObject, $this->transaction, $this->nextJob2);
     }
 
     function replacePlaceholders($template, $data, $prefix = '')

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

@@ -68,19 +68,19 @@ class CreateBillingAddressLogic extends AbstractControllerLogic
     {
         $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 ($address->type !== AddressType::BILLING || $address->id !== $companyModule->addresses->where('type', AddressType::BILLING)->first()->id) {
+        if ($billingAddressInputed->type !== AddressType::BILLING || $billingAddressInputed->id !== $companyModule->addresses->where('type', AddressType::BILLING)->first()->id) {
             // delete all current billing address
             Address::where('owner_type', CompanyModule::class)->where('owner_id', $request->input('company_module_id'))->where('type', AddressType::BILLING)->delete();
 
-            // create addrress
-            $billingAddress = new AddressObject($address->street_one, $address->street_two, $address->country_id, $address->state_id, $address->district_id, $address->postcode, AddressType::BILLING, ApprovalStatus::APPROVED, $address->reference);
+            // create new billing addrress
+            $billingAddress = new AddressObject($billingAddressInputed->street_one, $billingAddressInputed->street_two, $billingAddressInputed->country_id, $billingAddressInputed->state_id, $billingAddressInputed->district_id, $billingAddressInputed->postcode, AddressType::BILLING, ApprovalStatus::APPROVED, $billingAddressInputed->reference);
             $this->canCreateAddress->passes($billingAddress);
             $this->createsAddress->execute($companyModule, $billingAddress);
         }
 
-        return $this->resourceResponse(new AddressResource($address));
+        return $this->resourceResponse(new AddressResource($billingAddressInputed));
     }
 
 }

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/Billplzs/Services/CreatesBillplzBill.php

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

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

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

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

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

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

@@ -15,17 +15,9 @@ 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 [
@@ -34,49 +26,38 @@ 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()
     {
-        $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;
+        return PackingList::where('type', '=', 1)->where('status', '=', 2)->where('owner_type', Order::class);
     }
 
+    /**
+     * @param $packingList
+     * @return array
+     */
     public function map($packingList): array
     {
         $order = $packingList->owner;
-        $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;
+
+        $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;
         });
-        $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));
+
+        $arrival_date = $packingList->transports()->first()->drop_date->format('d-m-Y');
 
         return [
             $packingList->owner->reference,
@@ -86,9 +67,7 @@ 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,6 @@ class ExportsPaymentTransactions implements FromQuery, WithHeadings, WithHeading
             'DocNo',
             'DocDate',
             'DebtorCode',
-            'Ref',
             'ShipInfo',
             'AccNo',
             'DetailDescription',
@@ -127,7 +126,6 @@ class ExportsPaymentTransactions implements FromQuery, WithHeadings, WithHeading
             $transaction->created_at->format('m/d/Y H:m'),
             $company->debtor,
             $order->reference,
-            $order->reference,
             '500-0000',
             'X1 Freight Service Charge',
             $furtherDescription,

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

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

app/Classes/Modules/HelpMenu/ControllersLogic/FetchHelpMenuQuestionLogic.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\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

@@ -1,62 +0,0 @@
-<?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

@@ -1,67 +0,0 @@
-<?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

@@ -1,60 +0,0 @@
-<?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

@@ -1,66 +0,0 @@
-<?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

@@ -1,89 +0,0 @@
-<?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

@@ -0,0 +1,124 @@
+<?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

@@ -1,131 +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\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

@@ -1,55 +0,0 @@
-<?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

@@ -1,55 +0,0 @@
-<?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/DeleteHelpMenuAnswerProcessor.php

@@ -4,40 +4,32 @@ namespace App\Classes\Modules\HelpMenu\Processors;
 
 use App\Models\QAUserAnswerSelected;
 use App\Classes\Modules\HelpMenu\Services\FetchesHelpMenuUserAnswerSelected;
-use App\Classes\Modules\HelpMenu\Services\ListsHelpMenuUserAnswerSelected;
+use App\Classes\Modules\HelpMenu\Services\FetchesHelpMenuUserAnswerSelectedList;
 
-class DeleteAnswerQAProcessor
+class DeleteHelpMenuAnswerProcessor
 {
     /** @var FetchesHelpMenuUserAnswerSelected */
     private $fetchesHelpMenuUserAnswerSelected;
 
-    /** @var ListsHelpMenuUserAnswerSelected */
-    private $listsHelpMenuUserAnswerSelected;
+    /** @var FetchesHelpMenuUserAnswerSelectedList */
+    private $fetchesHelpMenuUserAnswerSelectedList;
 
     /**
-     * DeleteAnswerQAProcessor constructor.
+     * DeleteHelpMenuAnswerProcessor constructor.
      * @param FetchesHelpMenuUserAnswerSelected $fetchesHelpMenuUserAnswerSelected
-     * @param ListsHelpMenuUserAnswerSelected $listsHelpMenuUserAnswerSelected
+     * @param FetchesHelpMenuUserAnswerSelectedList $fetchesHelpMenuUserAnswerSelectedList
      */
-    public function __construct(FetchesHelpMenuUserAnswerSelected $fetchesHelpMenuUserAnswerSelected, ListsHelpMenuUserAnswerSelected $listsHelpMenuUserAnswerSelected)
+    public function __construct(FetchesHelpMenuUserAnswerSelected $fetchesHelpMenuUserAnswerSelected, FetchesHelpMenuUserAnswerSelectedList $fetchesHelpMenuUserAnswerSelectedList)
     {
         $this->fetchesHelpMenuUserAnswerSelected = $fetchesHelpMenuUserAnswerSelected;
-        $this->listsHelpMenuUserAnswerSelected = $listsHelpMenuUserAnswerSelected;
+        $this->fetchesHelpMenuUserAnswerSelectedList = $fetchesHelpMenuUserAnswerSelectedList;
     }
 
-
-    /**
-     * @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->listsHelpMenuUserAnswerSelected->execute(['user_id' => $userId, 'question_id' => $questionId, 'order_by' => (object)['column' => 'id','DESC' => true]])[0];
+                $selectedAnswer = $this->fetchesHelpMenuUserAnswerSelectedList->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/FetchFirstHelpMenuQuestionProcessor.php

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

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

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

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

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

@@ -1,70 +0,0 @@
-<?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

@@ -1,25 +0,0 @@
-<?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

@@ -1,25 +0,0 @@
-<?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,6 +2,7 @@
 
 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/FetchesHelpMenuUserAnswerSelectedList.php

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

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

@@ -1,33 +0,0 @@
-<?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

@@ -1,32 +0,0 @@
-<?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

@@ -1,32 +0,0 @@
-<?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/Standards/Rules/CanFetchHelpMenuQuestionList.php

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

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

@@ -1,43 +0,0 @@
-<?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

@@ -1,45 +0,0 @@
-<?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/CreateOrderLogic.php

@@ -4,14 +4,20 @@ 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;
 
@@ -41,6 +47,12 @@ class CreateOrderLogic extends AbstractControllerLogic
     /** @var GeneratesOrderNumber */
     private $generatesOrderNumber;
 
+    /** @var CreatesAddress */
+    private $createsAddress;
+
+    /** @var CanCreateAddress */
+    private $canCreateAddress;
+
     /** @var NewLeadTaskToPerfexCRMProcessor */
     private $newLeadTaskToPerfexCRMProcessor;
     /**
@@ -51,14 +63,18 @@ 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,  NewLeadTaskToPerfexCRMProcessor $newLeadTaskToPerfexCRMProcessor)
+    public function __construct(FetchesCompany $fetchesCompany, FetchesAddress $fetchesAddress, CreateOrderProcessor $createOrderProcessor, FetchesCompanyModule $fetchesCompanyModule, GeneratesOrderNumber $generatesOrderNumber, CreatesAddress $createsAddress, CanCreateAddress $canCreateAddress,  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;
     }
 
@@ -83,10 +99,11 @@ class CreateOrderLogic extends AbstractControllerLogic
         } else {
             $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $request->input('warehouse_id')]);
 
-            $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 (!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]);
+            }
         }
-
+        
         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/Services/FetchesDataFromYDPortal.php

@@ -32,7 +32,6 @@ 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/CreateWarehouseTransportLogic.php

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

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

@@ -11,7 +11,6 @@ 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;
@@ -66,7 +65,7 @@ class CreatePackingListProcessor
         $this->createsPackingList->execute($object, $packingList);
 
         if(config('perfexcrm.is_enabled') == 'true'){
-            $this->packingListToPerfexCRMProcessor->execute($packingList, PerfexCRMTasksYDStages::DEFAULT);
+            $this->packingListToPerfexCRMProcessor->execute($packingList);
         }
 
         return $packingList;

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

@@ -26,7 +26,6 @@ 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;
@@ -36,7 +35,6 @@ 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;
@@ -64,25 +62,20 @@ 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, PackingListToPerfexCRMProcessor $packingListToPerfexCRMProcessor)
+    public function __construct(FetchesDataFromYDPortal $fetchesDataFRomYDPortal, CreatesTransport $createsTransport, CreatesSchedule $createsSchedule, FetchesContainer $fetchesContainer, CreateContainerProcessor $createContainerProcessor)
     {
         $this->fetchesDataFRomYDPortal = $fetchesDataFRomYDPortal;
         $this->createsTransport = $createsTransport;
         $this->createsSchedule = $createsSchedule;
         $this->fetchesContainer = $fetchesContainer;
         $this->createContainerProcessor = $createContainerProcessor;
-        $this->packingListToPerfexCRMProcessor = $packingListToPerfexCRMProcessor;
     }
 
 
@@ -94,8 +87,7 @@ class FetchContainersFromYdPortalProcessor
      */
     public function execute()
     {
-        $maxFetchTime = Carbon::now()->subMonths(4);
-        $packingLists = PackingList::where('type', PackingListType::SHIPPING_PACKING_LIST)->whereDate('created_at', '>=', $maxFetchTime)->doesntHave('containers')->get();
+        $packingLists = PackingList::where('type', PackingListType::SHIPPING_PACKING_LIST)->doesntHave('containers')->get();
 
         foreach ($packingLists as $packingList) {
             $time_start = microtime(true);
@@ -145,10 +137,6 @@ 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,11 +8,9 @@ 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;
@@ -29,21 +27,16 @@ 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, PackingListToPerfexCRMProcessor $packingListToPerfexCRMProcessor)
+    public function __construct(FetchesDataFromYDPortal $fetchesDataFRomYDPortal, UpdatesContractObligation $updatesContractObligations, CreatesSchedule $createsSchedule)
     {
         $this->fetchesDataFRomYDPortal = $fetchesDataFRomYDPortal;
         $this->updatesContractObligations = $updatesContractObligations;
         $this->createsSchedule = $createsSchedule;
-        $this->packingListToPerfexCRMProcessor = $packingListToPerfexCRMProcessor;
     }
 
 
@@ -58,7 +51,7 @@ class FetchContainersUpdatesFromYdPortalProcessor
         foreach ($containers as $container) {
             $time_start = microtime(true);
 
-            $packingList = $container->packingLists()->first();
+            $packingList = $container->packingLists()->random();
 
             $trackingRequest = $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/ApiTracking.ashx', 'GET', [
                 'trakingno' => $packingList->reference
@@ -72,14 +65,10 @@ 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();
@@ -108,12 +97,10 @@ 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 === '货物已进目的港仓库') {
@@ -121,32 +108,7 @@ 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();
 
@@ -162,6 +124,7 @@ class FetchContainersUpdatesFromYdPortalProcessor
                         }
                     }
                 }
+
             }
 
             if($unstuffingDate){
@@ -183,9 +146,7 @@ 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,8 +8,6 @@ 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;
@@ -36,21 +34,16 @@ 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, PackingListToPerfexCRMProcessor $packingListToPerfexCRMProcessor)
+    public function __construct(UpdatesContractObligation $updatesContractObligations, CreatesTransport $createsTransport, CreatesSchedule $createsSchedule)
     {
         $this->updatesContractObligations = $updatesContractObligations;
         $this->createsTransport = $createsTransport;
         $this->createsSchedule = $createsSchedule;
-        $this->packingListToPerfexCRMProcessor = $packingListToPerfexCRMProcessor;
     }
 
 
@@ -106,9 +99,6 @@ 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,7 +121,6 @@ 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,
@@ -132,7 +131,6 @@ 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,10 +42,7 @@ class CreateTaskPerfexCRMObject implements DataTransferObject
     /** @var string */
     private $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)
+    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)
     {
         $this->email = $email;
         $this->name = $name;
@@ -59,7 +56,6 @@ class CreateTaskPerfexCRMObject implements DataTransferObject
         $this->department = $department;
         $this->priority = $priority;
         $this->duedate = $duedate;
-        $this->invoiceId = $invoiceId;
     }
 
     /**
@@ -162,12 +158,4 @@ class CreateTaskPerfexCRMObject implements DataTransferObject
     {
         return $this->duedate;
     }
-
-    /**
-     * @return int
-     */
-    public function getInvoiceId(): int
-    {
-        return $this->invoiceId;
-    }
 }

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

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

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

@@ -151,8 +151,7 @@ class CreatePerfexCRMInvoiceProcessor
             array_push($invoiceItems, $invoiceSingleItem);
         }
 
-        // $total = $transaction->amount;
-        $total = number_format($transaction->amount, 2,'.','') * 1;
+        $total = $transaction->amount;
 
         //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,7 +25,19 @@ class CreatePerfexCRMTaskProcessor
     * @throws \App\Classes\Exceptions\MalformedRequestException
     */
    public function execute(CreateTaskPerfexCRMObject $createTaskPerfexCRMObject) {
-        $this->createsPerfexCRMTask->execute($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()
+        );
         return true;
    }
 

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

@@ -1,73 +0,0 @@
-<?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,8 +7,6 @@ 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
 {
@@ -19,32 +17,26 @@ class NewLeadTaskToPerfexCRMProcessor
      */
     public function execute(Company $company)
     {
-        try {
-            $companyModule = $company->companyModules()->first();
-            $employee = $companyModule->employees()->first();
-            $contactEmail = $employee->email;
+        $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",
-                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"
+        );
 
-            CreatePerfexCRMSingleTask::dispatch($createTaskPerfexCRMObject);
-
-        } catch (\Exception $exception){
-            Log::error($exception);
-        }
+        CreatePerfexCRMSingleTask::dispatch($createTaskPerfexCRMObject);
         return true;
     }
 

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

@@ -4,160 +4,57 @@ 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 bool
+     * @return \Illuminate\Database\Eloquent\Model
      * @throws \App\Classes\Exceptions\MalformedRequestException
      */
-    public function execute(PackingList $packingList, int $stage = PerfexCRMTasksYDStages::DEFAULT): bool
+    public function execute(PackingList $packingList)
     {
         try {
             if($packingList->owner instanceof \App\Models\Order) {
-                $info = $this->extractInfo($packingList);
-                $tasks = $this->defineTasks($stage);
+                $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;
 
                 $updatePerfexCRMObject = new UpdatePerfexCRMObject(
-                    $info['companyName'],
-                    $info['companyReference'],
-                    $info['contactName'],
-                    $info['contactEmail'],
-                    $info['bookingMarking'], //For Exchange-2.0
-                    $info['projectName'],
+                    $companyName,
+                    $companyReference,
+                    $contactName,
+                    $contactEmail,
+                    "",
+                    $projectName,
                     PerfexCRMProjectStatus::NOT_STARTED,
-                    0,
                     [],
-                    $tasks
+                    [
+                        PerfexCRMTasks::TASK_LOADED_CONTAINER_1,
+                        PerfexCRMTasks::TASK_LOADED_CONTAINER_2,
+                    ]
                 );
-                $this->dispatchUpdateJob($packingList, $updatePerfexCRMObject);
+                UpdatePerfexCRMPrelude::dispatch($packingList, null, $updatePerfexCRMObject, UpdatePerfexCRM::class, null);
             }
         } catch (\Exception $exception){
-            Log::error('PackingListToPerfexCRMProcessor: ' . json_encode($packingList));
+            Log::error(json_encode('PackingListToPerfexCRMProcessor debug:'));
+            Log::error(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

@@ -0,0 +1,75 @@
+<?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

@@ -1,145 +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\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,11 +15,10 @@ 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;
@@ -208,46 +207,18 @@ class UpdatePerfexCRMProcessor
                 }
 
                 // Get existing or create task
-                $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());
-
+                $result = $this->fetchesPerfexCRMTask->execute($tasks[$count]['name'], $milestoneId, 'project', $projectId);
                 if(isset($result->payload)){
-                    //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']);
-                    }
+                    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']);
+                    // }
                 }
                 else{
-                    $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);
+                    $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']);
                 }
             }
         }

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

@@ -4,7 +4,6 @@ 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
@@ -25,16 +24,11 @@ class ConvertsPerfexCRMLeadToCustomer
 
                 return (object) $data;
             }else{
-                Log::error('ConvertsPerfexCRMLeadToCustomer: '.$response);
+                Log::error($response);
                 return null;
             }
-        }
-        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());
+        }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,7 +4,6 @@ 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
@@ -28,16 +27,11 @@ class CreatesPerfexCRMCustomer
                 $data = $response->json();
                 return (object) $data;
             }else{
-                Log::error('CreatesPerfexCRMCustomer: '.$response);
+                Log::error($response);
                 return null;
             }
-        }
-        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());
+        }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,7 +5,6 @@ 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
@@ -35,16 +34,11 @@ class CreatesPerfexCRMCustomerContact
                 $data = $response->json();
                 return (object) $data;
             }else{
-                Log::error('CreatesPerfexCRMCustomerContact: '.$response);
+                Log::error($response);
                 return null;
             }
-        }
-        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());
+        }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,7 +4,6 @@ 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
@@ -34,16 +33,11 @@ class CreatesPerfexCRMCustomerProject
                 $data = $response->json();
                 return (object) $data;
             }else{
-                Log::error('CreatesPerfexCRMCustomerProject: '.$response);
+                Log::error($response);
                 return null;
             }
-        }
-        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());
+        }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,7 +4,6 @@ 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;
 
@@ -54,16 +53,11 @@ class CreatesPerfexCRMInvoice
                 $data = $response->json();
                 return (object) $data;
             }else{
-                Log::error('CreatesPerfexCRMInvoice: '.$response);
+                Log::error($response);
                 return null;
             }
-        }
-        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());
+        }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,7 +4,6 @@ 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;
 
@@ -34,16 +33,11 @@ class CreatesPerfexCRMInvoicePayment
                 $data = $response->json();
                 return (object) $data;
             }else{
-                Log::error('CreatesPerfexCRMInvoicePayment: '.$response);
+                Log::error($response);
                 return null;
             }
-        }
-        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());
+        }catch(\Exception $exception){
+            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server' . $exception->getMessage());
         }
     }
 }

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

@@ -4,7 +4,6 @@ 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\CreateLeadPerfexCRMObject;
 
@@ -41,16 +40,11 @@ class CreatesPerfexCRMLead
                 $data = $response->json();
                 return (object) $data;
             }else{
-                Log::error('CreatesPerfexCRMLead: '.$response);
+                Log::error($response);
                 return null;
             }
-        }
-        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());
+        }catch(\Exception $exception){
+            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server ' . $exception->getMessage());
         }
     }
 }

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

@@ -4,7 +4,6 @@ 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 CreatesPerfexCRMMilestone
@@ -37,16 +36,11 @@ class CreatesPerfexCRMMilestone
                 $data = $response->json();
                 return (object) $data;
             }else{
-                Log::error('CreatesPerfexCRMMilestone: '.$response);
+                Log::error($response);
                 return null;
             }
-        }
-        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());
+        }catch(\Exception $exception){
+            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server' . $exception->getMessage());
         }
     }
 }

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

@@ -4,7 +4,6 @@ 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 CreatesPerfexCRMSupportTicket
@@ -37,16 +36,8 @@ class CreatesPerfexCRMSupportTicket
                 Log::error($response);
                 return null;
             }
-        }
-        catch(\Illuminate\Http\Client\ConnectionException $exception){
-            $error = 'Failed to connect to CRM';
-            throw new ConnectionErrorException($error, $exception->getMessage(), "", $exception->getTraceAsString());
-        }
-        catch(\Exception $exception){
-            $error = 'Support Ticket creation failed';
-            Log::error($error. ": ". $exception->getMessage());
-            Log::error('Payload: '.json_encode($data));
-            throw new MalformedRequestException($error);
+        }catch(\Exception $exception){
+            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server: ' . $exception->getMessage());
         }
     }
 }

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

@@ -4,50 +4,69 @@ 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\ValueObjects\Constants\PerfexCRMCustomFields;
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\CreateTaskPerfexCRMObject;
 
 class CreatesPerfexCRMTask
 {
     /**
-     * @param CreateTaskPerfexCRMObject $createTaskPerfexCRMObject
+     * @param string $taskName
+     * @param string $taskDescription
+     * @param string $leadId
+     * @param string $milestoneId
+     * @param string $projectId
+     * @param string $reference
+     * @param string $on_task_completion
+     * @param string $department
+     * @param string $status
+     * @param string $priority
+     * @param string $duedate
      * @return null|object
      * @throws MalformedRequestException
      */
-
-    public function execute(CreateTaskPerfexCRMObject $createTaskPerfexCRMObject) {
+    public function execute(string $taskName, string $taskDescription, string $leadId, string $milestoneId, string $projectId, string $reference, string $on_task_completion, string $department, string $status, string $priority, string $duedate) {
         try{
             $custom_fields = [];
-            if($createTaskPerfexCRMObject->getDepartment() != ""){
+            if($department != ""){
                 $custom_fields = [
                     "tasks" => [
-                        PerfexCRMCustomFields::TASKS_DEPARTMENT => $createTaskPerfexCRMObject->getDepartment()
+                        PerfexCRMCustomFields::TASKS_DEPARTMENT => $department
                     ]
                 ];
             }
 
             $data = [
-                'name' => $createTaskPerfexCRMObject->getName(),
-                'description' => $createTaskPerfexCRMObject->getDescription(),
-                'milestone' => $createTaskPerfexCRMObject->getMilestoneId(),
+                'name' => $taskName,
+                'description' => $taskDescription,
+                'milestone' => $milestoneId,
                 'startdate' => date('Y-m-d'),
                 'rel_type' => 'project',
-                'rel_id' => $createTaskPerfexCRMObject->getProjectId(),
-                'status' => $createTaskPerfexCRMObject->getStatus(),
+                'rel_id' => $projectId,
+                'status' => $status,
                 'is_system_created' => 1,
-                'reference' => $createTaskPerfexCRMObject->getReference(),
-                'on_task_completion' => $createTaskPerfexCRMObject->getOnTaskCompletion(),
+                'reference' => $reference,
+                'on_task_completion' => $on_task_completion,
                 'custom_fields' => $custom_fields,
-                'priority' => $createTaskPerfexCRMObject->getPriority(),
-                'duedate' => date('Y-m-d', strtotime('+' . $createTaskPerfexCRMObject->getDuedate() . ' days')),
-                'invoice_id' => $createTaskPerfexCRMObject->getInvoiceId(),
+                'priority' => $priority,
+                'duedate' => date('Y-m-d', strtotime('+' . $duedate . ' days')),
             ];
 
-            if($createTaskPerfexCRMObject->getLeadId() != '') {
-                $data['rel_type'] = 'lead';
-                $data['rel_id'] = $createTaskPerfexCRMObject->getLeadId();
+            if($leadId != '') {
+                $data = [
+                    'name' => $taskName,
+                    'description' => $taskDescription,
+                    'milestone' => $milestoneId,
+                    'startdate' => date('Y-m-d'),
+                    'rel_type' => 'lead',
+                    'rel_id' => $leadId,
+                    'status' => $status,
+                    'is_system_created' => 1,
+                    'reference' => $reference,
+                    'on_task_completion' => $on_task_completion,
+                    'custom_fields' => $custom_fields,
+                    'priority' => $priority,
+                    'duedate' => date('Y-m-d', strtotime('+' . $duedate . ' days')),
+                ];
             }
 
             $response = Http::asForm()->withHeaders([
@@ -58,16 +77,11 @@ class CreatesPerfexCRMTask
                 $data = $response->json();
                 return (object) $data;
             }else{
-                Log::error('CreatesPerfexCRMTask: '.$response);
+                Log::error($response);
                 return null;
             }
-        }
-        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());
+        }catch(\Exception $exception){
+            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server' . $exception->getMessage());
         }
     }
 }

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

@@ -4,7 +4,6 @@ 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 FetchesPerfexCRMCustomer
@@ -25,18 +24,11 @@ class FetchesPerfexCRMCustomer
 
                 return (object) $data;
             }else{
-                Log::error('FetchesPerfexCRMCustomer: '.$response);
+                Log::error($response);
                 return null;
             }
-        }
-        catch(\Illuminate\Http\Client\ConnectionException $exception){
-            $error = 'Failed to connect to CRM';
-            throw new ConnectionErrorException($error, $exception->getMessage(), $email, $exception->getTraceAsString());
-        }
-        catch(\Exception $exception){
-            $error = 'Unable to get correct response from Perfex CRM server: ' . $exception->getMessage();
-            Log::error($error);
-            throw new MalformedRequestException($error);
+        }catch(\Exception $exception){
+            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server: ' . $exception->getMessage());
         }
     }
 }

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

@@ -4,7 +4,6 @@ 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 FetchesPerfexCRMInvoice
@@ -27,15 +26,10 @@ class FetchesPerfexCRMInvoice
 
                 return (object) $data;
             }else{
-                Log::error('FetchesPerfexCRMInvoice: '.$response);
+                Log::error($response);
                 return null;
             }
-        }
-        catch(\Illuminate\Http\Client\ConnectionException $exception){
-            $error = 'Failed to connect to CRM';
-            throw new ConnectionErrorException($error, $exception->getMessage(), "", $exception->getTraceAsString());
-        }
-        catch(\Exception $exception){
+        }catch(\Exception $exception){
             throw new MalformedRequestException('Unable to get correct response from Perfex CRM server: ' . $exception->getMessage());
         }
     }

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

@@ -4,7 +4,6 @@ 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 FetchesPerfexCRMLead
@@ -25,15 +24,10 @@ class FetchesPerfexCRMLead
 
                 return (object) $data;
             }else{
-                Log::error('FetchesPerfexCRMLead: '.$response);
+                Log::error($response);
                 return null;
             }
-        }
-        catch(\Illuminate\Http\Client\ConnectionException $exception){
-            $error = 'Failed to connect to CRM';
-            throw new ConnectionErrorException($error, $exception->getMessage(), $email, $exception->getTraceAsString());
-        }
-        catch(\Exception $exception){
+        }catch(\Exception $exception){
             throw new MalformedRequestException('Unable to get correct response from Perfex CRM server: ' . $exception->getMessage());
         }
     }

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

@@ -4,7 +4,6 @@ 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 FetchesPerfexCRMMilestone
@@ -31,16 +30,11 @@ class FetchesPerfexCRMMilestone
 
                 return (object) $data;
             }else{
-                Log::error('FetchesPerfexCRMMilestone: '.$response);
+                Log::error($response);
                 return null;
             }
-        }
-        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());
+        }catch(\Exception $exception){
+            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server' . $exception->getMessage());
         }
     }
 }

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

@@ -4,7 +4,6 @@ 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 FetchesPerfexCRMProject
@@ -31,16 +30,11 @@ class FetchesPerfexCRMProject
 
                 return (object) $data;
             }else{
-                Log::error('FetchesPerfexCRMProject: '.$response);
+                Log::error($response);
                 return null;
             }
-        }
-        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());
+        }catch(\Exception $exception){
+            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server' . $exception->getMessage());
         }
     }
 }

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

@@ -4,7 +4,6 @@ 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\General\Helper;
 
@@ -18,7 +17,7 @@ class FetchesPerfexCRMTask
      * @return null|object
      * @throws MalformedRequestException
      */
-    public function execute(string $taskName, string $milestoneId, string $relType, string $relId, string $invoiceId) {
+    public function execute(string $taskName, string $milestoneId, string $relType, string $relId) {
         try{
             $data = [
                 'name' => $taskName,
@@ -31,11 +30,6 @@ class FetchesPerfexCRMTask
                 $data = array_merge($data, $newItem);
             }
 
-            if($invoiceId != 0) {
-                $newItem = ['invoice_id' =>  $invoiceId ];
-                $data = array_merge($data, $newItem);
-            }
-
             $response = Http::asForm()->withHeaders([
                 'authtoken' => config('perfexcrm.api_key')])
             ->post(config('perfexcrm.base_url').'/api/tasks/customsearch', $data);
@@ -45,16 +39,11 @@ class FetchesPerfexCRMTask
 
                 return (object) $data;
             }else{
-                Helper::debugLogger($response);
+                Helper::debugLoggerForPerfexCRM($response);
                 return null;
             }
-        }
-        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());
+        }catch(\Exception $exception){
+            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server' . $exception->getMessage());
         }
     }
 }

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

@@ -4,7 +4,6 @@ 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\ValueObjects\Constants\PerfexCRMCustomFields;
 use App\Classes\General\Helper;
@@ -39,16 +38,11 @@ class UpdatesPerfexCRMCustomer
                 $data = $response->json();
                 return (object) $data;
             }else{
-                // Helper::debugLogger($response);
+                Helper::debugLoggerForPerfexCRM($response);
                 return null;
             }
-        }
-        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());
+        }catch(\Exception $exception){
+            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server' . $exception->getMessage());
         }
     }
 }

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

@@ -4,7 +4,6 @@ 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 UpdatesPerfexCRMInvoice
@@ -61,15 +60,10 @@ class UpdatesPerfexCRMInvoice
                 $data = $response->json();
                 return (object) $data;
             }else{
-                Log::error('UpdatesPerfexCRMInvoice: '.$response);
+                Log::error($response);
                 return null;
             }
-        }
-        catch(\Illuminate\Http\Client\ConnectionException $exception){
-            $error = 'Failed to connect to CRM';
-            throw new ConnectionErrorException($error, $exception->getMessage(), "", $exception->getTraceAsString());
-        }
-        catch(\Exception $exception){
+        }catch(\Exception $exception){
             throw new MalformedRequestException('Unable to get correct response from Perfex CRM server: ' . $exception->getMessage());
         }
     }

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

@@ -4,7 +4,6 @@ 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\ValueObjects\Constants\PerfexCRMCustomFields;
 
@@ -42,15 +41,10 @@ class UpdatesPerfexCRMLead
                 $data = $response->json();
                 return (object) $data;
             }else{
-                Log::error('UpdatesPerfexCRMLead: '.$response);
+                Log::error($response);
                 return null;
             }
-        }
-        catch(\Illuminate\Http\Client\ConnectionException $exception){
-            $error = 'Failed to connect to CRM';
-            throw new ConnectionErrorException($error, $exception->getMessage(), "", $exception->getTraceAsString());
-        }
-        catch(\Exception $exception){
+        }catch(\Exception $exception){
             throw new MalformedRequestException('Unable to get correct response from Perfex CRM server: ' . $exception->getMessage());
         }
     }

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

@@ -4,7 +4,6 @@ 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 UpdatesPerfexCRMProject
@@ -34,15 +33,10 @@ class UpdatesPerfexCRMProject
                 $data = $response->json();
                 return (object) $data;
             }else{
-                Log::error('UpdatesPerfexCRMProject: '.$response);
+                Log::error($response);
                 return null;
             }
-        }
-        catch(\Illuminate\Http\Client\ConnectionException $exception){
-            $error = 'Failed to connect to CRM';
-            throw new ConnectionErrorException($error, $exception->getMessage(), "", $exception->getTraceAsString());
-        }
-        catch(\Exception $exception){
+        }catch(\Exception $exception){
             throw new MalformedRequestException('Unable to get correct response from Perfex CRM server: ' . $exception->getMessage());
         }
     }

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

@@ -4,7 +4,6 @@ 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 UpdatesPerfexCRMTask
@@ -39,16 +38,11 @@ class UpdatesPerfexCRMTask
                 $data = $response->json();
                 return (object) $data;
             }else{
-                Log::error('UpdatesPerfexCRMTask: '.$response);
+                Log::error($response);
                 return null;
             }
-        }
-        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());
+        }catch(\Exception $exception){
+            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server' . $exception->getMessage());
         }
     }
 }

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

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

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

@@ -31,7 +31,7 @@ class CreatePaymentTransactionLogic extends AbstractControllerLogic
     private $createPaymentTransactionProcessor;
 
     public function __construct(
-        FetchesTransaction $fetchesTransaction,
+        FetchesTransaction $fetchesTransaction, 
         CreatePaymentTransactionProcessor $createPaymentTransactionProcessor
     )
     {
@@ -47,20 +47,6 @@ class CreatePaymentTransactionLogic extends AbstractControllerLogic
 
         $payment_transaction = $this->createPaymentTransactionProcessor->execute($invoice_transaction, $payment_method , $request->input('bank_code'));
 
-        //cief todo: at exchange there is a transition step - starts
-        // if(PaymentMethodType::PAYMENT_METHODS[$request->input('payment_method')] == PaymentMethodType::PAYMENT_GATEWAY){
-        //     $this->updatesTransactionStatus->execute($transaction, ApprovalStatus::PENDING_VERIFICATION);
-        // }
-
-        // if(config('perfexcrm.is_enabled') == 'true'){
-        //     $this->transactionToPerfexCRMV2Processor->execute($transaction, $status);
-        // }
-
-        //To use
-        //ApprovalStatus::PENDING_VERIFICATION;
-        //use this to trigger  $this->transactionToPerfexCRMV2Processor->execute > defineTasks > defineTasks_handlePendingVerificationStatus > definePaymentTasks
-        //cief todo: at exchange there is a transition step - ends
-
         return $this->resourceResponse(new TransactionResource($payment_transaction));
     }
 }

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

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

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

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

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

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

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

@@ -20,7 +20,6 @@ use App\Models\Wallet;
 use App\Classes\Modules\Orders\Processors\UpdateDoFromVTPortalProcessor;
 use App\Classes\Modules\Orders\Processors\UpdateDoFromYDPortalProcessor;
 use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
-use Illuminate\Support\Facades\Log;
 
 class CreatePaymentTransactionProcessor
 {
@@ -39,7 +38,7 @@ class CreatePaymentTransactionProcessor
 
     /** @var UpdatesWalletBalance */
     private $updatesWalletBalance;
-
+    
     /** @var UpdateDoFromVTPortalProcessor */
     private $updateDoFromVTPortalProcessor;
 
@@ -70,7 +69,7 @@ class CreatePaymentTransactionProcessor
         UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor,
         UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor,
         UpdatesTransactionStatus $updatesTransactionStatus
-    )
+    ) 
     {
         $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
         $this->createsPaymentTransaction = $createsPaymentTransaction;
@@ -88,8 +87,7 @@ class CreatePaymentTransactionProcessor
     public function execute(Transaction $invoice, $payment_method, $bank_code)
     {
         $amount             = $invoice->amount;
-        Log::info($invoice->owner);
-        $company_module     = $invoice->owner->owner->companyModule()->first();
+        $company_module     = $invoice->owner()->first()->owner()->first()->companyModule()->first();
         $approvalStatus     = ApprovalStatus::PENDING_SUBMISSION;
         $billNumber         = $this->generatesTransactionBillNumber->execute('PYMT-');
         $payment_reference  = null;
@@ -99,12 +97,12 @@ class CreatePaymentTransactionProcessor
             // create billplz transaction
             $payment_method = PaymentMethodType::PAYMENT_GATEWAY;
             $billPlzBill = $this->createsBillplzBill->execute(
-                $company_module->name,
+                $company_module->name, 
                 (app()->environment(['production'])) ? $company_module->employees()->first()->email : 'uldvstar@gmail.com',
                 'This payment is for the invoice number . ' . $billNumber,
                 $amount,
-                $billNumber,
-                $bank_code,
+                $billNumber, 
+                $bank_code, 
                 true
             );
 
@@ -119,7 +117,7 @@ class CreatePaymentTransactionProcessor
             }
 
             $walletPaymentBillNumber = $this->generatesTransactionBillNumber->execute('PYMT-');
-
+            
             $transaction_object = new TransactionObject($walletPaymentBillNumber, TransactionType::PAYMENT, 1, $company_module->id, 1, PaymentMethodType::WALLET, $amount, $amount, 1, 1, 1, 0, 0, null, ApprovalStatus::APPROVED, [], '');
             $transaction = $this->createsTransactionableTransaction->execute($wallet, $transaction_object);
 

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

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

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

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

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

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

app/Classes/Notifications/InvoiceIssuedEmail.php

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

app/Classes/Notifications/ShipmentDepartureEmail.php

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

app/Classes/ValueObjects/Constants/PerfexCRMTasks.php

@@ -16,9 +16,7 @@ class PerfexCRMTasks
         'department' => '',
         'status' => PerfexCRMTaskStatus::COMPLETED,
         'priority' => PerfexCRMTaskPriority::DEFAULT,
-        'duedate' => 0,
-        'is_allow_multiple' => false,
-        'is_on_task_completion_update' => false
+        'duedate' => 0
     ];
 
     public const TASK_POST_PAYMENT_1 = [
@@ -37,9 +35,7 @@ class PerfexCRMTasks
         'department' => 'Accounts',
         'status' => PerfexCRMTaskStatus::IN_PROGRESS,
         'priority' => PerfexCRMTaskPriority::HIGH,
-        'duedate' => 0,
-        'is_allow_multiple' => false,
-        'is_on_task_completion_update' => false
+        'duedate' => 0
     ];
     public const TASK_POST_PAYMENT_2 = [
         'name' => 'Approve Payment',
@@ -51,9 +47,7 @@ class PerfexCRMTasks
         'department' => 'Accounts',
         'status' => '',
         'priority' => PerfexCRMTaskPriority::HIGH,
-        'duedate' => 0,
-        'is_allow_multiple' => false,
-        'is_on_task_completion_update' => false
+        'duedate' => 0
     ];
     public const TASK_POST_PAYMENT_3 = [
         'name' => 'Issue Shipping Autocount Invoince',
@@ -71,9 +65,7 @@ class PerfexCRMTasks
         'department' => 'Accounts',
         'status' => '',
         'priority' => PerfexCRMTaskPriority::MEDIUM,
-        'duedate' => 1,
-        'is_allow_multiple' => false,
-        'is_on_task_completion_update' => false
+        'duedate' => 1
     ];
     public const TASK_POST_PAYMENT_3_1 = [
         'name' => 'Issue Shipping Autocount OR',
@@ -86,9 +78,7 @@ class PerfexCRMTasks
         'department' => 'Accounts',
         'status' => '',
         'priority' => PerfexCRMTaskPriority::DEFAULT,
-        'duedate' => 0,
-        'is_allow_multiple' => false,
-        'is_on_task_completion_update' => false
+        'duedate' => 0
     ];
     public const TASK_POST_PAYMENT_4 = [
         'name' => 'Knockoff Invoice',
@@ -106,11 +96,34 @@ class PerfexCRMTasks
         'department' => 'Accounts',
         'status' => '',
         'priority' => PerfexCRMTaskPriority::MEDIUM,
-        'duedate' => 1,
-        'is_allow_multiple' => false,
-        'is_on_task_completion_update' => false
+        'duedate' => 1
     ];
 
+    public const TASK_LOADED_CONTAINER_1 = [
+        'name' => 'Generate Shipping Invoices',
+        'description' => '○ Purpose: -<br>
+        ○ Link to order page: {link_order}<br>',
+        'milestone' => '',
+        'reference' => 'TASK_LOADED_CONTAINER_1',
+        'on_task_completion' => 'TASK_LOADED_CONTAINER_2',
+        'department' => 'Operations',
+        'status' => PerfexCRMTaskStatus::IN_PROGRESS,
+        'priority' => PerfexCRMTaskPriority::HIGH,
+        'duedate' => 1
+    ];
+
+    public const TASK_LOADED_CONTAINER_2 = [
+        'name' => 'Approve Shipping Invoices',
+        'description' => '○ Purpose: -<br>
+        ○ Link to refer Pay On Behalf or Any extra charge: : {link_perfex}<br>',
+        'milestone' => '',
+        'reference' => 'TASK_LOADED_CONTAINER_2',
+        'on_task_completion' => '',
+        'department' => 'Customer Services',
+        'status' => '',
+        'priority' => PerfexCRMTaskPriority::HIGH,
+        'duedate' => 1
+    ];
 
 
     public const TASK_IDENTIFICATION_1 = [
@@ -129,97 +142,6 @@ class PerfexCRMTasks
         'department' => 'Operations',
         'status' => PerfexCRMTaskStatus::IN_PROGRESS,
         'priority' => PerfexCRMTaskPriority::DEFAULT,
-        'duedate' => 0,
-        'is_allow_multiple' => false,
-        'is_on_task_completion_update' => false
+        'duedate' => 0
     ];
-
-
-    public const TASK_YD_LOADED_CONTAINER_1 = [
-        'name' => 'Generate Shipping Invoices',
-        'description' => '○ Purpose: -<br>
-        ○ Link to order page: {link_order}<br>',
-        'milestone' => '',
-        'reference' => 'TASK_LOADED_CONTAINER_1',
-        'on_task_completion' => 'TASK_LOADED_CONTAINER_2',
-        'department' => 'Operations',
-        'status' => PerfexCRMTaskStatus::IN_PROGRESS,
-        'priority' => PerfexCRMTaskPriority::HIGH,
-        'duedate' => 1,
-        'is_allow_multiple' => false,
-        'is_on_task_completion_update' => false
-    ];
-
-    public const TASK_YD_LOADED_CONTAINER_2 = [
-        'name' => 'Approve Shipping Invoices',
-        'description' => '○ Purpose: -<br>
-        ○ Link to refer Pay On Behalf or Any extra charge: : {link_perfex}<br>',
-        'milestone' => '',
-        'reference' => 'TASK_LOADED_CONTAINER_2',
-        'on_task_completion' => '',
-        'department' => 'Customer Services',
-        'status' => '',
-        'priority' => PerfexCRMTaskPriority::HIGH,
-        'duedate' => 1,
-        'is_allow_multiple' => false,
-        'is_on_task_completion_update' => false
-    ];
-
-    public const TASK_YD_LOADED_CONTAINER_3 = [
-        'name' => 'Track 1 - Loaded Container',
-        'description' => '',
-        'milestone' => '',
-        'reference' => 'TASK_YD_SHIPPING_3',
-        'on_task_completion' => '',
-        'department' => '',
-        'status' => PerfexCRMTaskStatus::NOT_STARTED,
-        'priority' => PerfexCRMTaskPriority::DEFAULT,
-        'duedate' => 1,
-        'is_allow_multiple' => false,
-        'is_on_task_completion_update' => false
-    ];
-
-    public const TASK_YD_SHIPPING_1 = [
-        'name' => 'Track 2 - Shipping',
-        'description' => '',
-        'milestone' => '',
-        'reference' => 'TASK_YD_SHIPPING_1',
-        'on_task_completion' => '',
-        'department' => '',
-        'status' => PerfexCRMTaskStatus::NOT_STARTED,
-        'priority' => PerfexCRMTaskPriority::DEFAULT,
-        'duedate' => 1,
-        'is_allow_multiple' => false,
-        'is_on_task_completion_update' => false
-    ];
-
-    public const TASK_YD_UNSTUFFING_1 = [
-        'name' => 'Track 3 - Unstuffing',
-        'description' => '',
-        'milestone' => '',
-        'reference' => 'TASK_YD_UNSTUFFING_1',
-        'on_task_completion' => '',
-        'department' => '',
-        'status' => PerfexCRMTaskStatus::NOT_STARTED,
-        'priority' => PerfexCRMTaskPriority::DEFAULT,
-        'duedate' => 1,
-        'is_allow_multiple' => false,
-        'is_on_task_completion_update' => false
-    ];
-
-    public const TASK_YD_DELIVERY_1 = [
-        'name' => 'Track 4 - Delivery',
-        'description' => '',
-        'milestone' => '',
-        'reference' => 'TASK_YD_DELIVERY_1',
-        'on_task_completion' => '',
-        'department' => '',
-        'status' => PerfexCRMTaskStatus::NOT_STARTED,
-        'priority' => PerfexCRMTaskPriority::DEFAULT,
-        'duedate' => 1,
-        'is_allow_multiple' => false,
-        'is_on_task_completion_update' => false
-    ];
-
-
 }

app/Classes/ValueObjects/Constants/PerfexCRMTasksYDStages.php

@@ -1,17 +0,0 @@
-<?php
-
-namespace App\Classes\ValueObjects\Constants;
-
-final class PerfexCRMTasksYDStages {
-
-    public const DEFAULT = 0;
-
-    public const LOAD_CONTAINER = 10;
-
-    public const SHIP_SAILED = 20;
-    public const SHIP_ARRIVED = 21;
-
-    public const UNSTUFFING = 30;
-
-    public const DELIVERY = 40;
-}