inded package ui code

# Conflicts:
# app/Classes/Modules/Segments/ControllersLogic/UpdateConstantPostcodeLogic.php
# app/Classes/ValueObjects/Constants/TransactionType.php
# routes/api.php
# routes/web.php

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/DoesNotHavePaymentStatusIn.php

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

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

@@ -15,7 +15,7 @@ class DoesNotHaveTransactionType implements Filter
     public static function apply(Builder $builder, $value)
     {
         return $builder->whereDoesntHave('transactions', function (Builder $query) use($value) {
-            $query->where('type', $value)->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/HavePaymentStatusNotIn.php

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

app/Classes/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
 {
@@ -45,6 +40,12 @@ class CallbackBillplzLogic
     /** @var UpdateDoFromYDPortalProcessor */
     private $updateDoFromYDPortalProcessor ;
 
+    /** @var UpdatesWalletBalance */
+    private $updatesWalletBalance;
+
+    /** @var CreatePaymentTransactionProcessor */
+    private $createPaymentTransactionProcessor;
+
     /**
      * CallbackBillplzLogic constructor.
      * @param GetBillplzBill $getBillplzBill
@@ -52,14 +53,17 @@ class CallbackBillplzLogic
      * @param UpdatesTransactionStatus $updatesTransactionStatus
      * @param UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor
      * @param UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor
+     * @param CreatePaymentTransactionProcessor $createPaymentTransactionProcessor
      */
-    public function __construct(GetBillplzBill $getBillplzBill, FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor, UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor)
+    public function __construct(GetBillplzBill $getBillplzBill, FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor, UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor, UpdatesWalletBalance $updatesWalletBalance, CreatePaymentTransactionProcessor $createPaymentTransactionProcessor)
     {
         $this->getBillplzBill = $getBillplzBill;
         $this->fetchesTransaction = $fetchesTransaction;
         $this->updatesTransactionStatus = $updatesTransactionStatus;
         $this->updateDoFromVTPortalProcessor = $updateDoFromVTPortalProcessor;
         $this->updateDoFromYDPortalProcessor = $updateDoFromYDPortalProcessor;
+        $this->updatesWalletBalance = $updatesWalletBalance;
+        $this->createPaymentTransactionProcessor = $createPaymentTransactionProcessor;
     }
 
 
@@ -102,25 +106,51 @@ class CallbackBillplzLogic
         $token = Auth::fromUser(User::find(1));
         $request->headers->set('Authorization', 'Bearer '.$token);
 
+        // check if is wallet top up
+        if($transaction->owner instanceof Wallet && $status === ApprovalStatus::APPROVED &&!in_array($transaction->status, [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])) {
+            $this->updatesWalletBalance->execute($transaction->owner, $transaction->amount);
+        }
+
+        // group payment
+        if ($transaction->type == TransactionType::GROUP_PAYMENT && $status === ApprovalStatus::APPROVED &&!in_array($transaction->status, [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])) {
+            $group = Group::where('reference', $billplzXSignatureObject->getBillPlzId())->first();
+
+            foreach($group->groupTransactions as $groupTransaction) {
+                $invoice = $groupTransaction->transaction;
+                $this->createPaymentTransactionProcessor->execute($invoice, PaymentMethodType::WALLET, null);
+            }
+
+            $group->status = $status;
+            $group->save();
+        }
+
         $this->updatesTransactionStatus->execute($transaction, $status);
 
-        $totalPaidAmount = $invoice->transactions->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->sum('amount');
+        if (!$transaction->owner instanceof Wallet) {
+            $totalPaidAmount = $invoice->transactions->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->sum('amount');
 
-        if(($invoice->amount - $totalPaidAmount) < 0.01) {
-            $this->updatesTransactionStatus->execute($invoice, ApprovalStatus::COMPLETED);
-
-            $packingList->status = ApprovalStatus::APPROVED;
-            $packingList->save();
-
-            if(app()->environment('production')){
-                $this->updateDoFromVTPortalProcessor->execute($packingList);
-                $this->updateDoFromYDPortalProcessor->execute($packingList);
+            if(($invoice->amount - $totalPaidAmount) < 0.01) {
+                $this->updatesTransactionStatus->execute($invoice, ApprovalStatus::COMPLETED);
+    
+                $packingList->status = ApprovalStatus::APPROVED;
+                $packingList->save();
+    
+                if(app()->environment('production')){
+                    $this->updateDoFromVTPortalProcessor->execute($packingList);
+                    $this->updateDoFromYDPortalProcessor->execute($packingList);
+                }
             }
         }
 
+        $company_module_marking = $transaction->owner->owner->connections? $transaction->owner->owner->connections->first()->invitee_reference: null;
 
+        if ($transaction->owner instanceof Wallet) {
+            $company_module_marking = $transaction->owner->owner->connections? $transaction->owner->owner->connections->first()->invitee_reference: null;
+        } else {
 
+            $company_module_marking = $order->companyModule->connections? $order->companyModule->connections->first()->invitee_reference: null;
+        }
 
-        return $request->method() === 'POST' ? true : view('pages.payments_redirect', ['marking' => $order->reference, 'transaction' => $transaction, 'status' => $status]);
+        return $request->method() === 'POST' ? true : view('pages.payments_redirect', ['marking' => $order->reference ?? null, 'company_module_marking' => $company_module_marking ?? null, 'transaction' => $transaction, 'status' => $status]);
     }
 }

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

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

app/Classes/Modules/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/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

@@ -0,0 +1,179 @@
+<?php
+
+
+namespace App\Classes\Modules\Transactions\ControllersLogic;
+
+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\Companies\Services\FetchesCompanyModule;
+use App\Classes\Modules\Groups\DataTransferObjects\GroupObject;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+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;
+
+class CreateGroupsLogic extends AbstractControllerLogic
+{
+
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Create Group Transaction',
+            'message' => 'You have successfully created a group transaction'
+        ];
+    }
+
+    /** @var FetchesTransaction */
+    private $fetchesTransaction;
+
+    /** @var GeneratesTransactionBillNumber */
+    private $generatesTransactionBillNumber;
+
+
+    /** @var FetchesCompanyModule  */
+    private $fetchesCompanyModule;
+
+    /** @var CreateWalletTopUpTransactionProcessor */
+    private $createWalletTopUpTransactionProcessor;
+
+    /** @var CreatePaymentTransactionProcessor */
+    private $createPaymentTransactionProcessor;
+
+    /** @var CreatesGroup */
+    private $createsGroup;
+
+    public function __construct(
+        FetchesTransaction $fetchesTransaction, 
+        GeneratesTransactionBillNumber $generatesTransactionBillNumber, 
+        FetchesCompanyModule $fetchesCompanyModule,
+        CreateWalletTopUpTransactionProcessor $createWalletTopUpTransactionProcessor,
+        CreatePaymentTransactionProcessor $createPaymentTransactionProcessor,
+        CreatesGroup $createsGroup
+    )
+    {
+        $this->fetchesTransaction = $fetchesTransaction;
+        $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
+        $this->fetchesCompanyModule = $fetchesCompanyModule;
+        $this->createWalletTopUpTransactionProcessor = $createWalletTopUpTransactionProcessor;
+        $this->createPaymentTransactionProcessor = $createPaymentTransactionProcessor;
+        $this->createsGroup = $createsGroup;
+    }
+
+    public function logic(Request $request) : JsonResponse
+    {
+        $payment_method     = PaymentMethodType::PAYMENT_METHODS[$request->input('payment_method')];
+        $groupPyamentStatus = ApprovalStatus::PENDING_VERIFICATION;
+
+        $invoice_ids    = json_decode($request->route('transaction_ids'));
+        $billNumber     = $this->generatesTransactionBillNumber->execute('PYMT-');
+
+        // 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) {
+
+            $companyModuleId = $invoices->first()->receiver;
+
+            $wallet = Wallet::where('owner_id', $companyModuleId)->first();
+
+            // 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.');
+            }
+
+            $groupPyamentStatus = ApprovalStatus::APPROVED;
+        }
+
+        $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,
+            '-',
+            $groupPyamentStatus,
+        );
+
+        $group = $this->createsGroup->execute($group);
+
+        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

@@ -0,0 +1,58 @@
+<?php
+
+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 Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class DeleteGroupLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Delete Group Transaction',
+            'message' => 'You have successfully deleted this Group Transaction'
+        ];
+    }
+
+    /** @var FetchesGroup */
+    private $fetchesGroup;
+
+    /** @var DeletesGroup */
+    private $deletesGroup;
+
+    /**
+     * DeleteGroupLogic constructor.
+     * @param updatesTransactionStatus $updatesTransactionStatus
+     * @param FetchesGroup $fetchesGroup
+     * @param DeletesTransaction $deletesTransaction
+     */
+    public function __construct(FetchesGroup $fetchesGroup, DeletesGroup $deletesGroup)
+    {
+        $this->fetchesGroup = $fetchesGroup;
+        $this->deletesGroup = $deletesGroup;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $group = $this->fetchesGroup->execute(['id' => $request->route('id')]);
+
+        $this->deletesGroup->execute($group);
+
+        return $this->response([]);
+    }
+
+}

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

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

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

@@ -0,0 +1,78 @@
+<?php
+
+
+namespace App\Classes\Modules\Transactions\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\DocumentType;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Models\Order;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Mccarlosen\LaravelMpdf\Facades\LaravelMpdf;
+use App\Classes\Modules\Documents\Services\CreatesDocument;
+use App\Classes\Modules\Documents\Services\CreatesFiles;
+use App\Models\Document;
+
+class RegenerateShippingInvoiceTransactionLogic extends AbstractControllerLogic
+{
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Regenerate Shipping Invoice',
+            'message' => 'You have successfully regenerated shipping invoice'
+        ];
+    }
+
+    /** @var CreatesDocument */
+    private $createsDocument;
+
+    /** @var CreatesFiles */
+    private $createsFiles;
+
+    /**
+     * @param CreatesDocument $createsDocument
+     */
+    public function __construct(CreatesDocument $createsDocument, CreatesFiles $createsFiles)
+    {
+        $this->createsDocument = $createsDocument;
+        $this->createsFiles = $createsFiles;
+    }
+
+    public function logic(Request $request) : JsonResponse
+    {
+
+        $orders = Order::where('company_module_id', $request->route('company_module_id'))->get();
+
+        foreach ($orders as $order){
+            $invoices = $order->transactions()->where('transactions.type', TransactionType::SHIPPING_INVOICE)->get();
+            foreach ($invoices as $invoice){
+    
+                $invoice->documents()->delete();
+    
+                $transaction_invoice_pdf = LaravelMpdf::loadView('pages.pdfs.shipping_invoice', ['invoice_transaction' => $invoice]);
+    
+                $document_object = new DocumentObject(
+                    DocumentType::SHIPPING_INVOICE,
+                    [chunk_split('data:application/pdf;base64,'.base64_encode($transaction_invoice_pdf->output()))],
+                    '',
+                    ApprovalStatus::COMPLETED,
+                    'shipping_invoice'
+                );
+    
+                $document =$this->createsDocument->execute($invoice, $document_object);
+    
+                $this->createsFiles->execute($document, $document_object);
+    
+                // dump($document);
+            }
+        }
+
+        return $this->response([]);
+    }
+
+}

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

