inded package ui code

app/Classes/General/Abstracts/AbstractRule.php

@@ -10,7 +10,7 @@ use App\Classes\General\Interfaces\DataTransferObject;
 abstract class AbstractRule
 {
 
-    abstract protected function authorized($object): bool;
+    abstract protected function authorized(): bool;
 
     abstract protected function validators($object): bool;
 
@@ -26,7 +26,7 @@ abstract class AbstractRule
      */
     public function passes(?DataTransferObject $object = null): bool {
         try {
-            if(!$this->authorized($object)){
+            if(!$this->authorized()){
                 throw new AccessForbiddenException('You don\'t have permission to preform this action');
             }
 
@@ -43,4 +43,4 @@ abstract class AbstractRule
 
     }
 
-}
+}

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

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

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

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

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

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

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

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

app/Classes/Jobs/UpdatePerfexCRM.php

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

app/Classes/Jobs/UpdatePerfexCRMInvoice.php

@@ -30,7 +30,7 @@ class UpdatePerfexCRMInvoice implements ShouldQueue
 
     /**
      * CreatePerfexCRMSingleTask constructor.
-     * @param UpdatePerfexCRMInvoiceObject $updatePerfexCRMInvoiceObject
+     * @param UpdatePerfexCRMInvoiceObject $createTaskPerfexCRMObject
      */
     public function __construct(UpdatePerfexCRMInvoiceObject $updatePerfexCRMInvoiceObject)
     {
@@ -47,7 +47,7 @@ class UpdatePerfexCRMInvoice implements ShouldQueue
         $invoiceId = 0;
         $invoiceStatus = 0;
         $invoice = (App()->make(FetchesPerfexCRMInvoice::class))->execute($customer->userid,"INV-", $transaction->owner->bill_no);
-        Log::error('UpdatePerfexCRMInvoice debug bill_no: ' . $transaction->owner->bill_no . ', Project Id: ' . $this->updatePerfexCRMInvoiceObject->getProjectId());
+        Log::error(json_encode('UpdatePerfexCRMInvoice debug $transaction->owner->bill_no: '.$transaction->owner->bill_no));
 
         if(is_null($invoice)){
             $result = (App()->make(CreatePerfexCRMInvoiceProcessor::class))->execute($transaction->owner, $this->updatePerfexCRMInvoiceObject->getIsPaid());
@@ -55,7 +55,7 @@ class UpdatePerfexCRMInvoice implements ShouldQueue
                 $invoiceId = $result->payload['id'];
             } else {
                 // Log::error(json_encode('UpdatePerfexCRMInvoice CreatePerfexCRMInvoiceProcessor failed'));
-                Helper::debugLogger('UpdatePerfexCRMInvoice CreatePerfexCRMInvoiceProcessor failed');
+                Helper::debugLoggerForPerfexCRM('UpdatePerfexCRMInvoice CreatePerfexCRMInvoiceProcessor failed');
             }
         }
         else{
@@ -64,6 +64,7 @@ class UpdatePerfexCRMInvoice implements ShouldQueue
 
             //This only run when invoice already exist and the invoice does not have a PAID status
             if($invoiceStatus != PerfexCRMInvoiceStatus::PAID){
+                Log::error(json_encode('UpdatePerfexCRMInvoice debug $this->updatePerfexCRMInvoiceObject->getProjectId(): '.$this->updatePerfexCRMInvoiceObject->getProjectId()));
                 //update invoice
                 (App()->make(UpdatesPerfexCRMInvoice::class))->execute($invoice, $this->updatePerfexCRMInvoiceObject->getProjectId());
             }

app/Classes/Jobs/UpdatePerfexCRMPrelude.php

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

app/Classes/Modules/Accounts/Standards/Rules/CanAuthenticateUser.php

@@ -26,7 +26,7 @@ class CanAuthenticateUser extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized($object): bool
+    protected function authorized(): bool
     {
         return true;
 
@@ -54,4 +54,4 @@ class CanAuthenticateUser extends AbstractRule
         return true;
     }
 
-}
+}

app/Classes/Modules/Accounts/Standards/Rules/CanCreateUser.php

@@ -26,7 +26,7 @@ class CanCreateUser extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized($object): bool
+    protected function authorized(): bool
     {
         // TODO  Set Authorization rules
         return true;
@@ -54,4 +54,4 @@ class CanCreateUser extends AbstractRule
         return true;
     }
 
-}
+}

