multi payment final

2026-08-19 04:24:12 +00:00 · 2023-03-21 14:11:42 +08:00
parent f47c7ebc50
commit e0d0dccb4c
22 changed files with 1191 additions and 38 deletions
@@ -105,27 +105,36 @@ 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) {
-            $this->updatesWalletBalance->execute($transaction->owner, $transaction->amount);
-        }
-        
-        $this->updatesTransactionStatus->execute($transaction, $status);
+        if ($status === ApprovalStatus::APPROVED) {
+            // check if is wallet top up
+            if($transaction->owner instanceof Wallet && !in_array($transaction->status, [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])) {
+                $this->updatesWalletBalance->execute($transaction->owner, $transaction->amount);
+            }

-        if(($invoice->amount - $transaction->amount) < 0.01 && !$transaction->owner instanceof Wallet) {
-            $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 - $transaction->amount) < 0.01 && !$transaction->owner instanceof Wallet) {
+                $this->updatesTransactionStatus->execute($invoice, ApprovalStatus::COMPLETED);
+    
+                $packingList->status = ApprovalStatus::APPROVED;
+                $packingList->save();
+    
+                if(app()->environment('production')){
+                    $this->updateDoFromVTPortalProcessor->execute($packingList);
+                    $this->updateDoFromYDPortalProcessor->execute($packingList);
+                }
            }
        }

+        $this->updatesTransactionStatus->execute($transaction, $status);
+
        $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 ?? null, 'company_module_marking' => $company_module_marking ?? null, 'transaction' => $transaction, 'status' => $status]);
    }
 }
