edit transfer fee functionality for individual whiteform

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

@@ -0,0 +1,82 @@
+<?php
+
+namespace App\Classes\Modules\Transactions\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
+use App\Classes\Modules\Transactions\Services\CreatesTransaction;
+use App\Http\Resources\GroupResource;
+use App\Classes\Modules\Transactions\Services\FetchesGroup;
+use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateGroupTransferFeeLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Update Group Transfer Fee',
+            'message' => 'You have successfully updated transfer fee for this Group Transaction'
+        ];
+    }
+
+    /** @var FetchesGroup */
+    private $fetchesGroup;
+
+    /** @var CreatesTransaction */
+    private $createsTransaction;
+
+    /** @var GeneratesTransactionBillNumber */
+    private $generatesTransactionBillNumber;
+
+    /**
+     * UpdateGroupTransferFeeLogic constructor.
+     * @param FetchesGroup $fetchesGroup
+     * @param CreatesTransaction $createsTransaction
+     * @param GeneratesTransactionBillNumber $generatesTransactionBillNumber
+     */
+    public function __construct(FetchesGroup $fetchesGroup, CreatesTransaction $createsTransaction, GeneratesTransactionBillNumber $generatesTransactionBillNumber)
+    {
+        $this->fetchesGroup = $fetchesGroup;
+        $this->createsTransaction = $createsTransaction;
+        $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $group = $this->fetchesGroup->execute(['id' => $request->route('id')]);
+        $supplier = $group->issuerCompany;
+        $fee = $request->input('fee');
+
+        $transfer_fee = $group->morphTransactions()->where('type', TransactionType::TRANSFER_FEE)->first();
+
+        if ($transfer_fee) {
+            $transfer_fee->amount = $fee;
+            $transfer_fee->original_amount = $fee;
+            $transfer_fee->save();
+        } else {
+            $transferFeeNumber = $this->generatesTransactionBillNumber->execute('TRFR-');
+            $object = new TransactionObject($transferFeeNumber, TransactionType::TRANSFER_FEE, 1, $supplier->id,
+                $supplier->banks()->where('default', true)->first()->id, PaymentMethodType::CASH,
+                $fee, $fee, $group->original_currency_id, $group->original_currency_id,
+                1, 0, 0, null, ApprovalStatus::APPROVED);
+
+            $this->createsTransaction->execute($group, $object);
+        }
+
+        return $this->resourceResponse(new GroupResource($group));
+    }
+
+}

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

@@ -5,6 +5,7 @@ namespace App\Classes\Modules\Transactions\Services;
 use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
 use App\Classes\General\Interfaces\Transactionable;
 use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
+use App\Models\Group;
 use App\Models\Transaction;
 
 class CreatesTransaction extends AbstractUpdateRelationshipRecord
@@ -15,7 +16,7 @@ class CreatesTransaction extends AbstractUpdateRelationshipRecord
      * @return \Illuminate\Database\Eloquent\Model
      * @throws \App\Classes\Exceptions\MalformedRequestException
      */