@@ -0,0 +1,185 @@
+<?php
+
+namespace App\Classes\Modules\Transactions\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+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\DocumentType;
+use App\Http\Resources\GroupResource;
+use App\Models\Document;
+use App\Models\SegmentConstant;
+use App\Classes\Modules\Companies\Services\FetchesCompany;
+use App\Classes\Modules\Transactions\Services\CalculatesTransactionServiceCharge;
+use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
+use App\Classes\Modules\Transactions\Services\FetchesGroup;
+use App\Classes\Modules\Transactions\Services\UpdatesTransaction;
+use App\Classes\Modules\Transactions\Services\CalculatesTransactionTransferFee;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use ErrorException;
+use Illuminate\Support\Facades\DB;
+use Mccarlosen\LaravelMpdf\Facades\LaravelMpdf;
+
+class UpdateGroupLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Update Group Transaction',
+            'message' => 'You have successfully updated this Group Transaction'
+        ];
+    }
+
+    /** @var FetchesGroup */
+    private $fetchesGroup;
+
+    /** @var FetchesCompany */
+    private $fetchesCompany;
+
+    /** @var CalculatesTransactionServiceCharge */
+    private $calculatesTransactionServiceCharge;
+
+    /** @var UpdatesTransaction */
+    private $updatesTransaction;
+
+    /** @var CalculatesTransactionTransferFee */
+    private $calculatesTransactionTransferFee;
+
+    /** @var CreatesDocument */
+    private $createsDocument;
+
+    /** @var CreatesFiles */
+    private $createsFile;
+
+    /**
+     * UpdateGroupLogic constructor.
+     * @param FetchesGroup $fetchesGroup
+     * @param FetchesCompany $fetchesCompany
+     * @param CalculatesTransactionServiceCharge $calculatesTransactionServiceCharge
+     * @param UpdatesTransaction $updatesTransaction
+     * @param CalculatesTransactionTransferFee $calculatesTransactionTransferFee
+     * @param CreatesDocument $createsDocument
+     * @param CreatesFiles $createsFile
+     */
+    public function __construct(FetchesGroup $fetchesGroup, FetchesCompany $fetchesCompany, CalculatesTransactionServiceCharge $calculatesTransactionServiceCharge, UpdatesTransaction $updatesTransaction, CalculatesTransactionTransferFee $calculatesTransactionTransferFee, CreatesDocument $createsDocument, CreatesFiles $createsFile)
+    {
+        $this->fetchesGroup = $fetchesGroup;
+        $this->fetchesCompany = $fetchesCompany;
+        $this->calculatesTransactionServiceCharge = $calculatesTransactionServiceCharge;
+        $this->updatesTransaction = $updatesTransaction;
+        $this->calculatesTransactionTransferFee = $calculatesTransactionTransferFee;
+        $this->createsDocument = $createsDocument;
+        $this->createsFile = $createsFile;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $group = $this->fetchesGroup->execute(['id' => $request->route('id')]);
+
+        $transactions = $group->transactions()->get();
+
+        $rate = $request->input('rate');
+
+        $supplier = $this->fetchesCompany->execute(['id' => $request->input('supplier_id')]);
+
+//        $group->transactions()->update(['issuer' => $supplier->id, 'currency_rate' => $rate]);
+//        $group->transactions()->update(['amount' => DB::raw('(original_amount * (1 / currency_rate)) + service_charge + tax')]);
+
+
+        foreach($transactions as $transaction) {
+
+            $constant = SegmentConstant::where('reference', SegmentConstants::SERVICE_CHARGE)->where('detail->id', $supplier->id)->first();
+            $serviceCharge = $this->calculatesTransactionServiceCharge->execute($transaction->original_amount, $rate, $constant);
+
+            $object = new TransactionObject(
+                $transaction->bill_no,
+                TransactionType::BILL,
+                $supplier->id,
+                1,
+                $supplier->banks()->where('default', true)->first()->id,
+                PaymentMethodType::CASH,
+                $transaction->original_amount * (1 / $rate),
+                $transaction->original_amount,
+                1,
+                $transaction->original_currency_id,
+                $rate,
+                0,
+                $serviceCharge,
+                null,
+                ApprovalStatus::PENDING_VERIFICATION
+            );
+
+            $billTransaction = $this->updatesTransaction->execute($transaction, $object);
+
+            $transferTransaction = $transaction->transactions()->where('type', TransactionType::TRANSFER_FEE)->first();
+
+            $transferFee = $this->calculatesTransactionTransferFee->execute($billTransaction->original_amount, $constant);
+
+            $object = new TransactionObject(
+                $transferTransaction->bill_no,
+                TransactionType::TRANSFER_FEE,
+                $supplier->id,
+                1,
+                $supplier->banks()->where('default', true)->first()->id,
+                PaymentMethodType::CASH,
+                $transaction->original_amount,
+                $transaction->original_amount,
+                $transaction->original_currency_id,
+                $transaction->original_currency_id,
+                1,
+                0,
+                $transferFee,
+                null,
+                ApprovalStatus::PENDING_VERIFICATION
+            );
+
+            $this->updatesTransaction->execute($transferTransaction, $object);
+        }
+
+        $group->issuer = $supplier->id;
+        $group->amount = $group->transactions()->sum('amount');
+        $group->currency_rate = $rate;
+        $group->tax = $group->transactions()->sum('tax');
+        $group->service_charge = $group->transactions()->sum('service_charge');
+
+        $group->save();
+
+        $group->documents()->delete();
+
+        $transferFeeTransactions = $group->transactions()->with([
+            'transactions' => function ($transaction) {
+                return $transaction->where('type', TransactionType::TRANSFER_FEE);
+            }])->get()->pluck('transactions')->flatten();
+
+        $pdf = LaravelMpdf::loadView('pages.pdfs.currency_vendor_order', ['transactions' => $group->transactions, 'transferFeeTransactions' => $transferFeeTransactions, 'supplier' => $supplier]);
+
+        $object = new DocumentObject(
+            DocumentType::CURRENCY_VENDOR_ORDER,
+            [chunk_split('data:application/pdf;base64,'.base64_encode($pdf->output()))],
+            '',
+            ApprovalStatus::COMPLETED,
+            'currency_vendor_order'
+        );
+
+        /** @var Document $document */
+        $document = $this->createsDocument->execute($group, $object);
+        $this->createsFile->execute($document, $object);
+
+        return $this->resourceResponse(new GroupResource($group));
+    }
+
+}

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

@@ -0,0 +1,173 @@
+<?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;
+
+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;
+        $company_module     = $invoice->owner()->first()->owner()->first()->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/Processors/UpdateWalletTransactionProcessor.php

@@ -0,0 +1,71 @@
+<?php
+
+namespace App\Classes\Modules\Transactions\Processors;
+
+use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
+use App\Classes\Modules\Transactions\Services\FetchesTransaction;
+use App\Classes\Modules\Wallets\Services\FetchesWallet;
+use App\Classes\Modules\Wallets\Services\UpdatesWallet;
+use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
+use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use App\Models\Wallet;
+
+class UpdateWalletTransactionProcessor
+{
+    /** @var CreatesWalletTransaction */
+    private $createsWalletTransaction;
+
+    /** @var FetchesTransaction */
+    private $fetchesTransaction;
+
+    /** @var ListWallet  */
+    private $fetchesWallet;
+
+    /** @var UpdatesTransactionStatus */
+    private $updatesTransactionStatus;
+
+    /** @var UpdatesWallet  */
+    private $updatesWallet;
+
+    public function __construct(FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, UpdatesWallet $updatesWallet)
+    {
+        $this->fetchesTransaction = $fetchesTransaction;
+        $this->updatesTransactionStatus = $updatesTransactionStatus;
+        $this->updatesWallet = $updatesWallet;
+    }
+
+
+    /**
+     * @param Booking $booking
+     * @return void
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(int $transactionId, int $transactionStatus)
+    {
+
+        $transaction = $this->fetchesTransaction->execute(['id' => $transactionId]);
+        $wallet = $transaction->wallet;
+
+        switch($transaction->type){
+            case TransactionType::TOP_UP:
+                $updateWalletAmount = $transaction->amount + $wallet->amount;
+                break;
+            case TransactionType::WITHDRAW:
+                $updateWalletAmount = $wallet->amount - $transaction->amount;
+                break;
+            default:
+                break;
+        }
+
+        $walletOject = new WalletObject( $wallet->company->id,  $wallet->currency_id,  $wallet->code, $updateWalletAmount);
+
+        $this->updatesTransactionStatus->execute($transaction, $transactionStatus);
+
+        $this->updatesWallet->execute($wallet, $walletOject);
+
+        return $wallet;
+    }
+}

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

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Classes\Modules\Transactions\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
+use App\Classes\General\Interfaces\Transactionable;
+use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
+use App\Models\Transaction;
+
+class CreatesTransactionableTransaction extends AbstractUpdateRelationshipRecord
+{
+    /**
+     * @param Transactionable $transactionable
+     * @param TransactionObject $object
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Transactionable $transactionable, TransactionObject $object) {
+        $model = new Transaction();
+        $model->bill_no = $object->getBillNo();
+        $model->type = $object->getTransactionType();
+        $model->issuer = $object->getIssuer();
+        $model->receiver = $object->getReceiver();
+        $model->recipient_bank_account_id = $object->getRecipientBankAccountId();
+        $model->payment_method = $object->getPaymentMethod();
+        $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->expires_on = $object->getExpiresOn();
+        $model->status = $object->getStatus();
+        $model->payment_reference = $object->getPaymentReference();
+
+        return $this->handler($transactionable->transactions(), $model);
+
+    }
+}

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/Transactions/Services/ListsGroups.php

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

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

@@ -0,0 +1,73 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+
+use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
+use App\Classes\Modules\Wallets\Services\CreatesWallet;
+use App\Classes\Modules\Wallets\Services\GeneratesWalletCode;
+use App\Classes\Modules\Wallets\Standards\Rules\CanCreateCompanyWallet;
+use App\Http\Resources\WalletResource;
+use App\Classes\Modules\Companies\Services\FetchesCompanyModule;
+
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreateWalletLogic extends AbstractControllerLogic
+{
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Created Company Wallet',
+            'message' => 'You have successfully created a company wallet'
+        ];
+    }
+
+    /** @var CreatesWallet  */
+   private $createsWallet;
+
+   /** @var GeneratesWalletCode */
+   private $generatesWalletCode;
+
+   /** @var CanCreateCompanyWallet */
+   private $canCreateCompanyWallet;
+
+    /** @var FetchesCompanyModule */
+    private $fetchesCompanyModule;
+
+    /**
+     * CreateWalletLogic constructor.
+     * @param CreatesWallet $createsWallet
+     * @param GeneratesWalletCode $generatesWalletCode
+     * @param CanCreateCompanyWallet $canCreateCompanyWallet
+     */
+    public function __construct(CreatesWallet $createsWallet, GeneratesWalletCode $generatesWalletCode, CanCreateCompanyWallet $canCreateCompanyWallet, FetchesCompanyModule $fetchesCompanyModule)
+    {
+        $this->fetchesCompanyModule = $fetchesCompanyModule;
+        $this->createsWallet = $createsWallet;
+        $this->generatesWalletCode = $generatesWalletCode;
+        $this->canCreateCompanyWallet = $canCreateCompanyWallet;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $object = new WalletObject($request->input('company_module_id'), $request->input('currency_id'), $this->generatesWalletCode->execute());
+
+        $this->canCreateCompanyWallet->passes($object);
+
+        $company_module = $this->fetchesCompanyModule->execute(['id' => $request->input('company_id')]);
+
+        $wallet = $this->createsWallet->execute($object, $company_module);
+
+        return $this->resourceResponse(new WalletResource($wallet));
+    }
+}

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