app/Classes/Modules/Accounts/Standards/Rules/CanCrossAuthenticateUser.php

@@ -26,7 +26,7 @@ class CanCrossAuthenticateUser extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized($object): bool
+    protected function authorized(): bool
     {
         return true;
 
@@ -51,4 +51,4 @@ class CanCrossAuthenticateUser extends AbstractRule
     {
         return true;
     }
-}
+}

app/Classes/Modules/Accounts/Standards/Rules/CanDeleteUser.php

@@ -10,7 +10,7 @@ class CanDeleteUser extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized($object): bool
+    protected function authorized(): bool
     {
         // TODO  Set Authorization rules
         return true;
@@ -37,4 +37,4 @@ class CanDeleteUser extends AbstractRule
         return true;
     }
 
-}
+}

app/Classes/Modules/Accounts/Standards/Rules/CanFetchUser.php

@@ -12,7 +12,7 @@ class CanFetchUser extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized($object): bool
+    protected function authorized(): bool
     {
         return true;
 
@@ -39,4 +39,4 @@ class CanFetchUser extends AbstractRule
         return true;
     }
 
-}
+}

app/Classes/Modules/Accounts/Standards/Rules/CanGeneratePasswordReset.php

@@ -33,7 +33,7 @@ class CanGeneratePasswordReset extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized($object): bool
+    protected function authorized(): bool
     {
         return true;
 
@@ -62,4 +62,4 @@ class CanGeneratePasswordReset extends AbstractRule
     }
 
 
-}
+}

app/Classes/Modules/Accounts/Standards/Rules/CanListUsers.php

@@ -13,7 +13,7 @@ class CanListUsers extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized($object): bool
+    protected function authorized(): bool
     {
         return true;
 
@@ -39,4 +39,4 @@ class CanListUsers extends AbstractRule
         return true;
     }
 
-}
+}

app/Classes/Modules/Accounts/Standards/Rules/CanRegisterUser.php

@@ -24,7 +24,7 @@ class CanRegisterUser extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized($object): bool
+    protected function authorized(): bool
     {
         // TODO  Set Authorization rules
         return true;
@@ -48,4 +48,4 @@ class CanRegisterUser extends AbstractRule
     {
         return true;
     }
-}
+}

app/Classes/Modules/Accounts/Standards/Rules/CanResetPassword.php

@@ -34,7 +34,7 @@ class CanResetPassword extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized($object): bool
+    protected function authorized(): bool
     {
         return true;
 
@@ -62,4 +62,4 @@ class CanResetPassword extends AbstractRule
         return $this->passwordResetTokenExists->execute($object->getToken());
     }
 
-}
+}

app/Classes/Modules/Accounts/Standards/Rules/CanUpdateUser.php

@@ -26,7 +26,7 @@ class CanUpdateUser extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized($object): bool
+    protected function authorized(): bool
     {
         // TODO  Set Authorization rules
         return true;
@@ -54,4 +54,4 @@ class CanUpdateUser extends AbstractRule
         return true;
     }
 
-}
+}

app/Classes/Modules/Addresses/Standards/Rules/CanCreateAddress.php

@@ -26,7 +26,7 @@ class CanCreateAddress extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized($object): bool
+    protected function authorized(): bool
     {
         // TODO  Set Authorization rules
         return true;
@@ -54,4 +54,4 @@ class CanCreateAddress extends AbstractRule
         return true;
     }
 
-}
+}

app/Classes/Modules/Addresses/Standards/Rules/CanDeleteAddress.php

@@ -13,7 +13,7 @@ class CanDeleteAddress extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized($object): bool
+    protected function authorized(): bool
     {
         // TODO  Set Authorization rules
         return true;
@@ -40,4 +40,4 @@ class CanDeleteAddress extends AbstractRule
         return true;
     }
 
-}
+}

app/Classes/Modules/Addresses/Standards/Rules/CanFetchAddress.php

@@ -13,7 +13,7 @@ class CanFetchAddress extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized($object): bool
+    protected function authorized(): bool
     {
         // TODO  Set Authorization rules
         return true;
@@ -40,4 +40,4 @@ class CanFetchAddress extends AbstractRule
         return true;
     }
 
-}
+}

app/Classes/Modules/Addresses/Standards/Rules/CanListAddresses.php

