Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into dev

# Conflicts:
#	app/Classes/Modules/Transactions/ControllersLogic/DeleteGroupLogic.php

.env.example

@@ -57,3 +57,7 @@ MIX_EXCHANGE_URL="${EXCHANGE_URL}"
 YD_API_CODE=''
 
 JWT_SECRET=Btj63iMEleEaww6Bb2IBECkxWn7YHPhhPFluAkg9DfcQik0qDRy6QW75ABGmPT2h
+
+PERFEXCRM_BASE_URL=""
+PERFEXCRM_API_KEY=""
+PERFEXCRM_IS_ENABLED="false"

.gitlab-ci.yml

@@ -96,24 +96,24 @@ database:
     - if: '$CI_COMMIT_BRANCH =~ /.*/'
 
 #mysql
-unit_test:
-  stage: unit_test
-  services:
-    - name: mysql:8.0
-      command: [ "--default-authentication-plugin=mysql_native_password" ]
+#unit_test:
+ # stage: unit_test
+ # services:
+ #   - name: mysql:8.0
+ #     command: [ "--default-authentication-plugin=mysql_native_password" ]
   #dependencies:
   #  - database
-  script:
-    - npm install # Install npm dependencies
-    - gulp build # Build assets
-    - composer install
-    - cp .env.example .env
-    - php artisan key:generate
-    - php artisan migrate:fresh
-    - php artisan db:seed
-    - php artisan test
-  rules:
-    - if: '$CI_COMMIT_BRANCH =~ /.*/'
+ # script:
+ #   - npm install # Install npm dependencies
+ #   - gulp build # Build assets
+ #   - composer install
+ #   - cp .env.example .env
+ #   - php artisan key:generate
+ #   - php artisan migrate:fresh
+ #   - php artisan db:seed
+ #   - php artisan test
+ # rules:
+ #   - if: '$CI_COMMIT_BRANCH =~ /.*/'
 
 
 

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use App\Classes\ValueObjects\Constants\TransactionType;
+use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Builder;
+
+class DoesNotHavePaymentStatusIn implements Filter
+{
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->whereDoesntHave('transactions', function (Builder $query) use($value) {
+            $query->where('type', TransactionType::PAYMENT)->whereIn('status', $value);
+        });
+    }
+}

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);
+            $query->where('type', $value)->whereIn('status', [0,1,2,3,5]);
         })->whereHas('containers', function ($query){
             return $query->whereDate('loading_date', '>=', Carbon::parse('20-09-2022'));
         });

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

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

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

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use App\Classes\ValueObjects\Constants\TransactionType;
+use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Builder;
+
+class HavePaymentStatusNotIn implements Filter
+{
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->whereHas('transactions', function (Builder $query) use($value) {
+            $query->where('type', TransactionType::PAYMENT)->whereNotIn('status', $value);
+        });
+    }
+}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

app/Classes/General/Helper.php

@@ -2,8 +2,8 @@
 
 namespace App\Classes\General;
 
-
 use Illuminate\Support\Str;
+use Illuminate\Support\Facades\Log;
 
 class Helper
 {
@@ -24,4 +24,21 @@ class Helper
         return array_slice(get_class_methods($className), 1);
     }
 
-}
+     /**
+     * @param $log
+     * @return none
+     */
+    static function debugLoggerForPerfexCRM($log){
+        if($log){
+            $message = $log['message'];
+            $substring = 'No data were found';
+            if (isset($message)) {
+                if (strpos($message, $substring) !== false) {
+                    // Log::info('Message exist');
+                } else {
+                    Log::info($log['message']);
+                }
+            }
+        }
+    }
+}

app/Classes/Jobs/CreatePerfexCRMCustomer.php

@@ -3,6 +3,8 @@
 namespace App\Classes\Jobs;
 
 use App\Classes\Modules\PerfexCRM\Processors\CreatePerfexCRMLeadProcessor;
+use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMLead;
+use App\Classes\Modules\PerfexCRM\Services\UpdatesPerfexCRMLead;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
@@ -28,6 +30,12 @@ class CreatePerfexCRMCustomer implements ShouldQueue
 
     public function handle()
     {
-        (App()->make(CreatePerfexCRMLeadProcessor::class))->execute($this->createLeadPerfexCRMObject);
+        $lead = (App()->make(FetchesPerfexCRMLead::class))->execute($this->createLeadPerfexCRMObject->getEmail());
+        if(!is_null($lead)){
+            (App()->make(UpdatesPerfexCRMLead::class))->execute($lead, $this->createLeadPerfexCRMObject->getCompanyReference());
+        }
+        else{
+            (App()->make(CreatePerfexCRMLeadProcessor::class))->execute($this->createLeadPerfexCRMObject);
+        }
     }
 }

app/Classes/Jobs/CreatePerfexCRMInvoice.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Classes\Jobs;
+
+use App\Classes\Modules\PerfexCRM\Processors\CreatePerfexCRMInvoiceProcessor;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use App\Models\Transaction;
+
+class CreatePerfexCRMInvoice implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    /** @var Transaction $transaction*/
+    private $transaction;
+
+    /**
+     * CreatePerfexCRMInvoice constructor.
+     * @param Transaction $transaction
+     */
+    public function __construct(Transaction $transaction)
+    {
+        $this->transaction = $transaction;
+    }
+
+    public function handle()
+    {
+        (App()->make(CreatePerfexCRMInvoiceProcessor::class))->execute($this->transaction);
+    }
+}

app/Classes/Jobs/CreatePerfexCRMSingleTask.php

@@ -4,12 +4,12 @@ namespace App\Classes\Jobs;
 
 use App\Classes\Modules\PerfexCRM\Processors\CreatePerfexCRMTaskProcessor;
 use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMLead;
+use App\Classes\Modules\PerfexCRM\DataTransferObjects\CreateTaskPerfexCRMObject;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\CreateTaskPerfexCRMObject;
 
 class CreatePerfexCRMSingleTask implements ShouldQueue
 {

app/Classes/Jobs/InitializePerfexCRM.php

@@ -1,33 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs;
-
-use App\Classes\Modules\PerfexCRM\Processors\InitializePerfexCRMProcessor;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\InitialPerfexCRMObject;
-
-class InitializePerfexCRM implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    /** @var InitialPerfexCRMObject */
-    private $initialPerfexCRMObject;
-
-    /**
-     * InitializePerfexCRM constructor.
-     * @param InitialPerfexCRMObject $initialPerfexCRMObject
-     */
-    public function __construct(InitialPerfexCRMObject $initialPerfexCRMObject)
-    {
-        $this->initialPerfexCRMObject = $initialPerfexCRMObject;
-    }
-
-    public function handle()
-    {
-        (App()->make(InitializePerfexCRMProcessor::class))->execute($this->initialPerfexCRMObject);
-    }
-}

app/Classes/Jobs/UpdatePerfexCRM.php

@@ -9,6 +9,7 @@ use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 use App\Classes\Modules\PerfexCRM\DataTransferObjects\UpdatePerfexCRMObject;
+use App\Classes\Modules\PerfexCRM\DataTransferObjects\UpdatePerfexCRMInvoiceObject;
 
 class UpdatePerfexCRM implements ShouldQueue
 {
@@ -17,17 +18,37 @@ class UpdatePerfexCRM implements ShouldQueue
     /** @var UpdatePerfexCRMObject */
     private $updatePerfexCRMObject;
 
+    /** @var UpdatePerfexCRMInvoice */
+    private $nextJob;
+
+    /** @var */
+    private $transaction;
+
     /**
      * UpdatePerfexCRM constructor.
      * @param UpdatePerfexCRMObject $updatePerfexCRMObject
+     * @param UpdatePerfexCRMInvoice $nextJob
+     * @param $transaction
      */
-    public function __construct(UpdatePerfexCRMObject $updatePerfexCRMObject)
+    public function __construct(UpdatePerfexCRMObject $updatePerfexCRMObject, $transaction, $nextJob)
     {
         $this->updatePerfexCRMObject = $updatePerfexCRMObject;
+        $this->nextJob = $nextJob;
+        $this->transaction = $transaction;
     }
 
     public function handle()
     {
-        (App()->make(UpdatePerfexCRMProcessor::class))->execute($this->updatePerfexCRMObject);
+        $result = (App()->make(UpdatePerfexCRMProcessor::class))->execute($this->updatePerfexCRMObject);
+        if($this->nextJob != null && $this->transaction != null){
+            $updatePerfexCRMInvoiceOject = new UpdatePerfexCRMInvoiceObject(
+                $this->updatePerfexCRMObject->getContactEmail(),
+                $result->projectId,
+                $this->transaction,
+                true
+            );
+            /** @var UpdatePerfexCRMInvoice $nextJob */
+            $this->nextJob::dispatch($updatePerfexCRMInvoiceOject);
+        }
     }
 }

app/Classes/Jobs/UpdatePerfexCRMInvoice.php

@@ -0,0 +1,98 @@
+<?php
+
+namespace App\Classes\Jobs;
+
+use App\Classes\Modules\PerfexCRM\Processors\CreatePerfexCRMInvoiceProcessor;
+use App\Classes\Modules\PerfexCRM\Services\CreatesPerfexCRMInvoicePayment;
+use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMCustomer;
+use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMInvoice;
+use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMProject;
+use App\Classes\Modules\PerfexCRM\Services\UpdatesPerfexCRMInvoice;
+use App\Classes\Modules\PerfexCRM\DataTransferObjects\UpdatePerfexCRMInvoiceObject;
+use App\Classes\Modules\PerfexCRM\DataTransferObjects\InvoicePaymentPerfexCRMObject;
+use App\Classes\ValueObjects\Constants\PerfexCRMInvoiceStatus;
+use App\Models\PackingList;
+use App\Models\Transaction;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Log;
+use Carbon\Carbon;
+
+use App\Classes\General\Helper;
+
+class UpdatePerfexCRMInvoice implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    /** @var UpdatePerfexCRMInvoiceObject */
+    private $updatePerfexCRMInvoiceObject;
+
+    /**
+     * CreatePerfexCRMSingleTask constructor.
+     * @param UpdatePerfexCRMInvoiceObject $createTaskPerfexCRMObject
+     */
+    public function __construct(UpdatePerfexCRMInvoiceObject $updatePerfexCRMInvoiceObject)
+    {
+        $this->updatePerfexCRMInvoiceObject = $updatePerfexCRMInvoiceObject;
+    }
+
+    public function handle()
+    {
+        //get the client id
+        $customer = (App()->make(FetchesPerfexCRMCustomer::class))->execute($this->updatePerfexCRMInvoiceObject->getEmail());
+        $transaction = $this->updatePerfexCRMInvoiceObject->getTransaction();
+
+        //get the invoice id
+        $invoiceId = 0;
+        $invoiceStatus = 0;
+        $invoice = (App()->make(FetchesPerfexCRMInvoice::class))->execute($customer->userid,"INV-", $transaction->owner->bill_no);
+        Log::error(json_encode('UpdatePerfexCRMInvoice debug $transaction->owner->bill_no: '.$transaction->owner->bill_no));
+
+        if(is_null($invoice)){
+            $result = (App()->make(CreatePerfexCRMInvoiceProcessor::class))->execute($transaction->owner, $this->updatePerfexCRMInvoiceObject->getIsPaid());
+            if ($result) {
+                $invoiceId = $result->payload['id'];
+            } else {
+                // Log::error(json_encode('UpdatePerfexCRMInvoice CreatePerfexCRMInvoiceProcessor failed'));
+                Helper::debugLoggerForPerfexCRM('UpdatePerfexCRMInvoice CreatePerfexCRMInvoiceProcessor failed');
+            }
+        }
+        else{
+            $invoiceId = $invoice->id;
+            $invoiceStatus = $invoice->status;
+
+            //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());
+            }
+        }
+
+        //create invoice payment
+        if($invoiceId != 0 && $invoiceStatus != PerfexCRMInvoiceStatus::PAID){
+
+            $date = Carbon::parse($transaction->created_at)->format('Y-m-d');
+
+            $invoicePaymentPerfexCRMObject = new InvoicePaymentPerfexCRMObject(
+                $invoiceId,
+                "$transaction->amount",
+                $date,
+                1,
+                "",
+                ""
+            );
+            (App()->make(CreatesPerfexCRMInvoicePayment::class))->execute($invoicePaymentPerfexCRMObject);
+        }
+    }
+
+    public function delay($delay)
+    {
+        // Add delay in seconds to the job
+        $this->delay = $delay;
+        return $this;
+    }
+}

app/Classes/Jobs/UpdatePerfexCRMPrelude.php

