Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0

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

@@ -0,0 +1,66 @@
+<?php
+
+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\UpdatesTransactionStatus;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Http\Resources\BillGroupResource;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CancelBillGroupLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Cancel Bill Group Transaction',
+            'message' => 'You have successfully cancelled this Bill Group Transaction'
+        ];
+    }
+
+    /** @var FetchesBillGroup */
+    private $fetchesBillGroup;
+
+    /** @var UpdatesTransactionStatus */
+    private $updatesTransactionStatus;
+
+    /**
+     * CancelBillGroupLogic constructor.
+     * @param FetchesBillGroup $fetchesBillGroup
+     * @param UpdatesTransactionStatus $updatesTransactionStatus
+     */
+    public function __construct(FetchesBillGroup $fetchesBillGroup, UpdatesTransactionStatus $updatesTransactionStatus)
+    {
+        $this->fetchesBillGroup = $fetchesBillGroup;
+        $this->updatesTransactionStatus = $updatesTransactionStatus;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $billGroup = $this->fetchesBillGroup->execute(['id' => $request->route('id')]);
+
+        $transactions = $billGroup->transactions()->get();
+
+        foreach($transactions as $transaction) {
+            if ($transaction->status === ApprovalStatus::APPROVED || $transaction->status === ApprovalStatus::COMPLETED) {
+                $this->updatesTransactionStatus->execute($transaction, ApprovalStatus::PENDING_VERIFICATION);
+            }
+        }
+
+        $billGroup->status = ApprovalStatus::PENDING_VERIFICATION;
+        $billGroup->save();
+        
+        return $this->resourceResponse(new BillGroupResource($billGroup));
+    }
+
+}

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

@@ -26,6 +26,7 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use ErrorException;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
 use Mccarlosen\LaravelMpdf\Facades\LaravelMpdf;
 
 class UpdateGroupLogic extends AbstractControllerLogic

app/Console/Commands/UpdateBillGroupAndGroupToIncludeTransferFee.php

@@ -56,12 +56,21 @@ class UpdateBillGroupAndGroupToIncludeTransferFee extends Command
         $groups = Group::all();
 
         foreach ($groups as $group) {
+            $group_transfer_fee = 0;
+
+            $morph_transaction = $group->morphTransactions()->where('type', TransactionType::TRANSFER_FEE)->first();
+
+            if ($morph_transaction) {
+                $group_transfer_fee = $morph_transaction->original_amount;
+            }
+
+
             $originalTransferFees = (float)Transaction::where('type', TransactionType::TRANSFER_FEE)->whereIn('owner_id', $group->transactions->pluck('id'))->sum('service_charge');
             $correctOriginalAmount = $group->transactions()->sum('original_amount');
-            $correctOriginalAmount += $originalTransferFees;
+            $correctOriginalAmount = $correctOriginalAmount + $originalTransferFees + $group_transfer_fee;
             $correctAmount = $group->transactions()->sum('amount');
             $transferFees = $originalTransferFees / $group->currency_rate;
-            $correctAmount += $transferFees;
+            $correctAmount = $correctAmount + $transferFees + ($group_transfer_fee / $group->currency_rate);
 
             if ($group->original_amount != $correctOriginalAmount || $group->amount != $correctAmount) {
                 $group->original_amount = $correctOriginalAmount;
@@ -73,26 +82,26 @@ class UpdateBillGroupAndGroupToIncludeTransferFee extends Command
         }
 
         // update group calculation to include individual group transfer fee
-        $groups = Group::whereHas('morphTransactions', function ($q) {
-            $q->where('type', TransactionType::TRANSFER_FEE);
-        })->get();
+        // $groups = Group::whereHas('morphTransactions', function ($q) {
+        //     $q->where('type', TransactionType::TRANSFER_FEE);
+        // })->get();
 
-        foreach ($groups as $group) {
-            $route = FacadesRoute::getRoutes()->getByName('api.transaction.group.update');
-            $request = Request::create(route('api.transaction.group.update', $group->id));
-            $uri = $route->uri;
-            $request->setRouteResolver(function () use ($request, $uri) {
-                // Associate Route to request so we can access route parameters.
-                return (new Route('PUT', $uri, []))->bind($request);
-            });       
+        // foreach ($groups as $group) {
+        //     $route = FacadesRoute::getRoutes()->getByName('api.transaction.group.update');
+        //     $request = Request::create(route('api.transaction.group.update', $group->id));
+        //     $uri = $route->uri;
+        //     $request->setRouteResolver(function () use ($request, $uri) {
+        //         // Associate Route to request so we can access route parameters.
+        //         return (new Route('PUT', $uri, []))->bind($request);
+        //     });       
 
-            $request['rate'] = $group->currency_rate;
-            $request['supplier_id'] = $group->issuer;
-            $this->updateGroupLogic->execute($request);
+        //     $request['rate'] = $group->currency_rate;
+        //     $request['supplier_id'] = $group->issuer;
+        //     $this->updateGroupLogic->execute($request);
             
-            $group_transfer_fee = $group->morphTransactions()->where('type', TransactionType::TRANSFER_FEE)->first();
-            $this->info("updated group id: {$group->id}, added transfer fee to individual white form CNY {$group_transfer_fee->original_amount}");
-        }
+        //     $group_transfer_fee = $group->morphTransactions()->where('type', TransactionType::TRANSFER_FEE)->first();
+        //     $this->info("updated group id: {$group->id}, added transfer fee to individual white form CNY {$group_transfer_fee->original_amount}");
+        // }
 
         // update bill group calculation to include individual group transfer fee
         $billGroups = BillGroup::all();
@@ -103,23 +112,8 @@ class UpdateBillGroupAndGroupToIncludeTransferFee extends Command
                 continue;
             }
 