@@ -13,7 +13,7 @@ class CanListAddresses extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized($object): bool
+    protected function authorized(): bool
     {
         // TODO  Set Authorization rules
         return true;
@@ -40,4 +40,4 @@ class CanListAddresses extends AbstractRule
         return true;
     }
 
-}
+}

app/Classes/Modules/Addresses/Standards/Rules/CanUpdateAddress.php

@@ -26,7 +26,7 @@ class CanUpdateAddress extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized($object): bool
+    protected function authorized(): bool
     {
         // TODO  Set Authorization rules
         return true;
@@ -54,4 +54,4 @@ class CanUpdateAddress extends AbstractRule
         return true;
     }
 
-}
+}

app/Classes/Modules/Announcements/Standards/Rules/CanAssignSegment.php

@@ -13,7 +13,7 @@ class CanAssignSegment extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized($object): bool
+    protected function authorized(): bool
     {
         // TODO  Set Authorization rules
         return true;
@@ -37,4 +37,4 @@ class CanAssignSegment extends AbstractRule
         return true;
     }
 
-}
+}

app/Classes/Modules/Announcements/Standards/Rules/CanCreateAnnouncement.php

@@ -24,7 +24,7 @@ class CanCreateAnnouncement extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized($object): bool
+    protected function authorized(): bool
     {
         return true;
     }
@@ -47,4 +47,4 @@ class CanCreateAnnouncement extends AbstractRule
     {
         return true;
     }
-}
+}

app/Classes/Modules/Announcements/Standards/Rules/CanDeleteAnnouncement.php

@@ -10,7 +10,7 @@ class CanDeleteAnnouncement extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized($object): bool
+    protected function authorized(): bool
     {
         // TODO  Set Authorization rules
         return true;
@@ -37,4 +37,4 @@ class CanDeleteAnnouncement extends AbstractRule
         return true;
     }
 
-}
+}

app/Classes/Modules/Announcements/Standards/Rules/CanListAnnouncements.php

@@ -11,7 +11,7 @@ class CanListAnnouncements extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized($object): bool
+    protected function authorized(): bool
     {
         return true;
     }

app/Classes/Modules/Announcements/Standards/Rules/CanUpdateAnnouncement.php

@@ -26,7 +26,7 @@ class CanUpdateAnnouncement extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized($object): bool
+    protected function authorized(): bool
     {
         // TODO  Set Authorization rules
         return true;
@@ -51,4 +51,4 @@ class CanUpdateAnnouncement extends AbstractRule
         return true;
     }
 
-}
+}

app/Classes/Modules/Banks/Standards/Rules/CanCreateBank.php

@@ -24,7 +24,7 @@ class CanCreateBank extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized($object): bool
+    protected function authorized(): bool
     {
         return true;
     }
@@ -47,4 +47,4 @@ class CanCreateBank extends AbstractRule
     {
         return true;
     }
-}
+}

app/Classes/Modules/Banks/Standards/Rules/CanDeleteBank.php

@@ -10,7 +10,7 @@ class CanDeleteBank extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized($object): bool
+    protected function authorized(): bool
     {
         // TODO  Set Authorization rules
         return true;
@@ -37,4 +37,4 @@ class CanDeleteBank extends AbstractRule
         return true;
     }
 
-}
+}

app/Classes/Modules/Banks/Standards/Rules/CanListBanks.php

@@ -12,7 +12,7 @@ class CanListBanks extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized($object): bool
+    protected function authorized(): bool
     {
         return true;
     }
@@ -34,4 +34,4 @@ class CanListBanks extends AbstractRule
     {
         return true;
     }
-}
+}

app/Classes/Modules/Banks/Standards/Rules/CanUpdateBank.php

@@ -26,7 +26,7 @@ class CanUpdateBank extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized($object): bool
+    protected function authorized(): bool
     {
         // TODO  Set Authorization rules
         return true;
@@ -51,4 +51,4 @@ class CanUpdateBank extends AbstractRule
         return true;
     }
 
-}
+}

app/Classes/Modules/Companies/Standards/Rules/CanAssignEmployee.php

@@ -26,7 +26,7 @@ class CanAssignEmployee extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized($object): bool
+    protected function authorized(): bool
     {
         // TODO  Set Authorization rules
         return true;
@@ -51,4 +51,4 @@ class CanAssignEmployee extends AbstractRule
         return true;
     }
 
-}
+}

app/Classes/Modules/Companies/Standards/Rules/CanAssignSegment.php

