code update

Emergency fix problem with group payment (reported by Eileen)

See merge request CIEFWorldwideSdnBhd/shipping-portal!184

app/Classes/Exceptions/ConnectionErrorException.php

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

app/Classes/General/Abstracts/Abstract2ControllerLogic.php

@@ -0,0 +1,97 @@
+<?php
+
+namespace App\Classes\General\Abstracts;
+
+
+use App\Classes\Exceptions\ErrorException;
+use App\Classes\Exceptions\InternalServerErrorException;
+use App\Classes\ValueObjects\Constants\Notifications;
+use App\Classes\ValueObjects\Constants\HttpStatus;
+use App\Classes\ValueObjects\Response\ApiResponseObject;
+use ErrorException as GeneralExceptions;
+use TypeError;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
+use Illuminate\Http\Resources\Json\JsonResource;
+use Illuminate\Http\Resources\Json\ResourceCollection;
+use Illuminate\Support\Facades\DB;
+
+abstract class Abstract2ControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    abstract protected function notification(): array;
+
+    /**
+     * @return string
+     */
+    private function getNotificationTitle():string {
+        return $this->notification()['title'] ? $this->notification()['title']: Notifications::UNDEFINED['title'];
+    }
+
+    /**
+     * @return string
+     */
+    private function getNotificationMessage():string {
+        return $this->notification()['message'] ? $this->notification()['message']: Notifications::UNDEFINED['message'];
+    }
+
+    /**
+     * @param Request $request
+     * @return BinaryFileResponse
+     * @throws ErrorException
+     */
+    abstract protected function logic(Request $request) : BinaryFileResponse;
+
+    /**
+     * @param Request $request
+     * @return BinaryFileResponse
+     */
+    public function execute(Request $request) : BinaryFileResponse  {
+
+        try {
+
+            DB::beginTransaction();
+
+            $response = $this->logic($request);
+
+            DB::commit();
+
+            return $response;
+
+        } catch (ErrorException|GeneralExceptions|TypeError  $exception){
+            abort(404, $exception->getMessage());
+        }
+    }
+
+    /**
+     * @param array|null $data
+     * @return JsonResponse
+     */
+    public function response(?array $data = []) : JsonResponse {
+
+        return (new ApiResponseObject($this->getNotificationTitle().' Successful',
+            $this->getNotificationMessage(),
+            HttpStatus::OK_WITH_MESSAGE, $data))->handler();
+    }
+
+    /**
+     * @param JsonResource $resource
+     * @return JsonResponse
+     */
+    public function resourceResponse(JsonResource $resource){
+        return $this->response(['data' => $resource]);
+    }
+
+    /**
+     * @param ResourceCollection $collection
+     * @return JsonResponse
+     */
+    public function collectionResponse(ResourceCollection $collection){
+        return $this->response(json_decode($collection->response()->getContent(), true));
+    }
+
+}

app/Classes/General/Abstracts/AbstractRule.php

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

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

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+
+use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Builder;
+
+class CreatedAfterOrEqual implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        $table = $builder->getModel()->getTable();
+        $startDate = Carbon::createFromFormat('d-m-Y', $value)->startOfDay();
+        return $builder->where("{$table}.created_at", '>=', $startDate);
+    }
+}

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

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Builder;
+
+class CreatedBeforeOrEqual implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        $table = $builder->getModel()->getTable();
+        $endDate = Carbon::createFromFormat('d-m-Y', $value)->endOfDay();    
+        return $builder->where("{$table}.created_at", '<=', $endDate);
+    }
+}

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

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

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

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

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

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

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

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

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

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

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

@@ -14,7 +14,8 @@ class OwnerId implements Filter
      */
     public static function apply(Builder $builder, $value)
     {
-        return $builder->where('owner_id', $value);
+        $table = $builder->getModel()->getTable();
+        return $builder->where("{$table}.owner_id", $value);
     }
 
 }

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

@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class OwnerType implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        $table = $builder->getModel()->getTable();
+        return $builder->where("{$table}.owner_type", $value);
+    }
+
+}

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

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

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

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

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

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

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

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

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

@@ -14,7 +14,8 @@ class StatusIn implements Filter
      */
     public static function apply(Builder $builder, $value)
     {
-        return $builder->whereIn('status', $value);
+        $table = $builder->getModel()->getTable();
+        return $builder->whereIn("{$table}.status", $value);
     }
 
 }

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

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

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

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Carbon\Carbon;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Database\Eloquent\Builder;
+
+class WithAgingColumn implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        $today = Carbon::now();
+        return $builder->select('packing_lists.*')
+        ->addSelect(DB::raw("DATEDIFF('$today', transactions.updated_at) as days_over_duedate"))
+        ->addSelect(DB::raw("CASE
+        WHEN DATEDIFF('$today', transactions.updated_at) <= 0 THEN 0
+        WHEN DATEDIFF('$today', transactions.updated_at) > 0 AND DATEDIFF('$today', transactions.updated_at) <= 30 THEN 1
+        WHEN DATEDIFF('$today', transactions.updated_at) > 30 AND DATEDIFF('$today', transactions.updated_at) <= 60 THEN 2
+        WHEN DATEDIFF('$today', transactions.updated_at) > 60 AND DATEDIFF('$today', transactions.updated_at) <= 90 THEN 3
+        ELSE 4
+        END AS due_date_number"));
+    }
+}

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

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+
+use Illuminate\Database\Eloquent\Builder;
+
+class WithOrderReferenceLike implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->join('transactions as t2', 't2.payment_reference', '=', 'transactions.bill_no')
+            ->join('transactions as t3', 't3.id', '=', 't2.owner_id')
+            ->join('packing_lists', 'packing_lists.id', '=', 't3.owner_id')
+            ->join('orders', function ($join) use ($value) {
+                $join->on('orders.id', '=', 'packing_lists.owner_id')
+                    ->where('orders.reference', 'LIKE', '%'.$value.'%');
+            })
+            ->addSelect(['transactions.*', 't2.id as paymentTransactionId', 't3.id as invoiceTransactionId', 'packing_lists.id as packingListId', 'orders.reference as orderReference']);
+    }
+}

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

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

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