@@ -0,0 +1,132 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+
+use App\Classes\Modules\Wallets\Standards\Rules\CanCreateWalletTransaction;
+use App\Classes\Modules\Wallets\DataTransferObjects\WalletTransactionObject;
+use App\Classes\Modules\Wallets\Services\CreatesWalletTransaction;
+use App\Classes\Modules\Wallets\Services\GeneratesWalletTransactionBillNo;
+use App\Http\Resources\WalletTransactionResource;
+use App\Classes\Modules\Wallets\Services\FetchesWallet;
+
+use App\Classes\Modules\Currencies\Services\FetchesCurrency;
+use App\Classes\Modules\Currencies\Services\RateCalculatesCurrency;
+/*
+use App\Classes\Modules\Accounts\Standards\Rules\CanCreateUser;
+use App\Classes\Modules\Accounts\Services\CreatesUser;
+use App\Classes\Modules\Accounts\DataTransferObjects\UserObject;
+use App\Http\Resources\UserResource;
+
+use App\Classes\Modules\Companies\Standards\Rules\CanCreateCompany;
+use App\Classes\Modules\Companies\Services\CreatesCompany;
+use App\Classes\Modules\Companies\DataTransferObjects\CompanyObject;
+
+use App\Classes\Modules\Contacts\Standards\Rules\CanCreateContact;
+use App\Classes\Modules\Contacts\Services\CreatesContact;
+use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
+
+use App\Classes\Modules\Companies\Standards\Rules\CanCreateCompanyEmployee;
+use App\Classes\Modules\Companies\Services\CreatesCompanyEmployee;
+use App\Classes\Modules\Companies\DataTransferObjects\CompanyEmployeeObject;
+
+use App\Classes\Modules\SegmentCompanies\Standards\Rules\CanCreateSegmentCompany;
+use App\Classes\Modules\SegmentCompanies\Services\CreatesSegmentCompany;
+use App\Classes\Modules\SegmentCompanies\DataTransferObjects\SegmentCompanyObject;
+*/
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+
+class CreateWalletTransactionLogic extends AbstractControllerLogic
+{
+
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Created Wallet Transaction',
+            'message' => 'You have successfully created a wallet transaction'
+        ];
+    }
+
+    /** @var CreatesWalletTransaction  */
+   private $createsWalletTransaction;
+
+   /** @var GeneratesWalletTransactionBillNo */
+   private $generatesWalletTransactionBillNo;
+
+   /** @var CanCreateWalletTransaction */
+   private $canCreateWalletTransaction;
+   
+   private $fetchesCurrency;
+   
+   private $rateCalculatesCurrency;
+   
+   private $fetchesWallet;
+
+    /**
+     * CreateWalletLogic constructor.
+     * @param CreatesWalletTransaction $createsWalletTransaction
+     * @param GeneratesWalletTransactionBillNo $generatesWalletTransactionBillNo
+     * @param CanCreateWalletTransaction $canCreateWalletTransaction
+     * @param FetchesCurrency $fetchesCurrency
+     * @param RateCalculatesCurrency $rateCalculatesCurrency
+     * @param FetchesWallet $fetchesWallet
+     */
+    public function __construct(
+            CreatesWalletTransaction $createsWalletTransaction, GeneratesWalletTransactionBillNo $generatesWalletTransactionBillNo, CanCreateWalletTransaction $canCreateWalletTransaction,
+            FetchesCurrency $fetchesCurrency,RateCalculatesCurrency $rateCalculatesCurrency, FetchesWallet $fetchesWallet
+        )
+    {
+        $this->createsWalletTransaction = $createsWalletTransaction;
+        $this->generatesWalletTransactionBillNo = $generatesWalletTransactionBillNo;
+        $this->canCreateWalletTransaction = $canCreateWalletTransaction;
+        $this->fetchesCurrency = $fetchesCurrency;
+        $this->rateCalculatesCurrency = $rateCalculatesCurrency;
+        $this->fetchesWallet = $fetchesWallet;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        try {
+
+            DB::beginTransaction();
+            
+            $wallet =  $this->fetchesWallet->execute(['id' => $request->route('id')]);
+            $conversion_currency = $this->fetchesCurrency->execute(['id' => $request->input('currency_id')]);
+            $convertable_currency = $this->fetchesCurrency->execute(['id' => $wallet->currency_id]);//MYR
+            
+            $convert_amount = $this->rateCalculatesCurrency->execute($conversion_currency, $convertable_currency, $request->input('amount'));
+            $convert_rate = $this->rateCalculatesCurrency->execute_rate($conversion_currency, $convertable_currency);
+            
+
+            $object = new WalletTransactionObject(
+                $wallet->id, $this->generatesWalletTransactionBillNo->execute(),$request->input('trans_type'),
+                number_format( (float) $convert_amount, 5, '.', ''), $wallet->currency_id , number_format( (float) $request->input('amount'), 5, '.', ''),
+                $request->input('currency_id'),number_format( (float) $convert_rate, 5, '.', '')
+            );
+
+            $this->canCreateWalletTransaction->passes($object);
+
+            $wallet_transaction = $this->createsWalletTransaction->execute($object);
+
+            DB::commit();
+
+            return $this->resourceResponse(new WalletTransactionResource($wallet_transaction));
+
+        } catch (\Exception $exception) {
+            throw new ErrorException($exception->getMessage(), $exception->getCode());
+        }
+
+    }
+}

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

@@ -0,0 +1,101 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\ControllersLogic;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\JsonResponse;
+use App\Http\Resources\WalletResource;
+use App\Classes\Modules\Wallets\Services\CreatesWallet;
+use App\Classes\Modules\Wallets\Services\UpdatesWallet;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Companies\Services\FetchesCompany;
+use App\Classes\Modules\Wallets\Services\GeneratesWalletCode;
+
+use App\Classes\Modules\Transactions\Services\CreatesTransaction;
+use App\Classes\Modules\Wallets\Processors\CreditWalletProcessor;
+use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
+
+class CreditWalletLogic extends AbstractControllerLogic
+{
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Credit into Company Wallet',
+            'message' => 'You have successfully credit company wallet'
+        ];
+    }
+
+
+    /** @var FetchesCompany  */
+    private $fetchesCompany;
+
+    /** @var GeneratesWalletCode */
+    private $generatesWalletCode;
+
+    /** @var CreatesWallet  */
+    private $createsWallet;
+
+    /** @var GeneratesTransactionBillNumber  */
+    private $generatesTransactionBillNumber;
+
+    /** @var CreatesTransaction */
+    private $createsTransaction;
+
+    /** @var UpdatesWallet */
+    private $updatesWallet;
+
+    /** @var CreditWalletProcessor */
+    private $creditWalletProcessor;
+
+    /**
+     * CreateWalletLogic constructor.
+     * @param FetchesCompany $fetchesCompany
+     * @param GeneratesWalletCode $generatesWalletCode
+     * @param CreatesWallet $createsWallet
+     * @param GeneratesTransactionBillNumber $generatesTransactionBillNumber
+     * @param CreatesTransaction $createsTransaction
+     * @param UpdatesWallet $updatesWallet
+     * @param CreditWalletProcessor $creditWalletProcessor
+     */
+    public function __construct(
+        FetchesCompany $fetchesCompany,
+        GeneratesWalletCode $generatesWalletCode,
+        CreatesWallet $createsWallet,
+        GeneratesTransactionBillNumber $generatesTransactionBillNumber,
+        CreatesTransaction $createsTransaction,
+        UpdatesWallet $updatesWallet,
+        CreditWalletProcessor $creditWalletProcessor
+    )
+    {
+        $this->fetchesCompany = $fetchesCompany;
+        $this->generatesWalletCode = $generatesWalletCode;
+        $this->createsWallet = $createsWallet;
+        $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
+        $this->createsTransaction = $createsTransaction;
+        $this->updatesWallet = $updatesWallet;
+        $this->creditWalletProcessor = $creditWalletProcessor;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $amount = floatval(str_replace(',', '', $request->input('amount')));
+
+        $company = $this->fetchesCompany->execute(['id' => $request->input('company_id')]);
+
+        $reference = $request->input('reference');
+
+        $type = $request->input('transaction_type');
+
+        $wallet = $this->creditWalletProcessor->execute($company, $type, $amount, $reference);
+
+        return $this->resourceResponse(new WalletResource($wallet));
+    }
+}

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

@@ -0,0 +1,117 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\ControllersLogic;
+
+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\FetchesCompany;
+use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
+use App\Classes\Modules\Transactions\Services\CreatesTransaction;
+use App\Classes\Modules\Wallets\Services\UpdatesWallet;
+
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Http\Resources\WalletResource;
+
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+
+class DebitWalletLogic extends AbstractControllerLogic
+{
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Debit into Company Wallet',
+            'message' => 'You have successfully debit company wallet'
+        ];
+    }
+
+
+    /** @var FetchesCompany  */
+    private $fetchesCompany;
+
+    /** @var GeneratesTransactionBillNumber  */
+    private $generatesTransactionBillNumber;
+
+    /** @var CreatesTransaction */
+    private $createsTransaction;
+
+    /** @var UpdatesWallet */
+    private $updatesWallet;
+
+    /**
+     * CreateWalletLogic constructor.
+     * @param FetchesCompany $fetchesCompany
+     * @param GeneratesTransactionBillNumber $generatesTransactionBillNumber
+     * @param CreatesTransaction $createsTransaction
+     * @param UpdatesWallet $updatesWallet
+     */
+    public function __construct(
+        FetchesCompany $fetchesCompany,
+        GeneratesTransactionBillNumber $generatesTransactionBillNumber,
+        CreatesTransaction $createsTransaction,
+        UpdatesWallet $updatesWallet
+    )
+    {
+        $this->fetchesCompany = $fetchesCompany;
+        $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
+        $this->createsTransaction = $createsTransaction;
+        $this->updatesWallet = $updatesWallet;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $amount = floatval(str_replace(',', '', $request->input('amount')));
+        $company = $this->fetchesCompany->execute(['id' => $request->input('company_id')]);
+        $reference = $request->input('reference');
+
+        if (!$company->wallets()->first()) {
+            $object = new WalletObject($company->id, 1, $this->generatesWalletCode->execute());
+            $wallet = $this->createsWallet->execute($object, $company);
+        }
+
+        $wallet = $company->wallets()->first();
+
+        $billNumber = $this->generatesTransactionBillNumber->execute('DEBIT-NOTE-');
+        
+        $transaction_object = new TransactionObject(
+            $billNumber, 
+            TransactionType::DEBIT_NOTE, 
+            1, 
+            $wallet->company->id,
+            1, 
+            PaymentMethodType::CASH,
+            $amount, 
+            $amount, 
+            1,
+            1, 
+            1,
+            0, 
+            0, 
+            null, 
+            ApprovalStatus::APPROVED,
+            [],
+            $reference
+        );
+
+        $transaction = $this->createsTransaction->execute($wallet, $transaction_object);
+        $updateWalletAmount = $wallet->amount - $transaction->amount;
+
+        $walletOject = new WalletObject($wallet->company->id, $wallet->currency_id, $wallet->code, $updateWalletAmount);
+
+        $wallet = $this->updatesWallet->execute($wallet, $walletOject);
+
+        return $this->resourceResponse(new WalletResource($wallet));
+    }
+}

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

@@ -0,0 +1,89 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+
+use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
+use App\Classes\Modules\Wallets\Services\CreatesWallet;
+use App\Classes\Modules\Wallets\Services\GeneratesWalletCode;
+use App\Classes\Modules\Wallets\Standards\Rules\CanCreateCompanyWallet;
+use App\Http\Resources\WalletResource;
+use App\Classes\Modules\Wallets\Services\FetchesWallet;
+use App\Models\Wallet;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use App\Classes\Modules\Companies\Services\FetchesCompanyModule;
+
+class FetchWalletByCompanyModuleControllerLogic extends AbstractControllerLogic
+{
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Retrieved Wallet',
+            'message' => 'You have successfully retrieved a wallet'
+        ];
+    }
+
+    /** @var FetchesWallet  */
+   private $fetchesWallet;
+
+    /** @var CreatesWallet  */
+    private $createsWallet;
+
+    /** @var GeneratesWalletCode */
+    private $generatesWalletCode;
+
+    /** @var CanCreateCompanyWallet */
+    private $canCreateCompanyWallet;
+
+    /** @var FetchesCompanyModule */
+    private $fetchesCompanyModule;
+    
+
+    /**
+     * CreateWalletLogic constructor.
+     * @param FetchesWallet $fetchesWallet
+     */
+    public function __construct(FetchesWallet $fetchesWallet, CreatesWallet $createsWallet, GeneratesWalletCode $generatesWalletCode, CanCreateCompanyWallet $canCreateCompanyWallet, FetchesCompanyModule $fetchesCompanyModule)
+    {
+        $this->fetchesWallet = $fetchesWallet;
+        $this->fetchesCompanyModule = $fetchesCompanyModule;
+        $this->createsWallet = $createsWallet;
+        $this->generatesWalletCode = $generatesWalletCode;
+        $this->canCreateCompanyWallet = $canCreateCompanyWallet;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        // $this->canFetchWallet->passes();
+
+        if (!count(Wallet::where('owner_id', $request->route('company_module_id'))->get())) {
+            $object = new WalletObject($request->route('company_module_id'), $request->input('currency_id') ?? 1, $this->generatesWalletCode->execute());
+
+            $this->canCreateCompanyWallet->passes($object);
+    
+            $company_module = $this->fetchesCompanyModule->execute(['id' => $request->route('company_module_id')]);
+    
+            $wallet = $this->createsWallet->execute($object, $company_module);
+    
+            return $this->resourceResponse(new WalletResource($wallet));
+        }
+
+        $filters = $this->fetchesWallet->deserializeFilters($request->input('filters'));
+
+        $filters['owner_id'] = $request->route('company_module_id');
+
+        $query = $this->fetchesWallet->execute($filters);
+
+        return $this->resourceResponse(new WalletResource($query));
+    }
+}

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