@@ -13,7 +13,7 @@ class CanAssignSegment extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized($object): bool
+    protected function authorized(): bool
     {
         // TODO  Set Authorization rules
         return true;
@@ -37,4 +37,4 @@ class CanAssignSegment extends AbstractRule
         return true;
     }
 
-}
+}

app/Classes/Modules/Companies/Standards/Rules/CanCreateCompany.php

@@ -24,7 +24,7 @@ class CanCreateCompany extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized($object): bool
+    protected function authorized(): bool
     {
         // TODO  Set Authorization rules
         return true;
@@ -48,4 +48,4 @@ class CanCreateCompany extends AbstractRule
     {
         return true;
     }
-}
+}

app/Classes/Modules/Companies/Standards/Rules/CanCreateCompanyModule.php

@@ -24,7 +24,7 @@ class CanCreateCompanyModule extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized($object): bool
+    protected function authorized(): bool
     {
         // TODO  Set Authorization rules
         return true;

app/Classes/Modules/Companies/Standards/Rules/CanFetchCompany.php

@@ -13,7 +13,7 @@ class CanFetchCompany extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized($object): bool
+    protected function authorized(): bool
     {
         // TODO  Set Authorization rules
         return true;
@@ -40,4 +40,4 @@ class CanFetchCompany extends AbstractRule
         return true;
     }
 
-}
+}

app/Classes/Modules/Companies/Standards/Rules/CanListCompanies.php

@@ -13,7 +13,7 @@ class CanListCompanies extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized($object): bool
+    protected function authorized(): bool
     {
         // TODO  Set Authorization rules
         return true;
@@ -40,4 +40,4 @@ class CanListCompanies extends AbstractRule
         return true;
     }
 
-}
+}

app/Classes/Modules/Companies/Standards/Rules/CanUpdateCompany.php

@@ -24,7 +24,7 @@ class CanUpdateCompany extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized($object): bool
+    protected function authorized(): bool
     {
         // TODO  Set Authorization rules
         return true;
@@ -48,4 +48,4 @@ class CanUpdateCompany extends AbstractRule
     {
         return true;
     }
-}
+}

app/Classes/Modules/Contacts/Standards/Rules/CanCreateContact.php

@@ -26,7 +26,7 @@ class CanCreateContact extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized($object): bool
+    protected function authorized(): bool
     {
         // TODO  Set Authorization rules
         return true;
@@ -51,4 +51,4 @@ class CanCreateContact extends AbstractRule
         return true;
     }
 
-}
+}

app/Classes/Modules/Currencies/Standards/Rules/CanCreateCurrency.php

@@ -24,7 +24,7 @@ class CanCreateCurrency extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized($object): bool
+    protected function authorized(): bool
     {
         // TODO  Set Authorization rules
         return true;
@@ -48,4 +48,4 @@ class CanCreateCurrency extends AbstractRule
     {
         return true;
     }
-}
+}

app/Classes/Modules/Currencies/Standards/Rules/CanDeleteCurrency.php

@@ -10,7 +10,7 @@ class CanDeleteCurrency extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized($object): bool
+    protected function authorized(): bool
     {
         // TODO  Set Authorization rules
         return true;
@@ -36,4 +36,4 @@ class CanDeleteCurrency extends AbstractRule
         return true;
     }
 
-}
+}

app/Classes/Modules/Currencies/Standards/Rules/CanFetchCurrency.php

@@ -10,7 +10,7 @@ class CanFetchCurrency extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized($object): bool
+    protected function authorized(): bool
     {
         // TODO  Set Authorization rules
         return true;
@@ -37,4 +37,4 @@ class CanFetchCurrency extends AbstractRule
         return true;
     }
 
-}
+}

app/Classes/Modules/Currencies/Standards/Rules/CanListCurrency.php

@@ -10,7 +10,7 @@ class CanListCurrency extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized($object): bool
+    protected function authorized(): bool
     {
         // TODO  Set Authorization rules
 
@@ -38,4 +38,4 @@ class CanListCurrency extends AbstractRule
         return true;
     }
 
-}
+}

app/Classes/Modules/Currencies/Standards/Rules/CanUpdateCurrency.php

@@ -26,7 +26,7 @@ class CanUpdateCurrency extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized($object): bool
+    protected function authorized(): bool
     {
         // TODO  Set Authorization rules
         return true;
@@ -51,4 +51,4 @@ class CanUpdateCurrency extends AbstractRule
         return true;
     }
 