-            // get the groups
-            $payments = $billGroup->groups;
-
-            $totalOriginalTransferFee = 0;
-            $totalTransferFee = 0;
-            // for each group
-            foreach ($payments as $group) {
-                $group_transfer_fee = $group->morphTransactions()->where('type', TransactionType::TRANSFER_FEE)->first();
-
-                if ($group_transfer_fee) {
-                    $totalOriginalTransferFee += $group_transfer_fee->original_amount;
-                    $totalTransferFee = $totalTransferFee + ($group_transfer_fee->original_amount / $group->currency_rate);
-                }
-            }
-
-            $totalOriginal = $billGroup->original_amount + $totalOriginalTransferFee;
-            $total = $billGroup->amount + $totalTransferFee;
+            $totalOriginal = $billGroup->groups()->sum('original_amount');
+            $total = $billGroup->groups()->sum('amount');
 
             // update bill group payment transaction amount if there is only 1 payment transaction
             $payment_transactions = $billGroup->transactions()->whereIn('status', [ApprovalStatus::PENDING_SUBMISSION, ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->get();

app/Http/Controllers/Transactions/CancelBillGroupController.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\CancelBillGroupLogic;
+
+class CancelBillGroupController
+{
+    /**
+     * @param Request $request
+     * @param CancelGroupTransactionLogic $logic
+     * @return JsonResponse
+     */
+    public function cancel(Request $request, CancelBillGroupLogic $logic) : JsonResponse {
+        return $logic->execute($request);
+    }
+}

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

@@ -50,6 +50,22 @@
                                                         </general-confirmation-form-component>
                                                     </modal-component>
                                                 </div>
+                                                <div class="col-auto position-static no-padding requestModal" data-type="cancelBillGroup" v-if="section === 'paidBillGroupList'">
+                                                    <div class="btn btn-xs btn-outline-danger">
+                                                        Cancel
+                                                    </div>
+                                                    <modal-component class="animate__animated animate__fast animate__fadeIn" type="cancelBillGroup">
+                                                        <general-confirmation-form-component
+                                                            contentText="Are you sure you want to cancel this Bill Group?"
+                                                            modalType="delete"
+                                                            class="text-center"
+                                                            :apiRoute="route('api.transaction.group.bill.cancel', item.id)"
+                                                            apiMethod="put"
+                                                            :section="section"
+                                                        >
+                                                        </general-confirmation-form-component>
+                                                    </modal-component>
+                                                </div>
                                                 <div class="col-auto no-padding">
                                                     <div class="btn btn-sm btn-default b-rad-none no-border" @click="expanded = !expanded">
                                                         <i class="fa fa-fw" :class="[{'fa-angle-up': expanded}, {'fa-angle-down': !expanded}]"></i>

resources/assets/vue/components/general/forms/GeneralConfirmationFormComponent.vue

@@ -61,7 +61,7 @@
             successHandler(){
                 this.closeModal();
                 this.formHandler();
-                if (this.section && (this.section === 'paymentInProgressBillGroupList' || this.section === 'paymentVerificationBillGroupList')) {
+                if (this.section && (this.section === 'paymentInProgressBillGroupList' || this.section === 'paymentVerificationBillGroupList' || this.section === 'paidBillGroupList')) {
                     this.$store.dispatch('toggleSection', {name: 'paymentInProgressBillGroupList', status: !this.$store.getters.isShowing('paymentInProgressBillGroupList')});
                     this.$store.dispatch('toggleSection', {name: 'paymentVerificationBillGroupList', status: !this.$store.getters.isShowing('paymentVerificationBillGroupList')});
                     this.$store.dispatch('toggleSection', {name: 'paidBillGroupList', status: !this.$store.getters.isShowing('paidBillGroupList')});

routes/transaction.php

@@ -41,6 +41,7 @@ Route::group(['prefix' => 'transactions', 'namespace' => 'Transactions', 'as' =>
             Route::post('/transaction/{id}', 'CreateBillGroupPaymentProofDocumentController@create')->name('payment_proof.create');
             Route::post('/transaction/{id}/approval/{status}', 'ApproveBillGroupPaymentVerificationController@approve')->where('status', 'approve|reject')->name('payment_proof.approval');
             Route::delete('/{id}/delete', 'DeleteBillGroupController@delete')->name('delete');
+            Route::put('/{id}/cancel', 'CancelBillGroupController@cancel')->name('cancel');
             Route::post('/{id}/pay', 'CreateBillGroupPaymentTransactionController@pay')->name('pay');
             // Route::post('/bulk/po', 'CreateBulkPurchaseOrderDocumentController@create')->name('bulk.po');
         });