@@ -0,0 +1,60 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+
+use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
+use App\Classes\Modules\Wallets\Services\ListsWallet;
+use App\Classes\Modules\Wallets\Standards\Rules\CanListWallet;
+use App\Http\Resources\WalletResource;
+
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+
+class ListWalletLogic extends AbstractControllerLogic
+{
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'List Company Wallet',
+            'message' => 'You have successfully list company wallet'
+        ];
+    }
+
+    /** @var ListWallet  */
+   private $listsWallet;
+
+   /** @var CanCreateCompanyWallet */
+   private $canListWallet;
+
+    /**
+     * CreateWalletLogic constructor.
+     * @param CreatesWallet $createsWallet
+     * @param GeneratesWalletCode $generatesWalletCode
+     * @param CanCreateCompanyWallet $canCreateCompanyWallet
+     */
+    public function __construct(CanListWallet $canListWallet, ListsWallet $listsWallet)
+    {
+        $this->canListWallet = $canListWallet;
+        $this->listsWallet = $listsWallet;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        //$this->canListWallet->passes();
+
+        $query = $this->listsWallet->execute($this->listsWallet->deserializeFilters($request->input('filters')));
+
+        return $this->collectionResponse(WalletResource::collection($query));
+    }
+}

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

@@ -0,0 +1,88 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+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\Modules\Wallets\Processors\CreateWalletTopUpTransactionProcessor;
+use App\Http\Resources\WalletTransactionResource;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class TopUpWalletLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'TopUp into Company Wallet',
+            'message' => 'You have successfully created a topup request for company\'s wallet'
+        ];
+    }
+
+
+    /** @var FetchesCompanyModule  */
+    private $fetchesCompanyModule;
+
+    /** @var GeneratesWalletCode */
+    private $generatesWalletCode;
+
+    /** @var CreatesWallet  */
+    private $createsWallet;
+
+    /** @var GeneratesTransactionBillNumber  */
+    private $generatesTransactionBillNumber;
+
+    /** @var CreatesBillplzBill */
+    private $createsBillplzBill;
+
+    /** @var CreatesTransactionableTransaction */
+    private $createsTransactionableTransaction;
+
+    /** @var CreateWalletTopUpTransactionProcessor */
+    private $createWalletTopUpTransactionProcessor;
+
+
+    /**
+     * TopUpWalletLogic constructor.
+     * @param FetchesCompanyModule $fetchesCompanyModule
+     * @param GeneratesWalletCode $generatesWalletCode
+     * @param CreatesWallet $createsWallet
+     * @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, CreateWalletTopUpTransactionProcessor $createWalletTopUpTransactionProcessor)
+    {
+        $this->fetchesCompanyModule = $fetchesCompanyModule;
+        $this->generatesWalletCode = $generatesWalletCode;
+        $this->createsWallet = $createsWallet;
+        $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
+        $this->createsBillplzBill = $createsBillplzBill;
+        $this->createsTransactionableTransaction = $createsTransactionableTransaction;
+        $this->createWalletTopUpTransactionProcessor = $createWalletTopUpTransactionProcessor;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $amount = floatval(str_replace(',', '', $request->input('amount')));
+        $companyModule = $this->fetchesCompanyModule->execute(['id' => $request->input('company_module_id')]);
+
+        $transaction = $this->createWalletTopUpTransactionProcessor->execute($companyModule, $amount, $request->input('bank_code'));
+
+        return $this->resourceResponse(new WalletTransactionResource($transaction));
+    }
+}

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

@@ -0,0 +1,69 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+
+use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
+use App\Classes\Modules\Wallets\Services\ListsWallet;
+use App\Classes\Modules\Wallets\Services\FetchesWallet;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+
+use App\Classes\Modules\Wallets\Standards\Rules\CanListWallet;
+use App\Http\Resources\WalletResource;
+use App\Classes\Modules\Transactions\Processors\UpdateWalletTransactionProcessor;
+
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+
+class UpdateStatusWalletLogic extends AbstractControllerLogic
+{
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Update Status Transaction Company Wallet',
+            'message' => 'You have successfully status transaction company wallet'
+        ];
+    }
+
+    /** @var ListWallet  */
+   private $fetchesWallet;
+
+   /** @var CanCreateCompanyWallet */
+   private $canListWallet;
+
+    /** @var UpdateWalletTransactionProcessor */
+    private $updateWalletTransactionProcessor;
+
+    /**
+     * CreateWalletLogic constructor.
+     * @param CreatesWallet $createsWallet
+     * @param GeneratesWalletCode $generatesWalletCode
+     * @param CanCreateCompanyWallet $canCreateCompanyWallet
+     */
+    public function __construct(FetchesWallet $fetchesWallet, UpdateWalletTransactionProcessor $updateWalletTransactionProcessor)
+    {
+        $this->fetchesWallet = $fetchesWallet;
+        $this->updateWalletTransactionProcessor = $updateWalletTransactionProcessor;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $status = ($request->route('status')=='approve') ? 2 : 4;
+
+        $wallet = $this->updateWalletTransactionProcessor->execute($request->route('transaction_id'), $status);
+
+        return $this->resourceResponse(new WalletResource($wallet));
+
+    }
+}

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

@@ -0,0 +1,72 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+
+use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
+use App\Classes\Modules\Wallets\Services\ListsWallet;
+use App\Classes\Modules\Wallets\Services\FetchesWallet;
+use App\Classes\ValueObjects\Constants\TransactionType;
+
+use App\Classes\Modules\Wallets\Standards\Rules\CanWithdrawWallet;
+use App\Http\Resources\WalletResource;
+use App\Classes\Modules\Transactions\Processors\CreateWalletTransactionProcessor;
+
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+
+class WithdrawWalletLogic extends AbstractControllerLogic
+{
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Withdraw from Company Wallet',
+            'message' => 'You have successfully withdraw company wallet'
+        ];
+    }
+
+    /** @var FetchesWallet  */
+   private $fetchesWallet;
+
+   /** @var CanWithdrawWallet */
+   private $canWithdrawWallet;
+
+    /** @var CreateWalletTransactionProcessor */
+    private $createWalletTransactionProcessor;
+
+    /**
+     * CreateWalletLogic constructor.
+     * @param CreatesWallet $createsWallet
+     * @param GeneratesWalletCode $generatesWalletCode
+     * @param CanCreateCompanyWallet $canCreateCompanyWallet
+     */
+    public function __construct(CanWithdrawWallet $canWithdrawWallet, FetchesWallet $fetchesWallet, CreateWalletTransactionProcessor $createWalletTransactionProcessor)
+    {
+        $this->canWithdrawWallet = $canWithdrawWallet;
+        $this->fetchesWallet = $fetchesWallet;
+        $this->createWalletTransactionProcessor = $createWalletTransactionProcessor;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $wallet = $this->fetchesWallet->execute(['id' => $request->input('wallet_id')]);
+
+        $walletOject = new WalletObject( $wallet->company->id,  $wallet->currency_id,  $wallet->code, $request->input('amount'));
+
+        $this->canWithdrawWallet->passes($walletOject);
+
+        $transaction = $this->createWalletTransactionProcessor->execute($wallet, $walletOject, TransactionType::WITHDRAW);
+
+        return $this->resourceResponse(new WalletResource($wallet));
+    }
+}

app/Classes/Modules/Wallets/DataTransferObjects/WalletObject.php

@@ -0,0 +1,65 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\DataTransferObjects;
+
+use App\Classes\General\Interfaces\DataTransferObject;
+
+class WalletObject implements DataTransferObject
+{
+
+    /** @var int */
+    private $company_module_id;
+
+    /** @var int */
+	private $currency_id;
+
+	/** @var int */
+	private $code;
+
+    private $amount;
+
+    /**
+     * WalletObject constructor.
+     * @param int $company_module_id
+     * @param int $currency
+     * @param int $code
+     */
+    public function __construct(int $company_module_id, int $currency, int $code, float $amount=0)
+    {
+        $this->company_module_id = $company_module_id;
+        $this->currency_id = $currency;
+        $this->code = $code;
+        $this->amount = $amount;
+    }
+
+    /**
+     * @return int
+     */
+    public function getCompanyModuleId(): int
+    {
+        return $this->company_module_id;
+    }
+
+    /**
+     * @return int
+     */
+    public function getCurrency(): int
+    {
+        return $this->currency_id;
+    }
+
+    /**
+     * @return int
+     */
+    public function getCode(): int
+    {
+        return $this->code;
+    }
+
+    public function getAmount(): float
+    {
+        return $this->amount;
+    }
+
+
+}

app/Classes/Modules/Wallets/DataTransferObjects/WalletTransactionObject.php

@@ -0,0 +1,94 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\DataTransferObjects;
+
+use App\Classes\General\Interfaces\DataTransferObject;
+
+class WalletTransactionObject implements DataTransferObject
+{
+
+    private $wallet_id;
+
+    private $bill_no;
+    
+    private $trans_type;
+    
+    private $amount;
+    
+    private $currency_id;
+    
+    private $original_amount;
+    
+    private $original_currency_id;
+
+    private $currency_rate;
+    
+    public function __construct(
+        int $wallet_id, int $bill_no,int $trans_type,
+        float $amount, int $currency_id, int $original_amount,
+        int $original_currency_id, float $currency_rate
+    ){
+        $this->wallet_id = $wallet_id;
+        $this->bill_no = $bill_no;
+        $this->trans_type = $trans_type;
+        $this->amount= $amount;
+        $this->currency_id = $currency_id;
+        $this->original_amount = $original_amount;
+        $this->original_currency_id = $original_currency_id;
+        $this->currency_rate = $currency_rate;
+    }
+
+    /**
+     * @return int
+     */
+    public function getWalletId(): int
+    {
+        return $this->wallet_id;
+    }
+    
+    /**
+     * @return int
+     */
+    public function getBillNo(): int
+    {
+        return $this->bill_no;
+    }
+    
+    /**
+     * @return int
+     */
+    public function getTransType(): int
+    {
+        return $this->trans_type;
+    }
+    
+    
+    public function getAmount(): float
+    {
+        return $this->amount;
+    }
+
+    /**
+     * @return int
+     */
+    public function getCurrency(): int
+    {
+        return $this->currency_id;
+    }
+    
+    
+    public function getOriginalAmount(): float
+    {
+        return $this->original_amount;
+    }
+    
+    public function getOriginalCurrency(): int
+    {
+        return $this->original_currency_id;
+    }
+    
+    public function getCurrencyRate(): float
+    {
+        return $this->currency_rate;
+    }
+}

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/Modules/Wallets/Processors/CreditWalletProcessor.php

@@ -0,0 +1,90 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\Processors;
+
+use App\Models\Wallet;
+use App\Models\Company;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\Modules\Wallets\Services\CreatesWallet;
+use App\Classes\Modules\Wallets\Services\UpdatesWallet;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use App\Classes\Modules\Wallets\Services\GeneratesWalletCode;
+use App\Classes\Modules\Transactions\Services\CreatesTransaction;
+use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
+use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
+use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
+
+class CreditWalletProcessor
+{
+    /** @var GeneratesWalletCode */
+    private $generatesWalletCode;
+
+    /** @var CreatesWallet  */
+    private $createsWallet;
+
+    /** @var GeneratesTransactionBillNumber  */
+    private $generatesTransactionBillNumber;
+
+    /** @var CreatesTransaction */
+    private $createsTransaction;
+
+    /** @var UpdatesWallet */
+    private $updatesWallet;
+
+    /**
+     * CreateWalletLogic constructor.
+     * @param GeneratesWalletCode $generatesWalletCode
+     * @param CreatesWallet $createsWallet
+     * @param GeneratesTransactionBillNumber $generatesTransactionBillNumber
+     * @param CreatesTransaction $createsTransaction
+     * @param UpdatesWallet $updatesWallet
+     */
+    public function __construct(
+        GeneratesWalletCode $generatesWalletCode,
+        CreatesWallet $createsWallet,
+        GeneratesTransactionBillNumber $generatesTransactionBillNumber,
+        CreatesTransaction $createsTransaction,
+        UpdatesWallet $updatesWallet
+    )
+    {
+        $this->generatesWalletCode = $generatesWalletCode;
+        $this->createsWallet = $createsWallet;
+        $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
+        $this->createsTransaction = $createsTransaction;
+        $this->updatesWallet = $updatesWallet;
+    }
+
+
+    /**
+     * @param Company $company
+     * @param int $transactionType
+     * @param float $amount
+     * @param string $reference
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Company $company, int $transactionType, float $amount, string $reference)
+    {
+        if (!$company->wallets()->first()) {
+            $object = new WalletObject($company->id, 1, $this->generatesWalletCode->execute());
+            $this->createsWallet->execute($object, $company);
+        }
+
+        /** @var Wallet $wallet */
+        $wallet = $company->wallets()->first();
+
+        $billNumber = $this->generatesTransactionBillNumber->execute($transactionType === 2 ? 'DEBIT-NOTE-' : 'CREDIT-NOTE-');
+        
+        $transaction_object = new TransactionObject($billNumber, $transactionType === 2 ? TransactionType::DEBIT_NOTE : TransactionType::CREDIT_NOTE, 1,  $wallet->owner->id,  1, PaymentMethodType::CASH,  $amount,  $amount,  1,  1,  1,  0,  0,  null,  ApprovalStatus::APPROVED,  [], $reference);
+        $transaction = $this->createsTransaction->execute($wallet, $transaction_object);
+        
+        $updateWalletAmount = $transactionType === 2 ? ($wallet->amount - $transaction->amount) : ($wallet->amount + $transaction->amount);
+
+        $walletObject = new WalletObject($wallet->owner->id, $wallet->currency_id, $wallet->code, $updateWalletAmount);
+
+        $wallet = $this->updatesWallet->execute($wallet, $walletObject);
+
+        return $wallet;
+    }
+}

