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

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

.gitlab-ci.yml

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

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

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

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

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

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

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

app/Classes/General/Eloquent/Filters/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/QuestionId.php

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

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

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

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

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

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

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

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

@@ -4,29 +4,24 @@ namespace App\Classes\Modules\Billplzs\ControllersLogic;
 
 use App\Classes\Modules\Orders\Processors\UpdateDoFromVTPortalProcessor;
 use App\Classes\Modules\Orders\Processors\UpdateDoFromYDPortalProcessor;
-use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
-use App\Classes\Modules\Wallets\Services\UpdatesWallet;
 
 use App\Classes\Exceptions\ResourceNotFoundException;
 use App\Classes\Modules\Wallets\Services\UpdatesWalletBalance;
-use App\Http\Resources\TransactionResource;
-use App\Models\Booking;
 use App\Models\User;
 use App\Models\Wallet;
 use Illuminate\Http\Request;
-use Illuminate\Http\JsonResponse;
-
 use App\Classes\Exceptions\MalformedRequestException;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\Modules\Billplzs\Services\GetBillplzBill;
 use App\Classes\Modules\Billplzs\DataTransferObjects\BillplzXSignatureObject;
-use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Transactions\Services\FetchesTransaction;
+use App\Classes\Modules\Transactions\Processors\CreatePaymentTransactionProcessor;
 use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
 use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Models\Group;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Log;
 
 class CallbackBillplzLogic
 {
@@ -48,6 +43,9 @@ class CallbackBillplzLogic
     /** @var UpdatesWalletBalance */
     private $updatesWalletBalance;
 
+    /** @var CreatePaymentTransactionProcessor */
+    private $createPaymentTransactionProcessor;
+
     /**
      * CallbackBillplzLogic constructor.
      * @param GetBillplzBill $getBillplzBill
@@ -55,8 +53,9 @@ class CallbackBillplzLogic
      * @param UpdatesTransactionStatus $updatesTransactionStatus
      * @param UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor
      * @param UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor
+     * @param CreatePaymentTransactionProcessor $createPaymentTransactionProcessor
      */
-    public function __construct(GetBillplzBill $getBillplzBill, FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor, UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor, UpdatesWalletBalance $updatesWalletBalance)
+    public function __construct(GetBillplzBill $getBillplzBill, FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor, UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor, UpdatesWalletBalance $updatesWalletBalance, CreatePaymentTransactionProcessor $createPaymentTransactionProcessor)
     {
         $this->getBillplzBill = $getBillplzBill;
         $this->fetchesTransaction = $fetchesTransaction;
@@ -64,6 +63,7 @@ class CallbackBillplzLogic
         $this->updateDoFromVTPortalProcessor = $updateDoFromVTPortalProcessor;
         $this->updateDoFromYDPortalProcessor = $updateDoFromYDPortalProcessor;
         $this->updatesWalletBalance = $updatesWalletBalance;
+        $this->createPaymentTransactionProcessor = $createPaymentTransactionProcessor;
     }
 
 
@@ -111,12 +111,23 @@ class CallbackBillplzLogic
             $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);
 
-        $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);
+        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);

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,50 @@
+<?php
+
+namespace App\Classes\Modules\Documents\Processors;
+
+use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
+use App\Classes\Modules\Documents\Services\CreatesDocument;
+use App\Classes\Modules\Documents\Services\CreatesFiles;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Models\Document;
+use Illuminate\Http\Request;
+use App\Models\QAUserAnswerSelected;
+
+class UploadDocumentForHelpMenuProcessor
+{
+
+    /** @var CreatesDocument */
+    private $createsDocument;
+
+    /** @var CreatesFiles */
+    private $createsFiles;
+
+    /**
+     * UploadDocumentForHelpMenuProcessor constructor.
+     * @param CreatesDocument $createsDocument
+     * @param CreatesFiles $createsFiles
+     */
+    public function __construct(CreatesDocument $createsDocument, CreatesFiles $createsFiles)
+    {
+        $this->createsDocument = $createsDocument;
+        $this->createsFiles = $createsFiles;
+    }
+
+
+    /**
+     * @param Request $request
+     * @param QAUserAnswerSelected qaUserAnswerSelected
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Request $request, QAUserAnswerSelected $qaUserAnswerSelected) {
+        $object = new DocumentObject("HELP_MENU", $request->input('files'),
+            '123456', ApprovalStatus::PENDING_VERIFICATION, 'help_menu'); //cief todo: 123456 cannot be hardcoded
+
+        /** @var Document $document */
+        $document = $this->createsDocument->execute($qaUserAnswerSelected, $object);
+
+        $result = $this->createsFiles->execute($document, $object);
+        return $result;
+    }
+
+}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Classes\Modules\HelpMenu\Processors;
+
+use App\Classes\Modules\HelpMenu\Services\FetchesHelpMenuQuestion;
+use ErrorException;
+use Illuminate\Http\Request;
+
+
+class FetchFirstHelpMenuQuestionProcessor
+{
+    /** @var FetchesHelpMenuQuestion */
+    private $fetchesHelpMenuQuestion;
+
+    /**
+     * FetchFirstHelpMenuQuestionProcessor constructor.
+     * @param FetchesHelpMenuQuestion $fetchesHelpMenuQuestion
+     */
+    public function __construct(FetchesHelpMenuQuestion $fetchesHelpMenuQuestion)
+    {
+        $this->fetchesHelpMenuQuestion = $fetchesHelpMenuQuestion;
+    }
+
+    public function execute(Request $request){
+        try {
+            $query = $this->fetchesHelpMenuQuestion->execute(['questionnaire_set_id' => 1]);
+            return $query;
+        } catch (\Exception $exception){
+            throw new ErrorException($exception->getMessage(), $exception->getCode());
+        }
+    }
+}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -51,11 +51,11 @@ class TransactionToPerfexCRMProcessor
                     PerfexCRMProjectStatus::IN_PROGRESS,
                     [],
                     [
-                        PerfexCRMTasks::TASK_1,
-                        PerfexCRMTasks::TASK_POST_PAYMENT_1,
-                        PerfexCRMTasks::TASK_POST_PAYMENT_2,
-                        PerfexCRMTasks::TASK_POST_PAYMENT_3,
-                        PerfexCRMTasks::TASK_POST_PAYMENT_4,
+//                        PerfexCRMTasks::TASK_1,
+//                        PerfexCRMTasks::TASK_POST_PAYMENT_1,
+//                        PerfexCRMTasks::TASK_POST_PAYMENT_2,
+//                        PerfexCRMTasks::TASK_POST_PAYMENT_3,
+//                        PerfexCRMTasks::TASK_POST_PAYMENT_4,
                         ]
                 );
 

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

@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Classes\Modules\PerfexCRM\Services;
+
+use Illuminate\Support\Facades\Http;
+use App\Classes\Exceptions\MalformedRequestException;
+use Illuminate\Support\Facades\Log;
+
+class CreatesPerfexCRMSupportTicket
+{
+    /**
+     * @param string $subject
+     * @param string $department
+     * @param int $contactid
+     * @param int $userid
+     * @return null|object
+     * @throws MalformedRequestException
+     */
+    public function execute(string $subject, string $department, int $contactid, int $userid) {
+        try{
+            $data = [
+                'subject' => $subject,
+                'department' => $department,
+                'contactid' => $contactid,
+                'userid' => $userid,
+            ];
+
+            $response = Http::asForm()->withHeaders([
+                'authtoken' => config('perfexcrm.api_key')])
+            ->post(config('perfexcrm.base_url').'/api/tickets',$data);
+
+            if($response->successful()){
+                $data = $response->json();
+                return (object) $data;
+            }else{
+                Log::error($response);
+                return null;
+            }
+        }catch(\Exception $exception){
+            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server: ' . $exception->getMessage());
+        }
+    }
+}

app/Classes/Modules/Segments/ControllersLogic/UpdateConstantPostcodeLogic.php

@@ -29,7 +29,8 @@ class UpdateConstantPostcodeLogic  extends AbstractControllerLogic
      * @param UpdatePostcodeSegmentProcessor $updatePostcodeSegmentProcessor
      */
     public function __construct(
-        UpdatePostcodeSegmentProcessor $updatePostcodeSegmentProcessor)
+        UpdatePostcodeSegmentProcessor $updatePostcodeSegmentProcessor
+    )
     {
         $this->updatePostcodeSegmentProcessor = $updatePostcodeSegmentProcessor;
     }

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

@@ -7,24 +7,20 @@ use App\Classes\Exceptions\MalformedRequestException;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Transactions\Services\FetchesTransaction;
 use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
-use App\Classes\Modules\Transactions\Services\CreatesTransactionableTransaction;
-use App\Classes\Modules\Transactions\Services\CreatesPaymentTransaction;
-use App\Classes\Modules\Transactions\Services\CreatesTransaction;
-use App\Classes\Modules\Billplzs\Services\CreatesBillplzBill;
-use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
-use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
-use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Classes\Modules\Companies\Services\FetchesCompanyModule;
+use App\Classes\Modules\Groups\DataTransferObjects\GroupObject;
 use App\Classes\ValueObjects\Constants\PaymentMethodType;
-use App\Classes\Modules\Wallets\Services\UpdatesWalletBalance;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Http\Resources\TransactionResource;
+use App\Classes\Modules\Transactions\Processors\CreatePaymentTransactionProcessor;
 use App\Models\Group;
+use App\Classes\Modules\Groups\Services\CreatesGroup;
 use App\Models\Transaction;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use App\Classes\Modules\Wallets\Processors\CreateWalletTopUpTransactionProcessor;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Models\GroupTransaction;
+use App\Http\Resources\WalletTransactionResource;
 use App\Models\Wallet;
