supplier bill payment refund module

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

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use App\Classes\ValueObjects\Constants\TransactionType;
+use Illuminate\Database\Eloquent\Builder;
+
+class BelongsToSupplierId implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->whereHas('owner', function ($q) use ($value) {
+            $q->whereHas('transactions', function ($q2) use ($value) {
+                $q2->where('type', TransactionType::BILL)->where('issuer', $value);
+            });
+        });
+    }
+}

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

@@ -68,6 +68,12 @@ class CreateBillGroupPaymentTransactionLogic extends AbstractControllerLogic
         $billGroupPayment = $this->calculatesBillGroupPaymentAmount->execute($billGroup);
         $outstanding_amount = $billGroupPayment['outstanding_amount'];
 
+        if ($billGroupPayment['outstanding_amount'] == 0) {
+            if ($billGroup->transactions()->whereIn('status', [ApprovalStatus::PENDING_SUBMISSION, ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->count() !== 0) {
+                throw new MalformedRequestException('Invalid bill group, payment transaction already exist.');
+            }
+        }
+
         $payAmount = floatval(str_replace(',', '', $request->input('payAmount')));
         if($payAmount > round($outstanding_amount, 2)) throw new MalformedRequestException('Your payment must not be greater than '. $outstanding_amount .'.');
 

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

@@ -21,9 +21,11 @@ use App\Classes\Modules\Documents\Services\CreatesDocument;
 use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
 use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
 use App\Classes\Modules\Transactions\Services\CreatesTransaction;
+use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
 use App\Classes\ValueObjects\Constants\PaymentMethodType;
 use App\Classes\ValueObjects\Constants\TransactionType;
 use App\Models\BillGroup;
+use App\Models\Transaction;
 
 class CreateSupplierBillGroupLogic extends AbstractControllerLogic
 {
@@ -57,6 +59,9 @@ class CreateSupplierBillGroupLogic extends AbstractControllerLogic
     /** @var UpdateGroupLogic */
     private $updateGroupLogic;
 
+    /** @var UpdatesTransactionStatus */
+    private $updatesTransactionStatus;
+
 
     /**
      * CreateSupplierBillGroupLogic constructor.
@@ -66,8 +71,9 @@ class CreateSupplierBillGroupLogic extends AbstractControllerLogic
      * @param CreatesFiles $createsFile
      * @param GeneratesTransactionBillNumber $generatesTransactionBillNumber
      * @param UpdateGroupLogic $updateGroupLogic
+     * @param UpdatesTransactionStatus $updatesTransactionStatus
      */
-    public function __construct(FetchesCompany $fetchesCompany, CreatesTransaction $createsTransaction, CreatesDocument $createsDocument, CreatesFiles $createsFile, GeneratesTransactionBillNumber $generatesTransactionBillNumber, UpdateGroupLogic $updateGroupLogic)
+    public function __construct(FetchesCompany $fetchesCompany, CreatesTransaction $createsTransaction, CreatesDocument $createsDocument, CreatesFiles $createsFile, GeneratesTransactionBillNumber $generatesTransactionBillNumber, UpdateGroupLogic $updateGroupLogic, UpdatesTransactionStatus $updatesTransactionStatus)
     {
         $this->fetchesCompany = $fetchesCompany;
         $this->createsTransaction = $createsTransaction;
@@ -75,6 +81,7 @@ class CreateSupplierBillGroupLogic extends AbstractControllerLogic
         $this->createsFile = $createsFile;
         $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
         $this->updateGroupLogic = $updateGroupLogic;
+        $this->updatesTransactionStatus = $updatesTransactionStatus;
     }
 
     public function logic(Request $request) : JsonResponse
@@ -83,6 +90,19 @@ class CreateSupplierBillGroupLogic extends AbstractControllerLogic
         $supplier = $this->fetchesCompany->execute(['id' => $request->route('id')]);
 
         $payments = $request->input('payments');
+        $supplierRefunds = $request->input('supplierRefunds');
+
+        foreach ($supplierRefunds as $supplierRefund) {
+            $refund = Transaction::find($supplierRefund['id']);
+
+            if ($refund->owner->transactions()->where('type', TransactionType::BILL)->first()->issuer !== $supplier->id) {
+                throw new MalformedRequestException('The supplier refund and bill group does not belongs to same supplier.');
+            }
+
+            if ($refund->type !== TransactionType::SUPPLIER_REFUND) {
+                throw new MalformedRequestException('Only transaction type supplier refund can be used for bill refund.');
+            }
+        }
 
         $amount = 0;
         $original_amount = 0;
@@ -129,6 +149,41 @@ class CreateSupplierBillGroupLogic extends AbstractControllerLogic
             $billGroup->groups()->sync($payment['id'], false);
         }
 
+         //create bill refund
+         foreach ($supplierRefunds as $supplierRefund) {
+            $refund = Transaction::find($supplierRefund['id']);
+            $deductedRefunds = $refund->transactions()->where('type', TransactionType::BILL_REFUND)->where('status', ApprovalStatus::APPROVED)->get();
+            $refundDeductableAmount = $refund->amount - $deductedRefunds->sum('amount');
+            $refundDeductableOriginalAmount = $refund->original_amount - $deductedRefunds->sum('original_amount');
+
+            $amount -= round($refundDeductableAmount, 2);
+            $original_amount -= round($refundDeductableOriginalAmount, 2);
+
+            if ($amount > 0) {
+                $deductedRefundAmount = $refundDeductableAmount;
+                $deductedRefundOriginalAmount = $refundDeductableOriginalAmount;
+
+                $this->updatesTransactionStatus->execute($refund, ApprovalStatus::COMPLETED);
+            }
+
+            if ($amount < 0) {
+                $deductedRefundAmount = $refundDeductableAmount + $amount;
+                $deductedRefundOriginalAmount = $refundDeductableOriginalAmount + $original_amount;
+            }
+
+            $billNumber = $this->generatesTransactionBillNumber->execute('BRFD-');
+
+            $object = new TransactionObject($billNumber, TransactionType::BILL_REFUND, $supplier->id, 1, 
+                1, PaymentMethodType::CASH,
+                $deductedRefundAmount, $deductedRefundOriginalAmount, $refund->currency_id,
+                $refund->original_currency_id, $deductedRefundOriginalAmount / $deductedRefundAmount,
+                0, 0, null, ApprovalStatus::APPROVED, []);
+
+            $transaction = $this->createsTransaction->execute($refund, $object);
+
+            $billGroup->billRefunds()->sync($transaction->id, false);
+        }
+
         return $this->response([]);
     }
 }

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