app/Classes/Modules/Wallets/Services/ChecksIfWalletCodeExists.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\Services;
+
+
+use App\Models\Wallet;
+
+class ChecksIfWalletCodeExists
+{
+
+    /** @var wallet */
+    private $repository;
+
+
+    /**
+     * ChecksIfWalletCodeExists constructor.
+     * @param Wallet $repository
+     */
+    public function __construct(wallet $repository)
+    {
+        $this->repository = $repository;
+    }
+
+    public function execute(int $code): bool {
+        return $this->repository->where('code', $code)->exists();
+    }
+
+}

app/Classes/Modules/Wallets/Services/ChecksIfWalletTransactionBillNoExists.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\Services;
+
+
+use App\Models\WalletTransaction;
+
+class ChecksIfWalletTransactionBillNoExists
+{
+
+    private $repository;
+
+    public function __construct(WalletTransaction $repository)
+    {
+        $this->repository = $repository;
+    }
+
+    public function execute(int $bill_no): bool {
+        return $this->repository->where('bill_no', $bill_no)->exists();
+    }
+
+}

app/Classes/Modules/Wallets/Services/CreatesWallet.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
+use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
+use App\Models\Wallet;
+use App\Models\Company;
+use App\Models\CompanyModule;
+
+class CreatesWallet extends AbstractUpdateRelationshipRecord
+{
+    /**
+     * @param WalletObject $object
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(WalletObject $object, CompanyModule $companyModule) {
+        $model = new Wallet();
+        // $model->company_module_id = $object->getCompanyModuleId();
+        $model->code = $object->getCode();
+        $model->currency_id = $object->getCurrency();
+
+        return $this->handler($companyModule->wallets(), $model);
+    }
+}

app/Classes/Modules/Wallets/Services/CreatesWalletTransaction.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\Modules\Wallets\DataTransferObjects\WalletTransactionObject;
+use App\Models\WalletTransaction;
+
+class CreatesWalletTransaction extends AbstractUpdateRecord
+{
+    /**
+     * @param WalletTransactionObject $object
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(WalletTransactionObject $object) {
+        $model = new WalletTransaction();
+        $model->wallet_id = $object->getWalletId();
+        $model->bill_no = $object->getBillNo();
+        $model->trans_type = $object->getTransType();
+        $model->amount = $object->getAmount();
+        $model->currency_id = $object->getCurrency();
+        $model->original_amount = $object->getOriginalAmount();
+        $model->original_currency_id = $object->getOriginalCurrency();
+        $model->currency_rate = $object->getCurrencyRate();
+
+        return $this->handler($model);
+
+    }
+}

app/Classes/Modules/Wallets/Services/FetchesWallet.php

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

app/Classes/Modules/Wallets/Services/GeneratesWalletCode.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\Services;
+
+
+class GeneratesWalletCode
+{
+
+    /** @var ChecksIfWalletCodeExists */
+    private $walletCodeExists;
+
+    /**
+     * GeneratesWalletCode constructor.
+     * @param ChecksIfWalletCodeExists $walletCodeExists
+     */
+    public function __construct(ChecksIfWalletCodeExists $walletCodeExists)
+    {
+        $this->walletCodeExists = $walletCodeExists;
+    }
+
+
+    /**
+     * @return int
+     */
+    public function execute(): int {
+
+        $code = mt_rand(100000001, 999999999);
+        return !$this->walletCodeExists->execute($code) ? $code : self::execute();
+
+    }
+
+}

app/Classes/Modules/Wallets/Services/GeneratesWalletTransactionBillNo.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\Services;
+
+
+class GeneratesWalletTransactionBillNo
+{
+
+    
+    private $walletTransationBillNoExists;
+
+   
+    public function __construct(ChecksIfWalletTransactionBillNoExists $walletTransationBillNoExists)
+    {
+        $this->walletTransationBillNoExists = $walletTransationBillNoExists;
+    }
+
+
+   
+    public function execute(): int {
+
+        $code = mt_rand(100000001, 999999999);
+        return !$this->walletTransationBillNoExists->execute($code) ? $code : self::execute();
+
+    }
+
+}

app/Classes/Modules/Wallets/Services/ListsWallet.php

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

