multi invoice payment

2026-08-19 04:24:12 +00:00 · 2023-03-27 19:37:31 +08:00
parent c7f8831555
commit 08b2ba1c63
10 changed files with 182 additions and 44 deletions
@@ -111,6 +111,19 @@ class CallbackBillplzLogic
            $this->updatesWalletBalance->execute($transaction->owner, $transaction->amount);
        }

+        // group payment
+        if ($transaction->type == TransactionType::GROUP_PAYMENT && $status === ApprovalStatus::APPROVED &&!in_array($transaction->status, [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])) {
+            $group = Group::where('reference', $billplzXSignatureObject->getBillPlzId())->first();
+
+            foreach($group->groupTransactions as $groupTransaction) {
+                $invoice = $groupTransaction->transaction;
+                $this->createPaymentTransactionProcessor->execute($invoice, PaymentMethodType::WALLET, null);
+            }
+
+            $group->status = $status;
+            $group->save();
+        }
+
        $this->updatesTransactionStatus->execute($transaction, $status);

        if (!$transaction->owner instanceof Wallet) {
@@ -138,15 +151,6 @@ class CallbackBillplzLogic
            $company_module_marking = $order->companyModule->connections? $order->companyModule->connections->first()->invitee_reference: null;
        }

-        if ($transaction->type == TransactionType::GROUP_PAYMENT) {
-            $group = Group::where('reference', $billplzXSignatureObject->getBillPlzId())->first();
-
-            foreach($group->groupTransactions as $groupTransaction) {
-                $invoice = $groupTransaction->transaction;
-                $this->createPaymentTransactionProcessor->execute($invoice, PaymentMethodType::WALLET, 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]);
    }
 }
@@ -15,6 +15,7 @@ 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;
@@ -67,7 +68,8 @@ class CreateGroupsLogic extends AbstractControllerLogic

    public function logic(Request $request) : JsonResponse
    {
-        $payment_method = PaymentMethodType::PAYMENT_METHODS[$request->input('payment_method')];
+        $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-');
@@ -86,6 +88,8 @@ class CreateGroupsLogic extends AbstractControllerLogic
            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;
        }

        $group = new Group();
@@ -108,6 +112,7 @@ class CreateGroupsLogic extends AbstractControllerLogic
        $group->currency_rate           = $currency_rate;
        $group->tax                     = $tax;
        $group->service_charge          = $service_charge;
+        $group->payment_method          = $payment_method;
        $group->save();

        foreach ($invoices as $invoice) {
@@ -151,8 +156,7 @@ class CreateGroupsLogic extends AbstractControllerLogic
        $group->currency_rate           = $currency_rate;
        $group->tax                     = $tax;
        $group->service_charge          = $service_charge;
-        // todo-new: updates group status
-        // $group->status                  = $service_charge;
+        $group->status                  = $groupPyamentStatus;
        $group->save();

        if ($payment_method === PaymentMethodType::PAYMENT_GATEWAY) {
@@ -3,12 +3,8 @@
 namespace App\Http\Resources;

 use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\DocumentType;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Models\Booking;
-use App\Models\Transaction;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
 use Carbon\Carbon;
-use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Http\Resources\Json\JsonResource;

 class GroupResource extends JsonResource
@@ -22,9 +18,8 @@ class GroupResource extends JsonResource
    public function toArray($request)
    {

-        if(!$this->issuerCompany){
-            dd($this->id);
-        }
+        // dd($this->groupTransactions);
+
        return [
            'id' => $this->id,
            'original_amount' => (float) $this->original_amount,
@@ -36,18 +31,12 @@ class GroupResource extends JsonResource
            'currency' => new CurrencyResource($this->currency),
            'created_at' => Carbon::parse($this->created_at)->format('d-m-Y h:i:s A'),
            'currency_rate' => (float) $this->currency_rate,
-            'transactions' => $this->transactions()->get()->pluck('owner.owner.marking'),
-            'complete_transactions' => $this->transactions()->whereHasMorph('owner', [Transaction::class], function($query){
-                return $query->whereHas('booking', function($query){
-                    return $query->whereHas('transactions', function($query){
-                        return $query->where('type', TransactionType::PURCHASE_ORDER)->where('status', '=', ApprovalStatus::APPROVED);
-                    });
-                });
-            })->get()->pluck('owner.owner.marking'),
-            'documents' => [
-                'currency_order' => new DocumentResource($this->documents()->where('document_type', DocumentType::CURRENCY_VENDOR_ORDER)->first()),
-                'purchase_order' => new DocumentResource($this->documents()->where('document_type', DocumentType::BULK_PURCHASE_ORDER)->first())
-            ]
+            'status' => $this->status,
+            'status_name' => ApprovalStatus::APPROVAL_STATUS_ID[$this->status],
+            'payment_method' => $this->payment_method,
+            'payment_method_name' => ucwords(PaymentMethodType::PAYMENT_METHODS_ID[$this->payment_method]),
+            'invoices' => GroupTransactionResource::collection($this->groupTransactions),
+            'reference' => $this->reference,
        ];
    }
 }
@@ -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);
+    }
+}
@@ -27,6 +27,7 @@ class CreateGroupsTable extends Migration
            $table->decimal('tax', 14, 5)->default(0.00);
            $table->decimal('service_charge', 14, 5)->default(0.00);
            $table->integer('status')->default(ApprovalStatus::PENDING_VERIFICATION);