@@ -5,6 +5,8 @@ namespace App\Classes\Modules\Transactions\ControllersLogic;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Transactions\Services\FetchesBillGroup;
 use App\Classes\Modules\Transactions\Services\DeletesTransaction;
+use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Http\Resources\BillGroupResource;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -28,15 +30,20 @@ class DeleteBillGroupLogic extends AbstractControllerLogic
     /** @var DeletesTransaction */
     private $deletesTransaction;
 
+    /** @var UpdatesTransactionStatus */
+    private $updatesTransactionStatus;
+
     /**
      * DeleteBillGroupLogic constructor.
      * @param FetchesBillGroup $fetchesBillGroup
      * @param DeletesTransaction $deletesTransaction
+     * @param UpdatesTransactionStatus $updatesTransactionStatus
      */
-    public function __construct(FetchesBillGroup $fetchesBillGroup, DeletesTransaction $deletesTransaction)
+    public function __construct(FetchesBillGroup $fetchesBillGroup, DeletesTransaction $deletesTransaction, UpdatesTransactionStatus $updatesTransactionStatus)
     {
         $this->fetchesBillGroup = $fetchesBillGroup;
         $this->deletesTransaction = $deletesTransaction;
+        $this->updatesTransactionStatus = $updatesTransactionStatus;
     }
 
     /**
@@ -59,7 +66,15 @@ class DeleteBillGroupLogic extends AbstractControllerLogic
         foreach($groups as $group) {
             $billGroup->groups()->detach($group->id);
         }
+        
+        $billRefunds = $billGroup->billRefunds()->get();
 
+        foreach($billRefunds as $billRefund) {
+            $billGroup->billRefunds()->detach($billRefund->id);
+            $this->deletesTransaction->execute($billRefund);
+            $this->updatesTransactionStatus->execute($billRefund->owner, ApprovalStatus::APPROVED);
+        }
+        
         $billGroup->delete();
         
         return $this->resourceResponse(new BillGroupResource($billGroup));

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

@@ -8,11 +8,13 @@ use App\Models\BillGroup;
 class CalculatesBillGroupPaymentAmount
 {
     public function execute(BillGroup $billGroup){
+        $bill_refund_amount = floatval($billGroup->billRefunds->sum('amount'));
         $floating_amount = floatval($billGroup->transactions()->whereIn('status', [ApprovalStatus::PENDING_SUBMISSION, ApprovalStatus::PENDING_VERIFICATION])->sum('amount'));
         $paid_amount = floatval($billGroup->transactions()->where('status', ApprovalStatus::APPROVED)->sum('amount'));
-        $outstanding_amount = $billGroup->amount - $paid_amount - $floating_amount + $billGroup->service_charge;
+        $outstanding_amount = $billGroup->amount - $bill_refund_amount - $paid_amount - $floating_amount + $billGroup->service_charge;
 
         return [
+            'bill_refund_amount' => $bill_refund_amount,
             'floating_amount' => $floating_amount,
             'paid_amount' => $paid_amount,
             'outstanding_amount' => $outstanding_amount,

app/Classes/ValueObjects/Constants/TransactionType.php

@@ -33,4 +33,9 @@ final class TransactionType {
     public const CASH_BACK = 13;
 
     public const SUPPLIER_PAYMENT = 14;
+
+    public const SUPPLIER_REFUND = 15;
+
+    public const BILL_REFUND = 16;
+
 }

app/Console/Commands/ExpiredRefundedBookingCommand.php

@@ -151,6 +151,22 @@ class ExpiredRefundedBookingCommand extends Command
     
                         $transaction = $this->createsTransaction->execute($bookingPayment, $object);
                     }
+
+                    if ($bookingInWhiteForm) {
+                        $refund = $bookingPayment->transactions()->supplierRefunds()->where('amount', $transaction->amount)->where('status', ApprovalStatus::APPROVED)->first();
+
+                        if (!$refund) {
+                            $billNumber = $this->generatesTransactionBillNumber->execute('SRFD-');
+
+                            $object = new TransactionObject($billNumber, TransactionType::SUPPLIER_REFUND, 1, $booking->company->id,
+                                1, PaymentMethodType::CASH,
+                                $transaction->amount, $transaction->amount * $bookingPayment->currency_rate, 1,
+                                $bookingPayment->original_currency_id, $bookingPayment->currency_rate,
+                                0, 0, null, ApprovalStatus::APPROVED, [], $bookingPayment->bill_no);
+        
+                            $transaction = $this->createsTransaction->execute($bookingPayment, $object);
+                        }
+                    }
                 } else {
                     Log::info("Credit note transaction id: {$transaction->id}, booking marking not found, the payment reference is: {$transaction->payment_reference}");
                 }

app/Http/Resources/BillGroupResource.php

@@ -18,6 +18,7 @@ class BillGroupResource extends JsonResource
     public function toArray($request)
     {
         $billGroupPayment = (App()->make(CalculatesBillGroupPaymentAmount::class))->execute($this->resource);
+        $bill_refund_amount = $billGroupPayment['bill_refund_amount'];
         $floating_amount = $billGroupPayment['floating_amount'];
         $paid_amount = $billGroupPayment['paid_amount'];
         $outstanding_amount = $billGroupPayment['outstanding_amount'];
@@ -37,6 +38,7 @@ class BillGroupResource extends JsonResource
             'currency_rate' => (float) $this->currency_rate,
             'status' => $this->status,
             'groups' => GroupResource::collection($this->groups),
+            'bill_refund_amount' => $bill_refund_amount,
             'floating_amount' => $floating_amount,
             'paid_amount' => $paid_amount,
             'outstanding_amount' => $outstanding_amount,
@@ -58,6 +60,23 @@ class BillGroupResource extends JsonResource
                     'updated_at' => Carbon::parse($transaction->updated_at)->format('d-m-Y h:i:s A'),
                 ];
             }),
+            'bill_refunds' => $this->billRefunds->map(function ($transaction) {
+                return [
+                    'id' => $transaction->id,
+                    'type' => (int) $transaction->type,
+                    'bill_no' => $transaction->bill_no,
+                    'payment_method' => (float) $transaction->payment_method,
+                    'amount' => (double) $transaction->amount,
+                    'original_amount' => (double) $transaction->original_amount,
+                    'currency' => new CurrencyResource($transaction->currency),
+                    'original_currency' => new CurrencyResource($transaction->original_currency),
+                    'service_charge' => (double) $transaction->service_charge,
+                    'tax' => (double) $transaction->tax,
+                    'status' => (int) $transaction->status,
+                    'statusText' => ApprovalStatus::APPROVAL_STATUS_ID[(int) $transaction->status],
+                    'updated_at' => Carbon::parse($transaction->updated_at)->format('d-m-Y h:i:s A'),
+                ];
+            }),
         ];
     }
 }

app/Http/Resources/TransactionResource.php

@@ -3,6 +3,7 @@
 namespace App\Http\Resources;
 
 use App\Classes\Modules\Bookings\Services\CalculatesBookingRefundAmount;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\TransactionType;
 use App\Models\Booking;
 use Carbon\Carbon;
@@ -19,7 +20,7 @@ class TransactionResource extends JsonResource
     public function toArray($request)
     {
 
-        $booking = in_array((int)$this->type, [TransactionType::BILL, TransactionType::REFUND])? $this->owner->owner : $this->owner;
+        $booking = in_array((int)$this->type, [TransactionType::BILL, TransactionType::REFUND, TransactionType::SUPPLIER_REFUND])? $this->owner->owner : $this->owner;
         $days = $this->created_at->endOfDay()->addWeekdays($booking->service_id === 3 ? 3 : 1);
 
         return [
@@ -32,8 +33,8 @@ class TransactionResource extends JsonResource
             'recipient_bank_account' => new BankResource($booking->bank),
             'issuer_name' => $this->issuerCompany->name,
             'issuer_id' => $this->issuerCompany->id,
-            'amount' => (double) $this->amount,
-            'original_amount' => (double) $this->original_amount,
+            'amount' => (double) ($this->type === TransactionType::SUPPLIER_REFUND ? $this->amount - $this->transactions()->where('type', TransactionType::BILL_REFUND)->where('status', ApprovalStatus::APPROVED)->sum('amount') : $this->amount),
+            'original_amount' => (double) ($this->type === TransactionType::SUPPLIER_REFUND ? $this->original_amount - $this->transactions()->where('type', TransactionType::BILL_REFUND)->where('status', ApprovalStatus::APPROVED)->sum('original_amount') : $this->original_amount),
             'currency' => new CurrencyResource($this->currency),
             'original_currency' => new CurrencyResource($this->original_currency),
             'service_charge' => (double) $this->service_charge,

app/Models/BillGroup.php

@@ -29,6 +29,14 @@ class BillGroup extends Model implements Documentable, Transactionable
         return $this->MorphMany(Transaction::class, 'owner');
     }
 
+    use HasRelationships;
+    use \Staudenmeir\EloquentHasManyDeep\HasTableAlias;
+
+	public function billRefunds()
+    {
+        return $this->belongsToMany(Transaction::class, BillGroupRefund::class);
+    }
+
     /**
      * @return MorphMany
      */