@@ -26,7 +26,7 @@ class CanAuthenticateUser extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized(): bool
+    protected function authorized($object): 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(): bool
+    protected function authorized($object): 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(): bool
+    protected function authorized($object): 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(): bool
+    protected function authorized($object): 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(): bool
+    protected function authorized($object): 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(): bool
+    protected function authorized($object): 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(): bool
+    protected function authorized($object): 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(): bool
+    protected function authorized($object): 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(): bool
+    protected function authorized($object): 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(): bool
+    protected function authorized($object): 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(): bool
+    protected function authorized($object): 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(): bool
+    protected function authorized($object): 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(): bool
+    protected function authorized($object): 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(): bool
+    protected function authorized($object): 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(): bool
+    protected function authorized($object): 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(): bool
+    protected function authorized($object): 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(): bool
+    protected function authorized($object): 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(): bool
+    protected function authorized($object): 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(): bool
+    protected function authorized($object): bool
     {
         return true;
     }

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

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

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

@@ -14,14 +14,17 @@ use App\Classes\Exceptions\MalformedRequestException;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\Modules\Billplzs\Services\GetBillplzBill;
 use App\Classes\Modules\Billplzs\DataTransferObjects\BillplzXSignatureObject;
+use App\Classes\Modules\Billplzs\Processors\CallbackBillplzProcessor;
 use App\Classes\Modules\Transactions\Services\FetchesTransaction;
 use App\Classes\Modules\Transactions\Processors\CreatePaymentTransactionProcessor;
 use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
+use App\Classes\Modules\Transactions\Processors\CheckStorageInvoiceTransactionProcessor;
 use App\Classes\ValueObjects\Constants\PaymentMethodType;
 use App\Classes\ValueObjects\Constants\TransactionType;
 use App\Models\Group;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Log;
 
 class CallbackBillplzLogic
 {
@@ -46,6 +49,12 @@ class CallbackBillplzLogic
     /** @var CreatePaymentTransactionProcessor */
     private $createPaymentTransactionProcessor;
 
+    /** @var CallbackBillplzProcessor */
+    private $callbackBillplzProcessor;
+
+    /** @var CheckStorageInvoiceTransactionProcessor */
+    private $storageInvoiceTransactionProcessor;
+
     /**
      * CallbackBillplzLogic constructor.
      * @param GetBillplzBill $getBillplzBill
@@ -54,8 +63,10 @@ class CallbackBillplzLogic
      * @param UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor
      * @param UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor
      * @param CreatePaymentTransactionProcessor $createPaymentTransactionProcessor
+     * @param CallbackBillplzProcessor $callbackBillplzProcessor
+     * @param CheckStorageInvoiceTransactionProcessor $storageInvoiceTransactionProcessor
      */
-    public function __construct(GetBillplzBill $getBillplzBill, FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor, UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor, UpdatesWalletBalance $updatesWalletBalance, CreatePaymentTransactionProcessor $createPaymentTransactionProcessor)
+    public function __construct(GetBillplzBill $getBillplzBill, FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor, UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor, UpdatesWalletBalance $updatesWalletBalance, CreatePaymentTransactionProcessor $createPaymentTransactionProcessor, CallbackBillplzProcessor $callbackBillplzProcessor, CheckStorageInvoiceTransactionProcessor $storageInvoiceTransactionProcessor)
     {
         $this->getBillplzBill = $getBillplzBill;
         $this->fetchesTransaction = $fetchesTransaction;
@@ -64,6 +75,8 @@ class CallbackBillplzLogic
         $this->updateDoFromYDPortalProcessor = $updateDoFromYDPortalProcessor;
         $this->updatesWalletBalance = $updatesWalletBalance;
         $this->createPaymentTransactionProcessor = $createPaymentTransactionProcessor;
+        $this->callbackBillplzProcessor = $callbackBillplzProcessor;
+        $this->storageInvoiceTransactionProcessor = $storageInvoiceTransactionProcessor;
     }
 
 
@@ -103,44 +116,13 @@ class CallbackBillplzLogic
             $status = $billplzXSignatureObject->getStatus() === 'failed' ? ApprovalStatus::REJECTED : ApprovalStatus::PENDING_VERIFICATION;
         }
 
+        Log::info('Debug billPlz status: '.$status);
+
         $token = Auth::fromUser(User::find(1));
         $request->headers->set('Authorization', 'Bearer '.$token);
 