-    public function execute(Transactionable $transactionable, TransactionObject $object) {
+    public function execute(Transactionable|Group $transactionable, TransactionObject $object) {
         $model = new Transaction();
         $model->bill_no = $object->getBillNo();
         $model->type = $object->getTransactionType();
@@ -34,6 +35,10 @@ class CreatesTransaction extends AbstractUpdateRelationshipRecord
         $model->status = $object->getStatus();
         $model->payment_reference = $object->getPaymentReference();
 
+        if ($transactionable instanceof Group) {
+            return $this->handler($transactionable->morphTransactions(), $model);
+        }
+
         return $this->handler($transactionable->transactions(), $model);
 
     }

app/Http/Controllers/Transactions/UpdateGroupTransferFeeController.php

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

app/Http/Resources/GroupResource.php

@@ -21,6 +21,13 @@ class GroupResource extends JsonResource
      */
     public function toArray($request)
     {
+        $transfer_fee = $this->morphTransactions()->where('type', TransactionType::TRANSFER_FEE)->first();
+
+        if ($transfer_fee) {
+            $transfer_fee = (float) $transfer_fee->amount;
+        } else {
+            $transfer_fee = 0;
+        }
 
         if(!$this->issuerCompany){
             dd($this->id);
@@ -36,6 +43,7 @@ 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,
+            'transfer_fee' => $transfer_fee,
             'transactions' => $this->transactions()->get()->pluck('owner.owner.marking'),
             'complete_transactions' => $this->transactions()->whereHasMorph('owner', [Transaction::class], function($query){
                 return $query->whereHas('booking', function($query){

app/Models/Group.php

@@ -21,6 +21,14 @@ class Group extends Model implements Documentable
         return $this->belongsToMany(Transaction::class, GroupTransaction::class);
     }
 
+    /**
+     * @return MorphMany
+     */
+    public function morphTransactions(): MorphMany
+    {
+        return $this->MorphMany(Transaction::class, 'owner');
+    }
+
     /**
      * @return MorphMany
      */

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

@@ -216,6 +216,12 @@
                                                     {{ group.currency.short_code }} {{formatAmount(group.amount)}}
                                                 </div>
                                             </div>
+                                            <div class="col-2">
+                                                <div class="font-heading fs-12 muted all-caps">Transfer Fee</div>
+                                                <div class="font-heading fs-12">
+                                                    {{ group.original_currency.short_code }} {{formatAmount(group.transfer_fee)}}
+                                                </div>
+                                            </div>
                                             <div class="col-auto">
                                                 <div class="font-heading fs-12 muted all-caps">PO Completion</div>
                                                 <div class="col">

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

@@ -0,0 +1,79 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <div class="row">
+                <div class="col">
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <h5 class="all-caps m-b-5 bold no-margin">Edit Transaction Group Fee</h5>
+                        </div>
+                    </div>
+                    <div class="row m-b-5 animate__animated animate__fadeInUpBig animate__fast" v-if="error">
+                        <div class="col">
+                            <small class="bold fs-10 text-danger">{{error}}</small>
+                        </div>
+                    </div>
+                    <div class="row m-b-10">
+                        <div class="col p-r-0">
+                            <validation-wrapper-component :validator="$v.parameters.fee">
+                                <label class="all-caps">Transfer Fee</label>
+                                <input type="text" class="form-control" v-model.lazy="parameters.fee" v-money="{decimal: '.',thousands: ',', precision: 2}">
+                            </validation-wrapper-component>
+                        </div>
+                        <div class="col-auto b-r b-t b-b b-grey">
+                            <div class="row h-100 align-items-center">
+                                <div class="col">
+                                    <div class="font-heading fs-10 muted">CNY</div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col p-r-5">
+                            <div class="btn btn-sm btn-default bg-master-lightest btn-block b-rad-none" data-dismiss="modal">Cancel</div>
+                        </div>
+                        <div class="col p-l-5">
+                            <div class="btn btn-sm btn-success btn-block b-rad-none" @click="submitForm()">Update</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import { required } from "vuelidate/lib/validators";
+    import ModalFormHandler from '../../../general/mixins/modalFormHandler';
+
+    export default {
+        props: {
+            transfer_fee:{
+                type: Number,
+                required: true
+            },
+            id: {
+                type: Number,
+                required: true
+            }
+        },
+        data(){
+            return {
+                error: '',
+                parameters: {
+                    fee: (Math.round((this.transfer_fee + Number.EPSILON) * 10000) / 10000).toFixed(5)
+                },
+            }
+        },
+        validations: {
+            parameters: {
+                fee: { },
+            },
+        },
+        methods: {
+            submitForm() {
+                this.submit(route('api.transaction.group.fee.update', this.id), 'put', this.section, true, true);
+            }
+        },
+        mixins: [ModalFormHandler]
+    }
+</script>

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

@@ -36,6 +36,12 @@
                                 {{item.original_currency.short_code}} {{(Math.round((item.original_amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}
                             </div>
                         </div>
+                        <div class="col-auto">
+                            <div class="font-heading fs-10 muted all-caps">Transfer Fee</div>
+                            <div class="font-heading fs-10">
+                                {{item.original_currency.short_code}} {{(Math.round((item.transfer_fee + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}
+                            </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">
@@ -75,6 +81,18 @@
                                 </div>
                             </div>
                         </div>
+                        <div class="col-auto">
+                            <div class="row parentContainer">
+                                <div class="col p-l-0">
+                                    <button class="btn btn-xs btn-primary b-rad-none requestModal" data-type="editTransactionGroup">
+                                        Edit Transfer Fee
+                                    </button>
+                                    <modal-component small type="editTransactionGroup">
+                                        <edit-transfer-fee-form-component :section="section" :transfer_fee="item.transfer_fee" :id="item.id"></edit-transfer-fee-form-component>
+                                    </modal-component>
+                                </div>
+                            </div>
+                        </div>
                     </div>
                     <div class="row" v-if="expanded">
                         <div class="col">

routes/transaction.php

@@ -32,6 +32,7 @@ Route::group(['prefix' => 'transactions', 'namespace' => 'Transactions', 'as' =>
         Route::get('/list', 'ListGroupsController@list')->name('list');
         Route::delete('/{id}/delete', 'DeleteGroupController@delete')->name('delete');
         Route::put('/{id}/update', 'UpdateGroupController@update')->name('update');
+        Route::put('/{id}/update/fee', 'UpdateGroupTransferFeeController@update')->name('fee.update');
         Route::post('/{id}/approve', 'CreateBulkPurchaseOrderDocumentController@aprove')->name('approve');
         Route::post('/bulk/po', 'CreateBulkPurchaseOrderDocumentController@create')->name('bulk.po');