-}
+}

app/Classes/Modules/Currencies/Standards/Rules/Rates/CanCreateRate.php

@@ -24,7 +24,7 @@ class CanCreateRate extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized($object): bool
+    protected function authorized(): bool
     {
         // TODO  Set Authorization rules
         if (!\Auth::user()->can('add currency_rate')) {
@@ -52,4 +52,4 @@ class CanCreateRate extends AbstractRule
     {
         return true;
     }
-}
+}

app/Classes/Modules/Currencies/Standards/Rules/Rates/CanDeleteRate.php

@@ -10,7 +10,7 @@ class CanDeleteRate extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized($object): bool
+    protected function authorized(): bool
     {
         // TODO  Set Authorization rules
 
@@ -42,4 +42,4 @@ class CanDeleteRate extends AbstractRule
         return true;
     }
 
-}
+}

app/Classes/Modules/Currencies/Standards/Rules/Rates/CanFetchRate.php

@@ -13,7 +13,7 @@ class CanFetchRate extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized($object): bool
+    protected function authorized(): bool
     {
         // TODO  Set Authorization rules
         return true;
@@ -40,4 +40,4 @@ class CanFetchRate extends AbstractRule
         return true;
     }
 
-}
+}

app/Classes/Modules/Currencies/Standards/Rules/Rates/CanListRates.php

@@ -10,7 +10,7 @@ class CanListRates extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized($object): bool
+    protected function authorized(): bool
     {
         // TODO  Set Authorization rules
 
@@ -42,4 +42,4 @@ class CanListRates extends AbstractRule
         return true;
     }
 
-}
+}

app/Classes/Modules/Currencies/Standards/Rules/Rates/CanUpdateRate.php

@@ -25,7 +25,7 @@ class CanUpdateRate extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized($object): bool
+    protected function authorized(): bool
     {
         // TODO  Set Authorization rules
 
@@ -55,4 +55,4 @@ class CanUpdateRate extends AbstractRule
         return true;
     }
 
-}
+}

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

@@ -1,50 +0,0 @@
-<?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 $filesUpload
-     * @param QAUserAnswerSelected qaUserAnswerSelected
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute($filesUpload, QAUserAnswerSelected $qaUserAnswerSelected) {
-        $object = new DocumentObject("HELP_MENU", $filesUpload,
-            '123456', ApprovalStatus::PENDING_VERIFICATION, 'help_menu'); //cief todo: 123456 cannot be hardcoded
-
-        /** @var Document $document */
-        $document = $this->createsDocument->execute($qaUserAnswerSelected, $object);
-
-        $result = $this->createsFiles->execute($document, $object);
-        return $result;
-    }
-
-}

app/Classes/Modules/Documents/Standards/Rules/CanApproveDocument.php

@@ -12,7 +12,7 @@ class CanApproveDocument extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized($object): bool
+    protected function authorized(): bool
     {
         // TODO  Set Authorization rules
         return true;
@@ -36,4 +36,4 @@ class CanApproveDocument extends AbstractRule
         return true;
     }
 
-}
+}

app/Classes/Modules/Documents/Standards/Rules/CanCreateDocument.php

@@ -25,7 +25,7 @@ class CanCreateDocument extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized($object): bool
+    protected function authorized(): bool
     {
         // TODO  Set Authorization rules
         return true;
@@ -50,4 +50,4 @@ class CanCreateDocument extends AbstractRule
         return true;
     }
 
-}
+}

app/Classes/Modules/Documents/Standards/Rules/CanCreateFile.php

@@ -25,7 +25,7 @@ class CanCreateFile extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized($object): bool
+    protected function authorized(): bool
     {
         // TODO  Set Authorization rules
         return true;
@@ -50,4 +50,4 @@ class CanCreateFile extends AbstractRule
         return true;
     }
 
-}
+}

app/Classes/Modules/Documents/Standards/Rules/CanListDocuments.php