@@ -0,0 +1,96 @@
+<?php
+
+namespace App\Classes\Jobs;
+
+use App\Classes\Modules\PerfexCRM\DataTransferObjects\UpdatePerfexCRMObject;
+use App\Classes\Modules\PerfexCRM\DataTransferObjects\UpdatePerfexCRMInvoiceObject;
+use App\Models\PackingList;
+use App\Models\Transaction;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Log;
+
+
+class UpdatePerfexCRMPrelude implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    /** @var */
+    private $packingList;
+
+    /** @var */
+    private $transaction;
+
+    /** @var UpdatePerfexCRMObject */
+    private $updatePerfexCRMObject;
+
+    /** @var UpdatePerfexCRM */
+    private $nextJob1;
+
+    /** @var UpdatePerfexCRMInvoice */
+    private $nextJob2;
+
+    /**
+     * UpdatePerfexCRMPrelude constructor.
+     * @param $packingList
+     * @param $transaction
+     * @param UpdatePerfexCRMObject $updatePerfexCRMObject
+     * @param UpdatePerfexCRM $nextJob1
+     * @param UpdatePerfexCRMInvoice $nextJob2
+     */
+    public function __construct($packingList, $transaction, UpdatePerfexCRMObject $updatePerfexCRMObject, $nextJob1, $nextJob2)
+    {
+        $this->packingList = $packingList;
+        $this->transaction = $transaction;
+        $this->updatePerfexCRMObject = $updatePerfexCRMObject;
+        $this->nextJob1 = $nextJob1;
+        $this->nextJob2 = $nextJob2;
+    }
+
+    public function handle()
+    {
+        if(is_null($this->packingList)){
+            $this->packingList = $this->transaction->owner->owner;
+        }
+        $amount = 0.00;
+        if(!is_null($this->transaction)){
+            $amount = $this->transaction->amount;
+        }
+        $data = [
+            'amount' => number_format($amount, 2, '.', ''),
+            'link_order' => config('app.url').'/order/show/'.$this->packingList->owner->reference,
+            'link_autocount_or' => 'https://docs.google.com/spreadsheets/d/1Q3rJBGQ9Bo04HZp5WR9zbLp7pIW2kfDYsabxG7JON-4/edit#gid=2013983170',
+            'link_perfex' => 'https://perfex.cief-malaysia.com/admin/projects/view/89',
+        ];
+
+
+        $result = $this->replacePlaceholders($this->updatePerfexCRMObject->getTasks(), $data);
+        $this->updatePerfexCRMObject->setTasks($result);
+        /** @var UpdatePerfexCRM $nextJob1 */
+        /** @var UpdatePerfexCRMInvoice $nextJob2 */
+        $this->nextJob1::dispatch($this->updatePerfexCRMObject, $this->transaction, $this->nextJob2);
+    }
+
+    function replacePlaceholders($template, $data, $prefix = '')
+    {
+        foreach ($template as $key => $value) {
+            foreach ($data as $dataKey => $dataValue) {
+                if (is_array($dataValue)) {
+                    $template[$key] = $this->replacePlaceholders($template[$key], $dataValue, $dataKey);
+                } else {
+                    if ($prefix != '') {
+                        $template[$key] = str_replace('{' .$prefix. "." .$dataKey . '}', $dataValue, $template[$key]);
+                    } else {
+                        $template[$key] = str_replace('{' . $dataKey . '}', $dataValue, $template[$key]);
+                    }
+                }
+            }
+        }
+
+        return $template;
+    }
+
+}

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

@@ -161,7 +161,8 @@ class CreateCustomerLogic extends AbstractControllerLogic
                 $request->input('name'),
                 $request->input('email'),
                 $request->input('phone'),
-                $request->input('type') === CompanyType::COMPANY_BUSINESS ? $request->input('company_name') : $request->input('name')
+                $request->input('type') === CompanyType::COMPANY_BUSINESS ? $request->input('company_name') : $request->input('name'),
+                $connection->invitee_reference
             );
             CreatePerfexCRMCustomer::dispatch($createLeadPerfexCRMObject);
         }

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

@@ -4,7 +4,7 @@ namespace App\Classes\Modules\Accounts\ControllersLogic;
 
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Accounts\Services\UpdatesUser;
+use App\Classes\Modules\Accounts\Services\UpdatesUserFullName;
 use App\Classes\Modules\Accounts\Services\FetchesUser;
 use App\Classes\Modules\Accounts\Standards\Rules\CanUpdateUser;
 use App\Classes\Modules\Accounts\DataTransferObjects\FullNameObject;
@@ -29,8 +29,8 @@ class UpdateUserLogic extends AbstractControllerLogic
     /** @var CanUpdateUser */
     private $canUpdateUser;
 
-    /** @var UpdatesUser */
-    private $updatesUser;
+    /** @var UpdatesUserFullName */
+    private $updatesUserFullName;
 
     /** @var FetchesUser */
     private $fetchesUser;
@@ -38,13 +38,13 @@ class UpdateUserLogic extends AbstractControllerLogic
     /**
      * UpdateAddressLogic constructor.
      * @param CanUpdateUser $canUpdateUser
-     * @param UpdatesUser $updatesUser
+     * @param UpdatesUserFullName $updatesUserFullName
      * @param FetchesUser $fetchesUSer
      */
-    public function __construct(CanUpdateUser $canUpdateUser, UpdatesUser $updatesUser, FetchesUser $fetchesUser)
+    public function __construct(CanUpdateUser $canUpdateUser, UpdatesUserFullName $updatesUserFullName, FetchesUser $fetchesUser)
     {
         $this->canUpdateUser = $canUpdateUser;
-        $this->updatesUser = $updatesUser;
+        $this->updatesUserFullName = $updatesUserFullName;
         $this->fetchesUser = $fetchesUser;
     }
 
@@ -64,7 +64,7 @@ class UpdateUserLogic extends AbstractControllerLogic
 
             $query = $this->fetchesUser->execute(['id' => $request->route('id')]);
 
-            $query = $this->updatesUser->execute($query, $object);
+            $query = $this->updatesUserFullName->execute($query, $object);
 
             return $this->resourceResponse(new UserResource($query));
 

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

@@ -0,0 +1,71 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Accounts\Services\UpdatesUser;
+use App\Classes\Modules\Accounts\Services\FetchesUser;
+use App\Classes\Modules\Accounts\Standards\Rules\CanUpdateUser;
+use App\Classes\Modules\Accounts\DataTransferObjects\FullNameObject;
+use App\Classes\Modules\Accounts\DataTransferObjects\UserObject;
+use App\Http\Resources\UserResource;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateUserRoleLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Updated Admin Role',
+            'message' => 'You have successfully updated the Admin Role'
+        ];
+    }
+
+    /** @var CanUpdateUser */
+    private $canUpdateUser;
+
+    /** @var UpdatesUser */
+    private $updatesUser;
+
+    /** @var FetchesUser */
+    private $fetchesUser;
+
+    /**
+     * UpdateAddressLogic constructor.
+     * @param CanUpdateUser $canUpdateUser
+     * @param UpdatesUser $updatesUser
+     * @param FetchesUser $fetchesUSer
+     */
+    public function __construct(CanUpdateUser $canUpdateUser, UpdatesUser $updatesUser, FetchesUser $fetchesUser)
+    {
+        $this->canUpdateUser = $canUpdateUser;
+        $this->updatesUser = $updatesUser;
+        $this->fetchesUser = $fetchesUser;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $query = $this->fetchesUser->execute(['id' => $request->route('id')]);
+
+        $object = new UserObject($query->name, $request->input('type'));
+
+        $this->canUpdateUser->passes($object);
+
+        $query = $this->updatesUser->execute($query, $object);
+
+        return $this->resourceResponse(new UserResource($query));
+    }
+
+}

app/Classes/Modules/Accounts/DataTransferObjects/UserObject.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\DataTransferObjects;
+
+use App\Classes\General\Interfaces\DataTransferObject;
+
+class UserObject implements DataTransferObject
+{
+    /** @var string */
+    private $name;
+
+    /** @var int */
+    private $type;
+
+    /**
+     * FullNameObject constructor.
+     * @param string $name
+     */
+    public function __construct(string $name, int $type)
+    {
+        $this->name = $name;
+        $this->type = $type;
+    }
+
+    /**
+     * @return string
+     */
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    /**
+     * @return int
+     */
+    public function getType(): int
+    {
+        return $this->type;
+    }
+}

app/Classes/Modules/Accounts/Services/UpdatesUser.php

@@ -3,7 +3,7 @@
 namespace App\Classes\Modules\Accounts\Services;
 
 use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Classes\Modules\Accounts\DataTransferObjects\FullNameObject;
+use App\Classes\Modules\Accounts\DataTransferObjects\UserObject;
 use App\Models\User;
 
 class UpdatesUser extends AbstractUpdateRecord
@@ -11,13 +11,14 @@ class UpdatesUser extends AbstractUpdateRecord
 
     /**
      * @param User $model
-     * @param FullNameObject $object
+     * @param UserObject $object
      * @return \Illuminate\Database\Eloquent\Model
      * @throws \App\Classes\Exceptions\MalformedRequestException
      */