app/Models/BillGroupRefund.php

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

app/Models/Transaction.php

@@ -186,6 +186,20 @@ class Transaction extends AbstractModel implements Documentable, Transactionable
         return $query->where('type', TransactionType::REFUND);
     }
 
+    /**
+     * @param Builder $query
+     * @param string $payment_reference
+     * @return Builder
+     */
+    public function scopeSupplierRefunds(Builder $query, ?string $payment_reference = NULL)
+    {
+        if($payment_reference){
+            $query->where('payment_reference', $payment_reference);
+        }
+
+        return $query->where('type', TransactionType::SUPPLIER_REFUND);
+    }
+
 
     /**
      * @param Builder $query

database/migrations/2024_02_22_222130_create_bill_group_refunds_table.php

@@ -0,0 +1,22 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateBillGroupRefundsTable extends Migration
+{
+    public function up()
+    {
+        Schema::create('bill_group_refunds', function (Blueprint $table) {
+            $table->id();
+            $table->foreignId('bill_group_id')->unsigned()->on('bill_groups');
+            $table->foreignId('transaction_id')->unsigned()->on('transactions');
+        });
+    }
+
+    public function down()
+    {
+        Schema::dropIfExists('bill_group_refunds');
+    }
+}

resources/assets/vue/components/bookings/elements/BillGroupComponent.vue

@@ -58,6 +58,42 @@
                                             </div>
                                         </div>                                    
                                     </div>
+                                    <div class="col b-t b-grey p-t-10 m-l-5 m-r-5" v-show="expanded">
+                                        <div class="row m-b-10">
+                                            <div class="font-heading fs-12 all-caps text-underline">Bill Refunds</div>
+                                        </div>
+                                        <div class="row m-b-10" v-for="refund in item.bill_refunds">
+                                            <div class="col-3">
+                                                <div class="font-heading fs-12 muted all-caps">Date</div>
+                                                <div class="font-heading fs-12">
+                                                    {{refund.updated_at}}
+                                                </div>
+                                            </div>
+                                            <div class="col-3">
+                                                <div class="font-heading fs-12 muted all-caps">Reference</div>
+                                                <div class="font-heading fs-12">
+                                                    {{refund.bill_no}}
+                                                </div>
+                                            </div>
+                                            <div class="col-3" v-if="$store.getters.isAdmin">
+                                                <div class="font-heading fs-12 muted all-caps">Amount</div>
+                                                <div class="font-heading fs-12">
+                                                    {{ refund.currency.short_code }} {{ formatAmount(refund.amount) }}
+                                                </div>
+                                            </div>
+                                            <div class="col-3" v-if="$store.getters.isAdmin">
+                                                <div class="font-heading fs-12 muted all-caps">Status</div>
+                                                <div class="font-heading fs-12" :class="[{'text-danger': refund.status === 0 || refund.status === 4}, {'text-success': refund.status === 2 || refund.status === 3}, {'text-warning': refund.status === 1}]">
+                                                    {{ refund.statusText }}
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="row m-t-20 m-b-20" v-if="item.bill_refunds.length === 0">
+                                            <div class="col">
+                                                <div class="font-heading fs-12 text-center all-caps">No Selected Refunds</div>
+                                            </div>
+                                        </div>
+                                    </div>
                                     <div class="col b-t b-grey p-t-10 m-l-5 m-r-5" v-show="expanded">
                                         <div class="row m-b-10">
                                             <div class="font-heading fs-12 all-caps text-underline">Payment History</div>

resources/assets/vue/components/bookings/elements/BillGroupPaymentSummaryComponent.vue

@@ -36,6 +36,17 @@
                             <div class="font-heading fs-12">MYR 0.00</div>
                         </div>
                     </div>
+                    <div class="row align-items-end m-b-10 text-danger">
+                        <div class="col">
+                            <div class="font-heading all-caps fs-12">Bill Refund Total:</div>
+                        </div>
+                        <div class="col-auto text-right" v-if="selectedBillGroup.id">
+                            <div class="font-heading fs-12">- {{selectedBillGroup.currency.short_code}} {{formatAmount(selectedBillGroup.bill_refund_amount)}}</div>
+                        </div>
+                        <div class="col-auto text-right" v-else>
+                            <div class="font-heading fs-12">MYR 0.00</div>
+                        </div>
+                    </div>
                     <div class="row align-items-end m-b-10 text-success">
                         <div class="col">
                             <div class="font-heading all-caps fs-12">Paid Total:</div>
@@ -69,7 +80,7 @@
                             <div class="font-heading fs-12">MYR 0.00</div>
                         </div>
                     </div>
-                    <div v-if="selectedBillGroup.status === 0 && selectedBillGroup.outstanding_amount > 0">
+                    <div v-if="selectedBillGroup.status === 0 && (selectedBillGroup.outstanding_amount > 0 || (selectedBillGroup.bill_refund_amount === selectedBillGroup.amount && !selectedBillGroup.payment_history.some((item)=> [0, 1, 2, 3].includes(item.status))))">
                         <div class="row p-r-15 m-t-20 m-b-10">
                             <div class="col p-r-0">
                                 <validation-wrapper-component :validator="$v.parameters.payAmount">

resources/assets/vue/components/bookings/elements/SupplierRefundComponent.vue

@@ -0,0 +1,80 @@
+<template>
+    <div class="row m-b-10 parentContainer">
+        <div class="col">
+            <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="isLoading"></loading-component>
+            <div class="row align-items-center p-b-5 b-b b-grey" :class="[{'pointer': clickable}]" v-show="!isLoading" @click="clickable ? activate() : undefined">
+                <div class="col-auto p-r-0">
+                    <div class="b-grey b-a fs-10 btn-rounded icon-thumbnail icon-25 m-r-0" :class="[{'bg-primary': active}, {'bg-transparent': !active}]" v-if="clickable">
+                        <i class="fa fa-check text-white fs-12 fa-fw"></i>
+                    </div>
+                    <div style="width: 25px;" v-else></div>
+                </div>
+                <div class="col">
+                    <div class="row m-b-10">
+                        <div class="col-auto">
+                            <div class="font-heading fs-10 muted all-caps">Date</div>
+                            <div class="font-heading fs-10">
+                                {{item.created_at}}
+                            </div>
+                        </div>
+                        <div class="col text-right">
+                            <div class="font-heading fs-10 muted all-caps">Amount</div>
+                            <div class="font-heading fs-14 text-success bold">
+                                {{item.currency.short_code}} {{((Math.round(( item.amount + Number.EPSILON) * 100) / 100)).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    import staticFormHandler from '../../../general/mixins/staticFormHandler'
+    export default {
+        props: {
+            section:{
+                type: String,
+                required: true
+            },
+            payments:{
+                type: Array,
+                required: true
+            },
+            paymentTotal: {
+                type: Number,
+                required: true
+            },
+            refundTotal: {
+                type: Number,
+                required: true
+            },
+            supplierRefunds:{
+                type: Array,
+                required: true
+            }
+        },
+        computed: {
+            clickable(){
+                return this.refundTotal < this.paymentTotal || this.supplierRefunds.some((i) => this.item.id === i.id );
+            }
+        },
+        data(){
+            return {
+                active: this.item ? this.supplierRefunds.some(supplierRefund => supplierRefund.id === this.item.id) : false,
+            }
+        },
+        created(){
+            this.active = this.supplierRefunds.some(supplierRefund => supplierRefund.id === this.item.id);
+        },
+        methods: {
+            activate(){
+                this.active = !this.active;
+                this.$emit('input', this.item)
+            },
+        },
+        mixins: [componentHandler, staticFormHandler]
+    }
+</script>

resources/assets/vue/components/bookings/elements/TransactionGroupPaymentComponent.vue

@@ -117,14 +117,6 @@
             this.active = this.payments.some(payment => payment.id === this.item.id);
         },
         methods: {
-            deleteGroupTransaction() {
-                this.isLoading = true;
-                this.submit(this.route('api.transaction.group.delete', this.item.id), 'delete', this.section, true, true);
-            },
-            updateDo() {
-                this.isLoading = true;
-                this.submit(this.route('api.transaction.group.bulk.po'), 'post', this.section, true, true);
-            },
             activate(){
                 this.active = !this.active;
                 this.$emit('input', this.item)

resources/assets/vue/components/bookings/forms/SupplierWhiteFormPlaceOrderFormComponent.vue

@@ -16,7 +16,7 @@
                             <div class="font-heading all-caps fs-10">Order Total:</div>
                         </div>
                         <div class="col-auto text-right">
-                            <div class="font-heading fs-11">{{ this.payments.length > 0 ? this.payments[0].original_currency.short_code : "CNY"}} {{(Math.round((this.originalTotal + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div>
+                            <div class="font-heading fs-11">{{ this.payments.length > 0 ? this.payments[0].original_currency.short_code : "CNY"}} {{ formatNumber(this.originalTotal) }}</div>
                         </div>
                     </div>
                     <div class="row align-items-end m-b-5 text-info" v-if="!is1688Supplier">
@@ -24,7 +24,7 @@
                             <div class="font-heading all-caps fs-10"></div>
                         </div>
                         <div class="col-auto text-right">
-                            <div class="font-heading fs-11">MYR {{(Math.round((this.total + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div>
+                            <div class="font-heading fs-11">MYR {{ formatNumber(this.total) }}</div>
                         </div>
                     </div>
                     <div class="row align-items-end m-b-5 text-info" v-if="!is1688Supplier">
@@ -43,6 +43,17 @@
                             <div class="font-heading bold">{{ billGroupCurrencyRate }}</div>
                         </div>
                     </div>
+                    <div class="row align-items-end m-b-10 text-danger" v-if="refundTotal > 0">
+                        <div class="col">
+                            <div class="font-heading all-caps fs-10">Bill Refund Total:</div>
+                        </div>
+                        <div class="col-auto text-right" v-if="is1688Supplier">
+                            <div class="font-heading bold">- CNY {{ parameters.payment_total }}</div>
+                        </div>
+                        <div class="col-auto text-right" v-else>
+                            <div class="font-heading bold">- MYR {{ formatNumber(refundTotal > paymentTotal ? paymentTotal : refundTotal) }}</div>
+                        </div>
+                    </div>
                     <div class="row align-items-end m-b-10 text-success">
                         <div class="col">
                             <div class="font-heading all-caps fs-10">Payment Total:</div>
@@ -51,7 +62,7 @@
                             <div class="font-heading bold">MYR {{ parameters.payment_total }}</div>
                         </div>
                         <div class="col-auto text-right" v-else>
-                            <div class="font-heading bold">MYR {{(Math.round((paymentTotal  + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div>
+                            <div class="font-heading bold">MYR {{ formatNumber(paymentTotal) }}</div>
                         </div>
                     </div>
                 </div>
@@ -84,6 +95,18 @@
                     <button class="btn btn-xs btn-success b-rad-none p-t-5 p-b-5 all-caps fs-10 btn-block" @click="submitForm()">Create Bill Group</button>
                 </div>
             </div>
+            <div class="row" v-if="this.supplier.id !== ''">
+                <div class="col mx-3 m-t-20">
+                    <div class="m-b-20">
+                        <small class="all-caps muted fs-15">Supplier Refund</small>
+                    </div>
+                    <list-component :key="supplierRefundListKey" section="supplierRefundListSection" :options="{'per_page': 20, 'type': 15, 'status': 2, 'belongs_to_supplier_id': this.supplier.id}" :endpoint="route('api.transaction.list')">
+                        <template slot="list" slot-scope="{data}">
+                            <supplier-refund-component section="supplierRefundListSection" :data="data" :payments="payments" :supplierRefunds="supplierRefunds" :refundTotal="refundTotal" :paymentTotal="paymentTotal" v-on:input="refundOrder($event)"></supplier-refund-component>
+                        </template>
+                    </list-component>
+                </div>
+            </div>
         </div>
     </div>
 </template>
@@ -108,8 +131,16 @@
                 required: true
             },
         },
+        watch: {
+            'supplier': function() {
+                this.supplierRefundListKey ++;
+                this.supplierRefunds = []
+            },
+        },
         data(){
             return {
+                supplierRefunds: [],
+                supplierRefundListKey: 1,
                 parameters: {
                     service_charges: '0',
                     payment_total: '0',
@@ -150,6 +181,16 @@
             paymentTotal(){
                 return this.total ? this.total + parseFloat(this.parameters.service_charges.replaceAll(',', '')) : 0;
             },
+            refundOriginalTotal(){
+                return this.supplierRefunds.reduce(function (total, currentValue) {
+                    return total + currentValue.original_amount;
+                }, 0);
+            },
+            refundTotal(){
+                return this.supplierRefunds.reduce(function (total, currentValue) {
+                    return total + currentValue.amount;
+                }, 0);
+            },
             billGroupCurrencyRate(){
                 const paymentTotal = parseFloat(this.parameters.payment_total.replaceAll(',', ''));
                 return this.originalTotal && paymentTotal > 0 ? (this.originalTotal / paymentTotal).toFixed(5) : 1;
@@ -162,6 +203,9 @@
             submitForm(){
                 this.parameters = {
                     payments: this.payments,
+                    supplierRefunds: this.supplierRefunds.sort((a, b) => {
+                        return a.amount - b.amount;
+                    }),
                     service_charges: this.is1688Supplier ? '0' : this.parameters.service_charges,
                     payment_total: this.is1688Supplier ? this.parameters.payment_total : '0',
                 };
@@ -170,6 +214,8 @@
             },
             successHandler(){
                 this.refreshList();
+                this.supplierRefunds = []
+                this.supplierRefundListKey ++;
                 this.$store.dispatch('toggleSection', {name: 'paymentInProgressBillGroupList', status: !this.$store.getters.isShowing('paymentInProgressBillGroupList')});
                 this.parameters = {
                     payments: [],
@@ -177,6 +223,12 @@
                     payment_total: '0',
                 };
             },
+            refundOrder(supplierRefund){
+                this.supplierRefunds.some(item => item.id === supplierRefund.id) ? this.supplierRefunds = this.supplierRefunds.filter(item => item.id !== supplierRefund.id) : this.supplierRefunds.push(supplierRefund);
+            },
+            formatNumber(value) {
+                return (Math.round((value  + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")
+            }
         },
         mixins: [FormHandler]
     }