@@ -10,7 +10,7 @@ class CanListDocuments extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized($object): bool
+    protected function authorized(): bool
     {
 
         /*
@@ -44,4 +44,4 @@ class CanListDocuments extends AbstractRule
         return true;
     }
 
-}
+}

app/Classes/Modules/Documents/Standards/Rules/CanRenderDocument.php

@@ -10,7 +10,7 @@ class CanRenderDocument extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized($object): bool
+    protected function authorized(): bool
     {
         // TODO  Set Authorization rules
         return true;
@@ -36,4 +36,4 @@ class CanRenderDocument extends AbstractRule
         return true;
     }
 
-}
+}

app/Classes/Modules/Documents/Standards/Rules/CanUpdateDocument.php

@@ -25,7 +25,7 @@ class CanUpdateDocument extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized($object): bool
+    protected function authorized(): bool
     {
         // TODO  Set Authorization rules
         return true;
@@ -50,4 +50,4 @@ class CanUpdateDocument extends AbstractRule
         return true;
     }
 
-}
+}

app/Classes/Modules/Documents/Standards/Rules/CanUpdateDocumentReference.php

@@ -11,7 +11,7 @@ class CanUpdateDocumentReference extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized($object): bool
+    protected function authorized(): bool
     {
         // TODO  Set Authorization rules
         return true;
@@ -36,4 +36,4 @@ class CanUpdateDocumentReference extends AbstractRule
         return true;
     }
 
-}
+}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,31 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\HelpMenu\DataTransferObjects;
-
-
-use App\Classes\General\Interfaces\DataTransferObject;
-
-class GenerateFeedbackUrlObject implements DataTransferObject
-{
-
-    /** @var string */
-    private $apiKey;
-
-    /**
-     * GenerateFeedbackUrlObject constructor.
-     * @param string $apiKey
-     */
-    public function __construct(string $apiKey = "")
-    {
-        $this->apiKey = $apiKey;
-    }
-
-    /**
-     * @return string
-     */
-    public function getApiKey(): string
-    {
-        return $this->apiKey;
-    }
-
-}

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

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

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