-        // check if is wallet top up
-        if($transaction->owner instanceof Wallet && $status === ApprovalStatus::APPROVED &&!in_array($transaction->status, [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])) {
-            $this->updatesWalletBalance->execute($transaction->owner, $transaction->amount);
-        }
-
-        // group payment
-        if ($transaction->type == TransactionType::GROUP_PAYMENT && $status === ApprovalStatus::APPROVED &&!in_array($transaction->status, [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])) {
-            $group = Group::where('reference', $billplzXSignatureObject->getBillPlzId())->first();
-
-            foreach($group->groupTransactions as $groupTransaction) {
-                $invoice = $groupTransaction->transaction;
-                $this->createPaymentTransactionProcessor->execute($invoice, PaymentMethodType::WALLET, null);
-            }
-
-            $group->status = $status;
-            $group->save();
-        }
-
-        $this->updatesTransactionStatus->execute($transaction, $status);
-
-        if (!$transaction->owner instanceof Wallet) {
-            $totalPaidAmount = $invoice->transactions->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->sum('amount');
-
-            if(($invoice->amount - $totalPaidAmount) < 0.01) {
-                $this->updatesTransactionStatus->execute($invoice, ApprovalStatus::COMPLETED);
-    
-                $packingList->status = ApprovalStatus::APPROVED;
-                $packingList->save();
-    
-                if(app()->environment('production')){
-                    $this->updateDoFromVTPortalProcessor->execute($packingList);
-                    $this->updateDoFromYDPortalProcessor->execute($packingList);
-                }
-            }
-        }
+        $this->storageInvoiceBackDoorPreventionCheck($transaction, $status);
+        $result = $this->callbackBillplzProcessor->execute($transaction, $status);
 
         $company_module_marking = $transaction->owner->owner->connections? $transaction->owner->owner->connections->first()->invitee_reference: null;
 
@@ -151,6 +133,22 @@ class CallbackBillplzLogic
             $company_module_marking = $order->companyModule->connections? $order->companyModule->connections->first()->invitee_reference: null;
         }
 
-        return $request->method() === 'POST' ? true : view('pages.payments_redirect', ['marking' => $order->reference ?? null, 'company_module_marking' => $company_module_marking ?? null, 'transaction' => $transaction, 'status' => $status]);
+        return $request->method() === 'POST' ? true : view('pages.payments_redirect', ['marking' => $order->reference ?? null, 'company_module_marking' => $company_module_marking ?? null, 'transaction' => $transaction, 'status' => $status, 'result' => $result]);
+    }
+
+    private function storageInvoiceBackDoorPreventionCheck($transaction, $status){
+        if ($transaction->owner instanceof Wallet && $status === ApprovalStatus::APPROVED) {
+            $group = Group::where('reference', $transaction->payment_reference)->first();
+            if ($group) {
+                foreach ($group->groupTransactions as $groupTransaction) {
+                    $invoice = $groupTransaction->transaction;
+                    $pL = $invoice->owner;
+                    $order = $pL->owner;
+                    if($order){
+                        $this->storageInvoiceTransactionProcessor->executeOrder($order, false); //original was set true here so that no group is soft deleted or billplz bill got deleted
+                    }
+                }
+            }
+        }
     }
 }

app/Classes/Modules/Billplzs/Processors/CallbackBillplzProcessor.php