-use App\Classes\Modules\Orders\Processors\UpdateDoFromVTPortalProcessor;
-use App\Classes\Modules\Orders\Processors\UpdateDoFromYDPortalProcessor;
 
 class CreateGroupsLogic extends AbstractControllerLogic
 {
@@ -43,212 +39,141 @@ class CreateGroupsLogic extends AbstractControllerLogic
     /** @var FetchesTransaction */
     private $fetchesTransaction;
 
-
     /** @var GeneratesTransactionBillNumber */
     private $generatesTransactionBillNumber;
 
-    /** @var CreatesTransactionableTransaction */
-    private $createsTransactionableTransaction;
 
-    /** @var CreatesBillplzBill */
-    private $createsBillplzBill;
+    /** @var FetchesCompanyModule  */
+    private $fetchesCompanyModule;
 
-    /** @var UpdatesWalletBalance */
-    private $updatesWalletBalance;
+    /** @var CreateWalletTopUpTransactionProcessor */
+    private $createWalletTopUpTransactionProcessor;
 
-    /** @var CreatesTransaction */
-    private $createsTransaction;
+    /** @var CreatePaymentTransactionProcessor */
+    private $createPaymentTransactionProcessor;
 
-    /** @var CreatesPaymentTransaction */
-    private $createsPaymentTransaction;
-
-    /** @var UpdateDoFromVTPortalProcessor */
-    private $updateDoFromVTPortalProcessor;
-
-    /** @var UpdateDoFromYDPortalProcessor */
-    private $updateDoFromYDPortalProcessor ;
-
-    /** @var UpdatesTransactionStatus */
-    private $updatesTransactionStatus ;
+    /** @var CreatesGroup */
+    private $createsGroup;
 
     public function __construct(
         FetchesTransaction $fetchesTransaction, 
         GeneratesTransactionBillNumber $generatesTransactionBillNumber, 
-        CreatesTransactionableTransaction $createsTransactionableTransaction,
-        CreatesBillplzBill $createsBillplzBill,
-        UpdatesWalletBalance $updatesWalletBalance,
-        CreatesTransaction $createsTransaction,
-        CreatesPaymentTransaction $createsPaymentTransaction,
-        UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor, 
-        UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor,
-        UpdatesTransactionStatus $updatesTransactionStatus
+        FetchesCompanyModule $fetchesCompanyModule,
+        CreateWalletTopUpTransactionProcessor $createWalletTopUpTransactionProcessor,
+        CreatePaymentTransactionProcessor $createPaymentTransactionProcessor,
+        CreatesGroup $createsGroup
     )
     {
         $this->fetchesTransaction = $fetchesTransaction;
         $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
-        $this->createsTransactionableTransaction = $createsTransactionableTransaction;
-        $this->createsBillplzBill = $createsBillplzBill;
-        $this->updatesWalletBalance = $updatesWalletBalance;
-        $this->createsPaymentTransaction = $createsPaymentTransaction;
-        $this->updateDoFromVTPortalProcessor = $updateDoFromVTPortalProcessor;
-        $this->updateDoFromYDPortalProcessor = $updateDoFromYDPortalProcessor;
-        $this->updatesTransactionStatus = $updatesTransactionStatus;
+        $this->fetchesCompanyModule = $fetchesCompanyModule;
+        $this->createWalletTopUpTransactionProcessor = $createWalletTopUpTransactionProcessor;
+        $this->createPaymentTransactionProcessor = $createPaymentTransactionProcessor;
+        $this->createsGroup = $createsGroup;
     }
 
     public function logic(Request $request) : JsonResponse
     {
-        $invoice_ids = json_decode($request->route('transaction_ids'));
-        $billNumber = $this->generatesTransactionBillNumber->execute('PYMT-');
-        $approvalStatus = ApprovalStatus::PENDING_SUBMISSION;
-        $payment_method = PaymentMethodType::PAYMENT_METHODS[$request->input('payment_method')];
+        $payment_method     = PaymentMethodType::PAYMENT_METHODS[$request->input('payment_method')];
+        $groupPyamentStatus = ApprovalStatus::PENDING_VERIFICATION;
 
-        if (count($invoice_ids) > 1) {
-            dd('more than 1 invoice');
-            // creates group transaction 
-            $group = new Group();
+        $invoice_ids    = json_decode($request->route('transaction_ids'));
+        $billNumber     = $this->generatesTransactionBillNumber->execute('PYMT-');
 
-            $issuer = '';
-            $receiver = '';
-            $amount = 0;
-            $original_amount = 0;
-            $currency_id = 0;
-            $original_currency_id = '';
-            $currency_rate = '';
-            $tax = 0;
-            $service_charge = 0;
+        // todo-new: check why is this not working
+        // $invoices = $this->fetchesTransaction->execute(['id_in' => $invoice_ids]);
+        $invoices       = Transaction::whereIn('id', $invoice_ids)->get();
 
-            // todo-new: check why is this not working
-            // $invoices = $this->fetchesTransaction->execute(['id_in' => $invoice_ids]);
-            $invoices = Transaction::whereIn('id', $invoice_ids)->get();
+        if ($payment_method == PaymentMethodType::WALLET) {
 
-            foreach ($invoices as $invoice) {
-                // todo-new: attach transaction to the group id
-                // create one payment for each, then mark as pending_approval
-                $issuer = $invoice->issuer;
-                $receiver = $invoice->receiver;
-                $amount += $invoice->amount;
-                $original_amount += $invoice->original_amount;
-                $currency_id = $invoice->currency_id;
-                $original_currency_id = $invoice->original_currency_id;
-                $currency_rate = $invoice->currency_rate;
-                $tax += $invoice->tax;
-                $service_charge += $invoice->service_charge;
-            }
+            $companyModuleId = $invoices->first()->receiver;
 
-            $group->issuer = $issuer;
-            $group->receiver = $receiver;
-            $group->reference = $billNumber;
-            $group->amount = $amount;
-            $group->original_amount = $original_amount;
-            $group->currency_id = $currency_id;
-            $group->original_currency_id = $original_currency_id;
-            $group->currency_rate = $currency_rate;
-            $group->tax = $tax;
-            $group->service_charge = $service_charge;
+            $wallet = Wallet::where('owner_id', $companyModuleId)->first();
 
-            $group->save();
-
-
-            // attach payment on group transaction            
-            
-            // $invoice_transaction = $this->fetchesTransaction->execute(['id' => $invoice_ids->first()]);
-            // $amount = $request->input('amount');
-            // $company_module = $invoice_transaction->owner()->first()->owner()->first()->companyModule()->first();
-
-            $invoice_transaction = $group;
-            $transferDetails = $billNumber;
-            $company_module = $group->receiverCompany;
-        } else {
-
-            $invoice_transaction = $this->fetchesTransaction->execute(['id' => $invoice_ids[0]]);
-            $amount = $request->input('amount');
-            $company_module = $invoice_transaction->owner()->first()->owner()->first()->companyModule()->first();
-            $transferDetails = $invoice_transaction->bill_no;
-        }
-
-        $payment_reference = null;
-        if ($payment_method == PaymentMethodType::PAYMENT_GATEWAY) {
-
-            // create billplz transaction
-            $payment_method = PaymentMethodType::PAYMENT_GATEWAY;
-            $billPlzBill = $this->createsBillplzBill->execute(
-                $company_module->name, 
-                (app()->environment(['production'])) ? $company_module->employees()->first()->email : 'uldvstar@gmail.com',
-                'This payment is for the invoice number . ' . $transferDetails,
-                $amount,
-                $billNumber, 
-                $request->input('bank_code'), 
-                true
-            );
-
-            $payment_reference = $billPlzBill->id;
-        }
-        else if ($payment_method === PaymentMethodType::WALLET) {
-            /** @var Wallet $wallet */
-            $wallet = $company_module->wallets()->first();
-
-            if((float) number_format(($wallet->amount - $amount),2) < 0){
+            // todo-new: verify currently checking wallet amount based on 'amount' value passed by frontend
+            if((float) number_format(($wallet->amount - $request->input('amount')),2) < 0){
                 throw new MalformedRequestException('Insufficient wallet balance. Please Top up your wallet.');
             }
 
-            $walletPaymentBillNumber = $this->generatesTransactionBillNumber->execute('PYMT-');
-            
-            $transaction_object = new TransactionObject($walletPaymentBillNumber, TransactionType::PAYMENT, 1, $company_module->id, 1, PaymentMethodType::WALLET, $amount, $amount, 1, 1, 1, 0, 0, null, ApprovalStatus::APPROVED, [], '');
-            $transaction = $this->createsTransactionableTransaction->execute($wallet, $transaction_object);
-
-            $payment_reference = $walletPaymentBillNumber;
-
-            $this->updatesWalletBalance->execute($wallet, ($amount * -1));
-
-            if (count($invoice_ids) > 1) {
-                // do one by one
-                // dd($invoices);
-                // todo-new: update all the transaction inside 
-            } else {
-                // $invoice_transaction;
-                $packingList = $invoice_transaction->owner;
-                $order = $packingList->owner;
-                $packingList->status = ApprovalStatus::APPROVED;
-                $packingList->save();
-            }
-
-            if(app()->environment('production')){
-                $this->updateDoFromVTPortalProcessor->execute($packingList);
-                $this->updateDoFromYDPortalProcessor->execute($packingList);
-            }
-
-            $approvalStatus = ApprovalStatus::APPROVED;
-
-            // update invoice to completed
-            $this->updatesTransactionStatus->execute($invoice_transaction, ApprovalStatus::COMPLETED);
-        }
-        else {
-            $payment_method = PaymentMethodType::CASH;
+            $groupPyamentStatus = ApprovalStatus::APPROVED;
         }
 
-        // createsPaymentTransaction
-        $object = new TransactionObject(
-            $billNumber, 
-            TransactionType::PAYMENT, 
-            $company_module->id,
-            1,
-            1, 
+        $issuer                 = 0;
+        $receiver               = 0;
+        $amount                 = 0;
+        $original_amount        = 0;
+        $currency_id            = 0;
+        $original_currency_id   = 0;
+        $currency_rate          = 0;
+        $tax                    = 0;
+        $service_charge         = 0;
+
+        $group = new GroupObject(
+            $issuer,
+            $receiver,
+            $amount,
+            $original_amount,
+            $currency_id,
+            $original_currency_id,
+            $currency_rate,
+            $tax,
+            $service_charge,
             $payment_method,
-            $request->input('amount'),
-            $request->input('amount'),
-            1,
-            1, 
-            0, 
-            0, 
-            0,
-            null, 
-            $approvalStatus,
-            null,
-            $payment_reference
+            '-',
+            $groupPyamentStatus,
         );
 
-        $payment_transaction = $this->createsPaymentTransaction->execute($invoice_transaction, $object);
+        $group = $this->createsGroup->execute($group);
 
-        return $this->resourceResponse(new TransactionResource($payment_transaction));
+        foreach ($invoices as $invoice) {
+            if ($payment_method == PaymentMethodType::WALLET) {
+                $this->createPaymentTransactionProcessor->execute($invoice, PaymentMethodType::WALLET, $request->input('bank_code'));
+            }
+
+            $issuer                 = $invoice->issuer;
+            $receiver               = $invoice->receiver;
+            $amount                 += $invoice->amount;
+            $original_amount        += $invoice->original_amount;
+            $currency_id            = $invoice->currency_id;
+            $original_currency_id   = $invoice->original_currency_id;
+            $currency_rate          = $invoice->currency_rate;
+            $tax                    += $invoice->tax;
+            $service_charge         += $invoice->service_charge;
+
+            // creates group transaction
+            $groupTransaction = new GroupTransaction();
+            $groupTransaction->group_id = $group->id;
+            $groupTransaction->transaction_id = $invoice->id;
+            $groupTransaction->save();
+        }
+
+        if (in_array($payment_method, [PaymentMethodType::PAYMENT_GATEWAY, PaymentMethodType::CASH])) {
+            // create only one billplz payment for wallet top up
+            $amount = floatval(str_replace(',', '', $request->input('amount')));
+            $companyModuleId = $invoice->receiver;
+            $companyModule = $this->fetchesCompanyModule->execute(['id' => $companyModuleId]);
+
+            $topUpTransaction = $this->createWalletTopUpTransactionProcessor->execute($companyModule, $amount, $request->input('bank_code'), true, $payment_method);
+        }
+
+        $group->issuer                  = $issuer;
+        $group->receiver                = $receiver;
+        $group->reference               = $payment_method === PaymentMethodType::PAYMENT_GATEWAY ? $topUpTransaction->payment_reference : $billNumber;
+        $group->amount                  = $amount;
+        $group->original_amount         = $original_amount;
+        $group->currency_id             = $currency_id;
+        $group->original_currency_id    = $original_currency_id;
+        $group->currency_rate           = $currency_rate;
+        $group->tax                     = $tax;
+        $group->service_charge          = $service_charge;
+        $group->status                  = $groupPyamentStatus;
+        $group->save();
+
+        if ($payment_method === PaymentMethodType::PAYMENT_GATEWAY) {
+            return $this->resourceResponse(new WalletTransactionResource($topUpTransaction));
+
+        } else {
+            return $this->response([]);
+        }
     }
 }

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

@@ -5,30 +5,15 @@ namespace App\Classes\Modules\Transactions\ControllersLogic;
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Transactions\Services\FetchesTransaction;
-use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
-use App\Classes\Modules\Transactions\Services\CreatesPaymentTransaction;
-use App\Classes\Modules\Transactions\Services\CreatesTransactionDetail;
-use App\Classes\Modules\Billplzs\Services\CreatesBillplzBill;
-
-use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
-use App\Classes\Modules\Transactions\DataTransferObjects\TransactionDetailObject;
-
-use App\Classes\ValueObjects\Constants\OrderRoleTypes;
-use App\Classes\ValueObjects\Constants\TransactionType;
 use App\Classes\ValueObjects\Constants\PaymentMethodType;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-
 use App\Http\Resources\TransactionResource;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Storage;
-use Illuminate\Support\Str;
-use Mccarlosen\LaravelMpdf\Facades\LaravelMpdf;
+use App\Classes\Modules\Transactions\Processors\CreatePaymentTransactionProcessor;
 
 class CreatePaymentTransactionLogic extends AbstractControllerLogic
 {
 
-
     /**
      * @return array
      */
@@ -42,83 +27,25 @@ class CreatePaymentTransactionLogic extends AbstractControllerLogic
     /** @var FetchesTransaction */
     private $fetchesTransaction;
 
-    /** @var FetchesSegmentConstant */
-    private $fetchesSegmentConstant;
-
-    /** @var GeneratesTransactionBillNumber */
-    private $generatesTransactionBillNumber;
-
-    /** @var CreatesPaymentTransaction */
-    private $createsPaymentTransaction;
-
-    /** @var CreatesBillplzBill */
-    private $createsBillplzBill;
-
-    /** @var CreatesTransactionDetail */
-    private $createsTransactionDetail;
+    /** @var CreatePaymentTransactionProcessor */
+    private $createPaymentTransactionProcessor;
 
     public function __construct(
         FetchesTransaction $fetchesTransaction, 
-        GeneratesTransactionBillNumber $generatesTransactionBillNumber, 
-        CreatesPaymentTransaction $createsPaymentTransaction,
-        CreatesTransactionDetail $createsTransactionDetail,
-        CreatesBillplzBill $createsBillplzBill
+        CreatePaymentTransactionProcessor $createPaymentTransactionProcessor
     )
     {
         $this->fetchesTransaction = $fetchesTransaction;
-        $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
-        $this->createsPaymentTransaction = $createsPaymentTransaction;
-        $this->createsTransactionDetail = $createsTransactionDetail;
-        $this->createsBillplzBill = $createsBillplzBill;
+        $this->createPaymentTransactionProcessor = $createPaymentTransactionProcessor;
     }
 
     public function logic(Request $request) : JsonResponse
     {
+        $payment_method = PaymentMethodType::PAYMENT_METHODS[$request->input('payment_method')];
+
         $invoice_transaction = $this->fetchesTransaction->execute(['id' => $request->input('transaction_id')]);
-        $amount = $request->input('amount');
-        $company_module = $invoice_transaction->owner()->first()->owner()->first()->companyModule()->first();
 
-        $billNumber = $this->generatesTransactionBillNumber->execute('PYMT-');
-        $payment_reference = null;
-        if ($request->input('payment_method') == 5) {
-            $payment_method = PaymentMethodType::PAYMENT_GATEWAY;
-            $billPlzBill = $this->createsBillplzBill->execute(
-                $company_module->name, 
-                (app()->environment(['production'])) ? $company_module->employees()->first()->email : 'uldvstar@gmail.com',
-                'This payment is for the invoice number . ' . $invoice_transaction->bill_no,
-                $amount,
-                $billNumber, 
-                $request->input('bank_code'), 
-                true
-            );
-
-            $payment_reference = $billPlzBill->id;
-        }
-        else {
-            $payment_method = PaymentMethodType::CASH;
-        }
-
-        $object = new TransactionObject(
-            $billNumber, 
-            TransactionType::PAYMENT, 
-            $company_module->id,
-            1,
-            1, 
-            $payment_method,
-            $request->input('amount'),
-            $request->input('amount'),
-            1,
-            1, 
-            0, 
-            0, 
-            0,
-            null, 
-            ApprovalStatus::PENDING_SUBMISSION,
-            null,
-            $payment_reference
-        );
-
-        $payment_transaction = $this->createsPaymentTransaction->execute($invoice_transaction, $object);
+        $payment_transaction = $this->createPaymentTransactionProcessor->execute($invoice_transaction, $payment_method , $request->input('bank_code'));
 
         return $this->resourceResponse(new TransactionResource($payment_transaction));
     }

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

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

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

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

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

@@ -0,0 +1,175 @@
+<?php
+
+
+namespace App\Classes\Modules\Transactions\Processors;
+
+use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\Modules\Transactions\Services\FetchesTransaction;
+use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
+use App\Classes\Modules\Transactions\Services\CreatesPaymentTransaction;
+use App\Classes\Modules\Transactions\Services\CreatesTransactionDetail;
+use App\Classes\Modules\Billplzs\Services\CreatesBillplzBill;
+use App\Classes\Modules\Transactions\Services\CreatesTransactionableTransaction;
+use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\Modules\Wallets\Services\UpdatesWalletBalance;
+use App\Models\Transaction;
+use App\Models\Wallet;
+use App\Classes\Modules\Orders\Processors\UpdateDoFromVTPortalProcessor;
+use App\Classes\Modules\Orders\Processors\UpdateDoFromYDPortalProcessor;
+use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
+use Illuminate\Support\Facades\Log;
+
+class CreatePaymentTransactionProcessor
+{
+
+    /** @var GeneratesTransactionBillNumber */
+    private $generatesTransactionBillNumber;
+
+    /** @var CreatesPaymentTransaction */
+    private $createsPaymentTransaction;
+
+    /** @var CreatesBillplzBill */
+    private $createsBillplzBill;
+
+    /** @var CreatesTransactionableTransaction */
+    private $createsTransactionableTransaction;
+
+    /** @var UpdatesWalletBalance */
+    private $updatesWalletBalance;
+
+    /** @var UpdateDoFromVTPortalProcessor */
+    private $updateDoFromVTPortalProcessor;
+
+    /** @var UpdateDoFromYDPortalProcessor */
+    private $updateDoFromYDPortalProcessor ;
+
+    /** @var UpdatesTransactionStatus */
+    private $updatesTransactionStatus ;
+
+    /**
+     * @param FetchesTransaction $fetchesTransaction,
+     * @param GeneratesTransactionBillNumber $generatesTransactionBillNumber,
+     * @param CreatesPaymentTransaction $createsPaymentTransaction
+     * @param CreatesTransactionDetail $createsTransactionDetail
+     * @param CreatesBillplzBill $createsBillplzBil
+     * @param CreatesTransactionableTransaction $createsTransactionableTransaction
+     * @param UpdatesWalletBalance $updatesWalletBalance
+     * @param UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor
+     * @param UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor
+     * @param UpdatesTransactionStatus $updatesTransactionStatus
+     */
+    public function __construct(
+        GeneratesTransactionBillNumber $generatesTransactionBillNumber,
+        CreatesPaymentTransaction $createsPaymentTransaction,
+        CreatesBillplzBill $createsBillplzBill,
+        CreatesTransactionableTransaction $createsTransactionableTransaction,
+        UpdatesWalletBalance $updatesWalletBalance,
+        UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor,
+        UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor,
+        UpdatesTransactionStatus $updatesTransactionStatus
+    )
+    {
+        $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
+        $this->createsPaymentTransaction = $createsPaymentTransaction;
+        $this->createsBillplzBill = $createsBillplzBill;
+        $this->createsTransactionableTransaction = $createsTransactionableTransaction;
+        $this->updatesWalletBalance = $updatesWalletBalance;
+        $this->updateDoFromVTPortalProcessor = $updateDoFromVTPortalProcessor;
+        $this->updateDoFromYDPortalProcessor = $updateDoFromYDPortalProcessor;
+        $this->updatesTransactionStatus = $updatesTransactionStatus;
+    }
+
+    /**
+     * @throws MalformedRequestException
+     */
+    public function execute(Transaction $invoice, $payment_method, $bank_code)
+    {
+        $amount             = $invoice->amount;
+        Log::info($invoice->owner);
+        $company_module     = $invoice->owner->owner->companyModule()->first();
+        $approvalStatus     = ApprovalStatus::PENDING_SUBMISSION;
+        $billNumber         = $this->generatesTransactionBillNumber->execute('PYMT-');
+        $payment_reference  = null;
+
+        if ($payment_method == PaymentMethodType::PAYMENT_GATEWAY) {
+
+            // create billplz transaction
+            $payment_method = PaymentMethodType::PAYMENT_GATEWAY;
+            $billPlzBill = $this->createsBillplzBill->execute(
+                $company_module->name,
+                (app()->environment(['production'])) ? $company_module->employees()->first()->email : 'uldvstar@gmail.com',
+                'This payment is for the invoice number . ' . $billNumber,
+                $amount,
+                $billNumber,
+                $bank_code,
+                true
+            );
+
+            $payment_reference = $billPlzBill->id;
+        }
+        else if ($payment_method === PaymentMethodType::WALLET) {
+            /** @var Wallet $wallet */
+            $wallet = $company_module->wallets()->first();
+
+            if((float) number_format(($wallet->amount - $amount),2) < 0){
+                throw new MalformedRequestException('Insufficient wallet balance. Please Top up your wallet.');
+            }
+
+            $walletPaymentBillNumber = $this->generatesTransactionBillNumber->execute('PYMT-');
+
+            $transaction_object = new TransactionObject($walletPaymentBillNumber, TransactionType::PAYMENT, 1, $company_module->id, 1, PaymentMethodType::WALLET, $amount, $amount, 1, 1, 1, 0, 0, null, ApprovalStatus::APPROVED, [], '');
+            $transaction = $this->createsTransactionableTransaction->execute($wallet, $transaction_object);
+
+            $payment_reference = $walletPaymentBillNumber;
+
+            $this->updatesWalletBalance->execute($wallet, ($amount * -1));
+
+            $packingList = $invoice->owner;
+            $order = $packingList->owner;
+            $packingList->status = ApprovalStatus::APPROVED;
+            $packingList->save();
+
+            if(app()->environment('production')){
+                $this->updateDoFromVTPortalProcessor->execute($packingList);
+                $this->updateDoFromYDPortalProcessor->execute($packingList);
+            }
+
+            // later use this variabke to create a approved payment transaction
+            $approvalStatus = ApprovalStatus::APPROVED;
+
+            // update invoice to completed
+            $this->updatesTransactionStatus->execute($invoice, ApprovalStatus::COMPLETED);
+
+        }
+        else {
+            $payment_method = PaymentMethodType::CASH;
+        }
+
+        $object = new TransactionObject(
+            $billNumber,
+            TransactionType::PAYMENT,
+            $company_module->id,
+            1,
+            1,
+            $payment_method,
+            $amount,
+            $amount,
+            1,
+            1,
+            0,
+            0,
+            0,
+            null,
+            $approvalStatus,
+            null,
+            $payment_reference
+        );
+
+        $payment_transaction = $this->createsPaymentTransaction->execute($invoice, $object);
+
+        return $payment_transaction;
+    }
+}

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

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

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

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

app/Classes/Modules/Wallets/ControllersLogic/TopUpWalletLogic.php

@@ -2,21 +2,15 @@
 
 namespace App\Classes\Modules\Wallets\ControllersLogic;
 
-use App\Classes\Exceptions\MalformedRequestException;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
-use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
 use App\Classes\Modules\Companies\Services\FetchesCompanyModule;
 use App\Classes\Modules\Wallets\Services\CreatesWallet;
 use App\Classes\Modules\Wallets\Services\GeneratesWalletCode;
 use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
 use App\Classes\Modules\Billplzs\Services\CreatesBillplzBill;
 use App\Classes\Modules\Transactions\Services\CreatesTransactionableTransaction;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Classes\ValueObjects\Constants\PaymentMethodType;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\Modules\Wallets\Processors\CreateWalletTopUpTransactionProcessor;
 use App\Http\Resources\WalletTransactionResource;
-use App\Models\Wallet;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
@@ -52,6 +46,9 @@ class TopUpWalletLogic extends AbstractControllerLogic
     /** @var CreatesTransactionableTransaction */
     private $createsTransactionableTransaction;
 
+    /** @var CreateWalletTopUpTransactionProcessor */
+    private $createWalletTopUpTransactionProcessor;
+
 
     /**
      * TopUpWalletLogic constructor.
@@ -61,8 +58,9 @@ class TopUpWalletLogic extends AbstractControllerLogic
      * @param GeneratesTransactionBillNumber $generatesTransactionBillNumber
      * @param CreatesBillplzBill $createsBillplzBill
      * @param CreatesTransaction $createsTransaction
+     * @param CreateWalletTopUpTransactionProcessor $createWalletTopUpTransactionProcessor
      */
-    public function __construct(FetchesCompanyModule $fetchesCompanyModule, GeneratesWalletCode $generatesWalletCode, CreatesWallet $createsWallet, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CreatesBillplzBill $createsBillplzBill, CreatesTransactionableTransaction $createsTransactionableTransaction)
+    public function __construct(FetchesCompanyModule $fetchesCompanyModule, GeneratesWalletCode $generatesWalletCode, CreatesWallet $createsWallet, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CreatesBillplzBill $createsBillplzBill, CreatesTransactionableTransaction $createsTransactionableTransaction, CreateWalletTopUpTransactionProcessor $createWalletTopUpTransactionProcessor)
     {
         $this->fetchesCompanyModule = $fetchesCompanyModule;
         $this->generatesWalletCode = $generatesWalletCode;
@@ -70,6 +68,7 @@ class TopUpWalletLogic extends AbstractControllerLogic
         $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
         $this->createsBillplzBill = $createsBillplzBill;
         $this->createsTransactionableTransaction = $createsTransactionableTransaction;
+        $this->createWalletTopUpTransactionProcessor = $createWalletTopUpTransactionProcessor;
     }
 
     /**
@@ -82,27 +81,7 @@ class TopUpWalletLogic extends AbstractControllerLogic
         $amount = floatval(str_replace(',', '', $request->input('amount')));
         $companyModule = $this->fetchesCompanyModule->execute(['id' => $request->input('company_module_id')]);
 
-        /** @var Wallet $wallet */
-        $wallet = $companyModule->wallets()->first();
-
-        if (!$wallet) {
-            $object = new WalletObject($companyModule->id, 1, $this->generatesWalletCode->execute());
-            /** @var Wallet $wallet */
-            $wallet = $this->createsWallet->execute($object, $companyModule);
-        }
-
-        $user = $companyModule->employees()->first();
-        $billNumber = $this->generatesTransactionBillNumber->execute('TOPUP-');
-
-        if($amount < 0) {
-            throw new MalformedRequestException('Top up credit value must be greater than zero.');
-        }
-
-        $billPlzBill = $this->createsBillplzBill->execute($companyModule->name, $user->email, 'This payment is credit topup for company ref. ' . $companyModule->reference, $amount, $billNumber, $request->input('bank_code'), true);
-
-        $transaction_object = new TransactionObject($billNumber, TransactionType::TOP_UP, 1, $companyModule->id, 1, PaymentMethodType::PAYMENT_GATEWAY, $amount, $amount, 1, 1, 1, 0, 0, null, ApprovalStatus::PENDING_SUBMISSION, [], $billPlzBill->id);
-
-        $transaction = $this->createsTransactionableTransaction->execute($wallet, $transaction_object);
+        $transaction = $this->createWalletTopUpTransactionProcessor->execute($companyModule, $amount, $request->input('bank_code'));
 
         return $this->resourceResponse(new WalletTransactionResource($transaction));
     }

app/Classes/Modules/Wallets/Processors/CreateWalletTopUpTransactionProcessor.php

@@ -0,0 +1,91 @@
+<?php
+
+
+namespace App\Classes\Modules\Wallets\Processors;
+
+use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
+use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
+use App\Classes\Modules\Companies\Services\FetchesCompanyModule;
+use App\Classes\Modules\Wallets\Services\CreatesWallet;
+use App\Classes\Modules\Wallets\Services\GeneratesWalletCode;
+use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
+use App\Classes\Modules\Billplzs\Services\CreatesBillplzBill;
+use App\Classes\Modules\Transactions\Services\CreatesTransactionableTransaction;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Models\CompanyModule;
+use App\Models\Wallet;
+use PhpOffice\PhpSpreadsheet\Calculation\Logical\Boolean;
+
+class CreateWalletTopUpTransactionProcessor
+{
+    /** @var GeneratesWalletCode */
+    private $generatesWalletCode;
+
+    /** @var CreatesWallet  */
+    private $createsWallet;
+
+    /** @var GeneratesTransactionBillNumber  */
+    private $generatesTransactionBillNumber;
+
+    /** @var CreatesBillplzBill */
+    private $createsBillplzBill;
+
+    /** @var CreatesTransactionableTransaction */
+    private $createsTransactionableTransaction;
+
+    /**
+     * @param GeneratesWalletCode $generatesWalletCode
+     * @param CreatesWallet $createsWallet
+     * @param GeneratesTransactionBillNumber $generatesTransactionBillNumber
+     * @param CreatesBillplzBill $createsBillplzBill
+     * @param CreatesTransaction $createsTransaction
+     */
+    public function __construct(
+        GeneratesWalletCode $generatesWalletCode, 
+        CreatesWallet $createsWallet, 
+        GeneratesTransactionBillNumber $generatesTransactionBillNumber, 
+        CreatesBillplzBill $createsBillplzBill, 
+        CreatesTransactionableTransaction $createsTransactionableTransaction
+    ) 
+    {
+        $this->generatesWalletCode = $generatesWalletCode;
+        $this->createsWallet = $createsWallet;
+        $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
+        $this->createsBillplzBill = $createsBillplzBill;
+        $this->createsTransactionableTransaction = $createsTransactionableTransaction;
+    }
+
+    /**
+     * @throws MalformedRequestException
+     */
+    public function execute(CompanyModule $companyModule, $amount, $bank_code, ?bool $groupTransaction = false)
+    {
+        /** @var Wallet $wallet */
+        $wallet = $companyModule->wallets()->first();
+
+        if (!$wallet) {
+            $object = new WalletObject($companyModule->id, 1, $this->generatesWalletCode->execute());
+            /** @var Wallet $wallet */
+            $wallet = $this->createsWallet->execute($object, $companyModule);
+        }
+
+        $user = $companyModule->employees()->first();
+        $billNumber = $this->generatesTransactionBillNumber->execute('TOPUP-');
+
+        if($amount < 0) {
+            throw new MalformedRequestException('Top up credit value must be greater than zero.');
+        }
+
+        $billPlzBill = $this->createsBillplzBill->execute($companyModule->name, $user->email, 'This payment is credit topup for company ref. ' . $companyModule->reference, $amount, $billNumber, $bank_code, true);
+
+        // IF $groupTransaction, transaction type is GROUP_PAYMENT
+        $transaction_object = new TransactionObject($billNumber, $groupTransaction? TransactionType::GROUP_PAYMENT: TransactionType::TOP_UP, 1, $companyModule->id, 1, PaymentMethodType::PAYMENT_GATEWAY, $amount, $amount, 1, 1, 1, 0, 0, null, ApprovalStatus::PENDING_SUBMISSION, [], $billPlzBill->id);
+
+        $transaction = $this->createsTransactionableTransaction->execute($wallet, $transaction_object);
+
+        return $transaction;
+    }
+}

app/Classes/Notifications/InvoiceIssuedEmail.php

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

app/Classes/Notifications/ShipmentDepartureEmail.php

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

app/Classes/ValueObjects/Constants/QAType.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Classes\ValueObjects\Constants;
+
+final class QAType {
+
+    public const DEFAULT = 0;
+
+    public const MULTIPLE_CHOICES = 1;
+
+    public const FREE_TEXT = 2;
+
+    public const DOCUMENT_UPLOAD = 3;
+
+    public const ANSWER = 4;
+
+    public const TICKET_CRM = 5;
+}

app/Classes/ValueObjects/Constants/TransactionType.php

@@ -4,15 +4,12 @@ namespace App\Classes\ValueObjects\Constants;
 
 final class TransactionType {
 
+    // public const PAYMENT_ATTEMPT = 0;
+    
     public const SHIPPING_INVOICE = 1;
     
     public const PAYMENT = 2;
 
-    // public const PAYMENT_ATTEMPT = 0;
-
-
-    // public const INVOICE = 2;
-
     // public const BILL = 3;
 
     // public const PERFORMA = 4;
@@ -36,6 +33,9 @@ final class TransactionType {
     public const CASH_BACK = 13;
 
     // public const SHIPPING_COST = 14;
+
+    public const GROUP_PAYMENT = 15;
+    
     public const TRANSACTION_TYPE_ID = [
         self::SHIPPING_INVOICE   => "Shipping Invoice",
         self::PAYMENT            => "Payment",

app/Console/Commands/FixBillplzFailedCallbackPayment.php

@@ -77,7 +77,6 @@ class FixBillplzFailedCallbackPayment extends Command
     {
         ini_set('memory_limit', '-1'); 
 
-        $this->info(Carbon::now() . ' : Fix failled callback from billplz cron started.');
         $this->outputArray = []; 
         $start   = new Carbon();
 
@@ -85,6 +84,11 @@ class FixBillplzFailedCallbackPayment extends Command
 
         $transactions = Transaction::where('type', TransactionType::PAYMENT)->where('payment_method', PaymentMethodType::PAYMENT_GATEWAY)->whereNotIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->get();
         $totalTransactions = count($transactions);
+
+        if ($totalTransactions) {
+            $this->info(Carbon::now() . ' : Fix failled callback from billplz cron started.');
+        }
+
         $counter = 1;
         $totalAmount = 0;
         foreach ($transactions as $transaction){
@@ -180,6 +184,9 @@ class FixBillplzFailedCallbackPayment extends Command
         $end = new Carbon();
         $elapsedTime = $start->diff($end)->format('%H:%I:%S');
 
-        $this->info(Carbon::now() . ' : Done Billplz Failled Callback. ElapsedTime: ' . $elapsedTime . '. Total: ' . $totalAmount);
+        if ($totalTransactions) {
+            $this->info(Carbon::now() . ' : Done Billplz Failled Callback. ElapsedTime: ' . $elapsedTime . '. Total: ' . $totalAmount);
+        }
+
     }
 }

app/Console/Kernel.php

@@ -56,7 +56,7 @@ class Kernel extends ConsoleKernel
         $schedule->command('billplz-failed-callback:fix')
             ->dailyAt('00:00')
             ->withoutOverlapping()
-            ->appendOutputTo (storage_path().'/logs/dix_failed_callback_from_billplz.log');
+            ->appendOutputTo (storage_path().'/logs/fix_failed_callback_from_billplz.log');
     }
 
     /**

app/Http/Controllers/HelpMenu/FetchHelpMenuQuestionController.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\HelpMenu;
+
+use App\Classes\Modules\HelpMenu\ControllersLogic\FetchHelpMenuQuestionLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class FetchHelpMenuQuestionController
+{
+    /**
+     * @param Request $request
+     * @param FetchHelpMenuQuestionLogic $logic
+     * @return JsonResponse
+     */
+    public function fetch(Request $request, FetchHelpMenuQuestionLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}

app/Http/Controllers/HelpMenu/UpdateHelpMenuNextQuestionController.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Http\Controllers\HelpMenu;
+
+use App\Classes\Modules\HelpMenu\ControllersLogic\UpdateHelpMenuNextQuestionLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateHelpMenuNextQuestionController
+{
+    /**
+     * @param Request $request
+     * @param FetchQAQuestionListLogic $logic
+     * @return JsonResponse
+     */
+    public function fetch(Request $request, UpdateHelpMenuNextQuestionLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+}

app/Http/Controllers/Reports/MonthlyReportController.php

@@ -55,21 +55,31 @@ class MonthlyReportController
         $from = $request->route('from') ? Carbon::parse($request->route('from')) : Carbon::now()->startOfMonth();
         $to = $request->route('to') ? Carbon::parse($request->route('to')) : Carbon::now()->endOfMonth();
 
-        $receivedCbm = Package::warehouseReceiveList()->whereHas('deliveryTransports', function ($transport) use ($from, $to) {
-            return $transport->whereBetween('drop_date', [$from, $to]);
-        })->get()->sum(function($package){
-            return (( (float) $package->width / 100) * ( (float) $package->length / 100) * ( (float) $package->height / 100)) * $package->quantity;
-        });
+        /*       $receivedCbm = Package::warehouseReceiveList()->whereHas('deliveryTransports', function ($transport) use ($from, $to) {
+                   return $transport->whereBetween('drop_date', [$from, $to]);
+               })->get()->sum(function($package){
+               });*/
+
+
+        $receivedCbm = Package::with('deliveryTransports')
+            ->warehouseReceiveList()
+            ->whereHas('deliveryTransports', function ($transport) use ($from, $to) {
+                return $transport->whereBetween('drop_date', [$from, $to]);
+            })
+            ->get()
+            ->sum(function ($package) {
+                return (((float)$package->width / 100) * ((float)$package->length / 100) * ((float)$package->height / 100)) * $package->quantity;
+            });
 
         $containers = Container::whereBetween('loading_date', [$from, $to])->orderBy('loading_date')->get();
 
         $customers = $containers->flatMap(function ($container) {
             return $container->companyModules;
-        })->unique();
+        })->unique()->count();
 
         $orders = $containers->flatMap(function ($container) {
             return $container->orders;
-        })->unique();
+        })->unique()->count();
 
         $packages = $this->getPackages($from, $to);
 
@@ -84,12 +94,12 @@ class MonthlyReportController
              return $packingList->packages;
          });*/
 