@@ -1,51 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\HelpMenu\Processors;
-
-use App\Models\QAUserAnswerSelected;
-use App\Classes\Modules\HelpMenu\Services\FetchesHelpMenuUserAnswerSelected;
-use App\Classes\Modules\HelpMenu\Services\ListsHelpMenuUserAnswerSelected;
-
-class DeleteAnswerQAProcessor
-{
-    /** @var FetchesHelpMenuUserAnswerSelected */
-    private $fetchesHelpMenuUserAnswerSelected;
-
-    /** @var ListsHelpMenuUserAnswerSelected */
-    private $listsHelpMenuUserAnswerSelected;
-
-    /**
-     * DeleteAnswerQAProcessor constructor.
-     * @param FetchesHelpMenuUserAnswerSelected $fetchesHelpMenuUserAnswerSelected
-     * @param ListsHelpMenuUserAnswerSelected $listsHelpMenuUserAnswerSelected
-     */
-    public function __construct(FetchesHelpMenuUserAnswerSelected $fetchesHelpMenuUserAnswerSelected, ListsHelpMenuUserAnswerSelected $listsHelpMenuUserAnswerSelected)
-    {
-        $this->fetchesHelpMenuUserAnswerSelected = $fetchesHelpMenuUserAnswerSelected;
-        $this->listsHelpMenuUserAnswerSelected = $listsHelpMenuUserAnswerSelected;
-    }
-
-    public function execute($userId, $questionId, $request){
-        if ($request->has('isPrevious')) {
-            //Get current and previous question's answer
-            try{
-                $selectedAnswer = $this->listsHelpMenuUserAnswerSelected->execute(['user_id' => $userId, 'question_id' => $questionId, 'order_by' => (object)['column' => 'id','DESC' => true]])[0];
-            } 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/FetchFirstQuestionQAProcessor.php

@@ -1,32 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\HelpMenu\Processors;
-
-use App\Classes\Modules\HelpMenu\Services\FetchesHelpMenuQuestion;
-use ErrorException;
-use Illuminate\Http\Request;
-
-
-class FetchFirstQuestionQAProcessor
-{
-    /** @var FetchesHelpMenuQuestion */
-    private $fetchesHelpMenuQuestion;
-
-    /**
-     * FetchFirstQuestionQAProcessor 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/FetchNextQuestionQAProcessor.php

@@ -1,93 +0,0 @@
-<?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\ListsHelpMenuUserAnswerSelected;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-use App\Classes\ValueObjects\Constants\QAType;
-
-class FetchNextQuestionQAProcessor
-{
-    /** @var FetchesHelpMenuQuestion */
-    private $fetchesHelpMenuQuestion;
-
-    /** @var FetchesHelpMenuUserAnswerSelected */
-    private $fetchesHelpMenuUserAnswerSelected;
-
-    /** @var ListsHelpMenuUserAnswerSelected */
-    private $listsHelpMenuUserAnswerSelected;
-    /**
-     * FetchNextQuestionQAProcessor constructor.
-     * @param FetchesHelpMenuQuestion $fetchesHelpMenuQuestion
-     * @param FetchesHelpMenuUserAnswerSelected $fetchesHelpMenuUserAnswerSelected
-     * @param ListsHelpMenuUserAnswerSelected $listsHelpMenuUserAnswerSelected
-     */
-    public function __construct(FetchesHelpMenuQuestion $fetchesHelpMenuQuestion, FetchesHelpMenuUserAnswerSelected $fetchesHelpMenuUserAnswerSelected, ListsHelpMenuUserAnswerSelected $listsHelpMenuUserAnswerSelected)
-    {
-        $this->fetchesHelpMenuQuestion = $fetchesHelpMenuQuestion;
-        $this->fetchesHelpMenuUserAnswerSelected = $fetchesHelpMenuUserAnswerSelected;
-        $this->listsHelpMenuUserAnswerSelected = $listsHelpMenuUserAnswerSelected;
-    }
-
-    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->listsHelpMenuUserAnswerSelected->execute(['user_id' => $userId, 'order_by' => (object)['column' => 'id','DESC' => true]])[0];
-
-            //Get previous question
-            $previousQuestion = $this->fetchesHelpMenuQuestion->execute(['questionnaire_set_id' => 1, 'id' => $previousAnswer['question_id']]);
-            $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/SaveAnswerProcessor.php

@@ -1,62 +0,0 @@
-<?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 SaveAnswerProcessor
-{
-    /** @var FetchesHelpMenuUserAnswerSelected */
-    private $fetchesHelpMenuUserAnswerSelected;
-
-    /** @var UploadDocumentForHelpMenuProcessor */
-    private $uploadDocumentForHelpMenuProcessor;
-
-    /**
-     * SaveAnswerProcessor constructor.
-     * @param FetchesHelpMenuUserAnswerSelected $fetchesHelpMenuUserAnswerSelected
-     * @param UploadDocumentForHelpMenuProcessor $uploadDocumentForHelpMenuProcessor
-     */
-    public function __construct(FetchesHelpMenuUserAnswerSelected $fetchesHelpMenuUserAnswerSelected, UploadDocumentForHelpMenuProcessor $uploadDocumentForHelpMenuProcessor)
-    {
-        $this->fetchesHelpMenuUserAnswerSelected = $fetchesHelpMenuUserAnswerSelected;
-        $this->uploadDocumentForHelpMenuProcessor = $uploadDocumentForHelpMenuProcessor;
-    }
-
-    public function execute($userId, $sourceId, $questionId, $answerInText, $answerOptionId, $filesUpload){
-
-        $answer = null;
-        // try{
-        //      // $answer = $this->fetchesHelpMenuUserAnswerSelected->execute(['user_id' => $userId, 'question_id' => $questionId, 'order_by' => ['column' => 'id','DESC' => 1]]);
-        //     $answer = $this->fetchesHelpMenuUserAnswerSelected->execute(['user_id' => $userId, 'user_id' => $sourceId, 'question_id' => $questionId]);
-        // } catch (\Exception $exception){
-        //     $answer = null;
-        // }
-
-        if(is_null($answer))
-        {
-            $answer = new QAUserAnswerSelected;
-        }
-        $answer->user_id = $userId;
-        $answer->source_id = $sourceId;
-        $answer->question_id = $questionId;
-        $answer->answer_option_id = intval($answerOptionId);
-        $answer->free_text_answer = $answerInText;
-        $answer->save();
-
-        if($filesUpload){
-            $result = $this->uploadDocumentForHelpMenuProcessor->execute($filesUpload, $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/Processors/UserSourceForQAProcessor.php

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

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

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

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

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

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

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

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

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

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

@@ -1,32 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\HelpMenu\Services;
-
-use App\Classes\General\Eloquent\AbstractListRecord;
-use Illuminate\Database\Eloquent\Builder;
-use App\Models\QAUserAnswerSelected;
-
-class ListsHelpMenuUserAnswerSelected extends AbstractListRecord
-{
-
-    /** @var QAUserAnswerSelected */
-    private $repository;
-
-    /**
-     * ListsHelpMenuUserAnswerSelected 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/CanFetchHelpMenuQuestion.php

@@ -1,38 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\HelpMenu\Standards\Rules;
-
-
-use App\Classes\General\Abstracts\AbstractRule;
-
-class CanFetchHelpMenuQuestion extends AbstractRule
-{
-
-    /**
-     * @return bool
-     */
-    protected function authorized($object): 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/HelpMenu/Standards/Rules/CanGenerateFeedbackUrl.php

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

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

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

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

@@ -83,10 +83,11 @@ class CreateOrderLogic extends AbstractControllerLogic
         } else {
             $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $request->input('warehouse_id')]);
 
-            $originWarehouse = $this->fetchesCompanyModule->execute(['reference' =>  $originWarehouse->reference === WarehouseReferences::VT_GUANG_ZHOU ? WarehouseReferences::YD_GUANG_ZHOU : WarehouseReferences::YD_YIWU]);
-//            if (!in_array($company->companyModules()->importers()->first()->id, WarehouseReferences::YD_EXEMPT_LIST))
+            if (!in_array($company->companyModules()->importers()->first()->id, WarehouseReferences::YD_EXEMPT_LIST)) {
+                $originWarehouse = $this->fetchesCompanyModule->execute(['reference' =>  $originWarehouse->reference === WarehouseReferences::VT_GUANG_ZHOU ? WarehouseReferences::YD_GUANG_ZHOU : WarehouseReferences::YD_YIWU]);
+            }
         }
-
+        
         if($originWarehouse->reference === WarehouseReferences::YD_YIWU && in_array($address->state_id, [5, 13, 14])) {
             throw new RequestValidationException('Our Yiwu warehouse is unable to ship goods to Sabah & Sarawak at the moment. you can select our Guangzhou warehouse as an alternative.');
         }

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

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

app/Classes/Modules/Orders/Standards/Rules/CanApproveChangeOrderAddress.php

@@ -11,7 +11,7 @@ class CanApproveChangeOrderAddress extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized($object): bool
+    protected function authorized(): bool
     {
         // TODO  Set Authorization rules
         return true;

app/Classes/Modules/Orders/Standards/Rules/CanChangeOrderAddress.php

@@ -11,7 +11,7 @@ class CanChangeOrderAddress extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized($object): bool
+    protected function authorized(): bool
     {
         // TODO  Set Authorization rules
         return true;

app/Classes/Modules/Orders/Standards/Rules/CanConfirmOrder.php

@@ -17,7 +17,7 @@ class CanConfirmOrder extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized($object): bool
+    protected function authorized(): bool
     {
         // TODO  Set Authorization rules
         return true;

app/Classes/Modules/Orders/Standards/Rules/CanCreateOrder.php

@@ -18,7 +18,7 @@ class CanCreateOrder extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized($object): bool
+    protected function authorized(): bool
     {
         // TODO  Set Authorization rules
         return true;
@@ -42,4 +42,4 @@ class CanCreateOrder extends AbstractRule
     {
         return true;
     }
-}
+}

app/Classes/Modules/Orders/Standards/Rules/CanCreateOrderRole.php

@@ -17,7 +17,7 @@ class CanCreateOrderRole extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized($object): bool
+    protected function authorized(): bool
     {
         // TODO  Set Authorization rules
         return true;

app/Classes/Modules/Orders/Standards/Rules/CanFetchOrder.php

@@ -12,7 +12,7 @@ class CanFetchOrder extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized($object): bool
+    protected function authorized(): bool
     {
         // TODO  Set Authorization rules
         return true;
@@ -39,4 +39,4 @@ class CanFetchOrder extends AbstractRule
         return true;
     }
 
-}
+}

app/Classes/Modules/Orders/Standards/Rules/CanListOrders.php

@@ -12,7 +12,7 @@ class CanListOrders extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized($object): bool
+    protected function authorized(): bool
     {
         // TODO  Set Authorization rules
         return true;

app/Classes/Modules/Orders/Standards/Rules/CanUpdateCurrentStep.php

@@ -17,7 +17,7 @@ class CanUpdateCurrentStep extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized($object): bool
+    protected function authorized(): bool
     {
         // TODO  Set Authorization rules
         return true;
@@ -36,4 +36,4 @@ class CanUpdateCurrentStep extends AbstractRule
     {
         return true;
     }
-}
+}

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

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

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

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

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

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

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

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

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

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