app/Classes/Modules/Wallets/Services/UpdatesWallet.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
+use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
+use App\Models\Wallet;
+use App\Models\Company;
+
+class UpdatesWallet extends AbstractUpdateRecord
+{
+    /**
+     * @param WalletObject $object
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Wallet $model, WalletObject  $object) {
+        $model->amount = $object->getAmount();
+        $model->code = $object->getCode();
+        $model->currency_id = $object->getCurrency();
+
+
+        return $this->handler($model);
+
+    }
+}

app/Classes/Modules/Wallets/Services/UpdatesWalletBalance.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
+use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
+use App\Models\Wallet;
+use App\Models\Company;
+
+class UpdatesWalletBalance extends AbstractUpdateRecord
+{
+    /**
+     * @param Wallet $model
+     * @param $amount
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Wallet $model, $amount) {
+
+        $model->amount = $model->amount + $amount;
+        return $this->handler($model);
+
+    }
+}

app/Classes/Modules/Wallets/Standards/Rules/CanCreateCompanyWallet.php

@@ -0,0 +1,55 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
+use App\Classes\Modules\Wallets\Standards\Validators\CompanyWalletValidation;
+
+class CanCreateCompanyWallet extends AbstractRule
+{
+
+    /** @var CompanyWalletValidation */
+    private $companyWalletValidation;
+
+    /**
+     * CanCreateCompanyWallet constructor.
+     * @param CompanyWalletValidation $companyWalletValidation
+     */
+    public function __construct(CompanyWalletValidation $companyWalletValidation)
+    {
+        $this->companyWalletValidation = $companyWalletValidation;
+    }
+
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+    }
+
+    /**
+     * @param WalletObject $object
+     * @return bool
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    protected function validators($object): bool
+    {
+        return $this->companyWalletValidation->validate($object);
+    }
+
+
+    /**
+     * @param WalletObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}

app/Classes/Modules/Wallets/Standards/Rules/CanCreateWalletTransaction.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Wallets\DataTransferObjects\WalletTransactionObject;
+use App\Classes\Modules\Wallets\Standards\Validators\WalletTransactionValidation;
+
+class CanCreateWalletTransaction extends AbstractRule
+{
+
+    /** @var WalletTransactionValidation */
+    private $walletTransactionValidation;
+
+  
+    public function __construct(WalletTransactionValidation $walletTransactionValidation)
+    {
+        $this->walletTransactionValidation = $walletTransactionValidation;
+    }
+
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+    }
+
+    /**
+     * @param WalletTransactionObject $object
+     * @return bool
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    protected function validators($object): bool
+    {
+        return $this->walletTransactionValidation->validate($object);
+    }
+
+    /**
+     * @param WalletTransactionObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}

app/Classes/Modules/Wallets/Standards/Rules/CanListWallet.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
+use App\Classes\Modules\Wallets\Standards\Validators\ListWalletValidation;
+
+class CanListWallet extends AbstractRule
+{
+
+    /** @var ListWalletValidation */
+    private $listWalletValidation;
+
+
+    public function __construct(ListWalletValidation $listWalletValidation)
+    {
+        $this->listWalletValidation = $listWalletValidation;
+    }
+
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+    }
+
+    /**
+     * @param WalletObject $object
+     * @return bool
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    protected function validators($object): bool
+    {
+        return $this->listWalletValidation->validate($object);
+    }
+
+    /**
+     * @param WalletTransactionObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}

app/Classes/Modules/Wallets/Standards/Rules/CanTopUpWallet.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
+use App\Classes\Modules\Wallets\Standards\Validators\TopUpWalletValidation;
+
+class CanTopUpWallet extends AbstractRule
+{
+
+    /** @var TopUpWalletValidation */
+    private $topUpWalletValidation;
+
+
+    public function __construct(TopUpWalletValidation $topUpWalletValidation)
+    {
+        $this->topUpWalletValidation = $topUpWalletValidation;
+    }
+
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+    }
+
+    /**
+     * @param WalletObject $object
+     * @return bool
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    protected function validators($object): bool
+    {
+        return $this->topUpWalletValidation->validate($object);
+    }
+
+    /**
+     * @param WalletTransactionObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}

app/Classes/Modules/Wallets/Standards/Rules/CanWithdrawWallet.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
+use App\Classes\Modules\Wallets\Standards\Validators\WithdrawWalletValidation;
+
+class CanWithdrawWallet extends AbstractRule
+{
+
+    /** @var WithdrawWalletValidation */
+    private $witdrawWalletValidation;
+
+
+    public function __construct(WithdrawWalletValidation $witdrawWalletValidation)
+    {
+        $this->witdrawWalletValidation = $witdrawWalletValidation;
+    }
+
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+    }
+
+    /**
+     * @param WalletObject $object
+     * @return bool
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    protected function validators($object): bool
+    {
+        return $this->witdrawWalletValidation->validate($object);
+    }
+
+    /**
+     * @param WalletTransactionObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}

app/Classes/Modules/Wallets/Standards/Validators/CompanyWalletValidation.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\Standards\Validators;
+
+use App\Classes\General\Abstracts\AbstractValidation;
+use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
+
+class CompanyWalletValidation extends AbstractValidation
+{
+    /**
+     * @param WalletObject $object
+     * @return array
+     */
+    protected function data($object): array 
+    {
+        return [
+            'company_module_id' => $object->getCompanyModuleId(),
+            'currency_id' => $object->getCurrency(),
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    protected function rules(): array 
+    {
+        return [
+            'company_module_id' => 'required',
+            'currency_id' => 'required',
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    protected function messages(): array 
+    {
+        return [];
+    }
+}

app/Classes/Modules/Wallets/Standards/Validators/ListWalletValidation.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\Standards\Validators;
+
+use App\Classes\General\Abstracts\AbstractValidation;
+
+class ListWalletValidation extends AbstractValidation
+{
+
+    protected function data($object): array
+    {
+        return [];
+    }
+
+    /**
+     * @return array
+     */
+    protected function rules(): array
+    {
+        return [];
+    }
+
+    /**
+     * @return array
+     */
+    protected function messages(): array
+    {
+        return [];
+    }
+}

app/Classes/Modules/Wallets/Standards/Validators/TopUpWalletValidation.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\Standards\Validators;
+
+use App\Classes\General\Abstracts\AbstractValidation;
+
+class TopUpWalletValidation extends AbstractValidation
+{
+
+    protected function data($object): array
+    {
+        return [];
+    }
+
+    /**
+     * @return array
+     */
+    protected function rules(): array
+    {
+        return [];
+    }
+
+    /**
+     * @return array
+     */
+    protected function messages(): array
+    {
+        return [];
+    }
+}

app/Classes/Modules/Wallets/Standards/Validators/WalletTransactionValidation.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\Standards\Validators;
+
+use App\Classes\General\Abstracts\AbstractValidation;
+
+class WalletTransactionValidation extends AbstractValidation
+{
+    
+    protected function data($object): array 
+    {
+        return [
+            'wallet_id' => $object->getWalletId(),
+            'currency_id' => $object->getCurrency(),
+            'amount' => $object->getAmount(),
+            'trans_type'=>$object->getTransType()
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    protected function rules(): array 
+    {
+        return [
+            'wallet_id' => 'required',
+            'currency_id' => 'required',
+            'amount' => 'required',
+            'trans_type'=>'required'
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    protected function messages(): array 
+    {
+        return [];
+    }
+}

app/Classes/Modules/Wallets/Standards/Validators/WithdrawWalletValidation.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\Standards\Validators;
+
+use App\Classes\General\Abstracts\AbstractValidation;
+
+class WithdrawWalletValidation extends AbstractValidation
+{
+
+    protected function data($object): array
+    {
+        return [];
+    }
+
+    /**
+     * @return array
+     */
+    protected function rules(): array
+    {
+        return [];
+    }
+
+    /**
+     * @return array
+     */
+    protected function messages(): array
+    {
+        return [];
+    }
+}

app/Classes/ValueObjects/Constants/PaymentMethodType.php

@@ -19,7 +19,7 @@ final class PaymentMethodType {
         'cheque' => self::CHEQUE,
         'ba' => self::BA,
         'wallet' => self::WALLET,
-        'payment gateway' => self::PAYMENT_GATEWAY,
+        'payment_gateway' => self::PAYMENT_GATEWAY,
     ];
 
     public const PAYMENT_METHODS_ID = [

app/Classes/ValueObjects/Constants/TransactionType.php

@@ -4,20 +4,17 @@ 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;
 
-    // public const TOP_UP = 5;
+    public const TOP_UP = 5;
 
     // public const REFUND = 6;
 
@@ -25,8 +22,20 @@ final class TransactionType {
 
     // public const SUPPLIER_DELIVER = 8;
 
-    // public const SHIPPING_COST = 9;
+    public const CREDIT_NOTE = 9;
 
+    public const WITHDRAW = 10;
+
+    public const DEBIT_NOTE = 11;
+
+    public const TRANSFER_FEE = 12;
+
+    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

@@ -51,7 +51,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/Transactions/CreateGroupsController.php

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

app/Http/Controllers/Transactions/DeleteGroupController.php

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

app/Http/Controllers/Transactions/ListGroupsController.php

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

app/Http/Controllers/Transactions/RegenerateShippingInvoiceTransactionController.php

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

app/Http/Controllers/Transactions/UpdateGroupController.php

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

app/Http/Controllers/Wallets/CreateWalletController.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Http\Controllers\Wallets;
+
+use App\Classes\Modules\Wallets\ControllersLogic\CreateWalletLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreateWalletController
+{
+
+    public function create(Request $request, CreateWalletLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+}

app/Http/Controllers/Wallets/CreateWalletTransactionController.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Http\Controllers\Wallets;
+
+use App\Classes\Modules\Wallets\ControllersLogic\CreateWalletTransactionLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreateWalletTransactionController
+{
+
+    public function create(Request $request, CreateWalletTransactionLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+}

app/Http/Controllers/Wallets/CreditWalletController.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Http\Controllers\Wallets;
+
+use App\Classes\Modules\Wallets\ControllersLogic\CreditWalletLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreditWalletController
+{
+
+    public function credit(Request $request, CreditWalletLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+}

app/Http/Controllers/Wallets/DebitWalletController.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Http\Controllers\Wallets;
+
+use App\Classes\Modules\Wallets\ControllersLogic\DebitWalletLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class DebitWalletController
+{
+
+    public function debit(Request $request, DebitWalletLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+}

app/Http/Controllers/Wallets/FetchWalletByCompanyModuleController.php

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

app/Http/Controllers/Wallets/ListWalletController.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Http\Controllers\Wallets;
+
+use App\Classes\Modules\Wallets\ControllersLogic\ListWalletLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ListWalletController
+{
+    public function list(Request $request, ListWalletLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+}

app/Http/Controllers/Wallets/TopUpWalletController.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Http\Controllers\Wallets;
+
+use App\Classes\Modules\Wallets\ControllersLogic\TopUpWalletLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class TopUpWalletController
+{
+
+    public function topUp(Request $request, TopUpWalletLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+}

app/Http/Controllers/Wallets/UpdateStatusWalletController.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Http\Controllers\Wallets;
+
+use App\Classes\Modules\Wallets\ControllersLogic\UpdateStatusWalletLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateStatusWalletController
+{
+    public function updateStatus(Request $request, UpdateStatusWalletLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+}

app/Http/Controllers/Wallets/WalletReportController.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Http\Controllers\Wallets;
+
+use App\Classes\ValueObjects\Response\ApiResponseObject;
+use App\Classes\ValueObjects\Constants\HttpStatus;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Models\Transaction;
+use App\Models\Wallet;
+
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class WalletReportController
+{
+    public function walletsReport(Request $request): JsonResponse
+    {
+        return (new ApiResponseObject(
+            'fetch service report Successful',
+            '',
+            HttpStatus::OK_WITH_MESSAGE,
+            ['data' => [
+                'walletSum' => (float) Wallet::all()->sum('amount'),
+                'outgoingSum' =>  (float) Transaction::where('type', TransactionType::PAYMENT)->where('owner_type', Wallet::class)->sum('amount'),
+                'incomingSum' =>  (float) Transaction::whereIn('type', [TransactionType::TOP_UP, TransactionType::CREDIT_NOTE])->where('owner_type', Wallet::class)->sum('amount'),
+            ]]
+        ))->handler();
+    }
+}

app/Http/Controllers/Wallets/WithdrawWalletController.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Http\Controllers\Wallets;
+
+use App\Classes\Modules\Wallets\ControllersLogic\WithdrawWalletLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class WithdrawWalletController
+{
+
+    public function withdraw(Request $request, WithdrawWalletLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+}

app/Http/Resources/GroupResource.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Http\Resources;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use Carbon\Carbon;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class GroupResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+
+        // dd($this->groupTransactions);
+
+        return [
+            'id' => $this->id,
+            'original_amount' => (float) $this->original_amount,
+            'original_currency' => new CurrencyResource($this->original_currency),
+            'issuer_name' => $this->issuerCompany->name,
+            'issuer_id' => $this->issuerCompany->id,
+            'amount' => (float) $this->amount,
+            'service_charge' => (float) $this->amount,
+            '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,
+            '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/OrderResource.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;
@@ -47,7 +48,7 @@ class OrderResource extends JsonResource
                 ];
             }),
             '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/WalletResource.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Http\Resources;
+
+use App\Classes\ValueObjects\Constants\TransactionType;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class WalletResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        return [
+            'id' => $this->id,
+            'code' => $this->code,
+            'currency_id' => $this->currency_id,
+            'amount' => (double) $this->amount,
+            'company_id' => (int) $this->owner->id,
+            'transactions' => $this->whenLoaded('transactions', WalletTransactionResource::collection($this->transactions()->whereIn('status', [2, 3])->orderBy('id', 'DESC')->get()), []),
+            'top_up_records' => $this->whenLoaded('transactions', WalletTransactionResource::collection($this->transactions()->whereNotIn('status', [0])->where('type', TransactionType::TOP_UP)->orderBy('id', 'DESC')->get()), []),
+            'company_module_marking' => $this->owner->connections->first()->invitee_reference,
+        ];
+    }
+}

app/Http/Resources/WalletTransactionResource.php

@@ -0,0 +1,64 @@
+<?php
+
+namespace App\Http\Resources;
+
+use App\Classes\General\Eloquent\Filters\TransactionServiceId;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Models\Transaction;
+use Carbon\Carbon;
+use Illuminate\Http\Resources\Json\JsonResource;
+use Illuminate\Support\Facades\Log;
+
+class WalletTransactionResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        $description = '';
+        switch((int) $this->type){
+            case TransactionType::TOP_UP:
+                $description = (double) $this->amount.' Credit Top up';
+                break;
+            case TransactionType::CREDIT_NOTE:
+                $description = 'Credit Voucher for '.$this->payment_reference;
+                break;
+            case TransactionType::PAYMENT:
+                $order = Transaction::where('payment_reference', $this->bill_no)->first()->owner->owner->owner;
+
+                if(!$order) {
+                    $description = 'Payment for unknown order, please contact tech support.';
+                    break;
+                }
+
+                $marking = $order->reference;
+                $description = 'Payment For order refs.'.'<a href="'.route('order.details', $marking).'">'.$marking.'</a>';
+                break;
+            case 11:
+                $description = 'Debit Voucher for '.$this->payment_reference;
+                break;
+
+        }
+
+        return [
+            'type' => (int) $this->type,
+            'marking' => $this->owner->owner->reference,
+            'bill_no' => $this->bill_no,
+            'reference' => $this->payment_reference,
+            'payment_method' => (float) $this->payment_method,
+            // 'issuer_name' => $this->issuerCompany->name,
+            'amount' => (double) $this->amount,
+            'service_charge' => (double) $this->service_charge,
+            'tax' => (double) $this->tax,
+            'status' => (int) $this->status,
+            'description' => $description,
+            'details' => TransactionDetailResource::collection($this->transactionDetails),
+            'updated_at' => Carbon::parse($this->updated_at)->format('d-m-Y h:i:s A'),
+            'created_at' => Carbon::parse($this->created_at)->format('d-m-Y h:i:s A')
+        ];
+    }
+}

app/Models/CompanyModule.php

@@ -194,7 +194,11 @@ class CompanyModule extends AbstractModel implements Addressable, Documentable,
         return $this->hasManyDeep(Transaction::class, [Order::class], ['company_module_id',  'owner_id'], ['id', 'id']);
     }
     
-
-
-
+    /**
+     * @return MorphMany
+     */
+    public function wallets(): morphMany
+    {
+        return $this->morphMany(Wallet::class, 'owner');
+    }
 }

app/Models/Group.php

@@ -0,0 +1,87 @@
+<?php
+
+namespace App\Models;
+
+use App\Classes\General\Traits\LogData;
+use Illuminate\Database\Eloquent\Model;
+use App\Classes\General\Interfaces\Documentable;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\MorphMany;
+use Staudenmeir\EloquentHasManyDeep\HasManyDeep;
+use Staudenmeir\EloquentHasManyDeep\HasRelationships;
+use App\Classes\General\Interfaces\Transactionable;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\SoftDeletes;
+
+
+class Group extends Model implements Documentable, Transactionable
+{
+    use HasRelationships;
+    use \Staudenmeir\EloquentHasManyDeep\HasTableAlias;
+    use SoftDeletes;
+	
+    /**
+     * @return MorphMany
+     */
+    public function transactions(): MorphMany
+    {
+        return $this->MorphMany(GroupTransaction::class, 'group');
+    }
+
+    /**
+     * @return HasMany
+     */
+    public function groupTransactions(): HasMany
+    {
+        return $this->hasMany(GroupTransaction::class);
+    }
+
+    /**
+     * @return MorphMany
+     */
+    public function documents(): morphMany
+    {
+        return $this->morphMany(Document::class, 'owner');
+    }
+
+    /**
+     * @return BelongsTo
+     */
+    public function currency(): BelongsTo
+    {
+        return $this->BelongsTo(Currency::class, 'currency_id', 'id');
+    }
+
+
+    /**
+     * @return HasManyDeep
+     */
+    public function transferFees(): HasManyDeep
+    {
+        return $this->HasManyDeep(Transaction::class, [GroupTransaction::class, Transaction::class.' as alias'], ['group_id', ['owner_type', 'owner_id'], ['owner_type', 'owner_id']], ['id', null, null]);
+    }
+
+    /**
+     * @return BelongsTo
+     */
+    public function issuerCompany(): BelongsTo
+    {
+        return $this->BelongsTo(CompanyModule::class, 'issuer', 'id');
+    }
+    
+    /**
+     * @return BelongsTo
+     */
+    public function receiverCompany(): BelongsTo
+    {
+        return $this->BelongsTo(CompanyModule::class, 'receiver', 'id');
+    }
+
+    /**
+     * @return BelongsTo
+     */
+    public function original_currency(): BelongsTo
+    {
+        return $this->BelongsTo(Currency::class, 'original_currency_id', 'id');
+    }
+}

app/Models/GroupTransaction.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+class GroupTransaction extends Model
+{
+    protected $table = 'group_transactions';
+    
+    /**
+     * @return BelongsTo
+     */
+    public function group(): BelongsTo
+    {
+        return $this->BelongsTo(Group::class, 'group_id', 'id');
+    }
+
+    /**
+     * @return BelongsTo
+     */
+    public function transaction(): BelongsTo
+    {
+        return $this->BelongsTo(Transaction::class, 'transaction_id', 'id');
+    }
+}

app/Models/Transaction.php

@@ -11,6 +11,7 @@ use App\Classes\ValueObjects\Constants\TransactionType;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Builder;
 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;
@@ -76,6 +77,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/Models/Wallet.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Models;
+
+use App\Classes\General\Interfaces\Transactionable;
+use App\Classes\General\Traits\LogData;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Relations\MorphTo;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\MorphMany;
+
+class Wallet extends AbstractModel implements Transactionable
+{
+    use SoftDeletes;
+    use LogData;
+
+    protected $table = 'wallets';
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\MorphTo
+     */
+    public function owner(): morphTo
+    {
+        return $this->morphTo();
+    }
+
+     /**
+     * @return morphMany
+     */
+    public function transactions(): morphMany
+    {
+        return $this->morphMany(Transaction::class, 'owner');
+    }
+}

database/migrations/2023_03_11_212614_create_companies_wallet_table.php

@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateCompaniesWalletTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('wallets', function (Blueprint $table) {
+            $table->id();
+            $table->morphs('owner');
+			$table->string('code');
+            $table->foreignId('currency_id')->unsigned();
+            $table->decimal('amount', 20, 5)->default(0.00);
+            $table->softDeletes();
+            $table->timestamps();
+
+            $table->foreign('currency_id')->references('id')->on('currencies');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('wallets');
+    }
+}

database/migrations/2023_03_19_170628_create_groups_table.php

@@ -0,0 +1,45 @@
+<?php
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateGroupsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('groups', function (Blueprint $table) {
+            $table->id();
+            $table->string('reference')->unique();
+            $table->foreignId('issuer')->unsigned();
+            $table->foreignId('receiver')->unsigned();
+            $table->decimal('amount', 14, 5)->default(0.00);
+            $table->decimal('original_amount', 14, 5)->default(0.00);
+            $table->foreignId('currency_id')->unsigned();
+            $table->foreignId('original_currency_id')->unsigned();
+            $table->decimal('currency_rate', 14, 5)->default(0.00);
+            $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();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('groups');
+    }
+}

database/migrations/2023_03_19_170641_create_group_transactions_table.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateGroupTransactionsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('group_transactions', function (Blueprint $table) {
+            $table->id();
+            $table->foreignId('group_id')->unsigned();
+            $table->foreignId('transaction_id')->unsigned();
+            $table->softDeletes();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('group_transactions');
+    }
+}

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

@@ -0,0 +1,134 @@
+<template>
+    <div class="row parentContainer">
+        <div class="col">
+            <div class="row">
+                <div class="col">
+                    <div v-show="!$store.getters.isLoading(section)">
+                        <list-component :section="section" :endpoint="endpoint" :options="options">
+                            <template slot="list" slot-scope="{data}">
+                                <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" v-if="!['customerPaidGroupInvoiceComponent', 'customerGroupPaymentInProgressInvoiceComponent'].includes(section)">
+                    <div class="row align-items-center">
+                        <div class="col">
+                            <div class="row" v-if="section === 'customerPendingPaymentInvoiceComponent'">
+                                <div class="col m-b-15">
+                                    <wallet-component :company_module_id="company_module_id" section="billingWalletSection"></wallet-component>
+                                </div>
+                            </div>
+                            <div class="b-a b-grey rounded padding-25 bg-white">
+                                <div class="row">
+                                    <div class="col">
+                                        <h6 class="semi-bold muted">Summary</h6>
+                                    </div>
+                                </div>
+                                <div class="row align-items-center justify-content-center">
+                                    <div class="col-auto">
+                                        <div class="padding-5">
+                                            <i class="fa fa-angle-up"></i>
+                                        </div>
+                                    </div>
+                                    <div class="col p-l-0">
+                                        <h6 class="semi-bold text-primary">{{selectedInvoice.length}} Invoice Selected</h6>
+                                    </div>
+                                </div>
+                                <div class="row">
+                                    <div class="col">
+                                        <div class="row" v-for="invoice in selectedInvoice">
+                                            <div class="col">
+                                                <h6 class="no-margin">{{ invoice.bill_no }}</h6>
+                                            </div>
+                                            <div class="col-auto">
+                                                <h6 class="no-margin">MYR  {{ invoice.amount.toFixed(2) }}</h6>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <hr>
+                                <div class="row">
+                                    <div class="col">
+                                        <h6 class="normal m-t-0 m-b-0">Total Amount</h6>
+                                    </div>
+                                    <div class="col-auto">
+                                        <h6 class="text-primary bold m-t-0 m-b-0">MYR {{ sumAmount }}</h6>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <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="['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">
+                        <group-payment-form-component :section="section" :company_module_id="company_module_id" :selectedIds="selectedIds" :sumAmount="sumAmount"></group-payment-form-component>
+                    </modal-component>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    export default {
+        props: {
+            options: {
+                default () {
+                    return {}
+                }
+            },
+            section:{
+                type: String,
+                required: true
+            },
+            company_module_id: {
+                type: Number,
+                required: true,
+            },
+            endpoint: {
+                type: String,
+                required: true
+            },
+        },
+        data(){
+            return {
+                isLoading: true,
+                invoices: null,
+                selectedInvoice: [],
+                selectedPaidInvoice: [],
+                selectedUnpaidInvoice: [],
+                selectAllInvoice: false,
+            }
+        },
+        computed: {
+            pendingQueue () {
+                return this.$store.getters.isInCompleteQueue(this.section);
+            },
+            sumAmount () {
+                var new_object = this.selectedInvoice;
+                return Object.keys(new_object).reduce(function(total, key) {
+                    return total + Math.round(new_object[key].amount * 100) / 100;
+                }, 0).toFixed(2);
+            },
+            selectedIds () {
+                return this.selectedInvoice.map(s=>s.id);
+            },
+        },
+        methods: {
+            generateSummaryInvoice(){
+                window.open(route('invoice.combined_summary', JSON.stringify(this.selectedIds)), '_blank');
+            },
+            makePayment(){
+                this.submit(this.route('api.transaction.group.create', JSON.stringify(this.selectedId)), 'post', this.section, true, false);
+            },
+            updateList(packageList){
+                this.selectedInvoice.includes(packageList) ? this.selectedInvoice.splice(this.selectedInvoice.indexOf(packageList), 1) : this.selectedInvoice.push(packageList);
+            },
+        }
+    }
+</script>

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

@@ -16,7 +16,8 @@
                                     <i class="fa fa-address-card fs-12 m-b-5 muted"></i>
                                 </div>
                                 <div class="col p-l-5">
-                                    <div class="muted bold fs-10">+{{item.owner.contact.country_code}} {{parseInt(item.owner.contact.phone, 10)}}</div>
+                                    <div class="muted bold fs-10" v-if="item.owner.contact">+{{item.owner.contact.country_code}} {{parseInt(item.owner.contact.phone, 10)}}</div>
+                                    <div class="muted bold fs-10" v-else></div>
                                 </div>
                             </div>
                         </div>
@@ -51,7 +52,8 @@
                                     </div>
                                     <div class="row">
                                         <div class="col">
-                                            <div class="fs-11 bold">{{item.owner.contact.wechat_id}}</div>
+                                            <div class="fs-11 bold" v-if="item.owner.contact">{{item.owner.contact.wechat_id}}</div>
+                                            <div class="fs-11 bold" v-else></div>
                                         </div>
                                     </div>
                                 </div>

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/orders/sections/OrderSectionComponent.vue

@@ -179,7 +179,7 @@
                                 <div class="col">
                                     <div class="row">
                                         <div class="col">
-                                            <list-order-component v-show="!$store.getters.isShowing('createOrderForm')" section="activeOrderListSection" :options="item ? {per_page: 12, order_by: {column: 'created_at', DESC: true}, status_in: [2], company_module_id: item.company_module.id, with_packing_lists: true} : {per_page: 30, order_by: {column: 'created_at', DESC: true}, status_in: [2], with_packing_lists: true}" :columns=3>
+                                            <list-order-component v-show="!$store.getters.isShowing('createOrderForm')" section="activeOrderListSection" :options="item ? {per_page: 12, order_by: {column: 'created_at', DESC: true}, status_in: [2], company_module_id: item.company_module.id, with_packing_lists: true} : {per_page: 12, order_by: {column: 'created_at', DESC: true}, status_in: [2], with_packing_lists: true}" :columns=3>
                                                 <template slot="list" slot-scope="{data}">
                                                     <order-component :data="data"></order-component>
                                                 </template>
@@ -196,7 +196,7 @@
                                 <div class="col">
                                     <div class="row">
                                         <div class="col">
-                                            <list-order-component v-show="!$store.getters.isShowing('createOrderForm')" section="completeOrderListSection" :options="item ? {per_page: 12, status_in: [3], company_module_id: item.company_module.id, with_packing_lists: true} : {per_page: 30, status_in: [3], with_packing_lists: true}" :columns=3>
+                                            <list-order-component v-show="!$store.getters.isShowing('createOrderForm')" section="completeOrderListSection" :options="item ? {per_page: 12, status_in: [3], company_module_id: item.company_module.id, with_packing_lists: true} : {per_page: 12, status_in: [3], with_packing_lists: true}" :columns=3>
                                                 <template slot="list" slot-scope="{data}">
                                                     <order-component :data="data"></order-component>
                                                 </template>
@@ -213,7 +213,7 @@
                                 <div class="col">
                                     <div class="row">
                                         <div class="col">
-                                            <list-order-component v-show="!$store.getters.isShowing('createOrderForm')" section="cancelledOrderListSection" :options="item ? {per_page: 12, status_in: [4, 5, 6], company_module_id: item.company_module.id, with_packing_lists: true} : {per_page: 30, status_in: [4, 5, 6], with_packing_lists: true}" :columns=3>
+                                            <list-order-component v-show="!$store.getters.isShowing('createOrderForm')" section="cancelledOrderListSection" :options="item ? {per_page: 12, status_in: [4, 5, 6], company_module_id: item.company_module.id, with_packing_lists: true} : {per_page: 12, status_in: [4, 5, 6], with_packing_lists: true}" :columns=3>
                                                 <template slot="list" slot-scope="{data}">
                                                     <order-component :data="data"></order-component>
                                                 </template>

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

@@ -0,0 +1,36 @@
+<template>
+    <div class="row">
+        <list-component
+            section="packageListSection"
+            :endpoint="route('api.packing_list.list')"
+            :options="{
+                packing_list_type: 1,
+                packing_list_status: 2,
+                per_page: 5,
+                owner_id: 1,
+                order_by: { column: 'arrival_date', DESC: true },
+                with_arrival_date: true,
+            }"
+        >
+            <template slot="list" slot-scope="{ data }">
+                <parcel-component
+                    v-for="packages in data.packages"
+                    :data="packages"
+                    :key="packages.id"
+                ></parcel-component>
+            </template>
+        </list-component>
+    </div>
+</template>
+<script>
+import componentHandler from "../../../general/mixins/componentHandler";
+export default {
+    data() {
+        return {
+            section: "packageListSection",
+        };
+    },
+    methods: {},
+    mixins: [componentHandler],
+};
+</script>

resources/assets/vue/components/paymentsBilling/elements/AdminDisputePaymentsBillingComponent.vue

@@ -65,6 +65,23 @@
                             <p class="no-margin fs-10 all-caps">Billing Question</p>
                             <div>{{ latestComment ? latestComment.content : '' }} </div>
                         </div>
+                        <div class="col-auto" v-if="invoice_status == 'Suspended Invoice'">
+                            <div class="btn bg-grey no-border muted requestModal" data-type="deleteInvoiceFunction">
+                                <i class="fa fa-trash"></i>
+                            </div>
+                            <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="deleteInvoiceFunction">
+                                <general-confirmation-form-component 
+                                    contentText="Are you sure you want to delete this Invoice?" 
+                                    modalType="delete" 
+                                    buttonText="Delete" 
+                                    class="text-center"
+                                    :apiRoute="route('api.transaction.delete', item.suspended_invoice.id)"
+                                    apiMethod="delete"
+                                    :section="section"
+                                >
+                                </general-confirmation-form-component>
+                            </modal-component>
+                        </div>
                     </div>
                 </div>
             </div>

resources/assets/vue/components/paymentsBilling/elements/GroupPaymentsBillingComponents.vue

@@ -0,0 +1,120 @@
+<template>
+    <div class="row m-b-15 m-l-5 m-r-10">
+        <div class="col bg-white rounded b-a" :class="{'b-white': !selected, 'b-primary': selected, 'bg-primary-lighter': selected, 'b-danger': item.status != 2, 'b-success': item.status == 2}">
+            <div class="row">
+                <div class="col padding-20">
+                    <div class="row align-items-center">
+                        <div class="col">
+                            <p class="no-margin fs-10 all-caps">Amount</p>
+                            <div>MYR  {{ item.amount.toFixed(2) }}</div>
+                        </div>
+                        <div class="col">
+                            <p class="no-margin fs-10 all-caps">Status</p>
+                            <div>{{ item.status_name }}</div>
+                        </div>
+                        <div class="col">
+                            <p class="no-margin fs-10 all-caps">Payment Method</p>
+                            <div>{{ item.payment_method_name }}</div>
+                        </div>
+                        <div class="col">
+                            <p class="no-margin fs-10 all-caps">Payment Date</p>
+                            <div>{{ item.created_at }}</div>
+                        </div>
+                        <div class="col-auto pointer btn btn-success" v-if="item.payment_method == 5 && item.status != 2" @click="retryPayment()">
+                            <div class=" no-border h-100">
+                                <i class="fa fa-repeat fs-20 text-white"></i>
+                            </div>
+                        </div>
+                        <div class="col-auto requestModal" v-if="item.status != 2" data-type="deleteGroupTransaction">
+                            <div class="btn bg-grey no-border">
+                                <i class="fa fa-times"></i>
+                            </div>
+                        </div>
+                        <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="deleteGroupTransaction">
+                            <general-confirmation-form-component 
+                                contentText="Are you sure you want to delete this Group Payment?" 
+                                modalType="delete" 
+                                buttonText="Delete" 
+                                class="text-center"
+                                :apiRoute="route('api.transaction.group.delete', item.id)"
+                                apiMethod="delete"
+                                :section="section"
+                            >
+                            </general-confirmation-form-component>
+                        </modal-component>
+                        <!-- payment method 1 -->
+                        <!-- <div class="col-auto pointer btn btn-success requestModal pointer" v-if="item.payment_method == 1 && item.status != 2" data-type="paymentProofModal" @click="selectedID(item.id)">
+                            <div class="no-border h-100">
+                                <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="30" height="30" viewBox="0 0 172 172" style=" fill:#000000;"><defs><linearGradient x1="86" y1="70.76994" x2="86" y2="116.46013" gradientUnits="userSpaceOnUse" id="color-1_52139_gr1"><stop offset="0" stop-color="#ffffff"></stop><stop offset="1" stop-color="#ffffff"></stop></linearGradient><linearGradient x1="61.8125" y1="34.48869" x2="61.8125" y2="144.97181" gradientUnits="userSpaceOnUse" id="color-2_52139_gr2"><stop offset="0" stop-color="#ffffff"></stop><stop offset="1" stop-color="#ffffff"></stop></linearGradient><linearGradient x1="130.34375" y1="34.48869" x2="130.34375" y2="144.97181" gradientUnits="userSpaceOnUse" id="color-3_52139_gr3"><stop offset="0" stop-color="#ffffff"></stop><stop offset="1" stop-color="#ffffff"></stop></linearGradient><linearGradient x1="86" y1="32.25" x2="86" y2="148.71013" gradientUnits="userSpaceOnUse" id="color-4_52139_gr4"><stop offset="0" stop-color="#ffffff"></stop><stop offset="1" stop-color="#ffffff"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><path d="M102.45825,99.43213h-5.70825c-1.4835,0 -2.6875,1.16637 -2.6875,2.65256v8.10013c0,1.48081 -1.19862,2.68481 -2.67944,2.68481h-10.76612c-1.48081,0 -2.67944,-1.204 -2.67944,-2.68481v-8.10013c0,-1.48619 -1.204,-2.65256 -2.6875,-2.65256h-5.70825c-1.93769,0 -3.04225,-2.39188 -1.88125,-4.05275l14.577,-20.855c1.8275,-2.61494 5.69481,-2.61763 7.52231,-0.00538l14.577,20.86306c1.16369,1.66088 0.05644,4.05006 -1.87856,4.05006z" fill="url(#color-1_52139_gr1)"></path><path d="M51.0625,67.1875h5.375c0,-8.0625 7.23206,-16.12231 16.125,-16.12231v-5.375c-11.85456,0 -21.5,10.74731 -21.5,21.49731z" fill="url(#color-2_52139_gr2)"></path><path d="M139.75,80.625c0,-10.75 -8.44144,-18.80981 -18.8125,-18.80981v5.375c7.40944,0 13.4375,5.37231 13.4375,13.43481z" fill="url(#color-3_52139_gr3)"></path><path d="M148.09738,92.27263c1.59369,-3.68188 2.40263,-7.59219 2.40263,-11.64494c0,-16.29969 -13.26281,-29.5625 -29.5625,-29.5625c-6.5145,0 -12.68769,2.08819 -17.78588,5.96088c-4.30269,-13.03438 -16.52006,-22.08587 -30.58912,-22.08587c-17.78319,0 -32.25,14.46681 -32.25,32.25c0,4.14681 0.16662,8.05981 1.42437,10.74731h-1.42437c-13.33806,0 -24.1875,10.84944 -24.1875,24.1875c0,11.56431 8.16194,21.24737 19.0275,23.62044c1.02394,6.39894 6.53869,11.31706 13.2225,11.31706h56.4375h16.125h5.375c6.54944,0 12.00238,-4.71388 13.18488,-10.92469c9.2235,-1.20131 16.37762,-9.08913 16.37762,-18.63513c0,-6.09256 -2.924,-11.72019 -7.77762,-15.23006zM126.3125,131.6875h-5.375h-16.125h-56.4375c-3.49912,0 -6.45538,-2.6875 -7.568,-5.375h93.0735c-1.11263,2.6875 -4.06888,5.375 -7.568,5.375zM137.0625,120.9375h-96.75c-10.37106,0 -18.8125,-8.44144 -18.8125,-18.8125c0,-10.37106 8.44144,-18.8125 18.8125,-18.8125h9.51375l-1.68506,-3.78131c-2.23063,-5.01488 -2.45369,-7.48737 -2.45369,-12.341c0,-14.81888 12.05613,-26.875 26.875,-26.875c13.01825,0 24.13106,9.29875 26.42619,22.11275l0.92719,5.17075l3.64962,-3.77325c4.60638,-4.76225 10.77687,-7.38525 17.372,-7.38525c13.33806,0 24.1875,10.84944 24.1875,24.1875c0,3.6765 -0.81431,7.21056 -2.37575,10.41944l-1.763,3.32713l2.37037,1.26044c4.40481,2.34081 7.14338,6.88806 7.14338,11.868c0,7.40944 -6.02806,13.43481 -13.4375,13.43481z" fill="url(#color-4_52139_gr4)"></path></g></g></svg>
+                            </div>
+                        </div>
+                        <div class="col-auto pointer btn btn-success invisible" v-else>
+                            <div class=" no-border h-100">
+                                <i class="fa fa-repeat fs-20 text-white"></i>
+                            </div>
+                        </div> -->
+                        <div class="col-auto">
+                            <div class="btn bg-grey no-border" @click="expanded = !expanded">
+                                <i class="fa" :class="{'fa-angle-down': !expanded, 'fa-angle-up': expanded}" ></i>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row b-t b-grey p-t-10 m-l-5 m-r-5" v-show="expanded" v-if="item.invoices">
+                <div class="col">
+                    <payments-billing-components :section="section" v-for="invoice in data.invoices" v-bind:key="invoice.id" :data="invoice" :selectedInvoice="selectedInvoice" v-on:input="updateList($event)"></payments-billing-components>
+                </div>
+            </div>
+            <modal-component type="paymentProofModal">
+                <payment-verification-form-component v-if="selected_id === item.id" :section="section" :data="item"></payment-verification-form-component>
+            </modal-component>
+        </div>
+    </div>
+</template>
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    export default {
+        props: {
+            selectedInvoice: {
+                type: Array,
+                required: false,
+            }, 
+            section:{
+                type: String,
+                default: null
+            },
+        },
+        data(){
+            return {
+                expanded: false,
+                selectedValue: false,
+                selected_id: '',
+            }
+        },
+        methods: {
+            activate(){
+                this.select = !this.select;
+                this.$emit('input', this.data);
+            },
+            selectedID(id){
+                this.selected_id = id;
+            },
+            retryPayment(){
+                window.location.href = route('billplz.bill', this.item.reference);
+            }
+        },
+        computed: {
+            selected() {
+                var response = false;
+                this.selectedInvoice.forEach((value, index) => {
+                    if (value.id == this.item.id) {
+                        response = true;
+                    }
+                });
+                return response;
+            }
+        },
+        mixins: [componentHandler]
+    }
+</script>

resources/assets/vue/components/paymentsBilling/elements/PaymentsBillingComponents.vue

@@ -4,7 +4,7 @@
             <div class="row">
                 <div class="col padding-20">
                     <div class="row align-items-center">
-                        <div class="col-auto pointer align-items-center" @click="activate()">
+                        <div class="col-auto pointer align-items-center" @click="activate()" v-if="!['customerPaidGroupInvoiceComponent', 'customerGroupPaymentInProgressInvoiceComponent'].includes(section)">
                             <i class="fa fs-30 fa-fw" :class="{'fa-square-o': !selected, 'fa-check-square': selected, 'text-primary':selected}" ></i>
                         </div>
                         <div class="col">
@@ -23,12 +23,16 @@
                             <p class="no-margin fs-10 all-caps">Amount</p>
                             <div>MYR  {{ item.amount.toFixed(2) }}</div>
                         </div>
+                        <div class="col" v-if="['customerPaidInvoiceComponent', 'customerPaidGroupInvoiceComponent'].includes(section)">
+                            <p class="no-margin fs-10 all-caps">Payment Date</p>
+                            <div>{{ item.payment_history[item.payment_history.length-1].created_at }}</div>
+                        </div>
                         <div class="col-auto">
                             <div v-if="item.documents.length">
                                 <div v-for="file in item.documents[0].files" v-bind:key="file.id" class="col-auto no-padding">
                                     <document-file-viewer-component :file="file">
                                         <template slot="button">
-                                            <div class="btn btn-success no-border muted">
+                                            <div class="btn no-border muted" :class="{'btn-info': section === 'customerPaidInvoiceComponent', 'btn-success': section !== 'customerPaidInvoiceComponent'}">
                                                 <i class="fa fa-file-pdf-o"></i>
                                             </div>
                                         </template>
@@ -54,7 +58,11 @@
             selectedInvoice: {
                 type: Array,
                 required: false,
-            }  
+            }, 
+            section:{
+                type: String,
+                default: null
+            },
         },
         data(){
             return {

resources/assets/vue/components/paymentsBilling/elements/ShippingTransactionComponent.vue

@@ -37,7 +37,7 @@
             <delete-payment-attempt-form-component :data="item" :section="section" class="text-center"></delete-payment-attempt-form-component>
         </modal-component>
         <modal-component type="paymentProofModal">
-                <payment-verification-form-component v-if="selected_id === item.id" :section="section" :data="item"></payment-verification-form-component>
+            <payment-verification-form-component v-if="selected_id === item.id" :section="section" :data="item"></payment-verification-form-component>
         </modal-component>
     </div>
 </template>

resources/assets/vue/components/paymentsBilling/forms/CustomerInvoiceRemarkFormComponent.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="row">
+    <div class="row" @keyup.enter="submitForm">
         <div class="col">
             <loading-component style="height: 50px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading(section)"></loading-component>
             <div class="row" v-show="!$store.getters.isLoading(section)">
@@ -37,6 +37,7 @@
 </template>
 <script>
     import ModalFormHandler from '../../../general/mixins/modalFormHandler';
+    import { required } from "vuelidate/lib/validators";
     export default {
         props: {
             data:{
@@ -58,9 +59,7 @@
         },
         validations: {
             parameters: {
-                content: {
-                    required: false
-                }
+                content:{ required },
             }
         },
         methods: {

resources/assets/vue/components/paymentsBilling/forms/PaymentFormComponent.vue

@@ -134,7 +134,7 @@
         },
         methods:{
             submitForm(){
-                this.parameters.payment_method = this.paymentMethod.id === 'payment_gateway' ? 5 : '';
+                this.parameters.payment_method = this.paymentMethod.id;
                 this.submit(this.route('api.transaction.payment.create'), 'post', 'orderProfileSection', true, true);
             },
             updatePaymentType(payment){