-        $totalCbm = $packages->sum(function($package){
-            return (( (float) $package->width / 100) * ( (float) $package->length / 100) * ( (float) $package->height / 100)) * $package->quantity;
+        $totalCbm = $packages->sum(function ($package) {
+            return (((float)$package->width / 100) * ((float)$package->length / 100) * ((float)$package->height / 100)) * $package->quantity;
         });
 
         $newCustomers = CompanyModule::where('type', BusinessType::IMPORTER)->whereBetween('created_at', [$from, $to])->count();
-        $newConvertedCustomers = CompanyModule::where('type', BusinessType::IMPORTER)->whereBetween('created_at', [$from, $to])->whereHas('orders', function($order){
+        $newConvertedCustomers = CompanyModule::where('type', BusinessType::IMPORTER)->whereBetween('created_at', [$from, $to])->whereHas('orders', function ($order) {
             return $order->whereHas('packingLists');
         })->count();
 
@@ -104,8 +114,8 @@ class MonthlyReportController
             '',
             HttpStatus::OK_WITH_MESSAGE, ['data' => [
                 'containers' => count($containers),
-                'activated_orders' => count($orders),
-                'active_customers' => count($customers),
+                'activated_orders' => $orders,
+                'active_customers' => $customers,
                 'new_customers' => $newCustomers,
                 'new_converted_customers' => $newConvertedCustomers,
                 'total_customers' => CompanyModule::where('type', BusinessType::IMPORTER)->count(),
@@ -117,11 +127,12 @@ class MonthlyReportController
             ]]))->handler();
     }
 
-    public function profitModelReport(Request $request): JsonResponse {
+    public function profitModelReport(Request $request): JsonResponse
+    {
         $from = $request->route('from') ? Carbon::parse($request->route('from')) : Carbon::now()->startOfMonth();
         $to = $request->route('to') ? Carbon::parse($request->route('to')) : Carbon::now()->endOfMonth();
-        $model = (int) $request->route('model');
-        $value = (float) $request->route('value');
+        $model = (int)$request->route('model');
+        $value = (float)$request->route('value');
 
         $packages = $this->getPackages($from, $to);
 
@@ -136,26 +147,26 @@ class MonthlyReportController
              return $packingList->packages;
          });*/
 
-        $totalCbm = $packages->sum(function($package){
-            return (( (float) $package->width / 100) * ( (float) $package->length / 100) * ( (float) $package->height / 100)) * $package->quantity;
+        $totalCbm = $packages->sum(function ($package) {
+            return (((float)$package->width / 100) * ((float)$package->length / 100) * ((float)$package->height / 100)) * $package->quantity;
         });
 
-        $projectedCbm = $packages->sum(function($package) use ($value, $model) {
+        $projectedCbm = $packages->sum(function ($package) use ($value, $model) {
 
-            if($model === 2){
-                return (( (float) ($package->width + ($package->width * ($value/100))) / 100) * ( (float) ($package->length + ($package->length * ($value/100))) / 100) * ( (float) ($package->height + ($package->height * ($value/100))) / 100)) * $package->quantity;
+            if ($model === 2) {
+                return (((float)($package->width + ($package->width * ($value / 100))) / 100) * ((float)($package->length + ($package->length * ($value / 100))) / 100) * ((float)($package->height + ($package->height * ($value / 100))) / 100)) * $package->quantity;
             }
 
-            if($model === 3){
-                return ((( (float) $package->width / 100) * ( (float) $package->length / 100) * ( (float) $package->height / 100)) + $value) * $package->quantity;
+            if ($model === 3) {
+                return ((((float)$package->width / 100) * ((float)$package->length / 100) * ((float)$package->height / 100)) + $value) * $package->quantity;
             }
 
-            if($model === 4){
-                $packageCbm = (( (float) $package->width / 100) * ( (float) $package->length / 100) * ( (float) $package->height / 100));
-                return ( $packageCbm + ($packageCbm * ($value/100))) * $package->quantity;
+            if ($model === 4) {
+                $packageCbm = (((float)$package->width / 100) * ((float)$package->length / 100) * ((float)$package->height / 100));
+                return ($packageCbm + ($packageCbm * ($value / 100))) * $package->quantity;
             }
 
-            return (( (float) ($package->width + $value) / 100) * ( (float) ($package->length + $value) / 100) * ( (float) ($package->height + $value) / 100)) * $package->quantity;
+            return (((float)($package->width + $value) / 100) * ((float)($package->length + $value) / 100) * ((float)($package->height + $value) / 100)) * $package->quantity;
 
         });
 
@@ -167,7 +178,8 @@ class MonthlyReportController
             ]]))->handler();
     }
 
-    public function customerReport(Request $request): JsonResponse {
+    public function customerReport(Request $request): JsonResponse
+    {
 
         $connection = CompanyConnection::where('invitee_reference', $request->route('marking'))->firstOrFail();
         $id = $connection->invitee->id;
@@ -190,7 +202,7 @@ class MonthlyReportController
 
         $packages = $this->getPackages($from, $to);
 
-        $packages = $packages->filter(function($package) use ($id) {
+        $packages = $packages->filter(function ($package) use ($id) {
             return $package->companyModule->id === $id;
         });
 
@@ -198,8 +210,8 @@ class MonthlyReportController
             return $package->order;
         });
 
-        $totalCbm = $packages->sum(function($package){
-            return (( (float) $package->width / 100) * ( (float) $package->length / 100) * ( (float) $package->height / 100)) * $package->quantity;
+        $totalCbm = $packages->sum(function ($package) {
+            return (((float)$package->width / 100) * ((float)$package->length / 100) * ((float)$package->height / 100)) * $package->quantity;
         });
 
         return (new ApiResponseObject('fetch monthly report Successful',
@@ -211,32 +223,72 @@ class MonthlyReportController
             ]]))->handler();
     }
 
-    public function serviceReport(Request $request): JsonResponse {
+    public function serviceReport(Request $request): JsonResponse
+    {
 
         return (new ApiResponseObject('fetch service report Successful',
             '',
             HttpStatus::OK_WITH_MESSAGE, ['data' => [
-                'received' => (float) Package::warehouseReceiveList()->sum('quantity'),
-                'pending_shipment' => (float) Package::shippingList()->whereDoesntHave('shippingSchedules', function($schedule){
-                    return $schedule->dispatched()->whereIn('schedules.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
-                })->sum('quantity'),
-                'in_transit' => (float) Package::shippingList()->Shipping()->whereHas('shippingSchedules', function($schedule){
-                    return $schedule->dispatched()->whereIn('schedules.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
-                })->whereDoesntHave('container', function($container){
-                    return $container->where('containers.status', ApprovalStatus::COMPLETED);
-                })->sum('quantity'),
-                'pending_delivery' => (float) Package::shippingList()->whereHas('container', function($container){
-                    return $container->where('containers.status', ApprovalStatus::COMPLETED);
-                })->whereDoesntHave('deliverySchedules', function($schedule){
-                    return $schedule->dispatched()->whereIn('schedules.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
-                })->sum('quantity'),
-                'delivered' => (float) Package::shippingList()->whereHas('deliverySchedules', function($schedule){
-                    return $schedule->dispatched()->whereIn('schedules.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
-                })->sum('quantity'),
+                'received' => (float)Package::warehouseReceiveList()->sum('quantity'),
+
+                /*       'pending_shipment' => (float)Package::shippingList()->whereDoesntHave('shippingSchedules', function ($schedule) {
+                           return $schedule->dispatched()->whereIn('schedules.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
+                       })->sum('quantity'),
+
+                    'in_transit' => (float) Package::shippingList()->Shipping()->whereHas('shippingSchedules', function($schedule){
+                         return $schedule->dispatched()->whereIn('schedules.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
+                     })->whereDoesntHave('container', function($container){
+                         return $container->where('containers.status', ApprovalStatus::COMPLETED);
+                     })->sum('quantity'),
+                     'pending_delivery' => (float) Package::shippingList()->whereHas('container', function($container){
+                         return $container->where('containers.status', ApprovalStatus::COMPLETED);
+                     })->whereDoesntHave('deliverySchedules', function($schedule){
+                         return $schedule->dispatched()->whereIn('schedules.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
+                     })->sum('quantity'),
+                     'delivered' => (float) Package::shippingList()->whereHas('deliverySchedules', function($schedule){
+                         return $schedule->dispatched()->whereIn('schedules.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
+                     })->sum('quantity'),*/
+
+                'pending_shipment' => (float)Package::shippingList()
+                    ->whereDoesntHave('shippingSchedules', function ($schedule) {
+                        $statuses = [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED];
+                        $schedule->dispatched()->whereIn('schedules.status', $statuses);
+                    })
+                    ->sum('quantity'),
+
+                'in_transit' => (float)Package::shippingList()
+                    ->whereHas('shippingSchedules', function ($schedule) {
+                        $statuses = [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED];
+                        $schedule->dispatched()->whereIn('schedules.status', $statuses);
+                    })
+                    ->whereDoesntHave('container', function ($container) {
+                        $container->where('containers.status', ApprovalStatus::COMPLETED);
+                    })
+                    ->sum('quantity'),
+
+                'pending_delivery' => (float)Package::shippingList()
+                    ->whereHas('container', function ($container) {
+                        $container->where('containers.status', ApprovalStatus::COMPLETED);
+                    })
+                    ->whereDoesntHave('deliverySchedules', function ($schedule) {
+                        $statuses = [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED];
+                        $schedule->dispatched()->whereIn('schedules.status', $statuses);
+                    })
+                    ->sum('quantity'),
+
+                'delivered' => (float)Package::shippingList()
+                    ->whereHas('deliverySchedules', function ($schedule) {
+                        $statuses = [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED];
+                        $schedule->dispatched()->whereIn('schedules.status', $statuses);
+                    })
+                    ->sum('quantity')
+
+
             ]]))->handler();
     }
 
-    public function customerActivityReport(Request $request): JsonResponse {
+    public function customerActivityReport(Request $request): JsonResponse
+    {
 
         $active_start = $request->input('active_start');
         $active_end = $request->input('active_end');
@@ -255,36 +307,87 @@ class MonthlyReportController
                return $query->where('packing_lists.type', PackingListType::WAREHOUSE_RECEIVE_LIST)->whereHas('transports', function ($query) use ($active_start, $active_end) {
                    return $query->whereDate('drop_date', '>=', Carbon::parse($active_start))->whereDate('drop_date', '<=', Carbon::parse($active_end)->addDay());
                });
-           })->whereNotIn('id', $activeCompanies)->get();*/
+           })->whereNotIn('id', $activeCompanies)->get();
 
         $companies = getActiveCompanies($inactive_start, $inactive_end, $active_start, $active_end);
 
         $customerActivityData = [];
         $counter = 1;
 
-        foreach ($companies as $key => $company){
+        foreach ($companies as $key => $company) {
             $connection = $company->inviters()->withPivot('invitee_reference')->first();
-            $marking = $connection ? $connection->pivot->invitee_reference:'';
-            $packingList = $company->orderPackingLists()->where('packing_lists.type', \App\Classes\ValueObjects\Constants\PackingListType::SHIPPING_PACKING_LIST)->get();
+            $marking = $connection ? $connection->pivot->invitee_reference : '';
+            $packingList = $company->orderPackingLists()->where('packing_lists.type', PackingListType::SHIPPING_PACKING_LIST)->get();
             $totalCbm = $packingList->flatMap(function ($packingList) {
                 return $packingList->packages;
-            })->sum(function($package){
-                return (( (float) $package->width / 100) * ( (float) $package->length / 100) * ( (float) $package->height / 100)) * $package->quantity;
+            })->sum(function ($package) {
+                return (((float)$package->width / 100) * ((float)$package->length / 100) * ((float)$package->height / 100)) * $package->quantity;
             });
 
-            if ($minCbm != 'null' && $totalCbm < $minCbm) { continue; }
+            if ($minCbm != 'null' && $totalCbm < $minCbm) {
+                continue;
+            }
 
-            if ($minOrders != 'null' && $packingList->count() < $minOrders) { continue; }
+            if ($minOrders != 'null' && $packingList->count() < $minOrders) {
+                continue;
+            }
 
             array_push($customerActivityData, array(
                 'key' => $counter,
                 'marking' => $marking,
-                'packingListCount'=> $packingList->count(),
-                'totalCbm'=> $totalCbm,
+                'packingListCount' => $packingList->count(),
+                'totalCbm' => $totalCbm,
             ));
-            $counter ++;
+            $counter++;
         }
 
+        */
+
+        $companies = getActiveCompanies($inactive_start, $inactive_end, $active_start, $active_end);
+
+        $customerActivityData = [];
+
+        $packingListType = PackingListType::SHIPPING_PACKING_LIST;
+
+        $companies->load([
+            'inviters' => function ($query) {
+                $query->withPivot('invitee_reference')->first();
+            },
+            'orderPackingLists' => function ($query) use ($packingListType) {
+                $query->where('packing_lists.type', $packingListType)->with('packages');
+            },
+        ]);
+
+        $counter = 1;
+
+        foreach ($companies as $company) {
+            $connection = $company->inviters->first();
+            $marking = $connection ? $connection->pivot->invitee_reference : '';
+            $packingList = $company->orderPackingLists;
+
+            $totalCbm = $packingList->flatMap->packages->sum(function ($package) {
+                return (((float)$package->width / 100) * ((float)$package->length / 100) * ((float)$package->height / 100)) * $package->quantity;
+            });
+
+            if ($minCbm !== null && $totalCbm < $minCbm) {
+                continue;
+            }
+
+            if ($minOrders !== null && $packingList->count() < $minOrders) {
+                continue;
+            }
+
+            $customerActivityData[] = [
+                'key' => $counter,
+                'marking' => $marking,
+                'packingListCount' => $packingList->count(),
+                'totalCbm' => $totalCbm,
+            ];
+
+            $counter++;
+        }
+
+
         return (new ApiResponseObject('fetch service report Successful',
             '',
             HttpStatus::OK_WITH_MESSAGE, ['data' => [

app/Http/Controllers/Transactions/ListMappableTransactionsController.php

@@ -0,0 +1,20 @@
+<?php
+
+
+namespace App\Http\Controllers\Transactions;
+
+use App\Classes\Modules\Transactions\ControllersLogic\ListMappableTransactionsLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+
+class ListMappableTransactionsController
+{
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     */
+    public function list(Request $request, ListMappableTransactionsLogic $logic) : JsonResponse {
+        return $logic->execute($request);
+    }
+}

app/Http/Resources/GroupResource.php

@@ -3,12 +3,8 @@
 namespace App\Http\Resources;
 
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\DocumentType;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Models\Booking;
-use App\Models\Transaction;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
 use Carbon\Carbon;
-use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 class GroupResource extends JsonResource
@@ -22,9 +18,8 @@ class GroupResource extends JsonResource
     public function toArray($request)
     {
 
-        if(!$this->issuerCompany){
-            dd($this->id);
-        }
+        // dd($this->groupTransactions);
+
         return [
             'id' => $this->id,
             'original_amount' => (float) $this->original_amount,
@@ -36,18 +31,12 @@ class GroupResource extends JsonResource
             'currency' => new CurrencyResource($this->currency),
             'created_at' => Carbon::parse($this->created_at)->format('d-m-Y h:i:s A'),
             'currency_rate' => (float) $this->currency_rate,
-            'transactions' => $this->transactions()->get()->pluck('owner.owner.marking'),
-            'complete_transactions' => $this->transactions()->whereHasMorph('owner', [Transaction::class], function($query){
-                return $query->whereHas('booking', function($query){
-                    return $query->whereHas('transactions', function($query){
-                        return $query->where('type', TransactionType::PURCHASE_ORDER)->where('status', '=', ApprovalStatus::APPROVED);
-                    });
-                });
-            })->get()->pluck('owner.owner.marking'),
-            'documents' => [
-                'currency_order' => new DocumentResource($this->documents()->where('document_type', DocumentType::CURRENCY_VENDOR_ORDER)->first()),
-                'purchase_order' => new DocumentResource($this->documents()->where('document_type', DocumentType::BULK_PURCHASE_ORDER)->first())
-            ]
+            'status' => $this->status,
+            'status_name' => ApprovalStatus::APPROVAL_STATUS_ID[$this->status],
+            'payment_method' => $this->payment_method,
+            'payment_method_name' => ucwords(PaymentMethodType::PAYMENT_METHODS_ID[$this->payment_method]),
+            'invoices' => GroupTransactionResource::collection($this->groupTransactions),
+            'reference' => $this->reference,
         ];
     }
 }

app/Http/Resources/GroupTransactionResource.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Http\Resources;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\DocumentType;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Models\Order;
+use App\Models\Transaction;
+use Carbon\Carbon;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class GroupTransactionResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        return new TransactionResource($this->transaction);
+    }
+}

app/Http/Resources/HelpMenuAnswerOptionsResource.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class HelpMenuAnswerOptionsResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        return [
+            'id' => $this->id,
+            'display_text' => $this->display_text,
+            'value' => $this->value,
+            'order' => $this->order,
+            'question_number' => $this->question_number,
+            'next_question_number' => $this->next_question_number,
+        ];
+    }
+}

app/Http/Resources/HelpMenuQuestionResource.php

@@ -0,0 +1,53 @@
+<?php
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+use App\Models\QAQuestions;
+use App\Models\QAAnswerOptions;
+use App\Models\QAUserAnswerSelected;
+
+class HelpMenuQuestionResource extends JsonResource
+{
+    /** @var integer */
+    private $userId;
+
+    /** @var QAQuestions*/
+    private $question;
+
+    public function __construct($question, $userId) {
+        $this->question = $question;
+        $this->userId = $userId;
+    }
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        if($this->question){
+            $q = (object)$this->question;
+            return [
+                'id' => $q->id,
+                'question_number' => $q->question_number,
+                'question_text' => $q->question_text,
+                'question_type' => $q->question_type,
+                'question_answers' => HelpMenuAnswerOptionsResource::collection(QAAnswerOptions::where('question_number', $q->question_number)->get()),
+                'questionnaire_set_id' => $q->questionnaire_set_id,
+                'next_nested_question' => $q->next_nested_question,
+                'next_main_question' => $q->next_main_question,
+                'is_start' => $q->is_start,
+                'is_end' => $q->is_end,
+                'end_text' => $q->end_text,
+                'order' => $q->order,
+                'answer' => QAUserAnswerSelected::where('question_id', $q->id)->where('user_id', $this->userId)->first(),
+                'questionnaire_answers' => $q->is_end ? HelpMenuQuestionnaireAnswersResource::collection(QAUserAnswerSelected::where('user_id', $this->userId)->get()) : null,
+            ];
+        }
+        else{
+            return [];
+        }
+    }
+}

app/Http/Resources/HelpMenuQuestionnaireAnswersResource.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+use App\Models\QAQuestions;
+
+class HelpMenuQuestionnaireAnswersResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        $question = QAQuestions::where('id', $this->question_id)->first();
+        return [
+            'question_text' => $question ? $question->question_text : null,
+            'free_text_answer' => $this->free_text_answer
+        ];
+    }
+}

app/Http/Resources/MappableTransactionResource.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Http\Resources;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\DocumentType;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Models\Order;
+use App\Models\Transaction;
+use App\Models\Wallet;
+use Carbon\Carbon;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class MappableTransactionResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        $reference = null;
+        if($this->type === TransactionType::TOP_UP) {
+            $reference = $this->owner->owner->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
+        }
+
+        if($this->type === TransactionType::PAYMENT && $this->owner !== Wallet::class){
+            $reference = $this->owner->owner->owner->reference;
+        }
+
+        return [
+            'system' => 'SHIPPING_PORTAL',
+            'type' => $this->type,
+            'owner_type' => $this->owner_type,
+            'owner_id'=> $this->id,
+            'owner_reference'=> $reference,
+        ];
+    }
+}

app/Http/Resources/OrderResource.php

@@ -5,7 +5,9 @@ namespace App\Http\Resources;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\OrderRoleTypes;
 use App\Classes\ValueObjects\Constants\PackingListType;
+use App\Classes\ValueObjects\Constants\TransactionType;
 use App\Classes\ValueObjects\Constants\TransportType;
+use App\Models\Transaction;
 use Carbon\Carbon;
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -19,6 +21,8 @@ class OrderResource extends JsonResource
      */
     public function toArray($request)
     {
+        $orderId = $this->id;
+
         return [
             'id' => $this->id,
             'reference' => $this->reference,
@@ -46,8 +50,8 @@ class OrderResource extends JsonResource
                     'received_packages' => PackingListResource::collection($this->packingLists()->where('type', PackingListType::WAREHOUSE_RECEIVE_LIST)->whereHas('packages')->get()),
                 ];
             }),
-            'invoices' => $this->whenLoaded('packingLists', function() {
-                return TransactionResource::collection($this->transactions()->whereNotIn('transactions.status', [0, 1])->get());
+            'invoices' => $this->whenLoaded('packingLists', function() use ($orderId) {
+                return TransactionResource::collection($this->transactions()->whereNotIn('transactions.status', [0, 1])->where('transactions.type', TransactionType::SHIPPING_INVOICE)->get());
             }),
             'remarks' => RemarkResource::collection($this->remarks),
             'created_at' => $this->created_at->format('d-m-Y')

app/Http/Resources/OrderV2Resource.php

@@ -5,6 +5,7 @@ namespace App\Http\Resources;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\OrderRoleTypes;
 use App\Classes\ValueObjects\Constants\PackingListType;
+use App\Classes\ValueObjects\Constants\TransactionType;
 use App\Classes\ValueObjects\Constants\TransportType;
 use Carbon\Carbon;
 use Illuminate\Http\Resources\Json\JsonResource;
@@ -30,7 +31,7 @@ class OrderV2Resource extends JsonResource
             'address' => new AddressResource($this->addresses()->where('status', '=', ApprovalStatus::APPROVED)->first()),
             'address_change_request' => new AddressResource($this->addressesPendingVerification()->first()),
             'invoices' => $this->whenLoaded('packingLists', function() {
-                return TransactionResource::collection($this->transactions()->whereNotIn('transactions.status', [0, 1])->get());
+                return TransactionResource::collection($this->transactions()->whereNotIn('transactions.status', [0, 1])->where('transactions.type', TransactionType::SHIPPING_INVOICE)->get());
             }),
             'remarks' => RemarkResource::collection($this->remarks),
             'created_at' => $this->created_at->format('d-m-Y')

app/Http/Resources/TransactionResource.php

@@ -22,6 +22,7 @@ class TransactionResource extends JsonResource
     {
         return [
             'id' => $this->id,
+            'owner_type' => $this->owner_type,
             'order' => ($this->owner instanceof Transaction) ? new OrderResource($this->owner->owner->owner) : new OrderResource($this->owner->owner),
             'documents' => DocumentResource::collection($this->documents),
             'type' => (int) $this->type,

app/Library/DefaultFractalSerializer.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Library;
+
+use Spatie\Fractalistic\ArraySerializer;
+
+class DefaultFractalSerializer extends ArraySerializer
+{
+      /**
+     * @param $resourceKey
+     * @param array $data
+     * @return array
+     */
+    public function collection($resourceKey, array $data):array
+    {
+        if ($resourceKey) {
+            return $resourceKey == 'include' ? $data : [$resourceKey => $data];
+        }
+        return $data;
+    }
+
+    /**
+     * @param $resourceKey
+     * @param array $data
+     * @return array
+     */
+    public function item($resourceKey, array $data):array
+    {
+        if ($resourceKey) {
+            return $resourceKey == 'include' ? $data : [$resourceKey => $data];
+        }
+        return $data;
+    }
+
+}

app/Library/helper.php

@@ -47,3 +47,38 @@ if (!function_exists('getPackingList')) {
     }
 }
 
+
+/**
+ *
+ * Get Packing List
+ * TODO change all packing related query to this
+ * @param Company $company
+ * @return mixed
+ */
+
+if (!function_exists('format_number')) {
+    function format_number($number): string
+    {
+        if ($number == 0) {
+            return $number;
+        } elseif (is_float($number)) {
+            return number_format($number, 2);
+        } else {
+            return number_format($number);
+        }
+    }
+}
+
+  /**
+   * check if a customer have confirmed orders
+     * @param Company $company
+     * @return bool
+     */
+if (!function_exists('checkIfHasConfirmedOrders'))
+{
+    function checkIfHasConfirmedOrders(Company $company): bool
+    {
+        return $company->hasConfirmedOrder();
+    }
+}
+

app/Models/Company.php

@@ -111,12 +111,32 @@ class Company extends AbstractModel implements Documentable, Contactable
         $orders = [];
 
         $this->CompanyModules->each(function ($companyModule) {
-                $orders[] = $companyModule->orders->sortByDesc('id');
-            });
+            $orders[] = $companyModule->orders->sortByDesc('id');
+        });
 
         return collect($orders);
     }
 
+    /**
+     * Has Confirmed orders
+     * @return bool
+     */
+    public function hasConfirmedOrder(): bool
+    {
+        $importerModule = $this->companyModules()->where('type', BusinessType::IMPORTER)->first();
+
+        if (!$importerModule) {
+            return false; // Return false if no relation  found
+        }
+
+        $hasConfirmedOrder = $importerModule->orders()
+            ->where('status', '!=', 0)
+            ->exists();
+
+        return (bool)$hasConfirmedOrder;
+
+    }
+
 
     /**
      * @return MorphMany

app/Models/Document.php

@@ -23,7 +23,7 @@ use Spatie\Activitylog\Models\Activity;
  * @property int document_type
  * @property string reference
  * @property int status
- * @property \App\Models\User approver
+ * @property User approver
  * @property timestamp issued_date
  * @property timestamp expired_date
  * @property timestamp approved_date
@@ -70,7 +70,7 @@ class Document extends AbstractModel
     protected $dates = ['deleted_at'];
 
     /**
-     * @return \Illuminate\Database\Eloquent\Relations\MorphTo
+     * @return MorphTo
      */
     public function owner(): morphTo
     {

app/Models/Group.php

@@ -14,6 +14,8 @@ use Staudenmeir\EloquentHasManyDeep\HasManyDeep;
 use Staudenmeir\EloquentHasManyDeep\HasRelationships;
 use App\Classes\General\Interfaces\Transactionable;
 use Staudenmeir\EloquentHasManyDeep\HasTableAlias;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\SoftDeletes;
 
 
 /**
@@ -37,22 +39,23 @@ class Group extends Model implements Documentable, Transactionable
     use HasRelationships;
     use HasTableAlias;
 
-	
-    // /**
-    //  * @return MorphMany
-    //  */
-    // public function transactions(): MorphMany
-    // {
-    //     return $this->belongsToMany(Transaction::class, GroupTransaction::class);
-    //     return $this->MorphMany(Transaction::class, 'owner');
-    // }
+    use \Staudenmeir\EloquentHasManyDeep\HasTableAlias;
+    use SoftDeletes;
 
     /**
      * @return MorphMany
      */
     public function transactions(): MorphMany
     {
-        return $this->MorphMany(Transaction::class, 'owner');
+        return $this->MorphMany(GroupTransaction::class, 'group');
+    }
+
+    /**
+     * @return HasMany
+     */
+    public function groupTransactions(): HasMany
+    {
+        return $this->hasMany(GroupTransaction::class);
     }
 
     /**

app/Models/QAAnswerOptions.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace App\Models;
+
+
+class QAAnswerOptions extends AbstractModel
+{
+	protected $table = 'qa_answer_options';
+}

app/Models/QAQuestionnaireSet.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Relations\HasMany;
+
+class QAQuestionnaireSet extends AbstractModel
+{
+	protected $table = 'qa_questionnaire_sets';
+}

app/Models/QAQuestions.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace App\Models;
+
+
+class QAQuestions extends AbstractModel
+{
+	protected $table = 'qa_questions';
+}

app/Models/QAUserAnswerSelected.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Models;
+
+use App\Classes\General\Interfaces\Documentable;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\MorphMany;
+
+/**
+ * Class Contact
+ * @package App\Models
+ */
+class QAUserAnswerSelected extends AbstractModel implements Documentable
+{
+	protected $table = 'qa_user_answer_selected';
+
+    /**
+     * @return MorphMany
+     */
+    public function documents(): morphMany
+    {
+        return $this->morphMany(Document::class, 'owner');
+    }
+}

app/Models/Transaction.php

@@ -14,6 +14,7 @@ use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
@@ -102,6 +103,10 @@ class Transaction extends AbstractModel implements Documentable, Transactionable
     use SoftDeletes;
     use LogData;
 
+    protected $casts = [
+        'type' => 'int'
+    ];
+
     protected $table = 'transactions';
 
     public function owner(): morphTo
@@ -157,6 +162,14 @@ class Transaction extends AbstractModel implements Documentable, Transactionable
         return $this->HasMany(TransactionDetail::class, 'transaction_id', 'id');
     }
 
+    /**
+     * @return BelongsToMany
+     */
+    public function groups(): BelongsToMany
+    {
+        return $this->BelongsToMany(Group::class, GroupTransaction::class, 'transaction_id');
+    }
+
     public function convert_original_amount()
     {
         if($this->booking()->first()->fix_currency_id !== 1) {

app/Transformers/AddressTransformer.php

@@ -18,9 +18,9 @@ class AddressTransformer extends TransformerAbstract
      *
      * @var array
      */
-    protected $defaultIncludes = [
-        'contact',
-        'remark'
+    protected array $defaultIncludes = [
+
+
     ];
 
     /**
@@ -28,9 +28,11 @@ class AddressTransformer extends TransformerAbstract
      *
      * @var array
      */
-    protected $availableIncludes = [
+    protected array $availableIncludes = [
         'company_module',
         'Owner_address',
+        'remark',
+        'contact',
 
     ];
 

app/Transformers/CompanyModuleTransformer.php

@@ -18,20 +18,21 @@ class CompanyModuleTransformer extends TransformerAbstract
      *
      * @var array
      */
-    protected $defaultIncludes = [
-        'address',
-        'billingAddress',
-    ];
+    protected array $defaultIncludes = [];
+
 
     /**
      * List of resources possible to include
      *
      * @var array
      */
-    protected $availableIncludes = [
+    protected array $availableIncludes = [
         'company',
         'remarks',
-        'contact'
+        'contact',
+        'address',
+        'billingAddress',
+        'connections',
     ];
 
     /**
@@ -47,7 +48,6 @@ class CompanyModuleTransformer extends TransformerAbstract
             'type' => $module->type,
             'name' => $module->name,
             'reference' => $module->reference,
-            'connections' => $module->connections,
             'marking' => $this->getMarkings($module),
             'warehouseCharges' => $this->calculateWarehouseCharges($module),
         ];
@@ -137,4 +137,17 @@ class CompanyModuleTransformer extends TransformerAbstract
         return $this->item($contact, new ContactTransformer());
     }
 
+    /**
+     * Include connections
+     * @param CompanyModule $module
+     * @return Item
+     */
+    public function includeConnections(CompanyModule $module): Item
+    {
+        $connection = $module->connections;
+        return $this->item($connection, new ConnectionTransformer());
+
+
+    }
+
 }

app/Transformers/CompanyTransformer.php

@@ -3,6 +3,7 @@
 namespace App\Transformers;
 
 use App\Models\Company;
+use App\Models\CompanyModule;
 use Illuminate\Support\Facades\Crypt;
 use League\Fractal\Resource\Item;
 use League\Fractal\TransformerAbstract;
@@ -15,7 +16,7 @@ class CompanyTransformer extends TransformerAbstract
      * List of all default includes
      */
     protected array $defaultIncludes = [
-        'contact',
+        'company_module'
     ];
 
     /**
@@ -25,15 +26,14 @@ class CompanyTransformer extends TransformerAbstract
     protected array $availableIncludes = [
 
         'segments',
-        'employee',
-        'company_module',
         'last_order',
-        'order_count',
         'identification',
     ];
 
     public function transform(Company $company): array
     {
+        $companyModule = $company->companyModules()->first();
+        $hasConfirmedOrders = checkIfHasConfirmedOrders($company);
         return [
             'id' => $company->id,
             'hash_id' => Crypt::encryptString($company->id),
@@ -43,7 +43,9 @@ class CompanyTransformer extends TransformerAbstract
             'type' => $company->type,
             'business_type' => (int)$company->business_type,
             'status' => $company->status,
-            'created_at' => $company->created_at->format('d-m-Y')
+            'created_at' => $company->created_at->format('d-m-Y'),
+            'order_count' => $companyModule->orders()->count(),
+            'has_confirmed_order' => $hasConfirmedOrders,
         ];
 
     }
@@ -61,4 +63,30 @@ class CompanyTransformer extends TransformerAbstract
 
         return $this->item($contact->first(), new ContactTransformer());
     }
+
+    /**
+     * add Employee to owner
+     * @param Company $company
+     * @return Item
+     */
+    public function includeEmployee(Company $company): Item
+    {
+        $companyModule = $company->companyModules()->first();
+
+        $employee = $companyModule->employees()->first();
+
+        return $this->item($employee, new UserTransformer());
+
+    }
+
+    /**
+     * Include a company Module to the Owner Object
+     * @param Company $company
+     * @return Item
+     */
+    public function includeCompanyModule(Company $company): Item
+    {
+        $companyModule = $company->companyModules()->first();
+        return $this->item($companyModule, new CompanyModuleTransformer());
+    }
 }

app/Transformers/ConnectionTransformer.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Transformers;
+
+use League\Fractal\TransformerAbstract;
+
+class ConnectionTransformer extends TransformerAbstract
+{
+    /**
+     * List of resources to automatically include
+     *
+     * @var array
+     */
+    protected $defaultIncludes = [
+        //
+    ];
+    
+    /**
+     * List of resources possible to include
+     *
+     * @var array
+     */
+    protected $availableIncludes = [
+        //
+    ];
+    
+    /**
+     * A Fractal transformer.
+     *
+     * @return array
+     */
+    public function transform()
+    {
+        return [
+            //
+        ];
+    }
+}

app/Transformers/DocumentTransformer.php

@@ -4,8 +4,10 @@ namespace App\Transformers;
 
 use App\Models\Document;
 use Carbon\Carbon;
+use League\Fractal\Manager;
 use League\Fractal\Resource\Collection;
 use League\Fractal\Resource\Item;
+use League\Fractal\Serializer\ArraySerializer;
 use League\Fractal\TransformerAbstract;
 
 class DocumentTransformer extends TransformerAbstract
@@ -40,13 +42,22 @@ class DocumentTransformer extends TransformerAbstract
     public function includeFiles(Document $document): Collection
     {
         $files = $document->files;
-        return $this->collection($files, new FileTransformer());
+        return $this->collection($files, new FileTransformer(true));
     }
 
+    /**
+     * include owner data
+     * @param Document $document
+     * @return Item
+     */
     public function includeOwner(Document $document): Item
     {
         $owner = $document->owner;
-        return $this->item($owner, new CompanyTransformer());
+
+        $transformer = new CompanyTransformer();
+        $transformer->setDefaultIncludes([ 'contact', 'employee', 'company_module']);
+
+        return $this->item($owner, $transformer);
     }
 
 }

app/Transformers/FileTransformer.php

@@ -8,6 +8,17 @@ use League\Fractal\TransformerAbstract;
 class FileTransformer extends TransformerAbstract
 {
 
+
+    /**
+     * @var bool|mixed|null
+     */
+    private bool $loadMediumAndOriginal;
+
+    public function __construct($loadMediumAndOriginal = false)
+    {
+        $this->loadMediumAndOriginal = $loadMediumAndOriginal;
+    }
+
     /**
      * AA Array of possible includes for file model
      * @var array
@@ -23,10 +34,23 @@ class FileTransformer extends TransformerAbstract
      */
     public function transform(File $file): array
     {
+        if ($this->loadMediumAndOriginal) {
+            $files = $file->file;
+            $newObject = $files->file_info = collect($files->file_info)
+                ->filter(function ($file) {
+                    return !isset($file->large) && !isset($file->small);
+                })
+                ->values()
+                ->all();
+
+        } else {
+            $newObject = $file->file;
+        }
+
 
         return [
             'id' => $file->id,
-            'file' => $file->file,
+            'file' => $newObject,
             'type' => (int)$file->file_type,
         ];
 

app/Transformers/OrderTransformer.php

@@ -17,12 +17,8 @@ class OrderTransformer extends TransformerAbstract
      *
      * @var array
      */
-    protected $defaultIncludes = [
+    protected array $defaultIncludes = [
         'company_module',
-        'warehouse',
-        'address',
-        'address_change_request',
-        'remarks'
 
     ];
 
@@ -31,9 +27,13 @@ class OrderTransformer extends TransformerAbstract
      *
      * @var array
      */
-    protected $availableIncludes = [
+    protected array $availableIncludes = [
         'parcels',
-        'invoices'
+        'invoices',
+        'warehouse',
+        'address',
+        'address_change_request',
+        'remarks'
     ];
 
     /**

app/Transformers/PackageListTransformer.php

@@ -17,12 +17,10 @@ class PackageListTransformer extends TransformerAbstract
      *
      * @var array
      */
-    protected $defaultIncludes = [
+    protected array $defaultIncludes = [
         'transport',
-        'receive_packing_list',
         'packages',
-        'shipping_transaction',
-        'suspended_invoice'
+
     ];
 
     /**
@@ -30,8 +28,12 @@ class PackageListTransformer extends TransformerAbstract
      *
      * @var array
      */
-    protected $availableIncludes = [
-        'order'
+    protected array $availableIncludes = [
+        'order',
+        'receive_packing_list',
+        'shipping_transaction',
+        'suspended_invoice'
+
     ];
 
     /**

app/Transformers/RemarkTransformer.php

@@ -14,7 +14,7 @@ class RemarkTransformer extends TransformerAbstract
      *
      * @var array
      */
-    protected $defaultIncludes = [
+    protected array $defaultIncludes = [
         'commenter'
     ];
 
@@ -23,7 +23,7 @@ class RemarkTransformer extends TransformerAbstract
      *
      * @var array
      */
-    protected $availableIncludes = [
+    protected array $availableIncludes = [
         //
     ];
 

composer.json

@@ -8,7 +8,7 @@
     ],
     "license": "MIT",
     "require": {
-        "php": "^7.3",
+        "php": "^7.4",
         "ext-fileinfo": "^7.3",
         "ext-json": "*",
         "barryvdh/laravel-dompdf": "^0.9.0",
@@ -23,6 +23,7 @@
         "laravel/tinker": "^2.5",
         "league/fractal": "^0.20.1",
         "maatwebsite/excel": "^3.1",
+        "predis/predis": "^2.1",
         "rinvex/countries": "^6.1",
         "spatie/laravel-activitylog": "^3.14",
         "spatie/laravel-fractal": "^5.8",

database/migrations/2023_02_20_134100_create_qa_questionnaire_sets_table.php

@@ -0,0 +1,37 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateQAQuestionnaireSetsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('qa_questionnaire_sets', function (Blueprint $table) {
+            $table->id();
+            $table->string('name');
+            $table->string('description')->nullable();
+            $table->unsignedSmallInteger('order')->default(0);
+            $table->unsignedBigInteger('next_set')->nullable();
+            $table->unsignedSmallInteger('version')->default(1);
+            $table->timestamps();
+            $table->softDeletes();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('qa_questionnaire_sets');
+    }
+}

database/migrations/2023_02_20_134124_create_qa_questions_table.php

@@ -0,0 +1,45 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateQAQuestionsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('qa_questions', function (Blueprint $table) {
+            $table->id();
+            $table->unsignedBigInteger('question_number');
+            $table->text('question_text');
+            $table->unsignedBigInteger('questionnaire_set_id');
+            $table->unsignedBigInteger('next_nested_question')->nullable();
+            $table->unsignedBigInteger('next_main_question')->nullable();
+            $table->unsignedBigInteger('question_type');
+            $table->tinyInteger('is_start');
+            $table->tinyInteger('is_end');
+            $table->string('end_text')->nullable();
+            $table->unsignedInteger('order')->default(0);
+            $table->timestamps();
+            $table->softDeletes();
+
+            $table->foreign('questionnaire_set_id')->references('id')->on('qa_questionnaire_sets');
+
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('qa_questions');
+    }
+}

database/migrations/2023_02_21_091314_create_qa_answer_options_table.php

@@ -0,0 +1,37 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateQAAnswerOptionsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('qa_answer_options', function (Blueprint $table) {
+            $table->id();
+            $table->text('display_text');
+            $table->string('value');
+            $table->unsignedSmallInteger('order')->default(0);
+            $table->unsignedBigInteger('question_number');
+            $table->unsignedBigInteger('next_question_number')->nullable();
+            $table->timestamps();
+            $table->softDeletes();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('qa_answer_options');
+    }
+}

database/migrations/2023_02_21_091507_create_qa_user_answer_selected_table.php

@@ -0,0 +1,40 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateQAUserAnswerSelectedTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('qa_user_answer_selected', function (Blueprint $table) {
+            $table->id();
+            $table->unsignedBigInteger('user_id');
+            $table->unsignedBigInteger('question_id');
+            $table->unsignedBigInteger('answer_option_id')->default(0);
+            $table->string('free_text_answer')->nullable();
+            $table->timestamps();
+            $table->softDeletes();
+
+            $table->foreign('question_id')->references('id')->on('qa_questions');
+            // $table->foreign('answer_option_id')->references('id')->on('qa_answer_options');
+            $table->foreign('user_id')->references('id')->on('users');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('qa_answer_option_selections');
+    }
+}

database/migrations/2023_03_19_170628_create_groups_table.php

@@ -27,6 +27,8 @@ class CreateGroupsTable extends Migration
             $table->decimal('tax', 14, 5)->default(0.00);
             $table->decimal('service_charge', 14, 5)->default(0.00);
             $table->integer('status')->default(ApprovalStatus::PENDING_VERIFICATION);
+            $table->string('payment_method')->nullable();
+            $table->softDeletes();
             $table->timestamps();
         });
     }

database/migrations/2023_03_19_170641_create_group_transactions_table.php

@@ -17,6 +17,8 @@ class CreateGroupTransactionsTable extends Migration
             $table->id();
             $table->foreignId('group_id')->unsigned();
             $table->foreignId('transaction_id')->unsigned();
+            $table->softDeletes();
+            $table->timestamps();
         });
     }
 

database/seeders/DatabaseSeeder.php

@@ -21,5 +21,8 @@ class DatabaseSeeder extends Seeder
         $this->call(SegmentConstantsTableSeeder::class);
 
         $this->call(DummyDataSeeder::class);
+
+        // $this->call(QAQuestionSeeder::class);
+        // $this->call(QAAnswerOptionsSeeder::class);
     }
 }

database/seeders/QAAnswerOptionsSeeder.php

@@ -0,0 +1,155 @@
+<?php
+
+namespace Database\Seeders;
+
+use Illuminate\Database\Seeder;
+use App\Models\QAAnswerOptions;
+
+class QAAnswerOptionsSeeder extends Seeder
+{
+    public function run()
+    {
+       // Option 1 for Question 10
+       $answerOption = new QAAnswerOptions;
+       $answerOption->display_text = "Billing";
+       $answerOption->value = "Billing";
+       $answerOption->question_number = 10;
+       $answerOption->next_question_number = 100;
+       $answerOption->save();
+
+       // Option 2 for Question 10
+       $answerOption = new QAAnswerOptions;
+       $answerOption->display_text = "Shipping";
+       $answerOption->value = "Shipping";
+       $answerOption->question_number = 10;
+       $answerOption->next_question_number = 100;
+       $answerOption->save();
+
+       // Option 3 for Question 10
+       $answerOption = new QAAnswerOptions;
+       $answerOption->display_text = "Returns";
+       $answerOption->value = "Returns";
+       $answerOption->question_number = 10;
+       $answerOption->next_question_number = 100;
+       $answerOption->save();
+
+       // Option 4 for Question 10
+       $answerOption = new QAAnswerOptions;
+       $answerOption->display_text = "Product Information";
+       $answerOption->value = "Product Information";
+       $answerOption->question_number = 10;
+       $answerOption->next_question_number = 100;
+       $answerOption->save();
+
+       // Option 5 for Question 10
+       $answerOption = new QAAnswerOptions;
+       $answerOption->display_text = "Technical Support";
+       $answerOption->value = "Technical Support";
+       $answerOption->question_number = 10;
+       $answerOption->next_question_number = 100;
+       $answerOption->save();
+
+       // Option 6 for Question 10
+       $answerOption = new QAAnswerOptions;
+       $answerOption->display_text = "Shipping Fee Calculation";
+       $answerOption->value = "Shipping Fee Calculation";
+       $answerOption->question_number = 10;
+       $answerOption->next_question_number = 600;
+       $answerOption->save();
+
+       // Option 7 for Question 10
+       $answerOption = new QAAnswerOptions;
+       $answerOption->display_text = "Error-in Measurements";
+       $answerOption->value = "Error-in Measurements";
+       $answerOption->question_number = 10;
+       $answerOption->next_question_number = 700;
+       $answerOption->save();
+
+       // Option 8 for Question 10
+       $answerOption = new QAAnswerOptions;
+       $answerOption->display_text = "Contact Us";
+       $answerOption->value = "Contact Us";
+       $answerOption->question_number = 10;
+       $answerOption->next_question_number = 800;
+       $answerOption->save();
+
+        // Option 1 for Question 20
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Option 1 for Question 20";
+        $answerOption->value = "Option 1 for Question 20";
+        $answerOption->question_number = 20;
+        $answerOption->save();
+
+        // Option 2 for Question 20
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Option 2 for Question 20";
+        $answerOption->value = "Option 2 for Question 20";
+        $answerOption->question_number = 20;
+        $answerOption->save();
+
+       // Option 1 for Question 100
+       $answerOption = new QAAnswerOptions;
+       $answerOption->display_text = "Option 1 for Question 100";
+       $answerOption->value = "Option 1 for Question 100";
+       $answerOption->question_number = 100;
+       $answerOption->save();
+
+       // Option 2 for Question 100
+       $answerOption = new QAAnswerOptions;
+       $answerOption->display_text = "Option 2 for Question 100";
+       $answerOption->value = "Option 2 for Question 100";
+       $answerOption->question_number = 100;
+       $answerOption->save();
+
+       // Option 1 for Question 30
+       $answerOption = new QAAnswerOptions;
+       $answerOption->display_text = "Option 1 for Question 30";
+       $answerOption->value = "Option 1 for Question 30";
+       $answerOption->question_number = 30;
+       $answerOption->save();
+
+       // Option 2 for Question 30
+       $answerOption = new QAAnswerOptions;
+       $answerOption->display_text = "Option 2 for Question 30";
+       $answerOption->value = "Option 2 for Question 30";
+       $answerOption->question_number = 30;
+       $answerOption->save();
+
+       // Option 3 for Question 30
+       $answerOption = new QAAnswerOptions;
+       $answerOption->display_text = "Option 3 for Question 30";
+       $answerOption->value = "Option 3 for Question 30";
+       $answerOption->question_number = 30;
+       $answerOption->save();
+
+
+        // Option 1 for Question 300
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Option 1 for Question 300";
+        $answerOption->value = "Option 1 for Question 300";
+        $answerOption->question_number = 300;
+        $answerOption->save();
+
+        // Option 2 for Question 300
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Option 2 for Question 300";
+        $answerOption->value = "Option 2 for Question 300";
+        $answerOption->question_number = 300;
+        $answerOption->save();
+
+        // Option 3 for Question 300
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Option 3 for Question 300";
+        $answerOption->value = "Option 3 for Question 300";
+        $answerOption->question_number = 300;
+        $answerOption->save();
+
+        // Option 1 for Question 600
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = '<h1>Et harum accusamus eum quis dolorum? </h1><p>Lorem ipsum dolor sit amet. Est corporis voluptas et repudiandae libero <em>Aut quis</em>! Est aperiam voluptatum eum quidem rerumnam deserunt sit internos possimus non dolore voluptate. Vel explicabo aliquam <strong>Sit sunt ut maxime voluptatibus non vero libero ad ratione dolore</strong>. </p><h2>Ea incidunt dolor in obcaecati harum ut dignissimos facilis! </h2><p>Et adipisci illo et laborum internos <strong>Nam aperiam est ipsa nisi non quia architecto ut itaque autem</strong>. Eos maiores sunt <em>Et voluptas aut expedita quidem aut odio repellendus eum neque voluptate</em> et iusto nisi vel consequatur quos. Sit doloribus omnis in minima illoQui soluta est omnis quasi vel officia reiciendis qui aliquid quis! Sed odit esse aut sint laborumEa internos et magni amet sed dolores omnis hic totam temporibus ut quia numquam. </p><ul><li>Est soluta praesentium ut vero obcaecati! </li><li>Sit nobis facere in porro rerum et quidem deserunt qui inventore odit. </li></ul><h3>Et laborum quaerat vel animi ipsum. </h3><p>Aut quos libero <a href="https://www.loremipzum.com" target="_blank">Et explicabo qui enim libero id rerum ipsa</a>. Est quod tempora est soluta enimaut quasi aut eligendi fugit et fugit Quis. </p>
+        ';
+        $answerOption->value = "Answer";
+        $answerOption->question_number = 600;
+        $answerOption->save();
+    }
+}

database/seeders/QAQuestionSeeder.php

@@ -0,0 +1,187 @@
+<?php
+
+namespace Database\Seeders;
+
+use Illuminate\Database\Seeder;
+use App\Models\QAQuestionnaireSet;
+use App\Models\QAQuestions;
+use App\Classes\ValueObjects\Constants\QAType;
+
+class QAQuestionSeeder extends Seeder
+{
+    public function run()
+    {
+        $questionnaireSets = [
+            [
+                'name' => 'Set 1',
+                'description' => 'This is set 1 questions',
+            ],
+        ];
+
+        foreach ($questionnaireSets as $set) {
+            $questionnaireSet = QAQuestionnaireSet::create([
+                'name' => $set['name'],
+                'description' => $set['description'],
+            ]);
+
+            $questions = [];
+
+            switch ($set['name']) {
+                case 'Set 1':
+                    $questions = [
+                    [
+                        'question_number' => 10,
+                        'question_text' => 'Please select one',
+                        'question_type' => QAType::MULTIPLE_CHOICES,
+                        'is_start' => true,
+                        'is_end' => false,
+                    ],
+                    [
+                        'question_number' => 20,
+                        'question_text' => 'Question text for question number 20?',
+                        'question_type' => QAType::MULTIPLE_CHOICES,
+                        'is_start' => false,
+                        'is_end' => false,
+                    ],
+                    [
+                        'question_number' => 30,
+                        'question_text' => 'Question text for question number 30?',
+                        'question_type' => QAType::MULTIPLE_CHOICES,
+                        'next_nested_question' => 300,
+                        'is_start' => false,
+                        'is_end' => false,
+                    ],
+                    [
+                        'question_number' => 40,
+                        'question_text' => 'What is your name?',
+                        'question_type' => QAType::FREE_TEXT,
+                        'is_start' => false,
+                        'is_end' => false,
+                    ],
+                    [
+                        'question_number' => 50,
+                        'question_text' => 'The End',
+                        'question_type' => QAType::ANSWER,
+                        'is_start' => false,
+                        'is_end' => true,
+                    ],
+                    [
+                        'question_number' => 60,
+                        'question_text' => 'We have received your request and will response as soon as possible.',
+                        'question_type' => QAType::TICKET_CRM,
+                        'is_start' => false,
+                        'is_end' => true,
+                    ],
+                    [
+                        'question_number' => 100,
+                        'question_text' => 'Question text for question number 100?',
+                        'question_type' => QAType::MULTIPLE_CHOICES,
+                        'next_nested_question' => 110, //200 //3 digits - first level
+                        'next_main_question' => 20,
+                        'is_start' => false,
+                        'is_end' => false,
+                    ],
+                    [
+                        'question_number' => 110,
+                        'question_text' => 'Question text for question number 110?',
+                        'question_type' => QAType::FREE_TEXT,
+                        'next_nested_question' => 1000, //1000 //4 digits - second level
+                        'next_main_question' => 20,
+                        'is_start' => false,
+                        'is_end' => false,
+                    ],
+                    [
+                        'question_number' => 300,
+                        'question_text' => 'Question text for question number 300?',
+                        'question_type' => QAType::MULTIPLE_CHOICES,
+                        'next_main_question' => 40,
+                        'is_start' => false,
+                        'is_end' => false,
+                    ],
+                    [
+                        'question_number' => 600,
+                        'question_text' => 'Shipping Fee Calculations',
+                        'question_type' => QAType::ANSWER,
+                        'is_start' => false,
+                        'is_end' => true,
+                    ],
+                    [
+                        'question_number' => 700,
+                        'question_text' => 'Please enter your measurements',
+                        'question_type' => QAType::FREE_TEXT,
+                        'next_nested_question' => 710,
+                        'next_main_question' => 20,
+                        'is_start' => false,
+                        'is_end' => false,
+                    ],
+                    [
+                        'question_number' => 710,
+                        'question_text' => 'Please upload the photo proof',
+                        'question_type' => QAType::DOCUMENT_UPLOAD,
+                        'next_main_question' => 60,
+                        'is_start' => false,
+                        'is_end' => false,
+                    ],
+                    [
+                        'question_number' => 800,
+                        'question_text' => 'What is your name?',
+                        'question_type' => QAType::FREE_TEXT,
+                        'next_nested_question' => 810,
+                        'is_start' => false,
+                        'is_end' => false,
+                    ],
+                    [
+                        'question_number' => 810,
+                        'question_text' => 'Click Next to speak to our customer service',
+                        'question_type' => QAType::FREE_TEXT,
+                        'is_start' => false,
+                        'is_end' => true,
+                        'end_text' => 'We have received your request and will response as soon as possible.',
+                    ],
+                    [
+                        'question_number' => 1000,
+                        'question_text' => 'Question text for question number 1000?',
+                        'question_type' => QAType::FREE_TEXT,
+                        'next_nested_question' => 10000, //10000 - 5 digits - 3rd level
+                        'next_main_question' => 20,
+                        'is_start' => false,
+                        'is_end' => false,
+                    ],
+                    [
+                        'question_number' => 10000,
+                        'question_text' => 'Question text for question number 10000?',
+                        'question_type' => QAType::FREE_TEXT,
+                        'next_main_question' => 20,
+                        'is_start' => false,
+                        'is_end' => false,
+                    ],
+                ];
+                break;
+            }
+
+            foreach ($questions as $key => $questionData) {
+                $question = new QAQuestions;
+                $question->question_number = $questionData['question_number'];
+                $question->question_text = $questionData['question_text'];
+                $question->question_type = $questionData['question_type'];
+                $question->questionnaire_set_id = $questionnaireSet->id;
+
+                if (isset($questionData['next_nested_question'])) {
+                    $question->next_nested_question = $questionData['next_nested_question'];
+                }
+                if (isset($questionData['next_main_question'])) {
+                    $question->next_main_question = $questionData['next_main_question'];
+                }
+
+                $question->is_start = $questionData['is_start'];
+                $question->is_end = $questionData['is_end'];
+                if (isset($questionData['end_text'])) {
+                    $question->end_text = $questionData['end_text'];
+                }
+
+                $question->order = $key + 1;
+                $question->save();
+            }
+        }
+    }
+}

resources/assets/vue/components/companies/elements/CustomerPaymentBillingInnerComponent.vue

@@ -4,14 +4,15 @@
             <div class="row">
                 <div class="col">
                     <div v-show="!$store.getters.isLoading(section)">
-                        <list-component :section="section" :endpoint="route('api.transaction.list')" :options="options">
+                        <list-component :section="section" :endpoint="endpoint" :options="options">
                             <template slot="list" slot-scope="{data}">
-                                <payments-billing-components :section="section" :data="data" :selectedInvoice="selectedInvoice" v-on:input="updateList($event)"></payments-billing-components>
+                                <payments-billing-components v-if="endpoint == route('api.transaction.list')" :section="section" :data="data" :selectedInvoice="selectedInvoice" v-on:input="updateList($event)"></payments-billing-components>
+                                <group-payments-billing-components v-else :section="section" :data="data" :selectedInvoice="selectedInvoice" v-on:input="updateList($event)"></group-payments-billing-components>
                             </template>
                         </list-component>
                     </div>
                 </div>
-                <div class="col-12 col-sm-12 col-md-4">
+                <div class="col-12 col-sm-12 col-md-4" v-if="!['customerPaidGroupInvoiceComponent', 'customerGroupPaymentInProgressInvoiceComponent'].includes(section)">
                     <div class="row align-items-center">
                         <div class="col">
                             <div class="row" v-if="section === 'customerPendingPaymentInvoiceComponent'">
@@ -62,7 +63,7 @@
                     <div class="row" v-if="selectedInvoice.length">
                         <div class="col">
                             <div v-if="section === 'customerPendingPaymentInvoiceComponent'" class="btn btn-success btn-xl pointer m-t-10 w-100 requestModal" data-type="makePayment">Make Payment</div>
-                            <div v-if="section === 'customerPaidInvoiceComponent'" class="btn btn-info btn-xl pointer m-t-10 w-100" @click='generateSummaryInvoice'>Generate Summary Invoice</div>
+                            <div v-if="['customerPaidInvoiceComponent', 'customerPendingPaymentInvoiceComponent'].includes(section)" class="btn btn-info btn-xl pointer m-t-10 w-100" @click='generateSummaryInvoice'>Generate Summary Invoice</div>
                         </div>
                     </div>
                     <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="makePayment">
@@ -89,6 +90,10 @@
                 type: Number,
                 required: true,
             },
+            endpoint: {
+                type: String,
+                required: true
+            },
         },
         data(){
             return {

resources/assets/vue/components/companies/elements/UserCompanyComponent.vue

@@ -1,38 +1,96 @@
 <template>
-    <div class="row m-b-15 align-items-end">
-        <div class="col-auto">
+    <div class="row m-b-20">
+        <div class="col">
             <div class="row">
-                <div class="col">
-                    <div class="font-heading fs-10 muted all-caps">Name</div>
+                <div class="col-3">
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading fs-10 muted all-caps">Name</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading all-caps fs-11">{{ item.company_module.name }}</div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-2">
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading fs-10 muted all-caps">Reference</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading all-caps fs-11">{{ item.connection.invitee_reference }}</div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-auto">
+                    <a :href="route('customer.profile', item.connection.invitee_reference)" target="_blank">
+                        <button type="button" class="btn btn-xs btn-primary fs-11">Open in new tab</button>
+                    </a>
                 </div>
             </div>
-            <div class="row">
-                <div class="col">
-                    <div class="font-heading all-caps fs-11">{{this.item.name}}</div>
+            <!-- company_module_contact -->
+            <div class="row m-b-10 m-t-5" v-if="item.company_module_contact">
+                <div class="col-auto">
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading fs-10 muted all-caps">Company Module Phone</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading all-caps fs-11">{{ item.company_module_contact.phone }}</div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-auto">
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading fs-10 muted all-caps">Company Module Email</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading all-caps fs-11">{{ item.company_module_contact.email }}</div>
+                        </div>
+                    </div>
                 </div>
             </div>
-        </div>
-        <div class="col-2 text-right">
-            <div class="row">
-                <div class="col">
-                    <div class="font-heading fs-10 muted all-caps">Reference</div>
+            <!-- company_contact -->
+            <div class="row m-t-5" v-if="item.company_contact">
+                <div class="col-auto">
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading fs-10 muted all-caps">Company Phone</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading all-caps fs-11">{{ item.company_contact.phone }}</div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-auto">
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading fs-10 muted all-caps">Company Email</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading all-caps fs-11">{{ item.company_contact.email }}</div>
+                        </div>
+                    </div>
                 </div>
             </div>
-            <div class="row">
-                <div class="col">
-                    <div class="font-heading all-caps fs-11">{{this.item.reference}}</div>
-                </div>
-            </div>
-        </div>
-        <div class="col-auto">
-            <a :href="route('customer.profile', this.item.reference)" target="_blank">
-                <button type="button" class="btn btn-xs btn-primary fs-11">Open in new tab</button>
-            </a>
         </div>
     </div>
 </template>
 <script>
-     import componentHandler from '../../../general/mixins/componentHandler';
+    import componentHandler from '../../../general/mixins/componentHandler';
     export default {
         mixins: [componentHandler]
     }

resources/assets/vue/components/general/forms/GeneralConfirmationFormComponent.vue

@@ -0,0 +1,55 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <loading-component style="height: 300px; top: 0;" key="1" color="success" v-show="isLoading" ></loading-component>
+            <div class="row justify-content-center" v-show="!isLoading">
+                <div class="col">
+                    <div class="row m-b-20">
+                        <div class="col">
+                            <h3 class="all-caps">Are you Sure?</h3>
+                            <div class="fs-11">{{ contentText }}</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col p-r-5">
+                            <div class="btn btn-sm btn-default btn-block bg-master-lighter" data-dismiss="modal">Cancel</div>
+                        </div>
+                        <div class="col p-l-5">
+                            <div class="btn btn-sm btn-block b-rad-none" :class="[{'btn-danger': modalType !== 'confirm'}, {'btn-success': modalType === 'confirm'}]" @click="submit(apiRoute, apiMethod, section, true, true)">{{ buttonText }}</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    import ModalFormHandler from '../../../general/mixins/modalFormHandler';
+    export default {
+        props: {
+            contentText: {
+                type: String,
+                required: true
+            },
+            modalType: {
+                type: String,
+                default: 'confirm'
+            },
+            buttonText: {
+                type: String,
+                default: 'Confirm'
+            },
+            apiRoute: {
+                type: String,
+                required: true
+            },
+            apiMethod: {
+                type: String,
+                required: true
+            },
+        },
+        mixins: [componentHandler, ModalFormHandler]
+
+    }
+</script>

resources/assets/vue/components/general/forms/HelpMenuFormComponent.vue

@@ -0,0 +1,235 @@
+<template>
+    <div class="row">
+        <div class="col bg-white padding-40 b-rad-lg">
+            <loading-component style="height: 50px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading(section)"></loading-component>
+            <div class="row" v-if="question" v-show="!$store.getters.isLoading(section)">
+                <div class="col">
+                    <div class="row m-b-5 animate__animated animate__fadeInUpBig animate__fast" v-if="error">
+                        <div class="col">
+                            <small class="bold fs-10 text-danger">{{error}}</small>
+                        </div>
+                    </div>
+                    <div class="row m-b-20">
+                        <div class="col">
+                            <h3>{{question.question_text}}</h3>
+                        </div>
+                    </div>
+                    <div class="row m-b-10" v-if="question.question_type === 4" >
+                        <div class="col" v-for="ans in question.question_answers">
+                            <div v-html="ans.display_text"></div>
+                        </div>
+                    </div>
+                    <div class="row m-b-15" v-else-if="question.question_type === 3">
+                        <div class="col">
+                            <file-input-component :validator="$v.files" v-model="files">
+                                <template slot="label">
+                                    <div class="font-heading fs-11 all-caps">Photo or File</div>
+                                </template>
+                                <template slot="tips">
+                                    <div class="row"  v-show="false">
+                                        <div class="col">
+                                            <div class="row m-b-20">
+                                                <div class="col">
+                                                    <div class="font-heading fs-11 text-warning m-b-10">{{ documentType === 0 ? 'IC': 'SSM registration'}} number shown in the photo should tally with {{ documentType === 0 ? 'IC': 'SSM registration'}} number provided above.</div>
+                                                    <div class="font-heading fs-11 muted">Tips on how your photo should look</div>
+                                                </div>
+                                            </div>
+
+                                        </div>
+                                    </div>
+                                </template>
+                            </file-input-component>
+                        </div>
+                    </div>
+                    <div class="row m-b-10" v-show="question.is_end === 0" v-else-if="question.question_type === 1" >
+                        <validation-wrapper-component :validator="$v.answer" class="col">
+                            <div class="col" v-for="ans in question.question_answers">
+                                <div class="col question.answers">
+                                    <div class="btn btn-xs btn-block" :answerValue="ans.value" :answerId=ans.id @click="addClass($event, 'question.answers')">{{ ans.display_text }}</div>
+                                </div>
+                            </div>
+                        </validation-wrapper-component>
+                    </div>
+                    <div class="row m-b-10" v-show="question.is_end === 0" v-else>
+                        <div class="col" >
+                            <validation-wrapper-component :validator="$v.answer">
+                                <label>Answer</label>
+                                <input type="text" class="form-control" v-model="answer" @input="formTouched = true">
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col p-r-5">
+                            <div class="btn btn-sm btn-default bg-master-lightest btn-block b-rad-none" @click=" submitForm('previous')">Previous</div>
+                        </div>
+                        <div class="col p-r-5">
+                            <div class="btn btn-sm btn-default bg-master-lightest btn-block b-rad-none" data-dismiss="modal">Cancel</div>
+                        </div>
+                        <div class="col p-l-5">
+                            <div class="btn btn-sm btn-primary btn-block b-rad-none" :disabled="!$v.$dirty || !$v.$valid" @click="formTouched = true; submitForm('next')">{{ data.remarks.length > 0 ? 'Edit' : (question.is_end === 0 ? 'Next' : 'Finish') }}</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import { required } from "vuelidate/lib/validators";
+    export default {
+        props: {
+            data:{
+                type: Object,
+                required: true
+            },
+            module_type: {
+                type: String,
+                required: true
+            }
+        },
+        data(){
+            return {
+                section: 'helpMenuForm',
+                showAnswerInput: false,
+                showUploadInput: false,
+                formTouched: false,
+                question: null,
+                answer: '',
+                answerId: 0,
+                direction: 'next',
+                documentType: 1,
+                files: [],
+                error: null
+            }
+        },
+        validations() {
+            return {
+                answer: {
+                    required:  this.formTouched && this.showAnswerInput ? required : false,
+                },
+                files: {
+                    required:  this.formTouched && this.showUploadInput ? required : false,
+                }
+            };
+        },
+        computed: {
+            pendingQueue () {
+                return this.$store.getters.isInCompleteQueue(this.section);
+            },
+            parametersExist() {
+                return Boolean(this.answer);
+            }
+        },
+        watch: {
+            pendingQueue(inComplete, oldValue){
+                if(inComplete){
+                    this.fetchCompany();
+                }
+            }
+        },
+        created(){
+            this.$store.dispatch('updateListQueue', {'name': this.section});
+        },
+        methods: {
+            fetchCompany(){
+                this.isLoading = true;
+                this.submit(route('api.helpmenu.first.question'), 'get', this.section, false, false);
+            },
+            successHandler(response){
+                this.$store.dispatch('completeList', {'name': this.section, 'data': []});
+                this.question = response.payload.data;
+                this.reset();
+                this.removeClass('question.answers');
+                if(this.question.answer != null && this.direction == "previous"){
+                    this.answer = this.question.answer.free_text_answer;
+                }
+            },
+            errorHandler(error){
+                this.error = error.message;
+            },
+            submitForm(direction) {
+                this.parameters = {}
+                this.error = null;
+                this.direction = direction;
+                if(this.question.question_type === 3){
+                    this.showAnswerInput = false;
+                    this.showUploadInput = true;
+                }
+                else if(this.question.question_type === 1 || (this.question.question_type === 2)){
+                    this.showAnswerInput = true;
+                    this.showUploadInput = false;
+                }
+                if(direction === 'next'){
+                    this.parameters.question = this.question;
+                    this.parameters.answer = this.answer;
+                    this.parameters.answerId = this.answerId;
+                    this.parameters.answerObj = this.question.question_answers.find(item => item.id === Number(this.answerId));
+                    this.parameters.files = this.files;
+                    if(this.question.question_type === 4)
+                    {
+                        this.closeModal();
+                        this.reset();
+                        this.fetchCompany();
+                    }
+                    else{
+                        if(this.question.is_end){
+                            if(this.question.question_type === 5){
+                                this.submit(this.route('api.helpmenu.next.question'), 'post', this.section, true, true);
+                                this.closeModal();
+                                this.reset();
+                            }
+                            else{
+                                $crisp.push(["do", "chat:open"]);
+                                const result = [
+                                    ...this.question.questionnaire_answers.map(item => [item.question_text.replace(/ /g, "_").replace(/\W/g, ''), item.free_text_answer])
+                                ];
+                                let payload = [];
+                                payload.push(result);
+                                $crisp.push(["set", "session:data", payload]);
+                                $crisp.push(["do", "message:send", ["text", "Hello there!"]]);
+                                this.closeModal();
+                                this.reset();
+                                this.fetchCompany();
+                            }
+                        }
+                        else{
+                            this.submit(this.route('api.helpmenu.next.question'), 'post', this.section, true, true);
+                        }
+                    }
+                }
+                else if(direction === 'previous'){
+                    this.formTouched = false;
+                    this.parameters.question = this.question;
+                    this.parameters.isPrevious = true;
+                    this.submit(this.route('api.helpmenu.next.question'), 'post', this.section, true, true);
+                }
+            },
+            reset() {
+                this.parameters = null;
+                this.isLoading = false;
+                this.answer = '';
+                this.answerId = 0;
+                this.files = [];
+                this.formTouched = false;
+                this.showAnswerInput = false;
+                this.showUploadInput = false;
+                this.error = null;
+            },
+            addClass(event, cls) {
+                const div = event.target;
+                this.answer = div.getAttribute('answerValue');
+                this.answerId = div.getAttribute('answerId');
+                this.removeClass(cls);
+                div.classList.add('btn-primary');
+            },
+            removeClass(cls) {
+                document.getElementsByClassName(cls).forEach(el => {
+                    const btnPrimaryEl = el.getElementsByClassName('btn-primary')[0];
+                    if (btnPrimaryEl) {
+                        btnPrimaryEl.classList.remove('btn-primary');
+                    }
+                });
+            }
+        },
+    }
+</script>

resources/assets/vue/components/general/forms/RemarkFormComponent.vue

@@ -36,6 +36,7 @@
     </div>
 </template>
 <script>
+    import { required } from "vuelidate/lib/validators";
     import ModalFormHandler from '../../../general/mixins/modalFormHandler';
     export default {
         props: {
@@ -58,9 +59,7 @@
         },
         validations: {
             parameters: {
-                content: {
-                    required: false
-                }
+                content: { required: required },
             }
         },
         methods: {
@@ -71,4 +70,4 @@
         mixins: [ModalFormHandler]
 
     }
-</script>
+</script>

resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue

@@ -25,9 +25,13 @@
                                         </div>
                                         <div class="col d-flex">
                                             <div class="btn btn-xs btn-outline-danger b-rad-none pointer requestModal align-items-center d-flex" data-type="changeOrderNo" v-if="$store.getters.isSuperAdmin">Change Order Number</div>
+                                            <div class="btn btn-xs btn-outline-danger b-rad-none pointer requestModal align-items-center d-flex m-l-10" data-type="helpMenu" v-if="$store.getters.isSuperAdmin">Help Menu</div>
                                             <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="changeOrderNo">
                                                 <change-order-number-form-component :section="section" :data="order"></change-order-number-form-component>
                                             </modal-component>
+                                            <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="helpMenu">
+                                                <help-menu-form-component module_type="Order" :data="order"></help-menu-form-component>
+                                            </modal-component>
                                         </div>
                                     </div>
                                     <div class="row m-b-20">
@@ -500,4 +504,4 @@
             }
         }
     }
-</script>
+</script>