@@ -0,0 +1,128 @@
+<?php
+
+namespace App\Classes\Modules\Billplzs\Processors;
+
+use Illuminate\Http\Request;
+use App\Models\Wallet;
+use App\Models\Group;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use App\Classes\Modules\Transactions\Processors\CreatePaymentTransactionProcessor;
+use App\Classes\Modules\Transactions\Processors\ReleaseGoodsToCustomerProcessor;
+use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
+use App\Classes\Modules\Wallets\Services\UpdatesWalletBalance;
+use App\Classes\Modules\Orders\Processors\UpdateDoFromVTPortalProcessor;
+use App\Classes\Modules\Orders\Processors\UpdateDoFromYDPortalProcessor;
+use Illuminate\Support\Facades\Log;
+
+class CallbackBillplzProcessor
+{
+    /** @var UpdatesTransactionStatus */
+    private $updatesTransactionStatus;
+
+    /** @var UpdateDoFromVTPortalProcessor */
+    private $updateDoFromVTPortalProcessor;
+
+    /** @var UpdateDoFromYDPortalProcessor */
+    private $updateDoFromYDPortalProcessor;
+
+    /** @var UpdatesWalletBalance */
+    private $updatesWalletBalance;
+
+    /** @var CreatePaymentTransactionProcessor */
+    private $createPaymentTransactionProcessor;
+
+    /** @var ReleaseGoodsToCustomerProcessor */
+    private $releaseGoodsToCustomerProcessor;
+
+    /**
+     * CreateUserProcessor constructor.
+     * @param UpdatesTransactionStatus $updatesTransactionStatus
+     * @param UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor
+     * @param UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor
+     * @param UpdatesWalletBalance $updatesWalletBalance
+     * @param CreatePaymentTransactionProcessor $createPaymentTransactionProcessor
+     * @param ReleaseGoodsToCustomerProcessor $releaseGoodsToCustomerProcessor
+     */
+    public function __construct(UpdatesTransactionStatus $updatesTransactionStatus, UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor, UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor, UpdatesWalletBalance $updatesWalletBalance, CreatePaymentTransactionProcessor $createPaymentTransactionProcessor, ReleaseGoodsToCustomerProcessor $releaseGoodsToCustomerProcessor)
+    {
+        $this->updatesTransactionStatus = $updatesTransactionStatus;
+        $this->updateDoFromVTPortalProcessor = $updateDoFromVTPortalProcessor;
+        $this->updateDoFromYDPortalProcessor = $updateDoFromYDPortalProcessor;
+        $this->updatesWalletBalance = $updatesWalletBalance;
+        $this->createPaymentTransactionProcessor = $createPaymentTransactionProcessor;
+        $this->releaseGoodsToCustomerProcessor = $releaseGoodsToCustomerProcessor;
+    }
+
+
+    /**
+     * @param Request $request
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute($transaction, $status)
+    {
+        $invoice = $transaction->owner;
+        $packingList = $invoice->owner;
+
+        $proceed = $this->checkForGroupPayment($transaction);
+        if(!$proceed) return false;
+
+        $this->updatesTransactionStatus->execute($transaction, $status);
+
+        // check if is wallet top up
+        if ($transaction->owner instanceof Wallet && $status === ApprovalStatus::APPROVED) {
+
+            $this->updatesWalletBalance->execute($transaction->owner, $transaction->amount);
+
+            $group = Group::where('reference', $transaction->payment_reference)->first();
+
+            // check if is group payment
+            if ($group) {
+                foreach ($group->groupTransactions as $groupTransaction) {
+                    $invoice = $groupTransaction->transaction;
+
+                    $paymentTransaction = $this->createPaymentTransactionProcessor->execute($invoice, PaymentMethodType::WALLET, null, false);
+
+                    if($paymentTransaction && $paymentTransaction->status == ApprovalStatus::APPROVED){
+                        $pL = $invoice->owner;
+                        $this->releaseGoodsToCustomerProcessor->execute($pL, $invoice);
+                    }
+                }
+
+                $group->status = $status;
+                $group->save();
+            }
+        }
+
+        if (!$transaction->owner instanceof Wallet) {
+            $this->releaseGoodsToCustomerProcessor->execute($packingList, $invoice);
+        }
+
+        return true;
+    }
+
+    private function checkForGroupPayment($transaction){
+        //This check is targetting group payment that expired and soft deleted
+        //command:check-storage-invoices must already run for this part of the code to work properly
+        $group = Group::withTrashed()->where('reference', $transaction->payment_reference)->first();
+        if ($group) {
+            $totalAmountToBePaid = 0;
+            $actualAmountPaid = $transaction->amount;
+
+            foreach ($group->groupTransactions as $groupTransaction) {
+                $invoice = $groupTransaction->transaction;
+                $totalAmountToBePaid += $invoice->amount;
+            }
+
+            if(($totalAmountToBePaid - $actualAmountPaid) < 0.01){
+
+            }
+            else{
+                Log::channel('storage_invoices')->info('Total amount from current transaction: '.$totalAmountToBePaid); //cief todo: to be removed
+                Log::channel('storage_invoices')->info('Total amount from paid transaction: '.$transaction->amount); //cief todo: to be removed
+                return false;
+            }
+        }
+        return true;
+    }
+}

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

@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Classes\Modules\Billplzs\Services;
+
+use Illuminate\Support\Facades\Http;
+use App\Classes\Exceptions\MalformedRequestException;
+use Illuminate\Support\Facades\Log;
+
+class DeletesBillplzBill
+{
+
+    /**
+     * @param string $billID
+     * @throws MalformedRequestException
+     */
+    public function execute(string $billID) {
+        try{
+            $response = Http::withBasicAuth(config('billplz.api_key').':', '')->delete(config('billplz.base_url').'/api/v3/bills/'.$billID);
+            Log::channel('storage_invoices')->info('DeletesBillplzBill response: '.json_encode($response));
+
+            if($response->successful()){
+                $data = $response->json();
+
+                // $data['url'] = $data['url'].'?auto_submit=true';
+
+                return (object) $data;
+            }else{
+                return null;
+            }
+        }catch(\Exception $exception){
+            throw new MalformedRequestException('Unable to get correct response from billplz server: ' . $exception->getMessage());
+        }
+    }
+}

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

@@ -26,7 +26,7 @@ class CanAssignEmployee extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized(): bool
+    protected function authorized($object): 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(): bool
+    protected function authorized($object): 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(): bool
+    protected function authorized($object): 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(): bool
+    protected function authorized($object): 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(): bool
+    protected function authorized($object): 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(): bool
+    protected function authorized($object): 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(): bool
+    protected function authorized($object): 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(): bool
+    protected function authorized($object): 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(): bool
+    protected function authorized($object): 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(): bool
+    protected function authorized($object): 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(): bool
+    protected function authorized($object): 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(): bool
+    protected function authorized($object): 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(): bool
+    protected function authorized($object): 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(): bool
+    protected function authorized($object): 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(): bool
+    protected function authorized($object): 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(): bool
+    protected function authorized($object): 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(): bool
+    protected function authorized($object): 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(): bool
+    protected function authorized($object): bool
     {
         // TODO  Set Authorization rules
 
@@ -55,4 +55,4 @@ class CanUpdateRate extends AbstractRule
         return true;
     }
 
-}
+}

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