+            $table->string('payment_method')->nullable();
            $table->timestamps();
        });
    }
@@ -4,14 +4,15 @@
            <div class="row">
                <div class="col">
                    <div v-show="!$store.getters.isLoading(section)">
-                        <list-component :section="section" :endpoint="route('api.transaction.list')" :options="options">
+                        <list-component :section="section" :endpoint="endpoint" :options="options">
                            <template slot="list" slot-scope="{data}">
-                                <payments-billing-components :section="section" :data="data" :selectedInvoice="selectedInvoice" v-on:input="updateList($event)"></payments-billing-components>
+                                <payments-billing-components v-if="endpoint == route('api.transaction.list')" :section="section" :data="data" :selectedInvoice="selectedInvoice" v-on:input="updateList($event)"></payments-billing-components>
+                                <group-payments-billing-components v-else :section="section" :data="data" :selectedInvoice="selectedInvoice" v-on:input="updateList($event)"></group-payments-billing-components>
                            </template>
                        </list-component>
                    </div>
                </div>
-                <div class="col-12 col-sm-12 col-md-4">
+                <div class="col-12 col-sm-12 col-md-4" v-if="!['customerPaidGroupInvoiceComponent', 'customerGroupPaymentInProgressInvoiceComponent'].includes(section)">
                    <div class="row align-items-center">
                        <div class="col">
                            <div class="row" v-if="section === 'customerPendingPaymentInvoiceComponent'">
@@ -89,6 +90,10 @@
                type: Number,
                required: true,
            },
+            endpoint: {
+                type: String,
+                required: true
+            },
        },
        data(){
            return {
@@ -0,0 +1,89 @@
+<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">
+                            <a :href="route('billplz.bill', item.reference)">
+                                <div class=" no-border h-100">
+                                    <i class="fa fa-repeat fs-20 text-white"></i>
+                                </div>
+                            </a>
+                        </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>
+        </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,
+            }
+        },
+        methods: {
+            activate(){
+                this.select = !this.select;
+                this.$emit('input', this.data);
+            }
+        },
+        computed: {
+            selected() {
+                var response = false;
+                this.selectedInvoice.forEach((value, index) => {
+                    if (value.id == this.item.id) {
+                        response = true;
+                    }
+                });
+                return response;
+            }
+        },
+        mixins: [componentHandler]
+    }
+</script>
@@ -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="section!=='customerPaidGroupInvoiceComponent'">
                            <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,7 +23,7 @@
                            <p class="no-margin fs-10 all-caps">Amount</p>
                            <div>MYR  {{ item.amount.toFixed(2) }}</div>
                        </div>
-                        <div class="col" v-if="section === 'customerPaidInvoiceComponent'">
+                        <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>
@@ -196,7 +196,7 @@
        methods:{
            submitForm(){
                this.parameters.payment_method = this.paymentMethod.id;
-                this.submit(this.route('api.transaction.group.create', JSON.stringify(this.selectedIds)), 'post', this.section, true, false);
+                this.submit(this.route('api.transaction.group.create', JSON.stringify(this.selectedIds)), 'post', this.section, true, true);
            },
            updatePaymentType(payment){
                this.paymentMethod = {