-    public function execute(User $model, FullNameObject $object) {
+    public function execute(User $model, UserObject $object) {
 
         $model->name = $object->getName();
+        $model->type = $object->getType();
         return $this->handler($model);
 
     }

app/Classes/Modules/Accounts/Services/UpdatesUserFullName.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\Modules\Accounts\DataTransferObjects\FullNameObject;
+use App\Models\User;
+
+class UpdatesUserFullName extends AbstractUpdateRecord
+{
+
+    /**
+     * @param User $model
+     * @param FullNameObject $object
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(User $model, FullNameObject $object) {
+
+        $model->name = $object->getName();
+        return $this->handler($model);
+
+    }
+}

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

@@ -3,6 +3,9 @@
 namespace App\Classes\Modules\Addresses\ControllersLogic;
 
 
+use App\Classes\Exceptions\AccessForbiddenException;
+use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\Exceptions\RequestValidationException;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\General\Interfaces\Contactable;
 use App\Classes\Modules\Addresses\Services\CreatesAddress;
@@ -17,6 +20,7 @@ use App\Classes\Modules\Remarks\Processors\CreateRemarkProcessor;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Http\Resources\AddressResource;
 use App\Models\Address;
+use App\Transformers\AddressTransformer;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -27,7 +31,8 @@ class CreateAddressLogic extends AbstractControllerLogic
     /**
      * @return array
      */
-    protected function notification():array {
+    protected function notification(): array
+    {
         return [
             'title' => 'Created Address',
             'message' => 'You have successfully created a new Address'
@@ -74,11 +79,11 @@ class CreateAddressLogic extends AbstractControllerLogic
     /**
      * @param Request $request
      * @return JsonResponse
-     * @throws \App\Classes\Exceptions\AccessForbiddenException
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     * @throws \App\Classes\Exceptions\RequestValidationException
+     * @throws AccessForbiddenException
+     * @throws MalformedRequestException
+     * @throws RequestValidationException
      */
-    public function logic(Request $request) : JsonResponse
+    public function logic(Request $request): JsonResponse
     {
 
         $district = $this->fetchesDistrict->execute(['id' => $request->input('district_id')]);
@@ -90,16 +95,22 @@ class CreateAddressLogic extends AbstractControllerLogic
         /** @var Address $address */
         $address = $this->createsAddress->execute($this->fetchesCompanyModule->execute(['id' => $request->input('company_module_id')]), $object);
 
-        if($request->input('phone')){
+        if ($request->input('phone')) {
             $contactObject = new ContactObject($request->input('person_in_charge'), $request->input('phone'), '', '');
             $this->createContactProcessor->execute($contactObject, $address);
         }
 
-        if($request->input('remark')){
+        if ($request->input('remark')) {
             $remarkObject = new RemarkObject($request->input('remark'), Auth()->user()->id);
             $this->createRemarkProcessor->execute($address, $remarkObject);
         }
 
+/*        return fractal()
+            ->item($address, new AddressTransformer())
+            ->parseIncludes('remark')
+            ->respond(200, [], JSON_PRETTY_PRINT);*/
+
+
         return $this->resourceResponse(new AddressResource($address));
 
     }

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

@@ -3,6 +3,9 @@
 namespace App\Classes\Modules\Addresses\ControllersLogic;
 
 
+use App\Classes\Exceptions\AccessForbiddenException;
+use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\Exceptions\RequestValidationException;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Addresses\Services\CreatesAddress;
 use App\Classes\Modules\Addresses\Standards\Rules\CanCreateAddress;
@@ -14,6 +17,7 @@ use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Http\Resources\AddressResource;
 use App\Models\Address;
 use App\Models\CompanyModule;
+use App\Transformers\AddressTransformer;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
@@ -23,7 +27,8 @@ class CreateBillingAddressLogic extends AbstractControllerLogic
     /**
      * @return array
      */
-    protected function notification():array {
+    protected function notification(): array
+    {
         return [
             'title' => 'Created Billing Address',
             'message' => 'You have successfully created a new Billing Address'
@@ -60,14 +65,14 @@ class CreateBillingAddressLogic extends AbstractControllerLogic
     /**
      * @param Request $request
      * @return JsonResponse
-     * @throws \App\Classes\Exceptions\AccessForbiddenException
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     * @throws \App\Classes\Exceptions\RequestValidationException
+     * @throws AccessForbiddenException
+     * @throws MalformedRequestException
+     * @throws RequestValidationException
      */
-    public function logic(Request $request) : JsonResponse
+    public function logic(Request $request): JsonResponse
     {
         $companyModule = $this->fetchesCompanyModule->execute(['id' => $request->input('company_module_id')]);
-        
+
         $billingAddressInputed = $this->fetchesAddress->execute(['id' => $request->input('billing_address_id')]);
 
         if ($billingAddressInputed->type !== AddressType::BILLING || $billingAddressInputed->id !== $companyModule->addresses->where('type', AddressType::BILLING)->first()->id) {
@@ -80,6 +85,14 @@ class CreateBillingAddressLogic extends AbstractControllerLogic
             $this->createsAddress->execute($companyModule, $billingAddress);
         }
 
+        //load address with only owner address
+
+/*        return fractal()
+            ->item($billingAddressInputed, new AddressTransformer())
+            ->parseIncludes('Owner_address')
+            ->respond(200, [], JSON_PRETTY_PRINT);*/
+
+
         return $this->resourceResponse(new AddressResource($billingAddressInputed));
     }
 

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

@@ -3,6 +3,8 @@
 namespace App\Classes\Modules\Addresses\ControllersLogic;
 
 
+use App\Classes\Exceptions\AccessForbiddenException;
+use App\Classes\Exceptions\RequestValidationException;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Addresses\Services\FetchesAddress;
 use App\Classes\Modules\Addresses\Standards\Rules\CanFetchAddress;
@@ -17,7 +19,8 @@ class FetchAddressLogic extends AbstractControllerLogic
     /**
      * @return array
      */
-    protected function notification():array {
+    protected function notification(): array
+    {
         return [
             'title' => 'Retrieved Address',
             'message' => 'You have successfully retrieved a Address'
@@ -45,15 +48,22 @@ class FetchAddressLogic extends AbstractControllerLogic
     /**
      * @param Request $request
      * @return JsonResponse
-     * @throws \App\Classes\Exceptions\AccessForbiddenException
-     * @throws \App\Classes\Exceptions\RequestValidationException
+     * @throws AccessForbiddenException
+     * @throws RequestValidationException
      */
-    public function logic(Request $request) : JsonResponse
+    public function logic(Request $request): JsonResponse
     {
         $this->canFetchAddress->passes();
 
         $query = $this->fetchesAddress->execute(['id' => $request->route('id')]);
 
+
+        //load address with no relationships
+        /*          return fractal()
+                    ->item($address, new AddressTransformer())
+                    ->respond(200, [], JSON_PRETTY_PRINT);*/
+
+
         return $this->resourceResponse(new AddressResource($query));
 
     }

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

@@ -3,10 +3,14 @@
 namespace App\Classes\Modules\Addresses\ControllersLogic;
 
 
+use App\Classes\Exceptions\AccessForbiddenException;
+use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\Exceptions\RequestValidationException;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Addresses\Services\ListsAddresses;
 use App\Classes\Modules\Addresses\Standards\Rules\CanListAddresses;
 use App\Http\Resources\AddressResource;
+use App\Transformers\AddressTransformer;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -17,7 +21,8 @@ class ListAddressesLogic extends AbstractControllerLogic
     /**
      * @return array
      */
-    protected function notification():array {
+    protected function notification(): array
+    {
         return [
             'title' => 'Retrieved Addresses',
             'message' => 'You have successfully retrieved a list of Addresses'
@@ -45,17 +50,25 @@ class ListAddressesLogic extends AbstractControllerLogic
     /**
      * @param Request $request
      * @return JsonResponse
-     * @throws \App\Classes\Exceptions\AccessForbiddenException
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     * @throws \App\Classes\Exceptions\RequestValidationException
+     * @throws AccessForbiddenException
+     * @throws MalformedRequestException
+     * @throws RequestValidationException
      */
-    public function logic(Request $request) : JsonResponse
+    public function logic(Request $request): JsonResponse
     {
 
         $this->canListAddresses->passes();
 
         $query = $this->listsAddresses->execute($this->listsAddresses->deserializeFilters($request->input('filters')));
 
+        //a collection of addresses with all incluides
+ /*       return fractal()
+            ->collection($query, new AddressTransformer)
+            ->parseIncludes('Owner_address')
+            ->parseIncludes('remark')
+            ->parseIncludes('contact')
+            ->respond(200, [], JSON_PRETTY_PRINT);*/
+
         return $this->collectionResponse(AddressResource::collection($query));
 
     }

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

@@ -7,7 +7,6 @@ use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Addresses\Services\ListsAddresses;
 use App\Classes\Modules\Addresses\Services\ListsDistricts;
 use App\Classes\Modules\Addresses\Standards\Rules\CanListAddresses;
-use App\Http\Resources\AddressResource;
 use App\Http\Resources\DistrictResource;
 use ErrorException;
 use Illuminate\Http\JsonResponse;

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

@@ -7,7 +7,6 @@ use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Addresses\Services\ListsAddresses;
 use App\Classes\Modules\Addresses\Services\ListsStates;
 use App\Classes\Modules\Addresses\Standards\Rules\CanListAddresses;
-use App\Http\Resources\AddressResource;
 use App\Http\Resources\StateResource;
 use ErrorException;
 use Illuminate\Http\JsonResponse;

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

@@ -9,6 +9,7 @@ use App\Classes\Modules\Addresses\Services\FetchesAddress;
 use App\Classes\Modules\Addresses\Services\ResetsAddressesDefault;
 use App\Classes\Modules\Addresses\Services\SetsAddressToDefault;
 use App\Models\Address;
+use App\Transformers\AddressTransformer;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
@@ -33,7 +34,7 @@ class SetAddressToDefaultLogic extends AbstractControllerLogic
     /** @var ResetsAddressesDefault */
     private $resetsAddressesDefault;
 
-    /** @var SetsAddressToDefault*/
+    /** @var SetsAddressToDefault */
     private $setsAddressToDefault;
 
 
@@ -64,7 +65,15 @@ class SetAddressToDefaultLogic extends AbstractControllerLogic
 
         $this->resetsAddressesDefault->execute($address->owner, $address->type);
 
-        return $this->resourceResponse(new AddressResource($this->setsAddressToDefault->execute($address)));
+
+        $setAddress = $this->setsAddressToDefault->execute($address);
+        //no relationships needed
+       /* return fractal()
+            ->item($setAddress, new AddressTransformer())
+            ->respond(200, [], JSON_PRETTY_PRINT);*/
+
+
+        return $this->resourceResponse(new AddressResource($address));
 
     }
 }

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

@@ -17,6 +17,7 @@ use App\Classes\ValueObjects\Constants\AddressType;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Http\Resources\AddressResource;
 use App\Models\Address;
+use App\Transformers\AddressTransformer;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
@@ -26,7 +27,8 @@ class UpdateAddressLogic extends AbstractControllerLogic
     /**
      * @return array
      */
-    protected function notification():array {
+    protected function notification(): array
+    {
         return [
             'title' => 'Updated Address',
             'message' => 'You have successfully updated the Address'
@@ -77,7 +79,7 @@ class UpdateAddressLogic extends AbstractControllerLogic
      * @throws \App\Classes\Exceptions\MalformedRequestException
      * @throws \App\Classes\Exceptions\RequestValidationException
      */
-    public function logic(Request $request) : JsonResponse
+    public function logic(Request $request): JsonResponse
     {
         $district = $this->fetchesDistrict->execute(['id' => $request->input('district_id')]);
 
@@ -90,18 +92,25 @@ class UpdateAddressLogic extends AbstractControllerLogic
         /** @var Address $address */
         $address = $this->updatesAddress->execute($address, $object);
 
-        $address->contacts()->delete(); $address->remarks()->delete();
+        $address->contacts()->delete();
+        $address->remarks()->delete();
 
-        if($request->input('phone')){
+        if ($request->input('phone')) {
             $contactObject = new ContactObject($request->input('person_in_charge'), $request->input('phone'), '', '');
             $this->createContactProcessor->execute($contactObject, $address);
         }
 
-        if($request->input('remark')){
+        if ($request->input('remark')) {
             $remarkObject = new RemarkObject($request->input('remark'), Auth()->user()->id);
             $this->createRemarkProcessor->execute($address, $remarkObject);
         }
 
+        //only remark relationship needed
+/*        return fractal()
+            ->item($address, new AddressTransformer())
+            ->parseIncludes('remark')
+            ->respond(200, [], JSON_PRETTY_PRINT);*/
+
         return $this->resourceResponse(new AddressResource($address));
 
     }

app/Classes/Modules/Announcements/ControllersLogic/UpdateAnnouncementLogic.php

@@ -10,7 +10,7 @@ use App\Classes\Modules\Announcements\Services\FetchesAnnouncement;
 use App\Classes\Modules\Announcements\Services\UpdatesAnnouncement;
 
 use App\Http\Resources\AnnouncementResource;
-
+use Carbon\Carbon;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
@@ -66,8 +66,8 @@ class UpdateAnnouncementLogic extends AbstractControllerLogic
         $annoucement_object = new AnnouncementObject(
             $request->input('title'),
             $request->input('description'),
-            $request->input('starting_on'),
-            $request->input('ending_on')
+            Carbon::createFromFormat('d-m-Y', $request->input('starting_on'))->format('Y-m-d H:i:s'),
+            Carbon::createFromFormat('d-m-Y', $request->input('ending_on'))->format('Y-m-d H:i:s')
         );
 
         $this->canUpdateAnnouncement->passes($annoucement_object);

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

@@ -4,28 +4,24 @@ namespace App\Classes\Modules\Billplzs\ControllersLogic;
 
 use App\Classes\Modules\Orders\Processors\UpdateDoFromVTPortalProcessor;
 use App\Classes\Modules\Orders\Processors\UpdateDoFromYDPortalProcessor;
-use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
-use App\Classes\Modules\Wallets\Services\UpdatesWallet;
 
 use App\Classes\Exceptions\ResourceNotFoundException;
 use App\Classes\Modules\Wallets\Services\UpdatesWalletBalance;
-use App\Http\Resources\TransactionResource;
-use App\Models\Booking;
 use App\Models\User;
 use App\Models\Wallet;
 use Illuminate\Http\Request;
-use Illuminate\Http\JsonResponse;
-
 use App\Classes\Exceptions\MalformedRequestException;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\Modules\Billplzs\Services\GetBillplzBill;
 use App\Classes\Modules\Billplzs\DataTransferObjects\BillplzXSignatureObject;
-use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Transactions\Services\FetchesTransaction;
+use App\Classes\Modules\Transactions\Processors\CreatePaymentTransactionProcessor;
 use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Models\Group;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Log;
 
 class CallbackBillplzLogic
 {
@@ -44,6 +40,12 @@ class CallbackBillplzLogic
     /** @var UpdateDoFromYDPortalProcessor */
     private $updateDoFromYDPortalProcessor ;
 
+    /** @var UpdatesWalletBalance */
+    private $updatesWalletBalance;
+
+    /** @var CreatePaymentTransactionProcessor */
+    private $createPaymentTransactionProcessor;
+
     /**
      * CallbackBillplzLogic constructor.
      * @param GetBillplzBill $getBillplzBill
@@ -51,14 +53,17 @@ class CallbackBillplzLogic
      * @param UpdatesTransactionStatus $updatesTransactionStatus
      * @param UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor
      * @param UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor
+     * @param CreatePaymentTransactionProcessor $createPaymentTransactionProcessor
      */
-    public function __construct(GetBillplzBill $getBillplzBill, FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor, UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor)
+    public function __construct(GetBillplzBill $getBillplzBill, FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor, UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor, UpdatesWalletBalance $updatesWalletBalance, CreatePaymentTransactionProcessor $createPaymentTransactionProcessor)
     {
         $this->getBillplzBill = $getBillplzBill;
         $this->fetchesTransaction = $fetchesTransaction;
         $this->updatesTransactionStatus = $updatesTransactionStatus;
         $this->updateDoFromVTPortalProcessor = $updateDoFromVTPortalProcessor;
         $this->updateDoFromYDPortalProcessor = $updateDoFromYDPortalProcessor;
+        $this->updatesWalletBalance = $updatesWalletBalance;
+        $this->createPaymentTransactionProcessor = $createPaymentTransactionProcessor;
     }
 
 
@@ -101,23 +106,51 @@ class CallbackBillplzLogic
         $token = Auth::fromUser(User::find(1));
         $request->headers->set('Authorization', 'Bearer '.$token);
 
-        $this->updatesTransactionStatus->execute($transaction, ApprovalStatus::APPROVED);
+        // check if is wallet top up
+        if($transaction->owner instanceof Wallet && $status === ApprovalStatus::APPROVED &&!in_array($transaction->status, [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])) {
+            $this->updatesWalletBalance->execute($transaction->owner, $transaction->amount);
+        }
 
-        if(($invoice->amount - $transaction->amount) < 0.01) {
-            $this->updatesTransactionStatus->execute($invoice, ApprovalStatus::COMPLETED);
+        // group payment
+        if ($transaction->type == TransactionType::GROUP_PAYMENT && $status === ApprovalStatus::APPROVED &&!in_array($transaction->status, [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])) {
+            $group = Group::where('reference', $billplzXSignatureObject->getBillPlzId())->first();
 
-            $packingList->status = ApprovalStatus::APPROVED;
-            $packingList->save();
+            foreach($group->groupTransactions as $groupTransaction) {
+                $invoice = $groupTransaction->transaction;
+                $this->createPaymentTransactionProcessor->execute($invoice, PaymentMethodType::WALLET, null);
+            }
 
-            if(app()->environment('production')){
-                $this->updateDoFromVTPortalProcessor->execute($packingList);
-                $this->updateDoFromYDPortalProcessor->execute($packingList);
+            $group->status = $status;
+            $group->save();
+        }
+
+        $this->updatesTransactionStatus->execute($transaction, $status);
+
+        if (!$transaction->owner instanceof Wallet) {
+            $totalPaidAmount = $invoice->transactions->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->sum('amount');
+
+            if(($invoice->amount - $totalPaidAmount) < 0.01) {
+                $this->updatesTransactionStatus->execute($invoice, ApprovalStatus::COMPLETED);
+
+                $packingList->status = ApprovalStatus::APPROVED;
+                $packingList->save();
+
+                if(app()->environment('production')){
+                    $this->updateDoFromVTPortalProcessor->execute($packingList);
+                    $this->updateDoFromYDPortalProcessor->execute($packingList);
+                }
             }
         }
 
+        $company_module_marking = $transaction->owner->owner->connections? $transaction->owner->owner->connections->first()->invitee_reference: null;
 
+        if ($transaction->owner instanceof Wallet) {
+            $company_module_marking = $transaction->owner->owner->connections? $transaction->owner->owner->connections->first()->invitee_reference: null;
+        } else {
 
+            $company_module_marking = $order->companyModule->connections? $order->companyModule->connections->first()->invitee_reference: null;
+        }
 
-        return $request->method() === 'POST' ? true : view('pages.payments_redirect', ['marking' => $order->reference, 'transaction' => $transaction, 'status' => $status]);
+        return $request->method() === 'POST' ? true : view('pages.payments_redirect', ['marking' => $order->reference ?? null, 'company_module_marking' => $company_module_marking ?? null, 'transaction' => $transaction, 'status' => $status]);
     }
 }

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

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

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

@@ -3,13 +3,16 @@
 namespace App\Classes\Modules\Companies\ControllersLogic;
 
 
+use App\Classes\Exceptions\AccessForbiddenException;
+use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\Exceptions\RequestValidationException;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Companies\Services\ListsCompanies;
 use App\Classes\Modules\Companies\Standards\Rules\CanListCompanies;
-use App\Http\Resources\CompanyResource;
-use ErrorException;
+use App\Transformers\CompanyTransformer;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use Spatie\Fractalistic\ArraySerializer;
 
 class ListCompaniesLogic extends AbstractControllerLogic
 {
@@ -45,16 +48,24 @@ class ListCompaniesLogic extends AbstractControllerLogic
     /**
      * @param Request $request
      * @return JsonResponse
-     * @throws \App\Classes\Exceptions\AccessForbiddenException
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     * @throws \App\Classes\Exceptions\RequestValidationException
+     * @throws AccessForbiddenException
+     * @throws MalformedRequestException
+     * @throws RequestValidationException
      */
     public function logic(Request $request) : JsonResponse
     {
         $this->canListCompanies->passes();
 
         $query = $this->listsCompanies->execute($this->listsCompanies->deserializeFilters($request->input('filters')));
-        return $this->collectionResponse(CompanyResource::collection($query));
+      //  return $this->collectionResponse(CompanyResource::collection($query));
+
+      return   fractal()
+            ->parseIncludes(['owner'])
+            ->collection($query, new CompanyTransformer(), "data")
+            ->serializeWith(new ArraySerializer())
+            ->respond(200, [], JSON_PRETTY_PRINT);
+
+
 
     }
 

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

@@ -3,10 +3,14 @@
 namespace App\Classes\Modules\Companies\ControllersLogic;
 
 
+use App\Classes\Exceptions\AccessForbiddenException;
+use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\Exceptions\RequestValidationException;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Companies\Services\ListsCompanyModules;
 use App\Classes\Modules\Companies\Standards\Rules\CanListCompanies;
 use App\Http\Resources\CompanyModuleResource;
+use App\Transformers\CompanyTransformer;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -17,7 +21,8 @@ class ListCompanyModulesLogic extends AbstractControllerLogic
     /**
      * @return array
      */
-    protected function notification():array {
+    protected function notification(): array
+    {
         return [
             'title' => 'Retrieved Company Moduels',
             'message' => 'You have successfully retrieved a list of Companies'
@@ -45,15 +50,26 @@ class ListCompanyModulesLogic extends AbstractControllerLogic
     /**
      * @param Request $request
      * @return JsonResponse
-     * @throws \App\Classes\Exceptions\AccessForbiddenException
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     * @throws \App\Classes\Exceptions\RequestValidationException
+     * @throws AccessForbiddenException
+     * @throws MalformedRequestException
+     * @throws RequestValidationException
      */
-    public function logic(Request $request) : JsonResponse
+    public function logic(Request $request): JsonResponse
     {
         $this->canListCompanies->passes();
 
         $query = $this->listsCompanyModules->execute($this->listsCompanyModules->deserializeFilters($request->input('filters')));
+
+        /*include all relationships*/
+/*        return fractal()
+            ->collection($query, new CompanyTransformer)
+            ->parseIncludes('company')
+            ->parseIncludes('contact')
+            ->parseIncludes('remarks')
+            ->parseIncludes('address')
+            ->parseIncludes('billingAddress')
+            ->respond(200, [], JSON_PRETTY_PRINT);*/
+
         return $this->collectionResponse(CompanyModuleResource::collection($query));
 
     }

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

@@ -0,0 +1,69 @@
+<?php
+
+namespace App\Classes\Modules\Companies\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Companies\Services\UpdatesCompany;
+use App\Classes\Modules\Companies\Services\FetchesCompany;
+use App\Classes\Modules\Companies\Standards\Rules\CanUpdateCompany;
+use App\Classes\Modules\Companies\DataTransferObjects\CompanyObject;
+use App\Http\Resources\CompanyResource;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateCompanyTypeLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Updated Company Type',
+            'message' => 'You have successfully updated the Company Tyoe'
+        ];
+    }
+
+    /** @var CanUpdateCompany */
+    private $canUpdateCompany;
+ 
+    /** @var UpdatesCompany */
+    private $updatesCompany;
+
+    /** @var FetchesCompany */
+    private $fetchesCompany;
+
+    /**
+     * UpdateCompanyControllersLogic constructor.
+     * @param CanUpdateCompany $canUpdateCompany
+     * @param UpdatesCompany $updatesCompany
+     * @param FetchesCompany $fetchesCompany
+     */
+    public function __construct(CanUpdateCompany $canUpdateCompany, UpdatesCompany $updatesCompany, FetchesCompany $fetchesCompany)
+    {
+        $this->canUpdateCompany = $canUpdateCompany;
+        $this->updatesCompany = $updatesCompany;
+        $this->fetchesCompany = $fetchesCompany;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $query = $this->fetchesCompany->execute(['id' => $request->route('id')]);
+
+        $object = new CompanyObject($query->name, $query->reference, $request->input('type'));
+
+        $this->canUpdateCompany->passes($object);
+
+        $query = $this->updatesCompany->execute($query, $object);
+
+        return $this->resourceResponse(new CompanyResource($query));
+    }
+
+}

app/Classes/Modules/Contacts/ControllersLogic/UpdateContactLogic.php

@@ -0,0 +1,77 @@
+<?php
+
+namespace App\Classes\Modules\Contacts\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Contacts\Services\UpdatesContact;
+use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
+use App\Classes\Modules\Contacts\Services\FetchesContact;
+use App\Http\Resources\ContactResource;
+use App\Transformers\ContactTransformer;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateContactLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Updated Contact',
+            'message' => 'You have successfully updated the Contact'
+        ];
+    }
+
+    /** @var UpdatesContact */
+    private $updatesContact;
+
+    /** @var FetchesContact */
+    private $fetchesContact;
+
+    /**
+     * UpdateContactLogic constructor.
+     * @param UpdatesContact $updatesContact
+     * @param FetchesContact $fetchesContact
+     */
+    public function __construct(UpdatesContact $updatesContact, FetchesContact $fetchesContact)
+    {
+        $this->updatesContact = $updatesContact;
+        $this->fetchesContact = $fetchesContact;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $object = new ContactObject(
+            $request->input('reference'),
+            $request->input('phone'),
+            $request->input('email'),
+            $request->input('wechat_id')
+        );
+
+        // $this->canUpdateContact->passes($object);
+
+        $query = $this->fetchesContact->execute(['id' => $request->route('id')]);
+
+        $query = $this->updatesContact->execute($query, $object);
+
+        /*uniformity*/
+            /*  return fractal()
+            ->item($query, new ContactTransformer())
+            ->parseIncludes('remark')
+            ->respond(200, [], JSON_PRETTY_PRINT);*/
+
+
+        return $this->resourceResponse(new ContactResource($query));
+    }
+
+}

app/Classes/Modules/Contacts/Services/FetchesContact.php

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

app/Classes/Modules/Contacts/Services/UpdatesContact.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Classes\Modules\Contacts\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
+use App\Models\Contact;
+
+class UpdatesContact extends AbstractUpdateRecord
+{
+
+    /**
+     * @param Contact $model
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Contact $model, ContactObject $object) 
+    {
+        $model->reference = $object->getReference();
+        $model->phone = $object->getPhone();
+        $model->email = $object->getEmail();
+        $model->wechat_id = $object->getWechatId();
+
+        return $this->handler($model);
+    }
+}

app/Classes/Modules/Delivery/ControllersLogic/CancelDeliveryOrderLogic.php

@@ -7,6 +7,7 @@ use App\Classes\Modules\Orders\Services\CancelsOrder;
 use App\Classes\Modules\Orders\Services\FetchesOrder;
 use App\Http\Resources\DeliveryOrderResource;
 use App\Models\Order;
+use App\Transformers\DeliveryOrderTransformer;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
@@ -52,6 +53,14 @@ class CancelDeliveryOrderLogic extends AbstractControllerLogic
         /** @var Order $order */
         $order = $this->fetchesOrder->execute(['id' => $request->route('id')]);
 
+        $order = $this->cancelsOrder->execute($order);
+
+                //no relationship  needed
+        /*   return fractal()
+            ->item($order, new DeliveryOrderTransformer())
+            ->respond(200, [], JSON_PRETTY_PRINT);*/
+
+
         return $this->resourceResponse(new DeliveryOrderResource($this->cancelsOrder->execute($order)));
 
     }

app/Classes/Modules/Delivery/ControllersLogic/CreateDeliveryOrderLogic.php

@@ -172,6 +172,12 @@ class CreateDeliveryOrderLogic extends AbstractControllerLogic
         $packageObject = new PackageObject($request->input('packing_list.type'), $request->input('packing_list.description'), (float) 1, (float) 1, (float) 1, $request->input('packing_list.weight'), (float) $request->input('packing_list.quantity'), ApprovalStatus::APPROVED);
         $this->createsPackage->execute($packageObject, $packingList);
 
+        //add relationship to order
+             /*   return fractal()
+            ->item($order, new DeliveryOrderTransformer())
+             ->parseIncludes(['sender_address', 'delivery_address', 'sender_address.contacts', 'delivery_address.contacts', 'sender_address.remarks', 'delivery_address.remarks', 'packing_list', 'packing_list.packages'])
+            ->respond(200, [], JSON_PRETTY_PRINT);*/
+
         return $this->resourceResponse(new DeliveryOrderResource($order));
 
     }

app/Classes/Modules/Delivery/ControllersLogic/ListOrdersLogic.php

@@ -48,6 +48,12 @@ class ListOrdersLogic extends AbstractControllerLogic
 
         $query = $this->listsOrders->execute(array_merge($this->listsOrders->deserializeFilters($request->input('filters')), ['with_parcels' => true, 'type_in' => [OrderType::LAST_MILE_DELIVERY]]));
 
+
+        //no relationship  needed
+             /*   return fractal()
+            ->collection($query, new DeliveryOrderTransformer)
+            ->respond(200, [], JSON_PRETTY_PRINT);*/
+
         return $this->collectionResponse(DeliveryOrderResource::collection($query));
 
     }

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

@@ -3,13 +3,21 @@
 namespace App\Classes\Modules\Documents\ControllersLogic;
 
 
+use App\Classes\Exceptions\AccessForbiddenException;
+use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\Exceptions\RequestValidationException;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Documents\Services\ListsDocuments;
 use App\Classes\Modules\Documents\Standards\Rules\CanListDocuments;
 use App\Http\Resources\DocumentResource;
+use App\Models\Document;
+use App\Transformers\DocumentTransformer;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use League\Fractal\Serializer\ArraySerializer;
+use League\Fractal;
+
 
 class ListDocumentLogic extends AbstractControllerLogic
 {
@@ -17,7 +25,8 @@ class ListDocumentLogic extends AbstractControllerLogic
     /**
      * @return array
      */
-    protected function notification():array {
+    protected function notification(): array
+    {
         return [
             'title' => 'Retrieved Document',
             'message' => 'You have successfully retrieved a list of Document'
@@ -45,19 +54,29 @@ class ListDocumentLogic extends AbstractControllerLogic
     /**
      * @param Request $request
      * @return JsonResponse
-     * @throws \App\Classes\Exceptions\AccessForbiddenException
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     * @throws \App\Classes\Exceptions\RequestValidationException
+     * @throws AccessForbiddenException
+     * @throws MalformedRequestException
+     * @throws RequestValidationException
      */
-    public function logic(Request $request) : JsonResponse
+    public function logic(Request $request): JsonResponse
     {
 
         $this->canListDocuments->passes();
 
         $query = $this->listsDocuments->execute(array_merge($this->listsDocuments->deserializeFilters($request->input('filters')), ['with_owner' => true]));
 
-        return $this->collectionResponse(DocumentResource::collection($query));
+        $data = fractal()
+            ->parseIncludes(['owner'])
+            ->collection($query, new DocumentTransformer, "data")
+            ->serializeWith(new ArraySerializer())
+            ->respond(200, [], JSON_PRETTY_PRINT);
+
+        return $data;
+
+
+
 
     }
 
+
 }

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

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

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

@@ -0,0 +1,50 @@
+<?php
+
+namespace App\Classes\Modules\Documents\Processors;
+
+use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
+use App\Classes\Modules\Documents\Services\CreatesDocument;
+use App\Classes\Modules\Documents\Services\CreatesFiles;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Models\Document;
+use Illuminate\Http\Request;
+use App\Models\QAUserAnswerSelected;
+
+class UploadDocumentForHelpMenuProcessor
+{
+
+    /** @var CreatesDocument */
+    private $createsDocument;
+
+    /** @var CreatesFiles */
+    private $createsFiles;
+
+    /**
+     * UploadDocumentForHelpMenuProcessor constructor.
+     * @param CreatesDocument $createsDocument
+     * @param CreatesFiles $createsFiles
+     */
+    public function __construct(CreatesDocument $createsDocument, CreatesFiles $createsFiles)
+    {
+        $this->createsDocument = $createsDocument;
+        $this->createsFiles = $createsFiles;
+    }
+
+
+    /**
+     * @param Request $request
+     * @param QAUserAnswerSelected qaUserAnswerSelected
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    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 */
+        $document = $this->createsDocument->execute($qaUserAnswerSelected, $object);
+
+        $result = $this->createsFiles->execute($document, $object);
+        return $result;
+    }
+
+}

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

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

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

@@ -32,6 +32,7 @@ class ExportsPaymentTransactions implements FromQuery, WithHeadings, WithHeading
             'DocNo',
             'DocDate',
             'DebtorCode',
+            'DebtorCode',
             'ShipInfo',
             'AccNo',
             'DetailDescription',
@@ -39,7 +40,12 @@ class ExportsPaymentTransactions implements FromQuery, WithHeadings, WithHeading
             'ProjNo',
             'DeptNo',
             'Qty',
-            'UnitPrice'
+            'UnitPrice',
+//            'marking',
+//            'contact person',
+//            'contact number',
+//            'link',
+//            'amount'
         ];
     }
 
@@ -97,6 +103,10 @@ class ExportsPaymentTransactions implements FromQuery, WithHeadings, WithHeading
         $order = $transaction->owner->owner;
         $company = $order->companyModule->company;
         $shippingTransactionDetails = $transaction->transactionDetails()->where('reference', 'SHIPPING_FEE')->first();
+        $marking = $order->companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
+        $contact = $order->companyModule->company->contacts->first();
+        $userName = $order->companyModule->employees()->first();
+        $link = route('customer.payment-and-billing', $marking);
 
         $furtherDescription = '';
 
@@ -117,13 +127,19 @@ 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,
             $container->reference,
             'CIEF',
             $shippingTransactionDetails->quantity,
-            $shippingTransactionDetails->price
+            $shippingTransactionDetails->price,
+//            $marking,
+//            $contact ? $contact->phone : '',
+//            $userName->name,
+//            $link,
+//            $transaction->amount
         ];
         return [
             '<<New>>',

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

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

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

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

app/Classes/Modules/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/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/Processors/DeleteHelpMenuAnswerProcessor.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Classes\Modules\HelpMenu\Processors;
+
+use App\Models\QAUserAnswerSelected;
+use App\Classes\Modules\HelpMenu\Services\FetchesHelpMenuUserAnswerSelected;
+use App\Classes\Modules\HelpMenu\Services\FetchesHelpMenuUserAnswerSelectedList;
+
+class DeleteHelpMenuAnswerProcessor
+{
+    /** @var FetchesHelpMenuUserAnswerSelected */
+    private $fetchesHelpMenuUserAnswerSelected;
+
+    /** @var FetchesHelpMenuUserAnswerSelectedList */
+    private $fetchesHelpMenuUserAnswerSelectedList;
+
+    /**
+     * DeleteHelpMenuAnswerProcessor constructor.
+     * @param FetchesHelpMenuUserAnswerSelected $fetchesHelpMenuUserAnswerSelected
+     * @param FetchesHelpMenuUserAnswerSelectedList $fetchesHelpMenuUserAnswerSelectedList
+     */
+    public function __construct(FetchesHelpMenuUserAnswerSelected $fetchesHelpMenuUserAnswerSelected, FetchesHelpMenuUserAnswerSelectedList $fetchesHelpMenuUserAnswerSelectedList)
+    {
+        $this->fetchesHelpMenuUserAnswerSelected = $fetchesHelpMenuUserAnswerSelected;
+        $this->fetchesHelpMenuUserAnswerSelectedList = $fetchesHelpMenuUserAnswerSelectedList;
+    }
+
+    public function execute($userId, $questionId, $request){
+        if ($request->has('isPrevious')) {
+            //Get current and previous question's answer
+            try{
+                $selectedAnswer = $this->fetchesHelpMenuUserAnswerSelectedList->execute(['user_id' => $userId, 'question_id' => $questionId, 'order_by' => (object)['column' => 'id','DESC' => true]])[0];
+            } catch (\Exception $exception){
+                $selectedAnswer = null;
+            }
+
+            if($selectedAnswer)
+            {
+                $this->fetchesHelpMenuUserAnswerSelected->execute(['id' => $selectedAnswer['id']])->delete();
+            }
+        }
+        else{
+            //Delete all answer's belongs to the user
+            $currentQuestion = $request->question;
+            $isStart = $currentQuestion['is_start'];
+            if($isStart){
+                QAUserAnswerSelected::where('user_id', $userId)->delete();
+            }
+        }
+    }
+}

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

@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Classes\Modules\HelpMenu\Processors;
+
+use App\Classes\Modules\HelpMenu\Services\FetchesHelpMenuQuestion;
+use ErrorException;
+use Illuminate\Http\Request;
+
+
+class FetchFirstHelpMenuQuestionProcessor
+{
+    /** @var FetchesHelpMenuQuestion */
+    private $fetchesHelpMenuQuestion;
+
+    /**
+     * FetchFirstHelpMenuQuestionProcessor constructor.
+     * @param FetchesHelpMenuQuestion $fetchesHelpMenuQuestion
+     */
+    public function __construct(FetchesHelpMenuQuestion $fetchesHelpMenuQuestion)
+    {
+        $this->fetchesHelpMenuQuestion = $fetchesHelpMenuQuestion;
+    }
+
+    public function execute(Request $request){
+        try {
+            $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

@@ -0,0 +1,93 @@
+<?php
+
+namespace App\Classes\Modules\HelpMenu\Processors;
+
+use App\Classes\Modules\HelpMenu\Services\FetchesHelpMenuQuestion;
+use App\Classes\Modules\HelpMenu\Services\FetchesHelpMenuUserAnswerSelected;
+use App\Classes\Modules\HelpMenu\Services\FetchesHelpMenuUserAnswerSelectedList;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use App\Classes\ValueObjects\Constants\QAType;
+
+class FetchNextHelpMenuQuestionProcessor
+{
+    /** @var FetchesHelpMenuQuestion */
+    private $fetchesHelpMenuQuestion;
+
+    /** @var FetchesHelpMenuUserAnswerSelected */
+    private $fetchesHelpMenuUserAnswerSelected;
+
+    /** @var FetchesHelpMenuUserAnswerSelectedList */
+    private $fetchesHelpMenuUserAnswerSelectedList;
+    /**
+     * FetchNextHelpMenuQuestionProcessor constructor.
+     * @param FetchesHelpMenuQuestion $fetchesHelpMenuQuestion
+     * @param FetchesHelpMenuUserAnswerSelected $fetchesHelpMenuUserAnswerSelected
+     * @param FetchesHelpMenuUserAnswerSelectedList $fetchesHelpMenuUserAnswerSelectedList
+     */
+    public function __construct(FetchesHelpMenuQuestion $fetchesHelpMenuQuestion, FetchesHelpMenuUserAnswerSelected $fetchesHelpMenuUserAnswerSelected, FetchesHelpMenuUserAnswerSelectedList $fetchesHelpMenuUserAnswerSelectedList)
+    {
+        $this->fetchesHelpMenuQuestion = $fetchesHelpMenuQuestion;
+        $this->fetchesHelpMenuUserAnswerSelected = $fetchesHelpMenuUserAnswerSelected;
+        $this->fetchesHelpMenuUserAnswerSelectedList = $fetchesHelpMenuUserAnswerSelectedList;
+    }
+
+    public function execute(Request $request){
+        $isEnd = 0;
+        $questionId = 0;
+        $nextQuestionNumber = 0;
+        $nextNestedQuestion = 0;
+        $nextMainQuestion= 0;
+        $currentQuestion = $request->question;
+        $questionType = QAType::DEFAULT;
+        $returnQuestion = null;
+
+        if ($currentQuestion && array_key_exists('id', $currentQuestion)) {
+            $questionId = $currentQuestion['id'];
+            $isEnd = $currentQuestion['is_end'];
+            $questionType = $currentQuestion['question_type'];
+            $nextNestedQuestion = $currentQuestion['next_nested_question'];
+            $nextMainQuestion = $currentQuestion['next_main_question'];
+        }
+        if ($request->has('answerObj')) {
+            $nextQuestionNumber = $request->answerObj['next_question_number'];
+        }
+
+        if ($request->has('isPrevious')) {
+            $userId = Auth::user()->id;
+            $previousAnswer = $this->fetchesHelpMenuUserAnswerSelectedList->execute(['user_id' => $userId, 'order_by' => (object)['column' => 'id','DESC' => true]])[0];
+
+            //Get previous question
+            $previousQuestion = $this->fetchesHelpMenuQuestion->execute(['questionnaire_set_id' => 1, 'id' => $previousAnswer['question_id']]);
+            $returnQuestion = $previousQuestion;
+        }
+        else{
+            //Get next question
+            $nextQuestion = null;
+            $question_number = 0;
+            if($nextQuestionNumber != 0){
+                $question_number = $nextQuestionNumber;
+            }
+            else if($nextNestedQuestion != 0){
+                $question_number = $nextNestedQuestion;
+            }
+            else {
+                $question_number = $nextMainQuestion;
+            }
+
+            if($isEnd){
+                $returnQuestion = null;
+            }
+            else if($question_number != 0){
+                $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' => 1, 'id_next' => $questionId, 'next_main_question' => null]);
+                $returnQuestion = $nextQuestion;
+            }
+        }
+
+        return $returnQuestion;
+    }
+}

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

@@ -0,0 +1,63 @@
+<?php
+
+namespace App\Classes\Modules\HelpMenu\Processors;
+
+use App\Models\QAUserAnswerSelected;
+use App\Classes\Modules\HelpMenu\Services\FetchesHelpMenuUserAnswerSelected;
+use App\Classes\Modules\Documents\Processors\UploadDocumentForHelpMenuProcessor;
+
+
+class SaveHelpMenuAnswerProcessor
+{
+    /** @var FetchesHelpMenuUserAnswerSelected */
+    private $fetchesHelpMenuUserAnswerSelected;
+
+    /** @var UploadDocumentForHelpMenuProcessor */
+    private $uploadDocumentForHelpMenuProcessor;
+
+    /**
+     * SaveHelpMenuAnswerProcessor constructor.
+     * @param FetchesHelpMenuUserAnswerSelected $fetchesHelpMenuUserAnswerSelected
+     * @param UploadDocumentForHelpMenuProcessor $uploadDocumentForHelpMenuProcessor
+     */
+    public function __construct(FetchesHelpMenuUserAnswerSelected $fetchesHelpMenuUserAnswerSelected, UploadDocumentForHelpMenuProcessor $uploadDocumentForHelpMenuProcessor)
+    {
+        $this->fetchesHelpMenuUserAnswerSelected = $fetchesHelpMenuUserAnswerSelected;
+        $this->uploadDocumentForHelpMenuProcessor = $uploadDocumentForHelpMenuProcessor;
+    }
+
+    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, 'question_id' => $questionId]);
+        } catch (\Exception $exception){
+            $answer = null;
+        }
+
+        if(is_null($answer))
+        {
+            $answer = new QAUserAnswerSelected;
+        }
+        $answer->user_id = $userId;
+        $answer->question_id = $questionId;
+        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($request, $answer);
+            $newData = array_map(function ($item) {
+                return [
+                    'document_id' => $item->document_id,
+                    'file_id' => $item->id,
+                ];
+            }, $result);
+            $answer->free_text_answer = json_encode($newData);
+            $answer->save();
+        }
+    }
+}

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

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

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

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

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

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

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

@@ -0,0 +1,37 @@
+<?php
+
+namespace App\Classes\Modules\HelpMenu\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+
+class CanFetchHelpMenuQuestionList extends AbstractRule
+{
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+    }
+
+    /**
+     * @param  $object
+     * @return bool
+     */
+    protected function validators($object): bool
+    {
+        return true;
+    }
+
+    /**
+     * @param  $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}

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

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

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

@@ -9,6 +9,7 @@ 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;
@@ -23,7 +24,8 @@ use Illuminate\Http\JsonResponse;
 class CreateOrderLogic extends AbstractControllerLogic
 {
 
-    protected function notification():array {
+    protected function notification(): array
+    {
         return [
             'title' => 'Created Order',
             'message' => 'You have successfully created a new Order'
@@ -51,6 +53,8 @@ class CreateOrderLogic extends AbstractControllerLogic
     /** @var CanCreateAddress */
     private $canCreateAddress;
 
+    /** @var NewLeadTaskToPerfexCRMProcessor */
+    private $newLeadTaskToPerfexCRMProcessor;
     /**
      * CreateOrderLogic constructor.
      * @param FetchesCompany $fetchesCompany
@@ -58,10 +62,11 @@ class CreateOrderLogic extends AbstractControllerLogic
      * @param CreateOrderProcessor $createOrderProcessor
      * @param FetchesCompanyModule $fetchesCompanyModule
      * @param GeneratesOrderNumber $generatesOrderNumber
+     * @param NewLeadTaskToPerfexCRMProcessor $newLeadTaskToPerfexCRMProcessor
      * @param CreatesAddress $createsAddress
      * @param CanCreateAddress $canCreateAddress
      */
-    public function __construct(FetchesCompany $fetchesCompany, FetchesAddress $fetchesAddress, CreateOrderProcessor $createOrderProcessor, FetchesCompanyModule $fetchesCompanyModule, GeneratesOrderNumber $generatesOrderNumber, CreatesAddress $createsAddress, CanCreateAddress $canCreateAddress)
+    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;
@@ -70,43 +75,45 @@ class CreateOrderLogic extends AbstractControllerLogic
         $this->generatesOrderNumber = $generatesOrderNumber;
         $this->createsAddress = $createsAddress;
         $this->canCreateAddress = $canCreateAddress;
+        $this->newLeadTaskToPerfexCRMProcessor = $newLeadTaskToPerfexCRMProcessor;
     }
 
 
-    public function logic(Request $request) : JsonResponse {
+    public function logic(Request $request): JsonResponse
+    {
+
 
-        
         $company = $this->fetchesCompany->execute(['id' => $request->input('company_id')]);
-        
+
         $address = $this->fetchesAddress->execute(['id' => $request->input('address_id')]);
 
-        $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $request->input('warehouse_id')]);
+        // todo-new: fix this
+        // if select warehouse foshan
+        if ($request->input('warehouse_id') === 'foshan') {
+            // 13 - sabah, 14 - sarawak
+            if (in_array($address->state->id, [13, 14])) {
+                $originWarehouse = $this->fetchesCompanyModule->execute(['reference' => WarehouseReferences::YD_FS_WEST_MALAYSIA]);
+            } else {
+                $originWarehouse = $this->fetchesCompanyModule->execute(['reference' => WarehouseReferences::YD_FS_WEST_MALAYSIA]);
+            }
+        } else {
+            $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $request->input('warehouse_id')]);
 
-        if ($request->input('billing_address_id')) {
-            $companyModule = $company->companyModules->first();
-            $billingAddressInputed = $this->fetchesAddress->execute(['id' => $request->input('billing_address_id')]);
-
-            if ($billingAddressInputed->type !== AddressType::BILLING || $billingAddressInputed->id !== $companyModule->addresses->where('type', AddressType::BILLING)->first()->id) {
-                // delete all current billing address
-                Address::where('owner_type', CompanyModule::class)->where('owner_id', $request->input('company_module_id'))->where('type', AddressType::BILLING)->delete();
-    
-                // create 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);
+            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(!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.');
         }
 
         $order = $this->createOrderProcessor->execute($company, $originWarehouse, $address, $this->generatesOrderNumber->execute());
 
+        if(config('perfexcrm.is_enabled') == 'true'){
+            $this->newLeadTaskToPerfexCRMProcessor->execute($company);
+        }
+
         return $this->resourceResponse(new OrderResource($order));
     }
 }

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

@@ -0,0 +1,60 @@
+<?php
+
+namespace App\Classes\Modules\Orders\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Orders\Services\FetchesOrder;
+use App\Classes\Modules\Orders\Standards\Rules\CanFetchOrder;
+use App\Http\Resources\OrderV2Resource;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class FetchOrderV2Logic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Retrieved Order',
+            'message' => 'You have successfully retrieved an order'
+        ];
+    }
+
+    /** @var CanFetchOrder */
+    private $canFetchOrder;
+
+    /** @var FetchesOrder */
+    private $fetchesOrder;
+
+    /**
+     * FetchOrderLogic constructor.
+     * @param CanFetchOrder $canFetchOrder
+     * @param FetchesOrder $fetchesOrder
+     */
+    public function __construct(CanFetchOrder $canFetchOrder, FetchesOrder $fetchesOrder)
+    {
+        $this->canFetchOrder = $canFetchOrder;
+        $this->fetchesOrder = $fetchesOrder;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+
+        $this->canFetchOrder->passes();
+
+        $query = $this->fetchesOrder->execute(['reference' => $request->route('id'), 'with_packing_lists' => true]);
+
+        return $this->resourceResponse(new OrderV2Resource($query));
+
+    }
+
+}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,81 @@
+<?php
+
+namespace App\Classes\Modules\PackingLists\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\PackingLists\Services\DeletesPackingList;
+use App\Classes\Modules\PackingLists\Services\FetchesPackingList;
+use App\Classes\Modules\PackingLists\Services\Packages\FetchesPackage;
+use App\Classes\Modules\PackingLists\Standards\Rules\CanDeletePackingList;
+use App\Classes\ValueObjects\Constants\PackingListType;
+use App\Models\PackingList;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class DeletePackingListByPackageIdLogic extends AbstractControllerLogic
+{
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Deleted PackingList',
+            'message' => 'You have successfully deleted a PackingList'
+        ];
+    }
+
+
+    /** @var CanDeletePackingList */
+    private $canDeletePackingList;
+
+    /** @var DeletesPackingList */
+    private $deletesPackingList;
+
+    /** @var FetchesPackingList */
+    private $fetchesPackingList;
+
+    /** @var FetchesPackage */
+    private $fetchesPackage;
+
+    /**
+     * DeletePackingListByPackageIdLogic constructor.
+     * @param CanDeletePackingList $canDeletePackingList
+     * @param DeletesPackingList $deletesPackingList
+     * @param FetchesPackingList $fetchesPackingList
+     * @param FetchesPackage $fetchesPackage
+     */
+    public function __construct(CanDeletePackingList $canDeletePackingList, DeletesPackingList $deletesPackingList, FetchesPackingList $fetchesPackingList, FetchesPackage $fetchesPackage)
+    {
+        $this->canDeletePackingList = $canDeletePackingList;
+        $this->deletesPackingList = $deletesPackingList;
+        $this->fetchesPackingList = $fetchesPackingList;
+        $this->fetchesPackage = $fetchesPackage;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $this->canDeletePackingList->passes();
+
+        $package = $this->fetchesPackage->execute(['id' => $request->route('id')]);
+
+        $packingList = $package->packingList;
+
+        $packingList = PackingList::where('reference', $packingList->reference)->get();
+
+        $childPackingList = PackingList::where('owner_type', PackingList::class)->whereIn('owner_id', $packingList->pluck('id'))->get();
+
+        $packingList->each->delete();
+
+        $childPackingList->each->delete();
+
+        return $this->response([]);
+    }
+
+}

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

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

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

@@ -4,6 +4,7 @@ namespace App\Classes\Modules\PackingLists\Processors;
 
 
 use App\Classes\General\Interfaces\Packable;
+use App\Classes\Modules\PerfexCRM\Processors\PackingListToPerfexCRMProcessor;
 use App\Classes\Modules\PackingLists\DataTransferObjects\PackingListObject;
 use App\Classes\Modules\PackingLists\Services\CreatesPackingList;
 use App\Classes\Modules\PackingLists\Standards\Rules\CanCreatePackingList;
@@ -25,16 +26,20 @@ class CreatePackingListProcessor
     /** @var CreatesPackingList */
     private $createsPackingList;
 
+    /** @var PackingListToPerfexCRMProcessor */
+    private $packingListToPerfexCRMProcessor;
 
     /**
      * CreatePackingListProcessor constructor.
      * @param CanCreatePackingList $canCreatePackingList
      * @param CreatesPackingList $createsPackingList
+     * @param PackingListToPerfexCRMProcessor $packingListToPerfexCRMProcessor
      */
-    public function __construct(CanCreatePackingList $canCreatePackingList, CreatesPackingList $createsPackingList)
+    public function __construct(CanCreatePackingList $canCreatePackingList, CreatesPackingList $createsPackingList, PackingListToPerfexCRMProcessor $packingListToPerfexCRMProcessor)
     {
         $this->canCreatePackingList = $canCreatePackingList;
         $this->createsPackingList = $createsPackingList;
+        $this->packingListToPerfexCRMProcessor = $packingListToPerfexCRMProcessor;
     }
 
     /**
@@ -59,6 +64,10 @@ class CreatePackingListProcessor
         $object = new PackingListObject($object->getReference().'_01', $appointee_id, $type, ApprovalStatus::PENDING_SUBMISSION);
         $this->createsPackingList->execute($object, $packingList);
 
+        if(config('perfexcrm.is_enabled') == 'true'){
+            $this->packingListToPerfexCRMProcessor->execute($packingList);
+        }
+
         return $packingList;
     }
 

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

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

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

@@ -19,13 +19,17 @@ class CreateLeadPerfexCRMObject implements DataTransferObject
     /** @var string */
     private $companyName;
 
-    public function __construct(string $name, string $email, string $phone, string $companyName)
+    /** @var string */
+    private $companyReference;
+
+    public function __construct(string $name, string $email, string $phone, string $companyName, string $companyReference)
     {
 
         $this->name = $name;
         $this->email = $email;
         $this->phone = $phone;
         $this->companyName = $companyName;
+        $this->companyReference = $companyReference;
     }
 
     /**
@@ -60,4 +64,11 @@ class CreateLeadPerfexCRMObject implements DataTransferObject
         return $this->companyName;
     }
 
+    /**
+     * @return string
+     */
+    public function getCompanyReference(): string
+    {
+        return $this->companyReference;
+    }
 }

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

@@ -33,8 +33,16 @@ class CreateTaskPerfexCRMObject implements DataTransferObject
     /** @var string */
     private $status;
 
+    /** @var string */
+    private $department;
 
-    public function __construct(string $email, string $name, string $description, string $leadId, string $projectId, string $milestoneId, string $reference, string $onTaskCompletion, string $status)
+    /** @var string */
+    private $priority;
+
+    /** @var string */
+    private $duedate;
+
+    public function __construct(string $email, string $name, string $description, string $leadId, string $projectId, string $milestoneId, string $reference, string $onTaskCompletion, string $status, string $department, string $priority, string $duedate)
     {
         $this->email = $email;
         $this->name = $name;
@@ -45,6 +53,9 @@ class CreateTaskPerfexCRMObject implements DataTransferObject
         $this->reference = $reference;
         $this->onTaskCompletion = $onTaskCompletion;
         $this->status = $status;
+        $this->department = $department;
+        $this->priority = $priority;
+        $this->duedate = $duedate;
     }
 
     /**
@@ -124,4 +135,27 @@ class CreateTaskPerfexCRMObject implements DataTransferObject
         return $this->status;
     }
 
+    /**
+     * @return string
+     */
+    public function getDepartment(): string
+    {
+        return $this->department;
+    }
+
+    /**
+     * @return string
+     */
+    public function getPriority(): string
+    {
+        return $this->priority;
+    }
+
+    /**
+     * @return string
+     */
+    public function getDuedate(): string
+    {
+        return $this->duedate;
+    }
 }

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

@@ -25,6 +25,9 @@ class InitialPerfexCRMObject implements DataTransferObject
     /** @var string */
     private $projectName;
 
+    /** @var int */
+    private $projectStatus;
+
     /** @var array */
     private $milestoneNames;
 
@@ -32,7 +35,7 @@ class InitialPerfexCRMObject implements DataTransferObject
     private $taskNames;
 
 
-    public function __construct(string $companyName, string $companyReference, string $contactName, string $contactEmail, string $bookingMarking, string $projectName, array $milestoneNames, array $taskNames)
+    public function __construct(string $companyName, string $companyReference, string $contactName, string $contactEmail, string $bookingMarking, string $projectName, int $projectStatus, array $milestoneNames, array $taskNames)
     {
 
         $this->companyName = $companyName;
@@ -41,6 +44,7 @@ class InitialPerfexCRMObject implements DataTransferObject
         $this->contactEmail = $contactEmail;
         $this->bookingMarking = $bookingMarking;
         $this->projectName = $projectName;
+        $this->projectStatus = $projectStatus;
         $this->milestoneNames = $milestoneNames;
         $this->taskNames = $taskNames;
     }
@@ -93,6 +97,14 @@ class InitialPerfexCRMObject implements DataTransferObject
         return $this->projectName;
     }
 
+    /**
+     * @return string
+     */
+    public function getProjectStatus(): int
+    {
+        return $this->projectStatus;
+    }
+
     /**
      * @return array
      */

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

@@ -7,7 +7,7 @@ use App\Classes\General\Interfaces\DataTransferObject;
 
 class InvoicePerfexCRMObject implements DataTransferObject
 {
-    /** @var int */
+    /** @var string */
     private $clientId;
 
     /** @var string */
@@ -56,9 +56,9 @@ class InvoicePerfexCRMObject implements DataTransferObject
     }
 
     /**
-     * @return int
+     * @return string
      */
-    public function getClientId(): int
+    public function getClientId(): string
     {
         return $this->clientId;
     }

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

@@ -14,7 +14,7 @@ class InvoiceSingleItemPerfexCRMObject implements DataTransferObject
     /** @var string */
     public $longDescription;
 
-    /** @var int */
+    /** @var float */
     public $qty;
 
     /** @var float */
@@ -26,7 +26,7 @@ class InvoiceSingleItemPerfexCRMObject implements DataTransferObject
     /** @var string */
     public $unit;
 
-    public function __construct(string $description, string $longDescription, int $qty, float $rate, int $order, string $unit)
+    public function __construct(string $description, string $longDescription, float $qty, float $rate, int $order, string $unit)
     {
         $this->description = $description;
         $this->longDescription = $longDescription;
@@ -53,9 +53,9 @@ class InvoiceSingleItemPerfexCRMObject implements DataTransferObject
     }
 
     /**
-     * @return int
+     * @return float
      */
-    public function getQty(): int
+    public function getQty(): float
     {
         return $this->qty;
     }

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

@@ -0,0 +1,62 @@
+<?php
+
+namespace App\Classes\Modules\PerfexCRM\DataTransferObjects;
+
+use Illuminate\Http\Request;
+use App\Classes\General\Interfaces\DataTransferObject;
+use App\Models\Transaction;
+
+class UpdatePerfexCRMInvoiceObject implements DataTransferObject
+{
+    /** @var string */
+    private $email;
+
+    /** @var Transaction */
+    private $transaction;
+
+    /** @var bool */
+    private $isPaid;
+
+    /** @var string */
+    private $projectId;
+
+    public function __construct(string $email, string $projectId, Transaction $transaction, bool $isPaid)
+    {
+        $this->email = $email;
+        $this->transaction = $transaction;
+        $this->isPaid = $isPaid;
+        $this->projectId = $projectId;
+    }
+
+    /**
+     * @return string
+     */
+    public function getEmail(): string
+    {
+        return $this->email;
+    }
+
+    /**
+     * @return string
+     */
+    public function getProjectId(): string
+    {
+        return $this->projectId;
+    }
+
+    /**
+     * @return Transaction
+     */
+    public function getTransaction(): Transaction
+    {
+        return $this->transaction;
+    }
+
+    /**
+     * @return bool
+     */
+    public function getIsPaid(): bool
+    {
+        return $this->isPaid;
+    }
+}

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

@@ -13,6 +13,9 @@ class UpdatePerfexCRMObject implements DataTransferObject
     /** @var string */
     private $companyReference;
 
+    /** @var string */
+    private $contactName;
+
     /** @var string */
     private $contactEmail;
 
@@ -22,23 +25,28 @@ class UpdatePerfexCRMObject implements DataTransferObject
     /** @var string */
     private $projectName;
 
-    /** @var string */
-    private $milestoneName;
+    /** @var int */
+    private $projectStatus;
 
-    /** @var string */
-    private $taskName;
+    /** @var array */
+    private $milestoneNames;
+
+    /** @var array */
+    private $tasks;
 
 
-    public function __construct(string $companyName, string $companyReference, string $contactEmail, string $bookingMarking, string $projectName, string $milestoneName, string $taskName)
+    public function __construct(string $companyName, string $companyReference, string $contactName, string $contactEmail, string $bookingMarking, string $projectName, int $projectStatus, array $milestoneNames, array $tasks)
     {
 
         $this->companyName = $companyName;
         $this->companyReference = $companyReference;
+        $this->contactName = $contactName;
         $this->contactEmail = $contactEmail;
         $this->bookingMarking = $bookingMarking;
         $this->projectName = $projectName;
-        $this->milestoneName = $milestoneName;
-        $this->taskName = $taskName;
+        $this->projectStatus = $projectStatus;
+        $this->milestoneNames = $milestoneNames;
+        $this->tasks = $tasks;
     }
 
     /**
@@ -57,6 +65,14 @@ class UpdatePerfexCRMObject implements DataTransferObject
         return $this->companyReference;
     }
 
+    /**
+     * @return string
+     */
+    public function getContactName(): string
+    {
+        return $this->contactName;
+    }
+
     /**
      * @return string
      */
@@ -82,19 +98,31 @@ class UpdatePerfexCRMObject implements DataTransferObject
     }
 
     /**
-     * @return string
+     * @return int
      */
-    public function getMilestoneName(): string
+    public function getProjectStatus(): int
     {
-        return $this->milestoneName;
+        return $this->projectStatus;
     }
 
     /**
-     * @return string
+     * @return array
      */
-    public function getTaskName(): string
+    public function getMilestoneNames(): array
     {
-        return $this->taskName;
+        return $this->milestoneNames;
     }
 
+    /**
+     * @return array
+     */
+    public function getTasks(): array
+    {
+        return $this->tasks;
+    }
+
+    public function setTasks($tasks)
+    {
+        $this->tasks = $tasks;
+    }
 }

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

@@ -2,14 +2,19 @@
 
 namespace App\Classes\Modules\PerfexCRM\Processors;
 
-// use App\Classes\Modules\PerfexCRM\DataTransferObjects\ContactObject;
+use App\Models\Transaction;
 use App\Classes\Modules\PerfexCRM\Services\CreatesPerfexCRMInvoice;
 use App\Classes\Modules\PerfexCRM\Services\CreatesPerfexCRMInvoicePayment;
 use App\Classes\Modules\PerfexCRM\Services\ConvertsPerfexCRMLeadToCustomer;
+use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMProject;
 use App\Classes\Modules\PerfexCRM\DataTransferObjects\InvoicePerfexCRMObject;
 use App\Classes\Modules\PerfexCRM\DataTransferObjects\InvoicePaymentPerfexCRMObject;
 use App\Classes\Modules\PerfexCRM\DataTransferObjects\InvoiceSingleItemPerfexCRMObject;
+use App\Classes\Modules\PerfexCRM\Services\CreatesPerfexCRMCustomerProject;
+use App\Classes\ValueObjects\Constants\PerfexCRMProjectStatus;
+use App\Models\PackingList;
 use Carbon\Carbon;
+use Illuminate\Support\Facades\Log;
 
 class CreatePerfexCRMInvoiceProcessor
 {
@@ -23,84 +28,116 @@ class CreatePerfexCRMInvoiceProcessor
     /** @var ConvertsPerfexCRMLeadToCustomer */
     private $convertsPerfexCRMLeadToCustomer;
 
+    /** @var FetchesPerfexCRMProject */
+    private $fetchesPerfexCRMProject;
+
+    /** @var CreatesPerfexCRMCustomerProject */
+    private $createsPerfexCRMCustomerProject;
+
     /**
      * CreatePerfexCRMInvoiceProcessor constructor.
      * @param CreatesPerfexCRMInvoice $createsPerfexCRMInvoice
      */
     public function __construct(CreatesPerfexCRMInvoice $createsPerfexCRMInvoice,
     CreatesPerfexCRMInvoicePayment $createsPerfexCRMInvoicePayment,
-    ConvertsPerfexCRMLeadToCustomer $convertsPerfexCRMLeadToCustomer)
+    ConvertsPerfexCRMLeadToCustomer $convertsPerfexCRMLeadToCustomer,
+    FetchesPerfexCRMProject $fetchesPerfexCRMProject,
+    CreatesPerfexCRMCustomerProject $createsPerfexCRMCustomerProject)
     {
         $this->createsPerfexCRMInvoice = $createsPerfexCRMInvoice;
         $this->createsPerfexCRMInvoicePayment = $createsPerfexCRMInvoicePayment;
         $this->convertsPerfexCRMLeadToCustomer = $convertsPerfexCRMLeadToCustomer;
+        $this->fetchesPerfexCRMProject = $fetchesPerfexCRMProject;
+        $this->createsPerfexCRMCustomerProject = $createsPerfexCRMCustomerProject;
     }
 
     /**
-     * @param $transaction
-     * @param $purchaseOrder
-     * @param $supplier
+     * @param Transaction $transaction
+     * @param bool $isPaid, default: false
      * @return null|object
      * @throws \App\Classes\Exceptions\MalformedRequestException
      */
-    public function execute($transaction, $purchaseOrder, $supplier) {
+    public function execute(Transaction $transaction, bool $isPaid = false) {
         $clientId = "";
         $number = $transaction->bill_no;
         $prefix = "INV-";
+
+        //This will remove the prefix if prefix already exist in the string
         if (substr($number, 0, strlen($prefix)) == $prefix) {
             $number = substr($number, strlen($prefix));
         }
 
-        $date = Carbon::parse($transaction->booking->created_at)->format('Y-m-d');
-        $dueDate = Carbon::parse($transaction->booking->created_at)->format('Y-m-d');
-        $currency = 1; //cief TODO: To look into Malaysia and Chinese currency
+        $date = Carbon::parse($transaction->created_at)->format('Y-m-d');
+        $dueDate = Carbon::parse($transaction->created_at)->addDays(6)->startOfDay()->format('Y-m-d');
+        $currency = 1;
         $subTotal = 0.00;
         $total = 0.00;
 
+        $companyModule = $transaction->owner->owner->companyModule;
         $billingStreet = "";
-        $addresses = $supplier->addresses()->where('billing', '=', true)->first();
+        $addresses = $companyModule
+                    ->addresses()
+                    ->where('status', '=', \App\Classes\ValueObjects\Constants\ApprovalStatus::APPROVED)
+                    ->where('type', '=', \App\Classes\ValueObjects\Constants\AddressType::BILLING)->first();
 
-        $billingStreet = $billingStreet.$addresses->street_one;
-        $billingStreet = $billingStreet.$addresses->street_two.',';
-        $billingStreet = $billingStreet.$addresses->district()->first()->name.',';
-        $billingStreet = $billingStreet.$addresses->postcode;
-        $billingStreet = $billingStreet.$addresses->state()->first()->name.',';
-        $billingStreet = $billingStreet.$addresses->country()->first()->name;
+        if ($addresses !== null) {
+            $billingStreet = $billingStreet.$addresses->street_one;
+            $billingStreet = $billingStreet.$addresses->street_two.',';
+            $billingStreet = $billingStreet.$addresses->district()->first()->name.',';
+            $billingStreet = $billingStreet.$addresses->postcode;
+            $billingStreet = $billingStreet.$addresses->state()->first()->name.',';
+            $billingStreet = $billingStreet.$addresses->country()->first()->name;
+        }
+        else{
+            $billingStreet = "[Pending Billing Details by user]";
+        }
 
-        $projectId = "";
         $allowedPaymentModes = [];
         $invoiceItems = [];
 
-        $email = $supplier->employees()->first()->email;
-        $email = 'dillon37@yahoo.com'; //cief TODO: To be updated to user actual email address
+        $employee = $companyModule->employees()->first();
+        $email = $employee->email;
+
         $result = $this->convertsPerfexCRMLeadToCustomer->execute($email);
         if(isset($result->payload)){
             $clientId = $result->payload['client_id'];
         }
 
+        //get project
+        $projectId = ""; //Project only exist in CRM if the customer already made payment
+        $projectName = "";
+        if($isPaid){
+            if($transaction->owner instanceof PackingList){
+                $orderReference = $transaction->owner->owner->reference;
+                $packingListReference = $transaction->owner->reference;
+                $projectName = 'IZYIM | X1 Shipping | '.$orderReference.' | '.$packingListReference;
+                $result = $this->fetchesPerfexCRMProject->execute($projectName, $clientId);
+                if(isset($result->payload)){
+                    $project = $result->payload[0];
+                    $projectId = $project['id'];
+                }
+                else{
+                    $result = $this->createsPerfexCRMCustomerProject->execute($projectName, PerfexCRMProjectStatus::NOT_STARTED, $clientId);
+                    if(isset($result->payload)){  //Here means project creation successful
+                        $projectId = $result->payload['project_id'];
+                    }
+                }
+            }
+
+            if($projectId == ""){
+                Log::error(json_encode('CreatePerfexCRMInvoiceProcessor debug: '.$projectName));
+                Log::error(json_encode($transaction->owner));
+            }
+        }
+
         //newitems
-        foreach ($purchaseOrder->transactionDetails as $key => $transaction_detail){
+        foreach ($transaction->transactionDetails as $key => $transaction_detail){
             $order = $key + 1;
-            $stockCode = $transaction_detail->product_code;
-            $description = $transaction_detail->product_name;
+            $description = $transaction_detail->name;
             $quantity = $transaction_detail->quantity;
-            $unitPrice = 0.00;
-            if($transaction->booking()->first()->fix_currency_id !== 1)
-                $unitPrice = (1/$transaction->currency_rate) * $transaction_detail->price;
-            else
-                $unitPrice = $transaction_detail->price;
+            $unitPrice = $transaction_detail->price;
 
-            //$totalAmount = 0.00;
-            if($transaction->booking()->first()->fix_currency_id !== 1){
-
-                //$totalAmount = (float)number_format( (1/$transaction->currency_rate) * $transaction_detail->price, 2,'.','')*$transaction_detail->quantity;
-                $subTotal += (1/$transaction->currency_rate) * $transaction_detail->price * $transaction_detail->quantity;
-            }
-            else
-            {
-                //$totalAmount = (float)number_format($transaction_detail->price, 2,'.','')*$transaction_detail->quantity;
-                $subTotal += $transaction_detail->price * $transaction_detail->quantity;
-            }
+            $subTotal = $subTotal + $transaction_detail->amount;
 
             //string $description, string $longDescription, int $qty, int $rate, int $order, string $unit
             $invoiceSingleItem = new InvoiceSingleItemPerfexCRMObject(
@@ -114,16 +151,11 @@ class CreatePerfexCRMInvoiceProcessor
             array_push($invoiceItems, $invoiceSingleItem);
         }
 
-        if($transaction->booking()->first()->fix_currency_id !== 1){
-            $total = ((1/$transaction->currency_rate) * $transaction->amount) + $transaction->service_charge + $transaction->tax;
-        }
-        else{
-            $total = $transaction->amount + $transaction->service_charge + $transaction->tax;
-        }
+        $total = $transaction->amount;
 
-        //cief TODO: To be updated, temporarily hardcoded allow payment modes
+        //This setting is similar to Setup > Leads > Sources, Setup > Leads > Statuses
+        //Can be found at Finance > Payment Modes
         array_push($allowedPaymentModes, 1, 2);
-
         $invoicePerfexCRMObject = new InvoicePerfexCRMObject(
             $clientId,
             $number,
@@ -140,20 +172,7 @@ class CreatePerfexCRMInvoiceProcessor
 
         $result = $this->createsPerfexCRMInvoice->execute($invoicePerfexCRMObject);
 
-        //If there is a checking whether an payment to an invoice need to be generated, do it here
-        if(true && $result->payload['id']){
-            $invoicePaymentPerfexCRMObject = new InvoicePaymentPerfexCRMObject(
-                $result->payload['id'],
-                $total,
-                $date,
-                1,
-                "",
-                ""
-            );
-            $this->createsPerfexCRMInvoicePayment->execute($invoicePaymentPerfexCRMObject);
-        }
-
-        return true;
+        return $result;
     }
 
 }

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

@@ -33,7 +33,10 @@ class CreatePerfexCRMTaskProcessor
             $createTaskPerfexCRMObject->getProjectId(),
             $createTaskPerfexCRMObject->getReference(),
             $createTaskPerfexCRMObject->getOnTaskCompletion(),
+            $createTaskPerfexCRMObject->getDepartment(),
             $createTaskPerfexCRMObject->getStatus(),
+            $createTaskPerfexCRMObject->getPriority(),
+            $createTaskPerfexCRMObject->getDuedate()
         );
         return true;
    }

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

@@ -1,192 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Processors;
-
-use App\Classes\Modules\PerfexCRM\Services\ConvertsPerfexCRMLeadToCustomer;
-use App\Classes\Modules\PerfexCRM\Services\CreatesPerfexCRMCustomerProject;
-use App\Classes\Modules\PerfexCRM\Services\CreatesPerfexCRMMilestone;
-use App\Classes\Modules\PerfexCRM\Services\CreatesPerfexCRMTask;
-use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMProject;
-use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMMilestone;
-use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMTask;
-use App\Classes\Modules\PerfexCRM\Services\CreatesPerfexCRMCustomer;
-use App\Classes\Modules\PerfexCRM\Services\CreatesPerfexCRMCustomerContact;
-use App\Classes\Modules\PerfexCRM\Services\UpdatesPerfexCRMCustomer;
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\CustomerContactObject;
-use App\Classes\Exceptions\MalformedRequestException;
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\InitialPerfexCRMObject;
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\UpdatePerfexCRMObject;
-use App\Classes\ValueObjects\Constants\PerfexCRMMilestones;
-use App\Classes\ValueObjects\Constants\PerfexCRMTasks;
-use App\Classes\ValueObjects\Constants\PerfexCRMStatus;
-use Illuminate\Support\Facades\Http;
-use Illuminate\Support\Facades\Log;
-use Illuminate\Http\Request;
-
-class InitializePerfexCRMProcessor
-{
-    /** @var ConvertsPerfexCRMLeadToCustomer */
-    private $convertsPerfexCRMLeadToCustomer;
-
-    /** @var CreatesPerfexCRMCustomerProject */
-    private $createsPerfexCRMCustomerProject;
-
-    /** @var CreatesPerfexCRMMilestone */
-    private $createsPerfexCRMMilestone;
-
-    /** @var CreatesPerfexCRMTask */
-    private $createsPerfexCRMTask;
-
-    /** @var FetchesPerfexCRMProject */
-    private $fetchesPerfexCRMProject;
-
-    /** @var FetchesPerfexCRMMilestone */
-    private $fetchesPerfexCRMMilestone;
-
-    /** @var FetchesPerfexCRMTask */
-    private $fetchesPerfexCRMTask;
-
-    /** @var CreatesPerfexCRMCustomer */
-    private $createsPerfexCRMCustomer;
-
-    /** @var CreatesPerfexCRMCustomerContact */
-    private $createsPerfexCRMCustomerContact;
-
-    /** @var UpdatesPerfexCRM */
-    private $updatePerfexCRM;
-
-    /** @var UpdatesPerfexCRMCustomer */
-    private $updatesPerfexCRMCustomer;
-
-   /**
-     * @param ConvertsPerfexCRMLeadToCustomer $convertsPerfexCRMLeadToCustomer
-     * @param CreatesPerfexCRMCustomerProject $createsPerfexCRMCustomerProject
-     * @param CreatesPerfexCRMMilestone $createsPerfexCRMMilestone
-     * @param CreatesPerfexCRMTask $createsPerfexCRMTask
-     * @param FetchesPerfexCRMProject $fetchesPerfexCRMProject
-     * @param FetchesPerfexCRMMilestone $fetchesPerfexCRMMilestone
-     * @param FetchesPerfexCRMTask $fetchesPerfexCRMTask
-     * @param CreatesPerfexCRMCustomer $createsPerfexCRMCustomer
-     * @param CreatesPerfexCRMCustomerContact $createsPerfexCRMCustomerContact
-     * @param UpdatesPerfexCRMCustomer $updatesPerfexCRMCustomer
-    */
-    public function __construct(ConvertsPerfexCRMLeadToCustomer $convertsPerfexCRMLeadToCustomer,
-        CreatesPerfexCRMCustomerProject $createsPerfexCRMCustomerProject,
-        CreatesPerfexCRMMilestone $createsPerfexCRMMilestone,
-        CreatesPerfexCRMTask $createsPerfexCRMTask,
-        FetchesPerfexCRMProject $fetchesPerfexCRMProject,
-        FetchesPerfexCRMMilestone $fetchesPerfexCRMMilestone,
-        FetchesPerfexCRMTask $fetchesPerfexCRMTask,
-        CreatesPerfexCRMCustomer $createsPerfexCRMCustomer,
-        CreatesPerfexCRMCustomerContact $createsPerfexCRMCustomerContact,
-        UpdatesPerfexCRMCustomer $updatesPerfexCRMCustomer)
-   {
-        $this->convertsPerfexCRMLeadToCustomer = $convertsPerfexCRMLeadToCustomer;
-        $this->createsPerfexCRMCustomerProject = $createsPerfexCRMCustomerProject;
-        $this->createsPerfexCRMMilestone = $createsPerfexCRMMilestone;
-        $this->createsPerfexCRMTask = $createsPerfexCRMTask;
-        $this->fetchesPerfexCRMProject = $fetchesPerfexCRMProject;
-        $this->fetchesPerfexCRMMilestone = $fetchesPerfexCRMMilestone;
-        $this->fetchesPerfexCRMTask = $fetchesPerfexCRMTask;
-        $this->createsPerfexCRMCustomer = $createsPerfexCRMCustomer;
-        $this->createsPerfexCRMCustomerContact = $createsPerfexCRMCustomerContact;
-        $this->updatesPerfexCRMCustomer = $updatesPerfexCRMCustomer;
-    }
-
-   /**
-    * @param InitialPerfexCRMObject $initialPerfexCRMObject
-    * @return null|object
-    * @throws \App\Classes\Exceptions\MalformedRequestException
-    */
-   public function execute(InitialPerfexCRMObject $initialPerfexCRMObject) {
-
-       // Customer has to exist first before Project can appear under it
-       // Check with Perfex CRM, if this user (email) was previously a lead, should automatically now become a customer
-       $crmCompany = $initialPerfexCRMObject->getCompanyName();
-       $result = $this->convertsPerfexCRMLeadToCustomer->execute($initialPerfexCRMObject->getContactEmail());
-       if(isset($result->payload)){
-           $crmClientId = $result->payload['client_id'];
-           if (isset($result->payload['company'])) {
-               $crmCompany = $result->payload['company'];
-           }
-       }
-       else{
-           //if reach this point, this means this user is not a official customer nor is a lead in crm
-           //Create Customer has 2 parts: Create Company (client), Create Contact
-           $result = $this->createsPerfexCRMCustomer->execute($crmCompany);
-           if(is_null($result)){
-                $crmCompany = $crmCompany." 2";
-                $result = $this->createsPerfexCRMCustomer->execute($crmCompany);
-           }
-
-           $crmClientId = $result->payload['clientId'];
-
-           $customerContactObject = new CustomerContactObject(
-               $crmClientId,
-               $initialPerfexCRMObject->getContactName(),
-               $initialPerfexCRMObject->getContactName(),
-               $initialPerfexCRMObject->getContactEmail(),
-               "pU^T@sC#9Q",
-               "on",
-               "on"
-           );
-           $result = $this->createsPerfexCRMCustomerContact->execute($customerContactObject);
-       }
-
-       //Update custom fields to identify company reference from exchange or shipping portal
-       $value_exists = false;
-       if (isset($result->payload['customfields'])) {
-           foreach ($result->payload['customfields'] as $element) {
-               if ($element['value'] === $initialPerfexCRMObject->getCompanyReference()) {
-                   $value_exists = true;
-                   break;
-               }
-           }
-       }
-       if(!$value_exists);
-       {
-           $result = $this->updatesPerfexCRMCustomer->execute($crmClientId, $crmCompany, $initialPerfexCRMObject->getCompanyReference());
-       }
-
-       // Get existing or create project, project has to exist first before milestone can appear under it
-       $result = $this->createsPerfexCRMCustomerProject->execute($initialPerfexCRMObject->getProjectName(), $crmClientId);
-       if(isset($result->payload)){  //Here means project creation successful
-            $projectId = $result->payload['project_id'];
-       }
-       else{
-            $projectId = $this->fetchesPerfexCRMProject->execute($initialPerfexCRMObject->getProjectName(), $crmClientId)->id;
-       }
-
-       if(!is_null($result)){
-            $tasks = $initialPerfexCRMObject->getTaskNames();
-
-            //Create tasks with milestone
-            for($count=0; $count < count($tasks); $count++) {
-                $milestoneId = 0; //By default milestoneId is 0, having this set at individual task is optional
-                if($tasks[$count]['milestone'] != "") //Create milestone only if it is defined
-                {
-                    // Get existing or create milestone, milestone has to exist first before task can appear under it
-                    $result = $this->createsPerfexCRMMilestone->execute($tasks[$count]['milestone'], $projectId, $count);
-                    if(isset($result->payload)){
-                        $milestoneId = $result->payload['milestone_id'];
-                    }
-                    else{
-                        $milestone = $this->fetchesPerfexCRMMilestone->execute($tasks[$count]['milestone'], $projectId);
-                        $array = json_decode(json_encode($milestone), true);
-                        $milestoneId = $array[0]['id'];
-                    }
-                }
-
-                $taskStatus = PerfexCRMStatus::NOT_STARTED;
-                if($tasks[$count]['status'] != ''){
-                    $taskStatus = $tasks[$count]['status'];
-                }
-
-                // Get existing or create task
-                $result = $this->createsPerfexCRMTask->execute($tasks[$count]['name'], $tasks[$count]['description'], '', $milestoneId, $projectId, $tasks[$count]['reference'], $tasks[$count]['on_task_completion'], $taskStatus);
-            }
-        }
-        return true;
-   }
-
-}