@@ -0,0 +1,254 @@
+<?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\Transactions\Services\CreatesTransactionableTransaction;
+use App\Classes\Modules\Transactions\Services\CreatesPaymentTransaction;
+use App\Classes\Modules\Transactions\Services\CreatesTransaction;
+use App\Classes\Modules\Billplzs\Services\CreatesBillplzBill;
+use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
+use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use App\Classes\Modules\Wallets\Services\UpdatesWalletBalance;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Http\Resources\TransactionResource;
+use App\Models\Group;
+use App\Models\Transaction;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use App\Models\Wallet;
+use App\Classes\Modules\Orders\Processors\UpdateDoFromVTPortalProcessor;
+use App\Classes\Modules\Orders\Processors\UpdateDoFromYDPortalProcessor;
+
+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 CreatesTransactionableTransaction */
+    private $createsTransactionableTransaction;
+
+    /** @var CreatesBillplzBill */
+    private $createsBillplzBill;
+
+    /** @var UpdatesWalletBalance */
+    private $updatesWalletBalance;
+
+    /** @var CreatesTransaction */
+    private $createsTransaction;
+
+    /** @var CreatesPaymentTransaction */
+    private $createsPaymentTransaction;
+
+    /** @var UpdateDoFromVTPortalProcessor */
+    private $updateDoFromVTPortalProcessor;
+
+    /** @var UpdateDoFromYDPortalProcessor */
+    private $updateDoFromYDPortalProcessor ;
+
+    /** @var UpdatesTransactionStatus */
+    private $updatesTransactionStatus ;
+
+    public function __construct(
+        FetchesTransaction $fetchesTransaction, 
+        GeneratesTransactionBillNumber $generatesTransactionBillNumber, 
+        CreatesTransactionableTransaction $createsTransactionableTransaction,
+        CreatesBillplzBill $createsBillplzBill,
+        UpdatesWalletBalance $updatesWalletBalance,
+        CreatesTransaction $createsTransaction,
+        CreatesPaymentTransaction $createsPaymentTransaction,
+        UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor, 
+        UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor,
+        UpdatesTransactionStatus $updatesTransactionStatus
+    )
+    {
+        $this->fetchesTransaction = $fetchesTransaction;
+        $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
+        $this->createsTransactionableTransaction = $createsTransactionableTransaction;
+        $this->createsBillplzBill = $createsBillplzBill;
+        $this->updatesWalletBalance = $updatesWalletBalance;
+        $this->createsPaymentTransaction = $createsPaymentTransaction;
+        $this->updateDoFromVTPortalProcessor = $updateDoFromVTPortalProcessor;
+        $this->updateDoFromYDPortalProcessor = $updateDoFromYDPortalProcessor;
+        $this->updatesTransactionStatus = $updatesTransactionStatus;
+    }
+
+    public function logic(Request $request) : JsonResponse
+    {
+        $invoice_ids = json_decode($request->route('transaction_ids'));
+        $billNumber = $this->generatesTransactionBillNumber->execute('PYMT-');
+        $approvalStatus = ApprovalStatus::PENDING_SUBMISSION;
+        $payment_method = PaymentMethodType::PAYMENT_METHODS[$request->input('payment_method')];
+
+        if (count($invoice_ids) > 1) {
+            dd('more than 1 invoice');
+            // creates group transaction 
+            $group = new Group();
+
+            $issuer = '';
+            $receiver = '';
+            $amount = 0;
+            $original_amount = 0;
+            $currency_id = 0;
+            $original_currency_id = '';
+            $currency_rate = '';
+            $tax = 0;
+            $service_charge = 0;
+
+            // todo-new: check why is this not working
+            // $invoices = $this->fetchesTransaction->execute(['id_in' => $invoice_ids]);
+            $invoices = Transaction::whereIn('id', $invoice_ids)->get();
+
+            foreach ($invoices as $invoice) {
+                // todo-new: attach transaction to the group id
+                // create one payment for each, then mark as pending_approval
+                $issuer = $invoice->issuer;
+                $receiver = $invoice->receiver;
+                $amount += $invoice->amount;
+                $original_amount += $invoice->original_amount;
+                $currency_id = $invoice->currency_id;
+                $original_currency_id = $invoice->original_currency_id;
+                $currency_rate = $invoice->currency_rate;
+                $tax += $invoice->tax;
+                $service_charge += $invoice->service_charge;
+            }
+
+            $group->issuer = $issuer;
+            $group->receiver = $receiver;
+            $group->reference = $billNumber;
+            $group->amount = $amount;
+            $group->original_amount = $original_amount;
+            $group->currency_id = $currency_id;
+            $group->original_currency_id = $original_currency_id;
+            $group->currency_rate = $currency_rate;
+            $group->tax = $tax;
+            $group->service_charge = $service_charge;
+
+            $group->save();
+
+
+            // attach payment on group transaction            
+            
+            // $invoice_transaction = $this->fetchesTransaction->execute(['id' => $invoice_ids->first()]);
+            // $amount = $request->input('amount');
+            // $company_module = $invoice_transaction->owner()->first()->owner()->first()->companyModule()->first();
+
+            $invoice_transaction = $group;
+            $transferDetails = $billNumber;
+            $company_module = $group->receiverCompany;
+        } else {
+
+            $invoice_transaction = $this->fetchesTransaction->execute(['id' => $invoice_ids[0]]);
+            $amount = $request->input('amount');
+            $company_module = $invoice_transaction->owner()->first()->owner()->first()->companyModule()->first();
+            $transferDetails = $invoice_transaction->bill_no;
+        }
+
+        $payment_reference = null;
+        if ($payment_method == PaymentMethodType::PAYMENT_GATEWAY) {
+
+            // create billplz transaction
+            $payment_method = PaymentMethodType::PAYMENT_GATEWAY;
+            $billPlzBill = $this->createsBillplzBill->execute(
+                $company_module->name, 
+                (app()->environment(['production'])) ? $company_module->employees()->first()->email : 'uldvstar@gmail.com',
+                'This payment is for the invoice number . ' . $transferDetails,
+                $amount,
+                $billNumber, 
+                $request->input('bank_code'), 
+                true
+            );
+
+            $payment_reference = $billPlzBill->id;
+        }
+        else if ($payment_method === PaymentMethodType::WALLET) {
+            /** @var Wallet $wallet */
+            $wallet = $company_module->wallets()->first();
+
+            if((float) number_format(($wallet->amount - $amount),2) < 0){
+                throw new MalformedRequestException('Insufficient wallet balance. Please Top up your wallet.');
+            }
+
+            $walletPaymentBillNumber = $this->generatesTransactionBillNumber->execute('PYMT-');
+            
+            $transaction_object = new TransactionObject($walletPaymentBillNumber, TransactionType::PAYMENT, 1, $company_module->id, 1, PaymentMethodType::WALLET, $amount, $amount, 1, 1, 1, 0, 0, null, ApprovalStatus::APPROVED, [], '');
+            $transaction = $this->createsTransactionableTransaction->execute($wallet, $transaction_object);
+
+            $payment_reference = $walletPaymentBillNumber;
+
+            $this->updatesWalletBalance->execute($wallet, ($amount * -1));
+
+            if (count($invoice_ids) > 1) {
+                // do one by one
+                // dd($invoices);
+                // todo-new: update all the transaction inside 
+            } else {
+                // $invoice_transaction;
+                $packingList = $invoice_transaction->owner;
+                $order = $packingList->owner;
+                $packingList->status = ApprovalStatus::APPROVED;
+                $packingList->save();
+            }
+
+            if(app()->environment('production')){
+                $this->updateDoFromVTPortalProcessor->execute($packingList);
+                $this->updateDoFromYDPortalProcessor->execute($packingList);
+            }
+
+            $approvalStatus = ApprovalStatus::APPROVED;
+
+            // update invoice to completed
+            $this->updatesTransactionStatus->execute($invoice_transaction, ApprovalStatus::COMPLETED);
+        }
+        else {
+            $payment_method = PaymentMethodType::CASH;
+        }
+
+        // createsPaymentTransaction
+        $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,
+            null,
+            $payment_reference
+        );
+
+        $payment_transaction = $this->createsPaymentTransaction->execute($invoice_transaction, $object);
+
+        return $this->resourceResponse(new TransactionResource($payment_transaction));
+    }
+}
@@ -0,0 +1,73 @@
+<?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\UpdatesTransactionStatus;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Http\Resources\GroupResource;
+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 UpdatesTransactionStatus */
+    private $updatesTransactionStatus;
+
+    /** @var FetchesGroup */
+    private $fetchesGroup;
+
+    /** @var DeletesTransaction */
+    private $deletesTransaction;
+
+    /**
+     * DeleteGroupLogic constructor.
+     * @param updatesTransactionStatus $updatesTransactionStatus
+     * @param FetchesGroup $fetchesGroup
+     * @param DeletesTransaction $deletesTransaction
+     */
+    public function __construct(updatesTransactionStatus $updatesTransactionStatus, FetchesGroup $fetchesGroup, DeletesTransaction $deletesTransaction)
+    {
+        $this->updatesTransactionStatus = $updatesTransactionStatus;
+        $this->fetchesGroup = $fetchesGroup;
+        $this->deletesTransaction = $deletesTransaction;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $group = $this->fetchesGroup->execute(['id' => $request->route('id')]);
+
+        $items = $group->transactions()->get();
+
+        foreach($items as $item) {
+            $bill = $item;
+            $payment = $bill->owner;
+            $group->transactions()->detach($bill->id);
+            $this->updatesTransactionStatus->execute($payment, ApprovalStatus::APPROVED);
+            $this->deletesTransaction->execute($bill);
+        }
+
+        $group->delete();
+        
+        return $this->resourceResponse(new GroupResource($group));
+    }
+
+}
@@ -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));
+    }
+
+}
@@ -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));
+    }
+
+}
@@ -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();
+    }
+}
@@ -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 = [
@@ -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);
+    }
+}
@@ -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);
+    }
+}
@@ -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);
+    }
+}
@@ -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);
+    }
+}
@@ -0,0 +1,53 @@
+<?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\Booking;
+use App\Models\Transaction;
+use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Collection;
+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)
+    {
+
+        if(!$this->issuerCompany){
+            dd($this->id);
+        }
+        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,
+            'transactions' => $this->transactions()->get()->pluck('owner.owner.marking'),
+            'complete_transactions' => $this->transactions()->whereHasMorph('owner', [Transaction::class], function($query){
+                return $query->whereHas('booking', function($query){
+                    return $query->whereHas('transactions', function($query){
+                        return $query->where('type', TransactionType::PURCHASE_ORDER)->where('status', '=', ApprovalStatus::APPROVED);
+                    });
+                });
+            })->get()->pluck('owner.owner.marking'),
+            'documents' => [
+                'currency_order' => new DocumentResource($this->documents()->where('document_type', DocumentType::CURRENCY_VENDOR_ORDER)->first()),
+                'purchase_order' => new DocumentResource($this->documents()->where('document_type', DocumentType::BULK_PURCHASE_ORDER)->first())
+            ]
+        ];
+    }
+}
@@ -21,22 +21,22 @@ class WalletTransactionResource extends JsonResource
    {
        $description = '';
        switch((int) $this->type){
-            case 5:
+            case TransactionType::TOP_UP:
                $description = (double) $this->amount.' Credit Top up';
                break;
-            case 9:
+            case TransactionType::CREDIT_NOTE:
                $description = 'Credit Voucher for '.$this->payment_reference;
                break;
-            case 1:
-                $booking = Transaction::where('payment_reference', $this->bill_no)->first()->owner;
+            case TransactionType::PAYMENT:
+                $order = Transaction::where('payment_reference', $this->bill_no)->first()->owner->owner->owner;

-                if(!$booking) {
-                    $description = 'Payment for unknown booking, please contact tech support.';
+                if(!$order) {
+                    $description = 'Payment for unknown order, please contact tech support.';
                    break;
                }

-                $marking = $booking->marking;
-                $description = 'Payment For booking refs.'.'<a href="'.route('booking.details', $marking).'">'.$marking.'</a>';
+                $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;
@@ -0,0 +1,86 @@
+<?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;
+
+
+class Group extends Model implements Documentable, Transactionable
+{
+    use HasRelationships;
+    use \Staudenmeir\EloquentHasManyDeep\HasTableAlias;
+
+	
+    // /**
+    //  * @return MorphMany
+    //  */
+    // public function transactions(): MorphMany
+    // {
+    //     return $this->belongsToMany(Transaction::class, GroupTransaction::class);
+    //     return $this->MorphMany(Transaction::class, 'owner');
+    // }
+
+    /**
+     * @return MorphMany
+     */
+    public function transactions(): MorphMany
+    {
+        return $this->MorphMany(Transaction::class, 'owner');
+    }
+
+    /**
+     * @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');
+    }
+}
@@ -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');
+    }
+}
@@ -0,0 +1,43 @@
+<?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->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('groups');
+    }
+}
@@ -0,0 +1,32 @@
+<?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();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('group_transactions');
+    }
+}
@@ -1,5 +1,5 @@
 <template>
-    <div class="row">
+    <div class="row parentContainer">
        <div class="col">
            <div class="row">
                <div class="col">
@@ -61,10 +61,13 @@
                    </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" @click='makePayment'>Make Payment</div>
+                            <div v-if="section === 'customerPendingPaymentInvoiceComponent'" class="btn btn-success btn-xl pointer m-t-10 w-100 requestModal" data-type="makePayment">Make Payment</div>
                            <div v-if="section === 'customerPaidInvoiceComponent'" class="btn btn-info btn-xl pointer m-t-10 w-100" @click='generateSummaryInvoice'>Generate Summary Invoice</div>
                        </div>
                    </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>
@@ -106,17 +109,17 @@
                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(){
-                var selectedId = this.selectedInvoice.map(s=>s.id);
-                window.open(route('invoice.combined_summary', JSON.stringify(selectedId)), '_blank');
+                window.open(route('invoice.combined_summary', JSON.stringify(this.selectedIds)), '_blank');
            },
            makePayment(){
-                var selectedId = this.selectedInvoice.map(s=>s.id);
-                // window.open(route('invoice.combined_summary', JSON.stringify(selectedId)), '_blank');
-                console.log(selectedId);
+                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);
@@ -75,9 +75,9 @@
                                    </div>
                                    <div class="row">
                                        <div class="col-4 p-l-5 p-r-5 m-b-10" v-for="(rate, method) in item.rates">
-                                            <validation-wrapper-component :validator="$v.parameters.currencies.$each[index].rates.$each[method].selling.value" :class="[{'hint-text': rate.payment_method === 'wallet' || rate.payment_method === 'payment gateway'}]">
+                                            <validation-wrapper-component :validator="$v.parameters.currencies.$each[index].rates.$each[method].selling.value" :class="[{'hint-text': rate.payment_method === 'wallet' || rate.payment_method === 'payment_gateway'}]">
                                                <label class="all-caps">{{rate.payment_method}}</label>
-                                                <input type="text" class="form-control" v-model.lazy="rate.selling.value" v-money="exchangeRate" :disabled="!item.active || rate.payment_method === 'wallet' || rate.payment_method === 'payment gateway'">
+                                                <input type="text" class="form-control" v-model.lazy="rate.selling.value" v-money="exchangeRate" :disabled="!item.active || rate.payment_method === 'wallet' || rate.payment_method === 'payment_gateway'">
                                            </validation-wrapper-component>
                                        </div>
                                    </div>
@@ -202,7 +202,7 @@
                            }
                        },
                        {
-                            payment_method: 'payment gateway',
+                            payment_method: 'payment_gateway',
                            selling: {
                                type: 'rate',
                                value: 0
@@ -19,11 +19,11 @@
                                <div class="col-2 fs-10 text-right">Balance</div>
                            </div>

-                            <div class="row bg-white padding-10 m-b-10 rounded" v-for="(item, index) in wallet.transactions" v-bind:key="item.id" :data="item">
+                            <div class="row bg-white padding-10 m-b-10 rounded align-items-center" v-for="(item, index) in wallet.transactions" v-bind:key="item.id" :data="item">
                                <div class="col-3 fs-12">{{item.created_at}}</div>
                                <div class="col fs-12" v-html="item.description"></div>
                                <div class="col-2 text-success text-center">{{[5, 9].includes(parseFloat(item.type)) ? (Math.round((parseFloat(item.amount) + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",") : ''}}</div>
-                                <div class="col-2 text-danger text-center">{{[1, 11].includes(parseFloat(item.type)) ? '- ' + (Math.round((parseFloat(item.amount) + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",") : ''}}</div>
+                                <div class="col-2 text-danger text-center">{{[2, 11].includes(parseFloat(item.type)) ? '- ' + (Math.round((parseFloat(item.amount) + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",") : ''}}</div>
                                <div class="col-2 text-right">{{remainingBalance(index)}}</div>
                            </div>  
                        </div>
@@ -136,7 +136,7 @@ export default {
            if(this.wallet){
                let transactions = this.wallet.transactions.slice().reverse();
                transactions.slice(0, transactions.length - index).map(function(transaction) {
-                    [1, 11].includes(transaction.type) ? tempBalance -= (transaction.amount) : tempBalance += (transaction.amount);
+                    [2, 11].includes(transaction.type) ? tempBalance -= (transaction.amount) : tempBalance += (transaction.amount);
                    return tempBalance
                }, 0);
            }
@@ -35,4 +35,13 @@ Route::group(['prefix' => 'transactions', 'namespace' => 'Transactions', 'as' =>

    // Route::post('booking/{id}/details/update', 'CreatePurchaseOrderTransactionController@create')->name('po.create');

+    Route::group(['prefix' => 'groups', 'as' => 'group.'], function () {
+        Route::post('/{transaction_ids}/create', 'CreateGroupsController@create')->name('create');
+        Route::get('/list', 'ListGroupsController@list')->name('list');
+        Route::delete('/{id}/delete', 'DeleteGroupController@delete')->name('delete');
+        Route::put('/{id}/update', 'UpdateGroupController@update')->name('update');
+        // Route::post('/{id}/approve', 'CreateBulkPurchaseOrderDocumentController@aprove')->name('approve');
+        // Route::post('/bulk/po', 'CreateBulkPurchaseOrderDocumentController@create')->name('bulk.po');
+    });
+
 });