@@ -0,0 +1,50 @@
+<?php
+
+namespace App\Classes\Modules\Documents\Processors;
+
+use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
+use App\Classes\Modules\Documents\Services\CreatesDocument;
+use App\Classes\Modules\Documents\Services\CreatesFiles;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Models\Document;
+use Illuminate\Http\Request;
+use App\Models\QAUserAnswerSelected;
+
+class UploadDocumentForHelpMenuProcessor
+{
+
+    /** @var CreatesDocument */
+    private $createsDocument;
+
+    /** @var CreatesFiles */
+    private $createsFiles;
+
+    /**
+     * UploadDocumentForHelpMenuProcessor constructor.
+     * @param CreatesDocument $createsDocument
+     * @param CreatesFiles $createsFiles
+     */
+    public function __construct(CreatesDocument $createsDocument, CreatesFiles $createsFiles)
+    {
+        $this->createsDocument = $createsDocument;
+        $this->createsFiles = $createsFiles;
+    }
+
+
+    /**
+     * @param $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(): bool
+    protected function authorized($object): 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(): bool
+    protected function authorized($object): 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(): bool
+    protected function authorized($object): 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(): bool
+    protected function authorized($object): 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(): bool
+    protected function authorized($object): 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(): bool
+    protected function authorized($object): 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(): bool
+    protected function authorized($object): bool
     {
         // TODO  Set Authorization rules
         return true;
@@ -36,4 +36,4 @@ class CanUpdateDocumentReference extends AbstractRule
         return true;
     }
 
-}
+}

app/Classes/Modules/Exports/ControllersLogic/ExportFeedbackDataLogic.php

@@ -0,0 +1,57 @@
+<?php
+
+namespace App\Classes\Modules\Exports\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\Abstract2ControllerLogic;
+use App\Classes\Modules\Exports\Services\ExportsFeedback;
+use App\Classes\Modules\Exports\Standards\Rules\CanExportFeedback;
+use Illuminate\Http\Request;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
+use Maatwebsite\Excel\Excel;
+
+class ExportFeedbackDataLogic extends Abstract2ControllerLogic
+{
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Retrieved Feedback',
+            'message' => 'You have successfully exported feedback data'
+        ];
+    }
+
+    /** @var ExportsFeedback */
+    private $exportsFeedback;
+
+    /** @var CanExportFeedback */
+    private $canExportFeedback;
+
+    /**
+     * ExportFeedbackDataLogic constructor.
+     * @param ExportsFeedback $exportsFeedback
+     * @param CanExportFeedback $canExportFeedback
+     */
+    public function __construct(ExportsFeedback $exportsFeedback, CanExportFeedback $canExportFeedback)
+    {
+        $this->exportsFeedback = $exportsFeedback;
+        $this->canExportFeedback = $canExportFeedback;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return Response
+     */
+    public function logic(Request $request) : BinaryFileResponse
+    {
+        $this->canExportFeedback->passes();
+
+        $response = $this->exportsFeedback->download('feedback.xls', Excel::XLS, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']);
+        ob_end_clean();
+
+        return $response;
+    }
+
+}

app/Classes/Modules/Exports/ControllersLogic/ExportPackingListLogic.php

@@ -0,0 +1,68 @@
+<?php
+
+namespace App\Classes\Modules\Exports\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\Abstract2ControllerLogic;
+use App\Classes\Modules\Exports\Standards\Rules\CanExportPackingList;
+use App\Classes\Modules\Exports\Services\ExportsOnHoldPackingList;
+use App\Classes\Modules\Exports\Services\ExportsPendingArrangementDeliveryList;
+use Illuminate\Http\Request;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
+use Maatwebsite\Excel\Excel;
+
+class ExportPackingListLogic extends Abstract2ControllerLogic
+{
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Retrieved PackingList',
+            'message' => 'You have successfully exported PackingList'
+        ];
+    }
+
+    /** @var ExportsOnHoldPackingList */
+    private $exportsOnHoldPackingList;
+
+    /** @var ExportsPendingArrangementDeliveryList */
+    private $exportsPendingArrangementDeliveryList;
+
+    /** @var CanExportPackingList */
+    private $canExportPackingList;
+
+    /**
+     * ExportPackingListLogic constructor.
+     * @param ExportsPendingArrangementDeliveryList $exportsPendingArrangementDeliveryList
+     * @param ExportsOnHoldPackingList $exportsOnHoldPackingList
+     * @param CanExportPackingList $canExportPackingList
+     */
+    public function __construct(ExportsPendingArrangementDeliveryList $exportsPendingArrangementDeliveryList, ExportsOnHoldPackingList $exportsOnHoldPackingList, CanExportPackingList $canExportPackingList)
+    {
+        $this->exportsPendingArrangementDeliveryList = $exportsPendingArrangementDeliveryList;
+        $this->exportsOnHoldPackingList = $exportsOnHoldPackingList;
+        $this->canExportPackingList = $canExportPackingList;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return Response
+     */
+    public function logic(Request $request) : BinaryFileResponse
+    {
+        $this->canExportPackingList->passes();
+        $isSetPendingArrangement = $request->header('PendingArrangement');
+        if($isSetPendingArrangement){
+            $response = $this->exportsPendingArrangementDeliveryList->download('packing-list-delivery.xls', Excel::XLS, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']);
+        }
+        else {
+            $response = $this->exportsOnHoldPackingList->download('packing-list-on-hold.xls', Excel::XLS, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']);
+        }
+
+        ob_end_clean();
+        return $response;
+    }
+
+}

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

@@ -0,0 +1,98 @@
+<?php
+
+namespace App\Classes\Modules\Exports\Services;
+
+use App\Models\Order;
+use App\Models\PackingList;
+use Maatwebsite\Excel\Concerns\FromQuery;
+use Maatwebsite\Excel\Concerns\Exportable;
+use Maatwebsite\Excel\Concerns\WithMapping;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\ShouldAutoSize;
+use Maatwebsite\Excel\Concerns\WithHeadingRow;
+use App\Classes\General\Eloquent\ApplyFiltersToQuery;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use DateTime;
+
+class ExportsAgingList implements WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize, FromQuery
+{
+    use Exportable;
+
+    private $filters;
+
+    public function __construct()
+    {
+        $this->filters = [
+            "has_invoice_status_in"                 => [2],
+            "packing_list_ordered_by_invoice_date"  => true,
+            "with_aging_column"                     => true
+        ];
+    }
+
+    public function headings(): array
+    {
+        return [
+            'Company Name',
+            'Customer Marking',
+            'Order Number',
+            'Invoice No',
+            'Invoice Date',
+            'Days',
+            'Amount',
+        ];
+    }
+
+    public function query()
+    {
+        return (new ApplyFiltersToQuery())->execute(PackingList::query(), $this->filters);
+    }
+
+    public function map($list): array
+    {
+        $marking = null;
+        $orderNo = null;
+        $name    = null;
+        $invDate = 'n/a';
+        $invNo   = 'n/a';
+        $days    = 'n/a';
+
+        if ($list->owner instanceof Order) {
+            $inviterPivotInviteeReference = $list->owner->companyModule->inviters()->withPivot('invitee_reference')->first();
+
+            if ($inviterPivotInviteeReference) {
+                $marking = $inviterPivotInviteeReference->pivot->invitee_reference;
+                $orderNo = $list->owner->reference;
+            }
+            $name = $list->owner->companyModule->company->name;
+        }
+
+        $transaction = $list->transactions()->whereIn('status', [ApprovalStatus::APPROVED])->first();
+        if ($transaction) {
+
+            $invoiceDate = $transaction->created_at;
+            $invDate     = date_format($invoiceDate, 'd-m-Y');
+            $invNo       = $transaction->bill_no;
+            $amt         = number_format($transaction->amount, 2);
+
+            $currentDate = new DateTime();
+            $interval    = $currentDate->diff($invoiceDate);
+            $days        = $interval->format('%a');
+        }
+
+        return [
+            $name,
+            $marking,
+            $orderNo,
+            $invNo,
+            $invDate,
+            $days,
+            $amt,
+        ];
+    }
+
+    private function dueDateColumn($colNum, $dueDateNumber, $amt)
+    {
+        if ($colNum == $dueDateNumber) return $amt;
+        return null;
+    }
+}

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

@@ -0,0 +1,108 @@
+<?php
+
+namespace App\Classes\Modules\Exports\Services;
+
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Models\Transaction;
+use App\Models\Company;
+use App\Models\Wallet;
+use Carbon\Carbon;
+use Illuminate\Http\Request;
+use Maatwebsite\Excel\Concerns\Exportable;
+use Maatwebsite\Excel\Concerns\FromQuery;
+use Maatwebsite\Excel\Concerns\ShouldAutoSize;
+use Maatwebsite\Excel\Concerns\WithHeadingRow;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\WithMapping;
+
+class ExportsCustomersWalletTransactionHistory implements FromQuery, WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize
+{
+    use Exportable;
+
+    private $request;
+    private $runningBalance = 0;
+
+    public function __construct(Request $request)
+    {
+        $this->request = $request;
+    }
+
+    public function headings(): array
+    {
+        return [
+            'Date',
+            'Description',
+            'Incoming',
+            'Outgoing',
+            'Balance',
+        ];
+    }
+
+    /**
+     * @return \Illuminate\Support\Collection|mixed
+     */
+    public function query()
+    {
+        $wallet = Wallet::find($this->request->route('wallet_id'));
+        $transactions = $wallet->transactions()->whereIn('transactions.status', [2, 3])->orderBy('id');
+
+        return $transactions;
+    }
+
+    /**
+     * @param Transaction $transaction
+     *
+     * @return array
+     */
+    public function map($transaction): array
+    {
+        $decimals = $this->request->route('is_precise') == 'true' ? 5 : 2;
+
+        $description = '';
+        switch ((int) $transaction->type) {
+            case TransactionType::TOP_UP:
+                $description = (float) $transaction->amount . ' Credit Top up';
+                break;
+            case TransactionType::GROUP_PAYMENT:
+                $description = (float) $transaction->amount . ' Credit Top up';
+                break;
+            case TransactionType::CREDIT_NOTE:
+                $description = 'Credit Voucher for ' . $transaction->payment_reference;
+                break;
+            case TransactionType::PAYMENT:
+                $booking = Transaction::where('payment_reference', $transaction->bill_no)->first()->owner;
+
+                if (!$booking) {
+                    $description = 'Payment for unknown booking, please contact tech support.';
+                    break;
+                }
+
+                $marking = $booking->marking;
+                $description = 'Payment For booking refs' . $marking;
+                break;
+            case TransactionType::DEBIT_NOTE:
+                $description = 'Debit Voucher for ' . $transaction->payment_reference;
+                break;
+        }
+
+        $incoming = $outgoing = '';
+
+        if (in_array($transaction->type, [TransactionType::TOP_UP, TransactionType::CREDIT_NOTE, TransactionType::GROUP_PAYMENT])) {
+            $incoming =  number_format($transaction->amount, $decimals, '.', ',');
+            $this->runningBalance += $transaction->amount;
+        }
+
+        if (in_array($transaction->type, [TransactionType::PAYMENT, TransactionType::DEBIT_NOTE])) {
+            $outgoing =  number_format($transaction->amount, $decimals, '.', ',');
+            $this->runningBalance -= $transaction->amount;
+        }
+
+        return [
+            Carbon::parse($transaction->created_at)->format('d-m-Y h:i:s A'),
+            $description,
+            $incoming,
+            $outgoing,
+            number_format($this->runningBalance, $decimals, '.', ',')
+        ];
+    }
+}

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

@@ -0,0 +1,75 @@
+<?php
+
+namespace App\Classes\Modules\Exports\Services;
+
+use App\Models\QAUserAnswerSelected;
+use Maatwebsite\Excel\Concerns\Exportable;
+use Maatwebsite\Excel\Concerns\FromQuery;
+use Maatwebsite\Excel\Concerns\WithHeadingRow;
+use Maatwebsite\Excel\Concerns\WithMapping;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\ShouldAutoSize;
+use App\Classes\ValueObjects\Constants\QASystemSourceType;
+use Carbon\Carbon;
+
+class ExportsFeedback implements FromQuery, WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize
+{
+
+    use Exportable;
+
+    public function headings(): array
+    {
+        return [
+            'Version',
+            'Question Set',
+            'Question Text',
+            'Answer Text',
+            'Answer Value',
+            'Source System',
+            'Source Marking',
+            'Source Email',
+            'Created Date'
+        ];
+    }
+
+    /**
+     * @return \Illuminate\Support\Collection|mixed
+     */
+    public function query()
+    {
+        return QAUserAnswerSelected::whereHas('question', function ($query) {
+            $query->whereHas('questionnaire', function ($innerQuery) {
+                $innerQuery->where('group', 'feedback');
+            }); //->where('created_at', '>',  Carbon::now()->subMonths(1));
+        })->orderBy('created_at', 'desc');
+    }
+
+    /**
+     * @param QAUserAnswerSelected $userAnswer
+     *
+     * @return array
+     */
+    public function map($userAnswer): array
+    {
+        $source = $userAnswer->userSource;
+        $user = $userAnswer->source_id === 0 ? $userAnswer->user : null;
+        $user_marking = '';
+        if($user){
+            $companyModule = $user->companyModule()->first();
+            $user_marking = $companyModule ? $companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference : "";
+        }
+        $answer = $userAnswer->answer;
+
+        return [
+            $userAnswer->question->questionnaire->version,
+            $userAnswer->question->questionnaire->description,
+            $userAnswer->question->question_text,
+            $answer->display_text,
+            $answer->value,
+            $user ? QASystemSourceType::getText(QASystemSourceType::IZYIM) : QASystemSourceType::getText($source->system),
+            $user ? $user_marking : $source->marking,
+            $user ? $user->email : $source->email,
+            Carbon::parse($userAnswer->created_at)->format('d-m-Y'),
+        ];
+    }
+}

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

@@ -74,7 +74,8 @@ class ExportsPaymentTransactions implements FromQuery, WithHeadings, WithHeading
             $approvalStatus = ApprovalStatus::APPROVED;
         }
 
-        $query->where('type', TransactionType::SHIPPING_INVOICE)->whereIn('status', [$approvalStatus]);
+        // $query->where('type', TransactionType::SHIPPING_INVOICE)->whereIn('status', [$approvalStatus]);
+        $query->whereIn('type', [TransactionType::SHIPPING_INVOICE, TransactionType::STORAGE_INVOICE])->whereIn('status', [$approvalStatus]);
 
         if($start_date && $end_date) {
             $query->whereBetween('updated_at', [
@@ -102,7 +103,12 @@ class ExportsPaymentTransactions implements FromQuery, WithHeadings, WithHeading
         $container = $transaction->owner->containers()->first();
         $order = $transaction->owner->owner;
         $company = $order->companyModule->company;
-        $shippingTransactionDetails = $transaction->transactionDetails()->where('reference', 'SHIPPING_FEE')->first();
+        if($transaction->type === TransactionType::STORAGE_INVOICE){
+            $shippingTransactionDetails = $transaction->transactionDetails()->where('reference', 'STORAGE_FEE')->first();
+        }
+        else{
+            $shippingTransactionDetails = $transaction->transactionDetails()->where('reference', 'SHIPPING_FEE')->first();
+        }
         $marking = $order->companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
         $contact = $order->companyModule->company->contacts->first();
         $userName = $order->companyModule->employees()->first();
@@ -118,6 +124,8 @@ class ExportsPaymentTransactions implements FromQuery, WithHeadings, WithHeading
                 $furtherDescription .= $item->name.' '.$item->quantity.' CBM'."\n";
             elseif($item->reference === 'MIN_CBM_CHARGES')
                 $furtherDescription .= $item->name.' '.$item->quantity.' CBM'."\n";
+            elseif($item->reference === 'STORAGE_FEE')
+                $furtherDescription .= str_replace('<br>', ' | ', $item->name).' '."\n";
             else
                 $furtherDescription .= $item->name.' '.$item->quantity.' X '.$item->price."\n";
         }

app/Classes/Modules/Exports/Standards/Rules/CanExportFeedback.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace App\Classes\Modules\Exports\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\ValueObjects\Constants\RoleTypes;
+
+class CanExportFeedback extends AbstractRule
+{
+
+    /**
+     * @return bool
+     */
+    protected function authorized($object): bool
+    {
+        if(Auth()->user()){
+            $roleToCheck = Auth()->user()->type;
+            if (in_array($roleToCheck, RoleTypes::ADMIN_ROLES)) {
+                return true;
+            }
+            else {
+                return false;
+            }
+        }
+        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/Exports/Standards/Rules/CanExportPackingList.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace App\Classes\Modules\Exports\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\ValueObjects\Constants\RoleTypes;
+
+class CanExportPackingList extends AbstractRule
+{
+
+    /**
+     * @return bool
+     */
+    protected function authorized($object): bool
+    {
+        if(Auth()->user()){
+            $roleToCheck = Auth()->user()->type;
+            if (in_array($roleToCheck, RoleTypes::ADMIN_ROLES)) {
+                return true;
+            }
+            else {
+                return false;
+            }
+        }
+        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/ControllersLogic/FetchQuestionQALogic.php

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

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

@@ -0,0 +1,75 @@
+<?php
+
+namespace App\Classes\Modules\HelpMenu\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\HelpMenu\DataTransferObjects\UrlObject;
+use App\Classes\Modules\HelpMenu\Standards\Rules\CanGenerateFeedbackUrl;
+use App\Classes\Modules\HelpMenu\Services\CreatesUrl;
+use App\Classes\Modules\HelpMenu\DataTransferObjects\GenerateFeedbackUrlObject;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Crypt;
+use Illuminate\Support\Str;
+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;
+
+    /** @var CreatesUrl */
+    private $createsUrl;
+
+    /**
+     * GenerateFeedbackUrlLogic constructor.
+     * @param CanGenerateFeedbackUrl $canGenerateFeedbackUrl
+     * @param CreatesUrl $createsUrl
+     */
+    public function __construct(CanGenerateFeedbackUrl $canGenerateFeedbackUrl, CreatesUrl $createsUrl)
+    {
+        $this->canGenerateFeedbackUrl = $canGenerateFeedbackUrl;
+        $this->createsUrl = $createsUrl;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $apiKey = "";
+        if($request->get('apiKeyExist'))
+        {
+            $apiKey = $request->get('apiKeyExist');
+        }
+        $object = new GenerateFeedbackUrlObject($apiKey, $request->input('system'), $request->input('customer_marking'), $request->input('email'), $request->input('question_set'));
+        $this->canGenerateFeedbackUrl->passes($object);
+
+        $shortUrl = Str::random(20);
+        $originalText = $object->getSystem() . '|' . $object->getCustomerMarking(). '|' . $object->getEmail(). '|' . $object->getQuestionSet() . '|' . $shortUrl;
+        $originalUrl =  Crypt::encryptString($originalText);
+
+
+        $url = $this->createsUrl->execute(new UrlObject('feedback', $shortUrl, $originalUrl));
+        $resource = ['token' => $url->short_url];
+
+        return $this->response(['data' => $resource]);
+    }
+
+}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,59 @@
+<?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;
+    }
+
+
+    /**
+     * @param int $userId
+     * @param int $questionId
+     * @param Request $request
+     * @return void
+     * @throws ResourceNotFoundException
+     */
+    public function execute($userId, $questionId, $request){
+        if ($request->has('isPrevious')) {
+            //Get current and previous question's answer
+            try{
+                $selectedAnswer = $this->listsHelpMenuUserAnswerSelected->execute(['user_id' => $userId, 'question_id' => $questionId, 'order_by' => (object)['column' => 'id','DESC' => true]])[0];
+            } 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

@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Classes\Modules\HelpMenu\Processors;
+
+use App\Classes\Modules\HelpMenu\Services\FetchesHelpMenuQuestion;
+use ErrorException;
+use Illuminate\Http\Request;
+
+
+class 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' => $request->route('set_id')]);
+            return $query;
+        } catch (\Exception $exception){
+            throw new ErrorException($exception->getMessage(), $exception->getCode());
+        }
+    }
+}

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

@@ -0,0 +1,96 @@
+<?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;
+        $questionnaireSetId = 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'];
+            $questionnaireSetId = $currentQuestion['questionnaire_set_id'];
+        }
+
+        if ($request->has('answerObj')) {
+            $nextQuestionNumber = $request->answerObj['next_question_number'];
+        }
+
+        if ($request->has('isPrevious')) {
+            $userId = Auth::user()->id;
+            $previousAnswer = $this->listsHelpMenuUserAnswerSelected->execute(['user_id' => $userId, 'order_by' => (object)['column' => 'id','DESC' => true]])[0];
+
+            //Get previous question
+            $previousQuestion = $this->fetchesHelpMenuQuestion->execute(['questionnaire_set_id' => $questionnaireSetId, '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' => $questionnaireSetId, 'question_number' => $question_number]);
+                $returnQuestion =  $nextQuestion;
+            }
+            else if (array_key_exists('id', $request->input('question'))) {
+                $nextQuestion = $this->fetchesHelpMenuQuestion->execute(['questionnaire_set_id' => $questionnaireSetId, 'id_next' => $questionId, 'next_main_question' => null]);
+                $returnQuestion = $nextQuestion;
+            }
+        }
+
+        return $returnQuestion;
+    }
+}

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

@@ -0,0 +1,65 @@
+<?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, $reference = null){
+
+        $answer = null;
+        // try{
+        //      // $answer = $this->fetchesHelpMenuUserAnswerSelected->execute(['user_id' => $userId, 'question_id' => $questionId, 'order_by' => ['column' => 'id','DESC' => 1]]);
+        //     $answer = $this->fetchesHelpMenuUserAnswerSelected->execute(['user_id' => $userId, '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;
+        if($reference){
+            $answer->reference = $reference;
+        }
+        $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

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

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

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

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

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

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

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

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

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