From ce60f96eb639bdb783533aa4b28ceb741ed86359 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Sun, 20 Mar 2022 23:50:54 +0800
Subject: [PATCH 01/54] create API and update wallet component statistics

---
 .../Wallets/WalletReportController.php        |  29 +++
 .../wallets/elements/WalletsComponent.vue     | 221 ++++++++++--------
 routes/wallet.php                             |   2 +
 3 files changed, 161 insertions(+), 91 deletions(-)
 create mode 100644 app/Http/Controllers/Wallets/WalletReportController.php

diff --git a/app/Http/Controllers/Wallets/WalletReportController.php b/app/Http/Controllers/Wallets/WalletReportController.php
new file mode 100644
index 00000000..998bba53
--- /dev/null
+++ b/app/Http/Controllers/Wallets/WalletReportController.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Http\Controllers\Wallets;
+
+use App\Classes\ValueObjects\Response\ApiResponseObject;
+use App\Classes\ValueObjects\Constants\HttpStatus;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Models\Transaction;
+use App\Models\Wallet;
+
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class WalletReportController
+{
+    public function walletsReport(Request $request): JsonResponse
+    {
+        return (new ApiResponseObject(
+            'fetch service report Successful',
+            '',
+            HttpStatus::OK_WITH_MESSAGE,
+            ['data' => [
+                'walletSum' => (float) Wallet::all()->sum('amount'),
+                'outgoingSum' =>  (float) Transaction::where('type', TransactionType::PAYMENT)->where('owner_type', Wallet::class)->sum('amount'),
+                'incomingSum' =>  (float) Transaction::whereIn('type', [TransactionType::TOP_UP, TransactionType::CREDIT_NOTE])->where('owner_type', Wallet::class)->sum('amount'),
+            ]]
+        ))->handler();
+    }
+}
diff --git a/resources/assets/vue/components/wallets/elements/WalletsComponent.vue b/resources/assets/vue/components/wallets/elements/WalletsComponent.vue
index 8f0daa9c..c37f0fba 100644
--- a/resources/assets/vue/components/wallets/elements/WalletsComponent.vue
+++ b/resources/assets/vue/components/wallets/elements/WalletsComponent.vue
@@ -1,122 +1,127 @@
 <template>
     <div class="row">
         <div class="col">
-            <div class="row">
-                <div class="col-12 p-0" style="width: 500px; height:350px">
-                    <canvas id="wallets-chart"></canvas>
-                </div>
-            </div>
-            <div class="row">
+            <loading-component v-if="isLoading"></loading-component>
+            <div class="row" v-if="!isLoading">
                 <div class="col">
-                    <div class="card no-border bg-success text-white widget-loader-bar m-b-10">
-                        <div class="container-xs-height full-height">
-                            <div class="row-xs-height">
-                                <div class="col-xs-height col-top">
-                                    <div class="card-header  top-left top-right">
-                                        <div class="card-title">
-                                            <span class="font-montserrat fs-11 all-caps">Total Amount</span>
+                    <div class="row">
+                        <div class="col-12 p-0" style="width: 500px; height:350px">
+                            <canvas id="wallets-chart"></canvas>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            <div class="card no-border bg-success text-white widget-loader-bar m-b-10">
+                                <div class="container-xs-height full-height">
+                                    <div class="row-xs-height">
+                                        <div class="col-xs-height col-top">
+                                            <div class="card-header  top-left top-right">
+                                                <div class="card-title">
+                                                    <span class="font-montserrat fs-11 all-caps">Total Amount</span>
+                                                </div>
+                                            </div>
                                         </div>
                                     </div>
-                                </div>
-                            </div>
-                            <div class="row-xs-height">
-                                <div class="col-xs-height col-top">
-                                    <div class="p-l-20 p-t-50 p-b-40 p-r-20">
-                                        <h3 class="no-margin p-b-5 text-white">MYR 500,123</h3>
+                                    <div class="row-xs-height">
+                                        <div class="col-xs-height col-top">
+                                            <div class="p-l-20 p-t-50 p-b-40 p-r-20">
+                                                <h3 class="no-margin p-b-5 text-white">MYR {{(Math.round((report.walletSum + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</h3>
+                                            </div>
+                                        </div>
                                     </div>
-                                </div>
-                            </div>
-                            <div class="row-xs-height">
-                                <div class="col-xs-height col-bottom">
-                                    <div class="progress progress-small m-b-0">
-                                        <div class="progress-bar progress-bar-success" style="width: 0"></div>
+                                    <div class="row-xs-height">
+                                        <div class="col-xs-height col-bottom">
+                                            <div class="progress progress-small m-b-0">
+                                                <div class="progress-bar progress-bar-success" style="width: 0"></div>
+                                            </div>
+                                        </div>
                                     </div>
                                 </div>
                             </div>
                         </div>
-                    </div>
-                </div>
-                <div class="col">
-                    <div class="card no-border bg-success-light text-white widget-loader-bar m-b-10">
-                        <div class="container-xs-height full-height">
-                            <div class="row-xs-height">
-                                <div class="col-xs-height col-top">
-                                    <div class="card-header  top-left top-right">
-                                        <div class="card-title">
-                                            <span class="font-montserrat fs-11 all-caps">Total Incoming Amount</span>
+                        <div class="col">
+                            <div class="card no-border bg-success-light text-white widget-loader-bar m-b-10">
+                                <div class="container-xs-height full-height">
+                                    <div class="row-xs-height">
+                                        <div class="col-xs-height col-top">
+                                            <div class="card-header  top-left top-right">
+                                                <div class="card-title">
+                                                    <span class="font-montserrat fs-11 all-caps">Total Incoming Amount</span>
+                                                </div>
+                                            </div>
                                         </div>
                                     </div>
-                                </div>
-                            </div>
-                            <div class="row-xs-height">
-                                <div class="col-xs-height col-top">
-                                    <div class="p-l-20 p-t-50 p-b-40 p-r-20">
-                                        <h3 class="no-margin p-b-5 text-white">MYR 500,123</h3>
+                                    <div class="row-xs-height">
+                                        <div class="col-xs-height col-top">
+                                            <div class="p-l-20 p-t-50 p-b-40 p-r-20">
+                                                <h3 class="no-margin p-b-5 text-white">MYR {{(Math.round((report.incomingSum + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</h3>
+                                            </div>
+                                        </div>
                                     </div>
-                                </div>
-                            </div>
-                            <div class="row-xs-height">
-                                <div class="col-xs-height col-bottom">
-                                    <div class="progress progress-small m-b-0">
-                                        <div class="progress-bar progress-bar-success" style="width: 0"></div>
+                                    <div class="row-xs-height">
+                                        <div class="col-xs-height col-bottom">
+                                            <div class="progress progress-small m-b-0">
+                                                <div class="progress-bar progress-bar-success" style="width: 0"></div>
+                                            </div>
+                                        </div>
                                     </div>
                                 </div>
                             </div>
                         </div>
-                    </div>
-                </div>
-                <div class="col">
-                    <div class="card no-border bg-warning widget-loader-bar m-b-10">
-                        <div class="container-xs-height full-height">
-                            <div class="row-xs-height">
-                                <div class="col-xs-height col-top">
-                                    <div class="card-header  top-left top-right">
-                                        <div class="card-title">
-                                            <span class="font-montserrat fs-11 all-caps">Total Outgoing Amount</span>
+                        <div class="col">
+                            <div class="card no-border bg-warning widget-loader-bar m-b-10">
+                                <div class="container-xs-height full-height">
+                                    <div class="row-xs-height">
+                                        <div class="col-xs-height col-top">
+                                            <div class="card-header  top-left top-right">
+                                                <div class="card-title">
+                                                    <span class="font-montserrat fs-11 all-caps">Total Outgoing Amount</span>
+                                                </div>
+                                            </div>
                                         </div>
                                     </div>
-                                </div>
-                            </div>
-                            <div class="row-xs-height">
-                                <div class="col-xs-height col-top">
-                                    <div class="p-l-20 p-t-50 p-b-40 p-r-20">
-                                        <h3 class="no-margin p-b-5">MYR 500,123</h3>
+                                    <div class="row-xs-height">
+                                        <div class="col-xs-height col-top">
+                                            <div class="p-l-20 p-t-50 p-b-40 p-r-20">
+                                                <h3 class="no-margin p-b-5 text-white">MYR {{(Math.round((report.outgoingSum + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</h3>
+                                            </div>
+                                        </div>
                                     </div>
-                                </div>
-                            </div>
-                            <div class="row-xs-height">
-                                <div class="col-xs-height col-bottom">
-                                    <div class="progress progress-small m-b-0">
-                                        <div class="progress-bar progress-bar-primary" style="width: 0"></div>
+                                    <div class="row-xs-height">
+                                        <div class="col-xs-height col-bottom">
+                                            <div class="progress progress-small m-b-0">
+                                                <div class="progress-bar progress-bar-primary" style="width: 0"></div>
+                                            </div>
+                                        </div>
                                     </div>
                                 </div>
                             </div>
                         </div>
-                    </div>
-                </div>
-                <div class="col">
-                    <div class="card no-border bg-danger text-white widget-loader-bar m-b-10">
-                        <div class="container-xs-height full-height">
-                            <div class="row-xs-height">
-                                <div class="col-xs-height col-top">
-                                    <div class="card-header  top-left top-right">
-                                        <div class="card-title">
-                                            <span class="font-montserrat fs-11 all-caps">Total Floating Amount</span>
+                        <div class="col d-none">
+                            <div class="card no-border bg-danger text-white widget-loader-bar m-b-10">
+                                <div class="container-xs-height full-height">
+                                    <div class="row-xs-height">
+                                        <div class="col-xs-height col-top">
+                                            <div class="card-header  top-left top-right">
+                                                <div class="card-title">
+                                                    <span class="font-montserrat fs-11 all-caps">Total Floating Amount</span>
+                                                </div>
+                                            </div>
                                         </div>
                                     </div>
-                                </div>
-                            </div>
-                            <div class="row-xs-height">
-                                <div class="col-xs-height col-top">
-                                    <div class="p-l-20 p-t-50 p-b-40 p-r-20">
-                                        <h3 class="no-margin p-b-5 text-white">MYR 500,123</h3>
+                                    <div class="row-xs-height">
+                                        <div class="col-xs-height col-top">
+                                            <div class="p-l-20 p-t-50 p-b-40 p-r-20">
+                                                <h3 class="no-margin p-b-5 text-white">MYR 500,123</h3>
+                                            </div>
+                                        </div>
                                     </div>
-                                </div>
-                            </div>
-                            <div class="row-xs-height">
-                                <div class="col-xs-height col-bottom">
-                                    <div class="progress progress-small m-b-0">
-                                        <div class="progress-bar progress-bar-primary" style="width: 0"></div>
+                                    <div class="row-xs-height">
+                                        <div class="col-xs-height col-bottom">
+                                            <div class="progress progress-small m-b-0">
+                                                <div class="progress-bar progress-bar-primary" style="width: 0"></div>
+                                            </div>
+                                        </div>
                                     </div>
                                 </div>
                             </div>
@@ -133,7 +138,28 @@
     import Chart from 'chart.js';
 
     export default {
+        data(){
+            return {
+                section: 'walletStatsSection',
+                isLoading: false,
+                report: {
+                    incomingSum: 0,
+                    outgoingSum: 0,
+                    walletSum: 0
+                }
+            }
+        },
+        computed: {
+            pendingQueue () {
+                return this.$store.getters.isInCompleteQueue(this.section);
+            },
+        },
         watch: {
+            pendingQueue(inComplete){
+                if(inComplete){
+                    this.fetchReport();
+                }
+            },
             wallet_details: function() {
                 const ctx = document.getElementById('wallets-chart');
                 var xValues = [100,200,300,400,500,600,700,800,900,1000];
@@ -172,6 +198,19 @@
                 });
             }
         },
+        created(){
+            this.$store.dispatch('updateListQueue', {'name': this.section});
+        },
+        methods: {
+            fetchReport(){
+                this.isLoading = true;
+                this.submit(route('api.wallet.reports'), 'get', this.section, false, false)
+            },
+            successHandler(response){
+                this.isLoading = false;
+                this.report = response.payload.data;
+            }
+        },
         mixins: [componentHandler]
     }
 
diff --git a/routes/wallet.php b/routes/wallet.php
index 123f36d6..f79708b3 100644
--- a/routes/wallet.php
+++ b/routes/wallet.php
@@ -10,4 +10,6 @@ Route::group(['prefix' => 'wallets', 'namespace' => 'Wallets', 'as' => 'wallet.'
     Route::post('/credit', 'CreditWalletController@credit')->name('credit'); // admin +
 
     Route::put('/{transaction_id}/update-status/{status}', 'UpdateStatusWalletController@updateStatus')->where('status', 'approve|reject')->name('approval');
+
+    Route::get('/reports', 'WalletReportController@walletsReport')->name('reports');
 });

From 7857063a5664b7ccb99d5c55556cbb15b36052ae Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Mon, 21 Mar 2022 21:32:33 +0800
Subject: [PATCH 02/54] move 'UPLOAD DEBTORS' to settings - can only de seen by
 superAdmin

---
 .../bookings/elements/UploadDebtorExcelComponent.vue         | 2 +-
 resources/views/pages/dashboards/admin.blade.php             | 5 -----
 resources/views/pages/settings.blade.php                     | 4 ++--
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/resources/assets/vue/components/bookings/elements/UploadDebtorExcelComponent.vue b/resources/assets/vue/components/bookings/elements/UploadDebtorExcelComponent.vue
index 946bafe1..da0d2eae 100644
--- a/resources/assets/vue/components/bookings/elements/UploadDebtorExcelComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/UploadDebtorExcelComponent.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="row" @keyup.enter="submitForm">
-        <div class="col no-padding">
+        <div class="col ml-md-3 ml-0 mt-md-0 mt-3 bg-white padding-15">
             <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading(section)"></loading-component>
             <div class="row" v-show="!$store.getters.isLoading(section)">
                 <div class="col">
diff --git a/resources/views/pages/dashboards/admin.blade.php b/resources/views/pages/dashboards/admin.blade.php
index 2719cfec..d998c745 100644
--- a/resources/views/pages/dashboards/admin.blade.php
+++ b/resources/views/pages/dashboards/admin.blade.php
@@ -303,11 +303,6 @@
                                         </list-component>
                                     </div>
                                 </div>
-                                <div class="row">
-                                    <div class="col">
-                                        <upload-debtor-excel-component section="uploadDebtorExcelSection"></upload-debtor-excel-component>
-                                    </div>
-                                </div>
                             </div>
                         </div>
                     </div>
diff --git a/resources/views/pages/settings.blade.php b/resources/views/pages/settings.blade.php
index a5fbc273..5f4569d8 100644
--- a/resources/views/pages/settings.blade.php
+++ b/resources/views/pages/settings.blade.php
@@ -512,10 +512,10 @@
                     </div>
                 </div>
             </div>
-            <div class="col-4 p-r-0" v-if="$store.getters.isAdmin">
+            <div class="col-12 col-md-4 p-r-0" v-if="$store.getters.isSuperAdmin">
                 <div class="row">
                     <div class="col">
-
+                        <upload-debtor-excel-component section="uploadDebtorExcelSection"></upload-debtor-excel-component>
                     </div>
                 </div>
             </div>

From 37537767bff3478b4aafccdc12ad0a8f2069a1ec Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Mon, 21 Mar 2022 23:30:19 +0800
Subject: [PATCH 03/54] update wallets chartjs

---
 .../wallets/elements/WalletsComponent.vue     | 68 ++++++++-----------
 1 file changed, 29 insertions(+), 39 deletions(-)

diff --git a/resources/assets/vue/components/wallets/elements/WalletsComponent.vue b/resources/assets/vue/components/wallets/elements/WalletsComponent.vue
index c37f0fba..49a99f0d 100644
--- a/resources/assets/vue/components/wallets/elements/WalletsComponent.vue
+++ b/resources/assets/vue/components/wallets/elements/WalletsComponent.vue
@@ -5,8 +5,8 @@
             <div class="row" v-if="!isLoading">
                 <div class="col">
                     <div class="row">
-                        <div class="col-12 p-0" style="width: 500px; height:350px">
-                            <canvas id="wallets-chart"></canvas>
+                        <div class="col-12 p-0" style="height:350px">
+                            <canvas id="wallets-chart" class="w-100"></canvas>
                         </div>
                     </div>
                     <div class="row">
@@ -160,47 +160,37 @@
                     this.fetchReport();
                 }
             },
-            wallet_details: function() {
-                const ctx = document.getElementById('wallets-chart');
-                var xValues = [100,200,300,400,500,600,700,800,900,1000];
-                new Chart(ctx, {
-                    type: "line",
-                    data: {
-                        labels: 'ndcs',
-                        datasets: [{
-                            data: [860,1140,1060,1060,1070,1110,1330,2210,7830,2478],
-                            borderColor: "red",
-                            fill: false
-                        },
-                        {
-                            data: [1600,1700,1700,1900,2000,2700,4000,5000,6000,7000],
-                            borderColor: "green",
-                            fill: false
-                        },
-                        {
-                            data: [300,700,2000,5000,6000,4000,2000,1000,200,100],
-                            borderColor: "blue",
-                            fill: false
-                        }]
-                    },
-                    options: {
-                        responsive: true,
-                        plugins: {
-                            legend: {
-                                position: 'top',
-                            },
-                            title: {
-                                display: true,
-                                text: 'Chart.js Line Chart'
-                            }
-                        }
-                    },
-                });
-            }
         },
         created(){
             this.$store.dispatch('updateListQueue', {'name': this.section});
         },
+        mounted() {
+            const ctx = document.getElementById('wallets-chart');
+            new Chart(ctx,  {
+                type: 'pie',
+                data: {
+                    labels: ['Red', 'Orange', 'Yellow', 'Green', 'Blue'],
+                    datasets: [
+                        {
+                            label: 'Dataset 1',
+                            data: [1, 1, 1, 1, 1],
+                        }
+                    ]
+                },
+                options: {
+                    responsive: true,
+                    plugins: {
+                        legend: {
+                            position: 'top',
+                        },
+                        title: {
+                            display: true,
+                            text: 'Chart.js Pie Chart'
+                        }
+                    }
+                },
+            });
+        },
         methods: {
             fetchReport(){
                 this.isLoading = true;

From 15cde500d1f0e7b1e8d443b02a3a9ac0628edff1 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Tue, 22 Mar 2022 00:23:24 +0800
Subject: [PATCH 04/54] tidy up transactions exports

---
 .../DownloadBillingWithDatesComponent.vue     | 83 +++++++++++++++++++
 .../elements/UploadDebtorExcelComponent.vue   | 64 ++++++++------
 resources/views/pages/payments.blade.php      |  5 ++
 .../views/pages/wallet/wallets.blade.php      |  5 ++
 routes/web.php                                |  6 +-
 5 files changed, 136 insertions(+), 27 deletions(-)
 create mode 100644 resources/assets/vue/components/bookings/elements/DownloadBillingWithDatesComponent.vue

diff --git a/resources/assets/vue/components/bookings/elements/DownloadBillingWithDatesComponent.vue b/resources/assets/vue/components/bookings/elements/DownloadBillingWithDatesComponent.vue
new file mode 100644
index 00000000..07819021
--- /dev/null
+++ b/resources/assets/vue/components/bookings/elements/DownloadBillingWithDatesComponent.vue
@@ -0,0 +1,83 @@
+<template>
+    <div class="row m-b-20">
+        <div class="col">
+            <div class="row">
+                <div class="col">
+                    <div class="row m-l-0 m-r-0">
+                        <div class="col-12 col-md mb-2 mb-md-0 p-l-3 p-r-3 p-md-0">
+                            <validation-wrapper-component :validator="$v.parameters.startDate">
+                                <label class="all-caps">Start Date</label>
+                                <date-picker-component :parameters="parameters" v-model.lazy="parameters.startDate"></date-picker-component>
+                            </validation-wrapper-component>
+                        </div>
+                        <div class="col-12 col-md mb-2 mb-md-0 p-l-3 p-r-3 p-md-0">
+                            <validation-wrapper-component :validator="$v.parameters.endDate">
+                                <label class="all-caps">End Date</label>
+                                <date-picker-component :parameters="parameters" v-model.lazy="parameters.endDate"></date-picker-component>
+                            </validation-wrapper-component>
+                        </div>
+                        <div class="col-12 col-md-auto p-l-3 p-r-3 p-md-0">
+                            <div class="btn btn-lg btn-primary fs-11 w-100 h-100 d-flex justify-content-center align-items-center" @click="downloadReport()">
+                                <span>
+                                    <i class="fa fa-cloud-download fs-20" style="margin-top: 8px;"></i>
+                                </span>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+import componentHandler from "../../../general/mixins/componentHandler";
+import { required } from "vuelidate/lib/validators";
+
+export default {
+    props: {
+        section:{
+            type: String,
+            required: true
+        }
+    },
+    data(){
+        return {
+            parameters: {
+                startDate: '',
+                endDate: '',
+            },
+        }
+    },
+    validations: {
+        parameters: {
+            startDate: {
+                required
+            },
+            endDate: {
+                required
+            },
+        }
+    },
+    methods: {
+        downloadReport(){
+            var apiRoute = '';
+            if(!this.validate()){ return; }
+            switch(this.section) {
+                case 'paymentsReportSection':
+                    apiRoute = route('paymentTransactions.export');
+                    break;
+                case 'walletsReportSection':
+                    apiRoute = route('walletTransactions.export');
+                    break;
+            }
+            window.open(apiRoute + '?startDate=' + this.parameters.startDate + '&endDate=' + this.parameters.endDate, '_blank');
+        },
+        updateDocumentType(documentType) {
+            this.parameters.type = documentType;
+            this.selectedDocumentStatus = !this.selectedDocumentStatus
+        }
+    },
+    mixins: [componentHandler]
+};
+</script>
diff --git a/resources/assets/vue/components/bookings/elements/UploadDebtorExcelComponent.vue b/resources/assets/vue/components/bookings/elements/UploadDebtorExcelComponent.vue
index da0d2eae..9c4bd824 100644
--- a/resources/assets/vue/components/bookings/elements/UploadDebtorExcelComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/UploadDebtorExcelComponent.vue
@@ -1,31 +1,44 @@
 <template>
-    <div class="row" @keyup.enter="submitForm">
-        <div class="col ml-md-3 ml-0 mt-md-0 mt-3 bg-white padding-15">
-            <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading(section)"></loading-component>
-            <div class="row" v-show="!$store.getters.isLoading(section)">
-                <div class="col">
-                    <div class="row m-b-10">
+    <div class="row">
+        <div class="col">
+            <div class="row" @keyup.enter="submitForm">
+                <div class="col ml-md-3 ml-0 mt-md-0 mt-3 bg-white padding-15">
+                    <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading(section)"></loading-component>
+                    <div class="row" v-show="!$store.getters.isLoading(section)">
                         <div class="col">
-                            <div class="font-heading fs-16 all-caps bold m-b-15">Upload Debtors</div>
-                        </div>
-                    </div>
-                    <error-message-component class="m-b-20" :error="error"></error-message-component>
-                    <div class="row">
-                        <div class="col">
-                            <file-input-component :validator="$v.files" v-model="files">
-                                <template slot="label">
-                                    <div class="font-heading fs-11 text-primary all-caps">Debtor Excel</div>
-                                </template>
-                            </file-input-component>
-                        </div>
-                    </div>
-                    <div class="row m-t-20">
-                        <div class="col">
-                            <div class="row">
+                            <div class="row m-b-10">
                                 <div class="col">
-                                    <button type="button" class="btn btn-block p-t-10 p-b-10 p-r-35 p-l-35 btn-success b-rad-none" @click="submitForm">Upload & Update</button>
+                                    <div class="font-heading fs-16 all-caps bold m-b-15">Upload Debtors</div>
                                 </div>
                             </div>
+                            <error-message-component class="m-b-20" :error="error"></error-message-component>
+                            <div class="row">
+                                <div class="col">
+                                    <file-input-component :validator="$v.files" v-model="files">
+                                        <template slot="label">
+                                            <div class="font-heading fs-11 text-primary all-caps">Debtor Excel</div>
+                                        </template>
+                                    </file-input-component>
+                                </div>
+                            </div>
+                            <div class="row m-t-20">
+                                <div class="col">
+                                    <div class="row">
+                                        <div class="col">
+                                            <button type="button" class="btn btn-block p-t-10 p-b-10 p-r-35 p-l-35 btn-success b-rad-none" @click="submitForm">Upload & Update</button>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row m-t-20">
+                <div class="col ml-md-3 ml-0">
+                    <div class="row">
+                        <div class="col">
+                            <button type="button" class="btn btn-block p-t-10 p-b-10 p-r-35 p-l-35 btn-primary b-rad-none" @click="downloadReport()">Download Null Debtors Report</button>
                         </div>
                     </div>
                 </div>
@@ -57,7 +70,10 @@
                 };
 
                 this.submit(this.route('api.debtor.import'), 'post', this.section, true, false)
-            }
+            },
+            downloadReport(){
+                window.open(route('nullDebtor.export'), '_blank');
+            },
         },
         mixins: [ModalFromHandler]
 
diff --git a/resources/views/pages/payments.blade.php b/resources/views/pages/payments.blade.php
index 14517e6e..12604a91 100644
--- a/resources/views/pages/payments.blade.php
+++ b/resources/views/pages/payments.blade.php
@@ -1,5 +1,10 @@
 @extends('layouts.base_portal')
 @section('inner_content')
+    <div class="row">
+        <div class="col-12 col-md-6 no-padding">
+            <download-billing-with-dates-component section="paymentsReportSection"></download-billing-withdates-component>
+        </div>
+    </div>
     <div class="row">
         <div class="col bg-white p-t-15 p-b-15">
             <div class="row no-margin">
diff --git a/resources/views/pages/wallet/wallets.blade.php b/resources/views/pages/wallet/wallets.blade.php
index 661825ee..29e66ca2 100644
--- a/resources/views/pages/wallet/wallets.blade.php
+++ b/resources/views/pages/wallet/wallets.blade.php
@@ -3,6 +3,11 @@
 @section('inner_content')
     <div class="row">
         <div class="col">
+            <div class="row">
+                <div class="col-12 col-md-6">
+                    <download-billing-with-dates-component section="walletsReportSection"></download-billing-withdates-component>
+                </div>
+            </div>
             <div class="row tabsContainer" v-if="$store.getters.isAdmin">
                 <div class="col">
                     <div class="row m-l-0 m-r-0 d-flex">
diff --git a/routes/web.php b/routes/web.php
index 571ce9fe..d98ef8e6 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -143,9 +143,9 @@ Route::get('billplz/bills/{bill_no}', function($bill_no){
 
 Route::get('/export/customers/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@export');
 Route::get('/export/transactions/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@transactions');
-Route::get('/export/null-debtor/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@nullDebtor');
-Route::get('/export/payment-transactions/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@paymentTransactions');
-Route::get('/export/wallet-transactions/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@walletTransactions');
+Route::get('/export/null-debtor/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@nullDebtor')->name('nullDebtor.export');
+Route::get('/export/payment-transactions/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@paymentTransactions')->name('paymentTransactions.export');
+Route::get('/export/wallet-transactions/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@walletTransactions')->name('walletTransactions.export');
 
 Route::get('/products', function (\App\Classes\Modules\Exports\Services\ExportsProducts $exportsProducts) {
     return $exportsProducts->download('products.csv', Excel::CSV, ['Content-Type' => 'text/csv']);

From 026bfd4c35d0af7b8f07f60fd92a1153936848ec Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Tue, 22 Mar 2022 00:32:11 +0800
Subject: [PATCH 05/54] change nullDebtor to newDebtor

---
 .../bookings/elements/DownloadBillingWithDatesComponent.vue   | 2 +-
 .../bookings/elements/UploadDebtorExcelComponent.vue          | 4 ++--
 routes/web.php                                                | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/resources/assets/vue/components/bookings/elements/DownloadBillingWithDatesComponent.vue b/resources/assets/vue/components/bookings/elements/DownloadBillingWithDatesComponent.vue
index 07819021..99be4562 100644
--- a/resources/assets/vue/components/bookings/elements/DownloadBillingWithDatesComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/DownloadBillingWithDatesComponent.vue
@@ -19,7 +19,7 @@
                         <div class="col-12 col-md-auto p-l-3 p-r-3 p-md-0">
                             <div class="btn btn-lg btn-primary fs-11 w-100 h-100 d-flex justify-content-center align-items-center" @click="downloadReport()">
                                 <span>
-                                    <i class="fa fa-cloud-download fs-20" style="margin-top: 8px;"></i>
+                                    Export
                                 </span>
                             </div>
                         </div>
diff --git a/resources/assets/vue/components/bookings/elements/UploadDebtorExcelComponent.vue b/resources/assets/vue/components/bookings/elements/UploadDebtorExcelComponent.vue
index 9c4bd824..a956a07c 100644
--- a/resources/assets/vue/components/bookings/elements/UploadDebtorExcelComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/UploadDebtorExcelComponent.vue
@@ -38,7 +38,7 @@
                 <div class="col ml-md-3 ml-0">
                     <div class="row">
                         <div class="col">
-                            <button type="button" class="btn btn-block p-t-10 p-b-10 p-r-35 p-l-35 btn-primary b-rad-none" @click="downloadReport()">Download Null Debtors Report</button>
+                            <button type="button" class="btn btn-block p-t-10 p-b-10 p-r-35 p-l-35 btn-primary b-rad-none" @click="downloadReport()">Download New Debtors Report</button>
                         </div>
                     </div>
                 </div>
@@ -72,7 +72,7 @@
                 this.submit(this.route('api.debtor.import'), 'post', this.section, true, false)
             },
             downloadReport(){
-                window.open(route('nullDebtor.export'), '_blank');
+                window.open(route('newDebtor.export'), '_blank');
             },
         },
         mixins: [ModalFromHandler]
diff --git a/routes/web.php b/routes/web.php
index d98ef8e6..b6032a66 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -143,7 +143,7 @@ Route::get('billplz/bills/{bill_no}', function($bill_no){
 
 Route::get('/export/customers/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@export');
 Route::get('/export/transactions/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@transactions');
-Route::get('/export/null-debtor/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@nullDebtor')->name('nullDebtor.export');
+Route::get('/export/null-debtor/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@nullDebtor')->name('newDebtor.export');
 Route::get('/export/payment-transactions/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@paymentTransactions')->name('paymentTransactions.export');
 Route::get('/export/wallet-transactions/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@walletTransactions')->name('walletTransactions.export');
 

From 0d4e396a548c4fc3365280b3ef4a5b242560c5a1 Mon Sep 17 00:00:00 2001
From: glovetleong <glovetleong@gmail.com>
Date: Tue, 22 Mar 2022 14:59:17 +0800
Subject: [PATCH 06/54] group transaction

---
 .../CreateSupplierTransactionLogic.php        | 42 ++++++++++
 app/Models/Group.php                          | 13 +++
 app/Models/GroupTransaction.php               | 10 +++
 .../2022_03_20_170628_create_groups_table.php | 40 ++++++++++
 ...170641_create_group_transactions_table.php | 31 +++++++
 .../RecoverGroupTransactionTableSeeder.php    | 80 +++++++++++++++++++
 6 files changed, 216 insertions(+)
 create mode 100644 app/Models/Group.php
 create mode 100644 app/Models/GroupTransaction.php
 create mode 100644 database/migrations/2022_03_20_170628_create_groups_table.php
 create mode 100644 database/migrations/2022_03_20_170641_create_group_transactions_table.php
 create mode 100644 database/seeds/RecoverGroupTransactionTableSeeder.php

diff --git a/app/Classes/Modules/Transactions/ControllersLogic/CreateSupplierTransactionLogic.php b/app/Classes/Modules/Transactions/ControllersLogic/CreateSupplierTransactionLogic.php
index 1cf71643..c8f2813e 100644
--- a/app/Classes/Modules/Transactions/ControllersLogic/CreateSupplierTransactionLogic.php
+++ b/app/Classes/Modules/Transactions/ControllersLogic/CreateSupplierTransactionLogic.php
@@ -5,6 +5,9 @@ namespace App\Classes\Modules\Transactions\ControllersLogic;
 
 use App\Classes\Modules\Transactions\Processors\CreateSupplierTransactionProcessor;
 use App\Models\Document;
+
+use App\Models\Group;
+
 use Illuminate\Http\Request;
 use Illuminate\Http\JsonResponse;
 use Meneses\LaravelMpdf\Facades\LaravelMpdf;
@@ -71,6 +74,44 @@ class CreateSupplierTransactionLogic extends AbstractControllerLogic
 
         if(!count($this->createSupplierTransactionProcessor->getBills())) return $this->response([]);
 
+        $group = new Group();
+        $group->save();
+
+        $issuer = '';
+        $receiver = '';
+        $amount = 0;
+        $original_amount = 0;
+        $currency_id = 0;
+        $original_currency_id = '';
+        $currency_rate = '';
+        $tax = 0;
+        $service_charge = 0;
+
+        foreach ($this->createSupplierTransactionProcessor->getBills() as $key => $row) {
+            $group->transaction()->sync($row->id, false);
+            $issuer = $row->issuer;
+            $receiver = $row->receiver;
+            $amount += $row->amount;
+            $original_amount += $row->original_amount;
+            $currency_id = $row->currency_id;
+            $original_currency_id = $row->original_currency_id;
+            $currency_rate = $row->currency_rate;
+            $tax += $row->tax;
+            $service_charge += $row->service_charge;
+        }
+
+        $group->issuer = $issuer;
+        $group->receiver = $receiver;
+        $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->update();
+
         $pdf = LaravelMpdf::loadView('pages.pdfs.currency_vendor_order', ['transactions' => $this->createSupplierTransactionProcessor->getBills(), 'transferFeeTransactions' => $this->createSupplierTransactionProcessor->getTransferTransactions(), 'supplier' => $supplier]);
 
         $object = new DocumentObject(
@@ -85,6 +126,7 @@ class CreateSupplierTransactionLogic extends AbstractControllerLogic
         $document = $this->createsDocument->execute($supplier, $object);
         $this->createsFile->execute($document, $object);
 
+
         return $this->response([]);
     }
 }
diff --git a/app/Models/Group.php b/app/Models/Group.php
new file mode 100644
index 00000000..eff309e2
--- /dev/null
+++ b/app/Models/Group.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Group extends Model
+{
+	public function transaction()
+    {
+        return $this->belongsToMany('App\Models\Transaction', 'group_transaction');
+    }
+}
diff --git a/app/Models/GroupTransaction.php b/app/Models/GroupTransaction.php
new file mode 100644
index 00000000..c8622ef9
--- /dev/null
+++ b/app/Models/GroupTransaction.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class GroupTransaction extends Model
+{
+    //
+}
diff --git a/database/migrations/2022_03_20_170628_create_groups_table.php b/database/migrations/2022_03_20_170628_create_groups_table.php
new file mode 100644
index 00000000..596a6ed5
--- /dev/null
+++ b/database/migrations/2022_03_20_170628_create_groups_table.php
@@ -0,0 +1,40 @@
+<?php
+
+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->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->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('groups');
+    }
+}
diff --git a/database/migrations/2022_03_20_170641_create_group_transactions_table.php b/database/migrations/2022_03_20_170641_create_group_transactions_table.php
new file mode 100644
index 00000000..6ce7cedc
--- /dev/null
+++ b/database/migrations/2022_03_20_170641_create_group_transactions_table.php
@@ -0,0 +1,31 @@
+<?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_transaction', function (Blueprint $table) {
+            $table->foreignId('group_id')->unsigned();
+            $table->foreignId('transaction_id')->unsigned();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('group_transaction');
+    }
+}
diff --git a/database/seeds/RecoverGroupTransactionTableSeeder.php b/database/seeds/RecoverGroupTransactionTableSeeder.php
new file mode 100644
index 00000000..ac1f01d7
--- /dev/null
+++ b/database/seeds/RecoverGroupTransactionTableSeeder.php
@@ -0,0 +1,80 @@
+<?php
+
+use App\Models\Document;
+use App\Models\Transaction;
+use App\Models\Group;
+
+use Illuminate\Database\Seeder;
+use Illuminate\Support\Facades\DB;
+
+class RecoverGroupTransactionTableSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     *
+     */
+    public function run()
+    {
+        DB::beginTransaction();
+
+        $document = Document::where('document_type', 'CURRENCY_VENDOR_ORDER')->get();
+        $transaction_group = Transaction::
+            select('issuer', 'currency_rate', 'type', DB::raw('count(DISTINCT id) as total'), DB::raw("DATE_FORMAT(created_at, '%Y-%m-%d %H:%i') as new_date"))
+            ->where('type', 3)
+            ->groupBy(
+                'issuer',
+                'currency_rate',
+                'new_date'
+            )
+            ->get();
+
+            foreach ($transaction_group as $key => $row) {
+                $transaction = Transaction::
+                    where('type', 3)
+                    ->where('issuer', $row->issuer)
+                    ->where('currency_rate', $row->currency_rate)
+                    ->where(DB::raw("DATE_FORMAT(created_at, '%Y-%m-%d %H:%i')"), $row->new_date)
+                    ->get();
+
+                $group = new Group();
+                $group->save();
+
+                $issuer = '';
+                $receiver = '';
+                $amount = 0;
+                $original_amount = 0;
+                $currency_id = 0;
+                $original_currency_id = '';
+                $currency_rate = '';
+                $tax = 0;
+                $service_charge = 0;
+
+                foreach ($transaction as $key_2 => $row_2) {
+                    $group->transaction()->sync($row_2->id, false);
+                    $issuer = $row_2->issuer;
+                    $receiver = $row_2->receiver;
+                    $amount += $row_2->amount;
+                    $original_amount += $row_2->original_amount;
+                    $currency_id = $row_2->currency_id;
+                    $original_currency_id = $row_2->original_currency_id;
+                    $currency_rate = $row_2->currency_rate;
+                    $tax += $row_2->tax;
+                    $service_charge += $row_2->service_charge;
+                }
+
+                $group->issuer = $issuer;
+                $group->receiver = $receiver;
+                $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->update();
+            }
+            
+        DB::commit();
+    }
+}

From 9cb0d37f248d8211ba3ef94c443bb110015d7a55 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Thu, 24 Mar 2022 12:39:24 +0800
Subject: [PATCH 07/54] debug on RFM

---
 .../companies/sections/CustomerSectionComponent.vue    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/resources/assets/vue/components/companies/sections/CustomerSectionComponent.vue b/resources/assets/vue/components/companies/sections/CustomerSectionComponent.vue
index 65bed7f7..1ef6f4ed 100644
--- a/resources/assets/vue/components/companies/sections/CustomerSectionComponent.vue
+++ b/resources/assets/vue/components/companies/sections/CustomerSectionComponent.vue
@@ -53,14 +53,14 @@
                         </div>
                         <div class="col-12 col-md-auto d-flex align-items-center flex-md-column justify-content-center">
                             <button type="button" class="btn btn-lg btn-primary fs-11 w-100 d-block m-r-5 mr-md-0 mb-md-1 mb-0" @click="submitSearch()">Search</button>
-                            <button type="button" class="btn btn-lg btn-secondary fs-11 w-100 d-block m-l-5 ml-md-0 mt-md-1 0t-0" @click="reserSearch()">Reset</button>
+                            <button type="button" class="btn btn-lg btn-secondary fs-11 w-100 d-block m-l-5 ml-md-0 mt-md-1 0t-0" @click="resetSarch()">Reset</button>
                         </div>
                     </div>
                 </div>
             </div>
             <div class="row no-margin" v-show="search" :key="serachSectionKey">
                 <div class="col bg-white padding-25">
-                    <list-component :section="section" :endpoint="route('api.company.list')" :options="{'with_total_payments': true, 'recency': recency, 'frequency': frequency, 'monetary': monetary, 'business_type': 2, with_bookings:true, order_by:{ column:'total_payments', DESC:true}}">
+                    <list-component :section="section" :endpoint="route('api.company.list')" :options="{'with_total_payments': true, 'recency': parameters.recency, 'frequency': parameters.frequency, 'monetary': parameters.monetary, 'business_type': 2, with_bookings:true, order_by:{ column:'total_payments', DESC:true}}">
                         <template slot="list" slot-scope="{data}">
                             <company-component :data="data"></company-component>
                         </template>
@@ -96,10 +96,11 @@ export default {
     },
     methods: {
         submitSearch(){
-            this.search = true;
             this.serachSectionKey ++;
+            this.search = true;
         },
-        reserSearch() {
+        resetSarch() {
+            this.search = false;
             this.parameters.recency = '2022-02-15';
             this.parameters.frequency = 0;
             this.parameters.frequencyDateFrom ='2021-01-01';
@@ -107,7 +108,6 @@ export default {
             this.parameters.monetary = 0;
             this.parameters.monetaryDateFrom = '2021-01-01';
             this.parameters.monetaryDateTo = '2022-02-15';
-            this.serachSectionKey ++;
         }
     },
     validations: {

From d83e908a683d51340e056cb8b9793de0793201b5 Mon Sep 17 00:00:00 2001
From: glovetleong <glovetleong@gmail.com>
Date: Tue, 29 Mar 2022 20:25:09 +0800
Subject: [PATCH 08/54] pull

---
 .../ControllersLogic/CreateSupplierTransactionLogic.php          | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/Classes/Modules/Transactions/ControllersLogic/CreateSupplierTransactionLogic.php b/app/Classes/Modules/Transactions/ControllersLogic/CreateSupplierTransactionLogic.php
index c8f2813e..3dde2e45 100644
--- a/app/Classes/Modules/Transactions/ControllersLogic/CreateSupplierTransactionLogic.php
+++ b/app/Classes/Modules/Transactions/ControllersLogic/CreateSupplierTransactionLogic.php
@@ -5,7 +5,6 @@ namespace App\Classes\Modules\Transactions\ControllersLogic;
 
 use App\Classes\Modules\Transactions\Processors\CreateSupplierTransactionProcessor;
 use App\Models\Document;
-
 use App\Models\Group;
 
 use Illuminate\Http\Request;

From 3fcfcf9de906fb83ae5282630d777170a2493bda Mon Sep 17 00:00:00 2001
From: glovetleong <glovetleong@gmail.com>
Date: Fri, 1 Apr 2022 10:12:23 +0800
Subject: [PATCH 09/54] cash back

---
 .../ControllersLogic/CallbackBillplzLogic.php |   8 +-
 .../ApprovePaymentVerificationLogic.php       |  15 +-
 .../FetchBookingPaymentQuotationLogic.php     |   1 -
 .../CreateCashBackTransactionProcessor.php    | 141 ++++++++++++++++++
 .../Processors/CreditWalletProcessor.php      |   2 +-
 .../ValueObjects/Constants/CashBack.php       |  55 +++++++
 .../Constants/TransactionType.php             |   2 +
 7 files changed, 215 insertions(+), 9 deletions(-)
 create mode 100644 app/Classes/Modules/Transactions/Processors/CreateCashBackTransactionProcessor.php
 create mode 100644 app/Classes/ValueObjects/Constants/CashBack.php

diff --git a/app/Classes/Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php b/app/Classes/Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php
index 2230343f..b7e7d8a0 100644
--- a/app/Classes/Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php
+++ b/app/Classes/Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php
@@ -4,6 +4,7 @@ namespace App\Classes\Modules\Billplzs\ControllersLogic;
 
 use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
 use App\Classes\Modules\Wallets\Services\UpdatesWallet;
+use App\Classes\Modules\Transactions\Processors\CreateCashBackTransactionProcessor;
 
 use App\Classes\Exceptions\ResourceNotFoundException;
 use App\Classes\Modules\Wallets\Services\UpdatesWalletBalance;
@@ -16,6 +17,7 @@ use Illuminate\Http\JsonResponse;
 
 use App\Classes\Exceptions\MalformedRequestException;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\TransactionType;
 use App\Classes\Modules\Billplzs\Services\GetBillplzBill;
 use App\Classes\Modules\Billplzs\DataTransferObjects\BillplzXSignatureObject;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
@@ -47,12 +49,13 @@ class CallbackBillplzLogic
      * @param UpdatesTransactionStatus $updatesTransactionStatus
      * @param UpdatesWalletBalance $updatesWalletBalance
      */
-    public function __construct(GetBillplzBill $getBillplzBill, FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, UpdatesWalletBalance $updatesWalletBalance)
+    public function __construct(GetBillplzBill $getBillplzBill, FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, UpdatesWalletBalance $updatesWalletBalance, CreateCashBackTransactionProcessor $createCashBackTransactionProcessor)
     {
         $this->getBillplzBill = $getBillplzBill;
         $this->fetchesTransaction = $fetchesTransaction;
         $this->updatesTransactionStatus = $updatesTransactionStatus;
         $this->updatesWalletBalance = $updatesWalletBalance;
+        $this->createCashBackTransactionProcessor = $createCashBackTransactionProcessor;
     }
 
 
@@ -93,6 +96,9 @@ class CallbackBillplzLogic
 
         }
 
+        if ($transaction->type == TransactionType::PAYMENT) {
+            $cash_back_transaction = $this->createCashBackTransactionProcessor->execute($transaction);
+        }
 
         $token = Auth::fromUser(User::find(1));
         $request->headers->set('Authorization', 'Bearer '.$token);
diff --git a/app/Classes/Modules/Bookings/ControllersLogic/ApprovePaymentVerificationLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/ApprovePaymentVerificationLogic.php
index b0a01562..d5810e12 100644
--- a/app/Classes/Modules/Bookings/ControllersLogic/ApprovePaymentVerificationLogic.php
+++ b/app/Classes/Modules/Bookings/ControllersLogic/ApprovePaymentVerificationLogic.php
@@ -2,16 +2,16 @@
 
 namespace App\Classes\Modules\Bookings\ControllersLogic;
 
-
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 
-
 use App\Classes\Modules\Documents\Services\ApprovesDocument;
 use App\Classes\Modules\Documents\Services\FetchesDocument;
 use App\Classes\Modules\Documents\Services\RejectsDocument;
 use App\Classes\Modules\Transactions\Services\FetchesTransaction;
 use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
 
+use App\Classes\Modules\Transactions\Processors\CreateCashBackTransactionProcessor;
+
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 
 use Illuminate\Http\JsonResponse;
@@ -26,14 +26,15 @@ class ApprovePaymentVerificationLogic extends AbstractControllerLogic
      * @param ApprovesDocument $approvesDocument
      * @param RejectsDocument $rejectsDocument
      * @param FetchesDocument $fetchesDocument
-     * @param CreateInvoiceTransactionProcessor $createInvoiceTransactionProcessor
+     * @param CreateCashBackTransactionProcessor $createCashBackTransactionProcessor
      */
-    public function __construct(FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, ApprovesDocument $approvesDocument, RejectsDocument $rejectsDocument, FetchesDocument $fetchesDocument)
+    public function __construct(FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, ApprovesDocument $approvesDocument, RejectsDocument $rejectsDocument, FetchesDocument $fetchesDocument, CreateCashBackTransactionProcessor $createCashBackTransactionProcessor)
     {
         $this->fetchesTransaction = $fetchesTransaction;
         $this->updatesTransactionStatus = $updatesTransactionStatus;
         $this->approvesDocument = $approvesDocument;
         $this->rejectsDocument = $rejectsDocument;
+        $this->createCashBackTransactionProcessor = $createCashBackTransactionProcessor;
     }
 
     /**
@@ -58,6 +59,9 @@ class ApprovePaymentVerificationLogic extends AbstractControllerLogic
     /** @var RejectsDocument */
     private $rejectsDocument;
 
+    /** @var CreateCashBackTransactionProcessor */
+    private $createCashBackTransactionProcessor;
+
     /**
      * @param Request $request
      * @return JsonResponse
@@ -65,7 +69,6 @@ class ApprovePaymentVerificationLogic extends AbstractControllerLogic
      */
     public function logic(Request $request) : JsonResponse
     {
-
         $status = $request->route('status');
 
         $transaction = $this->fetchesTransaction->execute(['id' => $request->route('payment_id')]);
@@ -74,7 +77,7 @@ class ApprovePaymentVerificationLogic extends AbstractControllerLogic
 
         $this->updatesTransactionStatus->execute($transaction, $status === 'approve' ? ApprovalStatus::APPROVED : ApprovalStatus::REJECTED);
 
-        // $this->createInvoiceTransactionProcessor->execute($transaction->booking);
+        $this->createCashBackTransactionProcessor->execute($transaction);
 
         return $this->response([]);
     }
diff --git a/app/Classes/Modules/Bookings/ControllersLogic/FetchBookingPaymentQuotationLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/FetchBookingPaymentQuotationLogic.php
index eaac0adc..3a981946 100644
--- a/app/Classes/Modules/Bookings/ControllersLogic/FetchBookingPaymentQuotationLogic.php
+++ b/app/Classes/Modules/Bookings/ControllersLogic/FetchBookingPaymentQuotationLogic.php
@@ -62,7 +62,6 @@ class FetchBookingPaymentQuotationLogic extends AbstractControllerLogic
      */
     public function logic(Request $request) : JsonResponse
     {
-
         $booking = Booking::find($request->route('id'));
 
         $conversionObject = new CurrencyConversionObject(floatval(str_replace(',', '', $request->input('amount'))), $booking->convertible_currency_id, $booking->service_id,  $booking->fix_currency_id === 1 ? 0:1, PaymentMethodType::PAYMENT_METHODS[$request->input('payment_method')]);
diff --git a/app/Classes/Modules/Transactions/Processors/CreateCashBackTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateCashBackTransactionProcessor.php
new file mode 100644
index 00000000..33aaa3a9
--- /dev/null
+++ b/app/Classes/Modules/Transactions/Processors/CreateCashBackTransactionProcessor.php
@@ -0,0 +1,141 @@
+<?php
+
+namespace App\Classes\Modules\Transactions\Processors;
+
+use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
+use App\Classes\Modules\Transactions\Services\CreatesTransaction;
+use App\Classes\Modules\Transactions\Services\CreatesTransactionDetail;
+use App\Classes\Modules\Transactions\Services\DeletesTransactionDetails;
+use App\Classes\Modules\Transactions\Services\UpdatesTransaction;
+use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
+use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
+use App\Classes\Modules\Wallets\Processors\CreditWalletProcessor;
+
+use App\Classes\Modules\Wallets\Services\CreatesWallet;
+use App\Classes\Modules\Wallets\Services\GeneratesWalletCode;
+use App\Classes\ValueObjects\Constants\CashBack;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use App\Models\Booking;
+use App\Models\Transaction;
+use Carbon\Carbon;
+
+class CreateCashBackTransactionProcessor
+{
+
+    /** @var UpdatesTransactionStatus */
+    private $updatesTransactionStatus;
+
+    /** @var CreatesTransaction */
+    private $createsTransaction;
+
+    /** @var CreatesTransactionDetail */
+    private $createsTransactionDetail;
+
+    /** @var UpdatesTransaction */
+    private $updatesTransaction;
+
+    /** @var DeletesTransactionDetails */
+    private $deletesTransactionDetails;
+
+    /** @var GeneratesTransactionBillNumber */
+    private $generatesTransactionBillNumber;
+
+    /** @var CreatesWallet */
+    private $createsWallet;
+
+    /** @var GeneratesWalletCode */
+    private $generatesWalletCode;
+
+    /** @var CreditWalletProcessor */
+    private $creditWalletProcessor;
+
+    /**
+     * CreateCashBackTransactionProcessor constructor.
+     * @param UpdatesTransactionStatus $updatesTransactionStatus
+     * @param CreatesTransaction $createsTransaction
+     * @param CreatesTransactionDetail $createsTransactionDetail
+     * @param UpdatesTransaction $updatesTransaction
+     * @param DeletesTransactionDetails $deletesTransactionDetails
+     * @param GeneratesTransactionBillNumber $generatesTransactionBillNumber
+     */
+    public function __construct(UpdatesTransactionStatus $updatesTransactionStatus, CreatesTransaction $createsTransaction, CreatesTransactionDetail $createsTransactionDetail, UpdatesTransaction $updatesTransaction, DeletesTransactionDetails $deletesTransactionDetails, GeneratesTransactionBillNumber $generatesTransactionBillNumber, GeneratesWalletCode $generatesWalletCode, CreditWalletProcessor $creditWalletProcessor)
+    {
+        $this->createsTransaction = $createsTransaction;
+        $this->createsTransactionDetail = $createsTransactionDetail;
+        $this->updatesTransaction = $updatesTransaction;
+        $this->deletesTransactionDetails = $deletesTransactionDetails;
+        $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
+
+        $this->generatesWalletCode = $generatesWalletCode;
+
+        $this->creditWalletProcessor = $creditWalletProcessor;
+    }
+
+
+    /**
+     * @param Booking $booking
+     * @param TransactionObject $object
+     * @return Transaction|\Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Transaction $transaction) 
+    {
+        $current_total_cash_back = Transaction::
+            where('type', TransactionType::CASH_BACK)
+            ->whereMonth('created_at', Carbon::now()->month)->sum('amount');
+
+        if ($current_total_cash_back < CashBack::MAX) {
+
+            $cash_back_segemnt = CashBack::SEGMENT;
+
+            foreach ($cash_back_segemnt as $key => $row) {
+                if ($row['max_value'] > $transaction->amount && $row['min_value'] <= $transaction->amount) {
+
+                    $method = $this->getRandomWeightedElement($row['weight']);
+
+                    $total = $transaction->amount * $row['percent'][$method];
+
+                    $billNumber = $this->generatesTransactionBillNumber->execute('CBACK-');
+
+                    $object = new TransactionObject(
+                        $billNumber, 
+                        TransactionType::CASH_BACK, 
+                        $transaction->issuer, 
+                        1,
+                        1, 
+                        PaymentMethodType::WALLET,
+                        $total, 
+                        $total, 
+                        $transaction->currency_id, 
+                        $transaction->currency_id,
+                        1, 
+                        0, 
+                        0,
+                        null,
+                        ApprovalStatus::APPROVED,
+                    );
+
+                    $cash_back_transaction = $this->createsTransaction->execute($transaction, $object);
+
+                    $credit = $this->creditWalletProcessor->execute($company, $transaction->type, $cash_back_transaction->amount, '');
+
+                }
+            }
+        }
+
+        return $transaction;
+    }
+
+     public function getRandomWeightedElement(array $weightedValues) {
+        $rand = mt_rand(1, (int) array_sum($weightedValues));
+        foreach ($weightedValues as $key => $value) {
+            $rand -= $value;
+            if ($rand <= 0) {
+                return $key;
+            }
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Wallets/Processors/CreditWalletProcessor.php b/app/Classes/Modules/Wallets/Processors/CreditWalletProcessor.php
index d86a4465..65f3b9b6 100644
--- a/app/Classes/Modules/Wallets/Processors/CreditWalletProcessor.php
+++ b/app/Classes/Modules/Wallets/Processors/CreditWalletProcessor.php
@@ -78,7 +78,7 @@ class CreditWalletProcessor
         
         $transaction_object = new TransactionObject($billNumber, $transactionType === 2 ? TransactionType::DEBIT_NOTE : TransactionType::CREDIT_NOTE, 1,  $wallet->owner->id,  1, PaymentMethodType::CASH,  $amount,  $amount,  1,  1,  1,  0,  0,  null,  ApprovalStatus::APPROVED,  [], $reference);
         $transaction = $this->createsTransaction->execute($wallet, $transaction_object);
-
+        
         $updateWalletAmount = $transactionType === 2 ? ($wallet->amount - $transaction->amount) : ($wallet->amount + $transaction->amount);
 
         $walletObject = new WalletObject($wallet->owner->id, $wallet->currency_id, $wallet->code, $updateWalletAmount);
diff --git a/app/Classes/ValueObjects/Constants/CashBack.php b/app/Classes/ValueObjects/Constants/CashBack.php
new file mode 100644
index 00000000..0fdc3df9
--- /dev/null
+++ b/app/Classes/ValueObjects/Constants/CashBack.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace App\Classes\ValueObjects\Constants;
+
+final class CashBack {
+
+    public const MAX = 15000;
+
+    public const DISPLAY_MAX = 50000;
+
+    public const SEGMENT = [
+        '0' => [
+        	'min_value' => 0,
+        	'max_value' => 2000,
+        	'weight' => [
+        		'0' => 80,
+        		'1' => 18,
+        		'2' => 2,
+        	],
+        	'percent' => [
+        		'0' => 0.002,
+        		'1' => 0.005,
+        		'2' => 0.02,
+        	]
+        ],
+        '1' => [
+        	'min_value' => 2001,
+        	'max_value' => 10000,
+        	'weight' => [
+        		'0' => 85,
+        		'1' => 10,
+        		'2' => 5,
+        	],
+        	'percent' => [
+        		'0' => 0.002,
+        		'1' => 0.005,
+        		'2' => 0.02,
+        	]
+        ],
+        '2' => [
+        	'min_value' => 10001,
+        	'max_value' => 100000,
+        	'weight' => [
+        		'0' => 70,
+        		'1' => 20,
+        		'2' => 10,
+        	],
+        	'percent' => [
+        		'0' => 0.002,
+        		'1' => 0.005,
+        		'2' => 0.02,
+        	]
+        ],
+    ];
+}
diff --git a/app/Classes/ValueObjects/Constants/TransactionType.php b/app/Classes/ValueObjects/Constants/TransactionType.php
index 107f2049..5221e8a2 100644
--- a/app/Classes/ValueObjects/Constants/TransactionType.php
+++ b/app/Classes/ValueObjects/Constants/TransactionType.php
@@ -29,4 +29,6 @@ final class TransactionType {
     public const WITHDRAW = 10;
 
     public const TRANSFER_FEE = 11;
+
+    public const CASH_BACK = 12;
 }

From bfe06cc85cae9c7b081668d2c56b46f7154a0afa Mon Sep 17 00:00:00 2001
From: glovetleong <glovetleong@gmail.com>
Date: Fri, 1 Apr 2022 12:35:10 +0800
Subject: [PATCH 10/54] test

---
 .../Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Classes/Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php b/app/Classes/Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php
index b7e7d8a0..0c48064b 100644
--- a/app/Classes/Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php
+++ b/app/Classes/Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php
@@ -83,6 +83,7 @@ class CallbackBillplzLogic
             $status = ApprovalStatus::APPROVED;
         }
 
+
         if($billPlz->state === 'due') {
             $status = $billplzXSignatureObject->getStatus() === 'failed' ? ApprovalStatus::REJECTED : ApprovalStatus::PENDING_VERIFICATION;
         }

From 0b5733ffb9e0803376bcc9f809ca8ec597f0a857 Mon Sep 17 00:00:00 2001
From: glovetleong <glovetleong@gmail.com>
Date: Sat, 2 Apr 2022 09:32:20 +0800
Subject: [PATCH 11/54] cash back front

---
 .../Processors/CreateCashBackTransactionProcessor.php |  8 ++++++--
 .../forms/BookingPaymentQuotationComponent.vue        | 11 +++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/app/Classes/Modules/Transactions/Processors/CreateCashBackTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateCashBackTransactionProcessor.php
index 33aaa3a9..6ad26563 100644
--- a/app/Classes/Modules/Transactions/Processors/CreateCashBackTransactionProcessor.php
+++ b/app/Classes/Modules/Transactions/Processors/CreateCashBackTransactionProcessor.php
@@ -86,7 +86,11 @@ class CreateCashBackTransactionProcessor
             where('type', TransactionType::CASH_BACK)
             ->whereMonth('created_at', Carbon::now()->month)->sum('amount');
 
-        if ($current_total_cash_back < CashBack::MAX) {
+
+        if (
+            $current_total_cash_back < CashBack::MAX &&
+            $transaction->owner()->first()->transactions()->where('type', TransactionType::PURCHASE_ORDER)->count() > 0
+        ) {
 
             $cash_back_segemnt = CashBack::SEGMENT;
 
@@ -119,12 +123,12 @@ class CreateCashBackTransactionProcessor
 
                     $cash_back_transaction = $this->createsTransaction->execute($transaction, $object);
 
+                    $company = $transaction->owner()->first()->company;
                     $credit = $this->creditWalletProcessor->execute($company, $transaction->type, $cash_back_transaction->amount, '');
 
                 }
             }
         }
-
         return $transaction;
     }
 
diff --git a/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue b/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue
index 6f5cb632..b03b6447 100644
--- a/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue
+++ b/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue
@@ -40,6 +40,17 @@
                     </div>
                 </div>
             </div>
+            <div class="row align-items-center m-b-15 parentContainer bg-master-lighter p-t-10 p-b-10">
+                <div class="col">
+                    <div class="row m-b-5">
+                        <div class="col">
+                            <div class="font-heading all-caps fs-10 muted">
+                                {{ !item.purchase_order ? 'Please fill up purchase order to enjoy the cashback' : 'You have entitled to earn cashbback' }}
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
             <div class="row align-items-center m-b-15 parentContainer bg-master-lighter p-t-10 p-b-10">
                 <div class="col">
                     <div class="row m-b-5">

From 4deb5845e3111c245e553ac86daf8356f7329ee0 Mon Sep 17 00:00:00 2001
From: glovetleong <glovetleong@gmail.com>
Date: Sun, 3 Apr 2022 23:32:50 +0800
Subject: [PATCH 12/54] bank log

---
 .../ControllersLogic/CreateBankLogic.php      | 11 +++-
 .../ControllersLogic/DeleteBankLogic.php      | 12 ++++-
 .../ControllersLogic/UpdateBankLogic.php      | 12 ++++-
 .../UpdateBankStatusLogic.php                 | 11 +++-
 .../Modules/Banks/Services/CreatesBankLog.php | 32 ++++++++++++
 .../CreateCashBackTransactionProcessor.php    |  2 -
 app/Models/BankLog.php                        | 10 ++++
 ...22_04_03_225513_create_bank_logs_table.php | 51 +++++++++++++++++++
 .../elements/BookingConfirmationComponent.vue |  1 +
 9 files changed, 134 insertions(+), 8 deletions(-)
 create mode 100644 app/Classes/Modules/Banks/Services/CreatesBankLog.php
 create mode 100644 app/Models/BankLog.php
 create mode 100644 database/migrations/2022_04_03_225513_create_bank_logs_table.php

diff --git a/app/Classes/Modules/Banks/ControllersLogic/CreateBankLogic.php b/app/Classes/Modules/Banks/ControllersLogic/CreateBankLogic.php
index ff5b16c2..53dd5caa 100644
--- a/app/Classes/Modules/Banks/ControllersLogic/CreateBankLogic.php
+++ b/app/Classes/Modules/Banks/ControllersLogic/CreateBankLogic.php
@@ -6,6 +6,7 @@ use App\Classes\General\Abstracts\AbstractControllerLogic;
 
 use App\Classes\Modules\Banks\Standards\Rules\CanCreateBank;
 use App\Classes\Modules\Banks\Services\CreatesBank;
+use App\Classes\Modules\Banks\Services\CreatesBankLog;
 use App\Classes\Modules\Banks\DataTransferObjects\BankObject;
 use App\Http\Resources\BankResource;
 
@@ -32,19 +33,24 @@ class CreateBankLogic extends AbstractControllerLogic
     /** @var CreatesBank */
     private $createsBank;
 
+    /** @var CreatesBankLog */
+    private $createsBankLog;
 
     /**
      * CreateBankLogic constructor.
      * @param CanCreateBank $canCreateBank
      * @param CreatesBank $createsBank
+     * @param CreatesBankLog $createsBankLog
      */
     public function __construct(
         CanCreateBank $canCreateBank,
-        CreatesBank $createsBank
+        CreatesBank $createsBank,
+        CreatesBankLog $createsBankLog
     )
     {
         $this->canCreateBank = $canCreateBank;
         $this->createsBank = $createsBank;
+        $this->createsBankLog = $createsBankLog;
     }
 
     /**
@@ -56,7 +62,6 @@ class CreateBankLogic extends AbstractControllerLogic
      */
     public function logic(Request $request) : JsonResponse
     {
-
         $bank_object = new BankObject($request->input('company_id'), $request->input('account_type'),
             $request->input('bank_name'), $request->input('holder_name'),  $request->input('account_no'),
              $request->input('bank_branch'),  $request->input('swift'),  $request->input('snap'),
@@ -66,6 +71,8 @@ class CreateBankLogic extends AbstractControllerLogic
 
         $bank = $this->createsBank->execute($bank_object);
 
+        $bankLog = $this->createsBankLog->execute($bank);
+
         return $this->resourceResponse(new BankResource($bank));
 
     }
diff --git a/app/Classes/Modules/Banks/ControllersLogic/DeleteBankLogic.php b/app/Classes/Modules/Banks/ControllersLogic/DeleteBankLogic.php
index 24975379..3ecac081 100644
--- a/app/Classes/Modules/Banks/ControllersLogic/DeleteBankLogic.php
+++ b/app/Classes/Modules/Banks/ControllersLogic/DeleteBankLogic.php
@@ -7,6 +7,7 @@ use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Banks\Services\FetchesBank;
 use App\Classes\Modules\Banks\Standards\Rules\CanDeleteBank;
 use App\Classes\Modules\Banks\Services\DeletesBank;
+use App\Classes\Modules\Banks\Services\CreatesBankLog;
 use App\Http\Resources\BankResource;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -33,22 +34,27 @@ class DeleteBankLogic extends AbstractControllerLogic
     /** @var FetchesBank */
     private $fetchesBank;
 
+    /** @var CreatesBankLog */
+    private $createsBankLog;
 
     /**
      * DeleteBankLogic constructor.
      * @param CanDeleteBank $canDeleteBank
      * @param DeletesBank $deletesBank
      * @param FetchesBank $fetchesBank
+     * @param CreatesBankLog $createsBankLog
      */
     public function __construct(
         CanDeleteBank $canDeleteBank,
         DeletesBank $deletesBank,
-        FetchesBank $fetchesBank
+        FetchesBank $fetchesBank,
+        CreatesBankLog $createsBankLog
     )
     {
         $this->canDeleteBank = $canDeleteBank;
         $this->deletesBank = $deletesBank;
         $this->fetchesBank = $fetchesBank;
+        $this->createsBankLog = $createsBankLog;
     }
 
     /**
@@ -69,7 +75,9 @@ class DeleteBankLogic extends AbstractControllerLogic
             throw new RequestValidationException('You can\'t delete bank account when it set to default');
         }
 
-        $this->deletesBank->execute($bank);
+        $bank = $this->deletesBank->execute($bank);
+
+        $bankLog = $this->createsBankLog->execute($bank);
 
         return $this->response([]);
     }
diff --git a/app/Classes/Modules/Banks/ControllersLogic/UpdateBankLogic.php b/app/Classes/Modules/Banks/ControllersLogic/UpdateBankLogic.php
index 9cb8fdd2..ed6ae159 100644
--- a/app/Classes/Modules/Banks/ControllersLogic/UpdateBankLogic.php
+++ b/app/Classes/Modules/Banks/ControllersLogic/UpdateBankLogic.php
@@ -10,6 +10,8 @@ use App\Classes\Modules\Banks\Services\FetchesBank;
 
 use App\Classes\Modules\Banks\Standards\Rules\CanUpdateBank;
 use App\Classes\Modules\Banks\Services\UpdatesBank;
+use App\Classes\Modules\Banks\Services\CreatesBankLog;
+
 use App\Classes\Modules\Banks\DataTransferObjects\BankObject;
 
 use ErrorException;
@@ -39,21 +41,27 @@ class UpdateBankLogic extends AbstractControllerLogic
     /** @var FetchesBank */
     private $fetchesBank;
 
+    /** @var CreatesBankLog */
+    private $createsBankLog;
+
     /**
      * UpdateBankLogic constructor.
      * @param CanUpdateBank $canUpdateBank
      * @param UpdatesBank $updatesBank
      * @param FetchesBank $fetchesBank
+     * @param CreatesBankLog $createsBankLog
      */
     public function __construct(
         CanUpdateBank $canUpdateBank,
         UpdatesBank $updatesBank,
-        FetchesBank $fetchesBank
+        FetchesBank $fetchesBank,
+        CreatesBankLog $createsBankLog
     )
     {
         $this->canUpdateBank = $canUpdateBank;
         $this->updatesBank = $updatesBank;
         $this->fetchesBank = $fetchesBank;
+        $this->createsBankLog = $createsBankLog;
     }
 
     /**
@@ -84,6 +92,8 @@ class UpdateBankLogic extends AbstractControllerLogic
 
         $bank_query = $this->updatesBank->execute($bank, $bankObject);
 
+        $bankLog = $this->createsBankLog->execute($bank_query);
+
         return $this->resourceResponse(new BankResource($bank_query));
 
     }
diff --git a/app/Classes/Modules/Banks/ControllersLogic/UpdateBankStatusLogic.php b/app/Classes/Modules/Banks/ControllersLogic/UpdateBankStatusLogic.php
index 09ee2796..4959face 100644
--- a/app/Classes/Modules/Banks/ControllersLogic/UpdateBankStatusLogic.php
+++ b/app/Classes/Modules/Banks/ControllersLogic/UpdateBankStatusLogic.php
@@ -6,6 +6,7 @@ use App\Http\Resources\BankResource;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Banks\Services\FetchesBank;
 use App\Classes\Modules\Banks\Services\UpdatesBankStatus;
+use App\Classes\Modules\Banks\Services\CreatesBankLog;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
@@ -28,18 +29,24 @@ class UpdateBankStatusLogic extends AbstractControllerLogic
     /** @var UpdatesBankStatus */
     private $updatesBankStatus;
 
+    /** @var CreatesBankLog */
+    private $createsBankLog;
+
     /**
      * UpdateBankStatusLogic constructor.
      * @param FetchesBank $fetchesBank
      * @param UpdatesBankStatus $updatesBankStatus
+     * @param CreatesBankLog $createsBankLog
      */
     public function __construct(
         FetchesBank $fetchesBank,
-        UpdatesBankStatus $updatesBankStatus
+        UpdatesBankStatus $updatesBankStatus,
+        CreatesBankLog $createsBankLog
     )
     {
         $this->fetchesBank = $fetchesBank;
         $this->updatesBankStatus = $updatesBankStatus;
+        $this->createsBankLog = $createsBankLog;
     }
 
     /**
@@ -55,6 +62,8 @@ class UpdateBankStatusLogic extends AbstractControllerLogic
 
         $bank_query = $this->updatesBankStatus->execute($bank, $request->input('status'));
 
+        $bankLog = $this->createsBankLog->execute($bank_query);
+
         return $this->resourceResponse(new BankResource($bank_query));
 
     }
diff --git a/app/Classes/Modules/Banks/Services/CreatesBankLog.php b/app/Classes/Modules/Banks/Services/CreatesBankLog.php
new file mode 100644
index 00000000..9d7877e1
--- /dev/null
+++ b/app/Classes/Modules/Banks/Services/CreatesBankLog.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Classes\Modules\Banks\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Models\Bank;
+use App\Models\BankLog;
+
+class CreatesBankLog extends AbstractUpdateRecord
+{
+    /**
+     * @param Bank $object
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Bank $object) {
+        $model = new BankLog();
+        $model->bank_id = $object->id;
+        $model->company_id = $object->company_id;
+        $model->reference = $object->reference;
+        $model->bank_name = $object->bank_name;
+        $model->holder_name = $object->holder_name;
+        $model->account_no = $object->account_no;
+        $model->bank_branch = $object->bank_branch;
+        $model->swift = $object->swift;
+        $model->snap = $object->snap;
+        $model->type = $object->type;
+        $model->country_id = $object->country_id;
+        return $this->handler($model);
+
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Transactions/Processors/CreateCashBackTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateCashBackTransactionProcessor.php
index 6ad26563..ed6c2ab8 100644
--- a/app/Classes/Modules/Transactions/Processors/CreateCashBackTransactionProcessor.php
+++ b/app/Classes/Modules/Transactions/Processors/CreateCashBackTransactionProcessor.php
@@ -86,7 +86,6 @@ class CreateCashBackTransactionProcessor
             where('type', TransactionType::CASH_BACK)
             ->whereMonth('created_at', Carbon::now()->month)->sum('amount');
 
-
         if (
             $current_total_cash_back < CashBack::MAX &&
             $transaction->owner()->first()->transactions()->where('type', TransactionType::PURCHASE_ORDER)->count() > 0
@@ -125,7 +124,6 @@ class CreateCashBackTransactionProcessor
 
                     $company = $transaction->owner()->first()->company;
                     $credit = $this->creditWalletProcessor->execute($company, $transaction->type, $cash_back_transaction->amount, '');
-
                 }
             }
         }
diff --git a/app/Models/BankLog.php b/app/Models/BankLog.php
new file mode 100644
index 00000000..a516d151
--- /dev/null
+++ b/app/Models/BankLog.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class BankLog extends Model
+{
+    //
+}
diff --git a/database/migrations/2022_04_03_225513_create_bank_logs_table.php b/database/migrations/2022_04_03_225513_create_bank_logs_table.php
new file mode 100644
index 00000000..02fecbd3
--- /dev/null
+++ b/database/migrations/2022_04_03_225513_create_bank_logs_table.php
@@ -0,0 +1,51 @@
+<?php
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\BankAccountType;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateBankLogsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('bank_logs', function (Blueprint $table) {
+            $table->id();
+            $table->foreignId('bank_id')->unsigned();
+            $table->foreignId('company_id')->unsigned();
+            $table->string('reference')->nullable();
+            $table->string('bank_name');
+            $table->string('holder_name');
+            $table->string('account_no');
+            $table->string('bank_branch')->nullable();
+            $table->string('swift')->nullable();
+            $table->string('snap')->nullable();
+            $table->integer('type')->default(BankAccountType::EXTERNAL);
+            $table->integer('default')->default(false);
+            $table->integer('status')->default(ApprovalStatus::APPROVED);
+            $table->foreignId('country_id')->unsigned();
+            $table->softDeletes();
+            $table->timestamps();
+
+            $table->foreign('bank_id')->references('id')->on('banks');
+            $table->foreign('country_id')->references('id')->on('countries');
+            $table->foreign('company_id')->references('id')->on('companies');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('bank_logs');
+    }
+}
diff --git a/resources/assets/vue/components/bookings/elements/BookingConfirmationComponent.vue b/resources/assets/vue/components/bookings/elements/BookingConfirmationComponent.vue
index f08ea597..cf8b727e 100644
--- a/resources/assets/vue/components/bookings/elements/BookingConfirmationComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/BookingConfirmationComponent.vue
@@ -148,6 +148,7 @@
                                             </div>
                                             <div class="row" v-show="createBank">
                                                 <div class="col">
+                                                    {{ data.company.id }}
                                                     <bank-account-form-component v-if="data.serviceType.id !== 4" section="customerProfileSection" :disabled="formDisabled" :data="Object.keys(parameters.bankAccount).length ? parameters.bankAccount  : {account_no: account_no, company_id: data.company.id, country_id: 2, account_type: 2}" :company_id="data.company.id" :country_id="2" :type="2" v-on:createdBank="updateBank($event)" :serviceType="data.serviceType" :closable=false v-on:close="clearAccount()"></bank-account-form-component>
                                                     <phone-account-form-component v-if="data.serviceType.id === 4" section="customerProfileSection" :disabled="formDisabled" :data="Object.keys(parameters.bankAccount).length ? parameters.bankAccount  : {account_no: account_no, company_id: data.company.id, country_id: 2, account_type: 2}" :company_id="data.company.id" :country_id="2" :type="2" v-on:createdBank="updateBank($event)" :serviceType="data.serviceType" :closable=false v-on:close="clearAccount()"></phone-account-form-component>
                                                 </div>

From 01ddfb62824e66d04fce1863cab87009cc28b5cd Mon Sep 17 00:00:00 2001
From: glovetleong <glovetleong@gmail.com>
Date: Tue, 5 Apr 2022 22:57:53 +0800
Subject: [PATCH 13/54] cash back ref

---
 .../ControllersLogic/CallbackBillplzLogic.php       |  3 +++
 .../ControllersLogic/CreateBookingPaymentLogic.php  | 13 +++++++++++--
 .../CreateCashBackTransactionProcessor.php          |  4 +++-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/app/Classes/Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php b/app/Classes/Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php
index 0c48064b..eb3aec53 100644
--- a/app/Classes/Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php
+++ b/app/Classes/Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php
@@ -42,6 +42,9 @@ class CallbackBillplzLogic
     /** @var UpdatesWalletBalance */
     private $updatesWalletBalance;
 
+    /** @var CreateCashBackTransactionProcessor */
+    private $createCashBackTransactionProcessor;
+
     /**
      * CallbackBillplzLogic constructor.
      * @param GetBillplzBill $getBillplzBill
diff --git a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingPaymentLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingPaymentLogic.php
index ecb6a87c..fdd786e6 100644
--- a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingPaymentLogic.php
+++ b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingPaymentLogic.php
@@ -20,6 +20,9 @@ use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\PaymentMethodType;
 use App\Classes\ValueObjects\Constants\TransactionType;
 use App\Http\Resources\TransactionResource;
+
+use App\Classes\Modules\Transactions\Processors\CreateCashBackTransactionProcessor;
+
 use App\Models\Booking;
 use App\Models\Transaction;
 use App\Models\Wallet;
@@ -64,6 +67,9 @@ class CreateBookingPaymentLogic extends AbstractControllerLogic
     /** @var UpdatesTransactionStatus */
     private $updatesTransactionStatus;
 
+    /** @var CreateCashBackTransactionProcessor */
+    private $createCashBackTransactionProcessor;
+
     /**
      * CreateBookingPaymentLogic constructor.
      * @param FetchesBookingQuotation $fetchBookingQuotation
@@ -74,8 +80,9 @@ class CreateBookingPaymentLogic extends AbstractControllerLogic
      * @param CreatesBillplzBill $createsBillplzBill
      * @param UpdatesWalletBalance $updatesWalletBalance
      * @param UpdatesTransactionStatus $updatesTransactionStatus
+     * @param CreateCashBackTransactionProcessor $createCashBackTransactionProcessor
      */
-    public function __construct(FetchesBookingQuotation $fetchBookingQuotation, FetchesCompanyPaymentAttemptLimit $fetchesCompanyPaymentAttemptLimit, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CreatesTransaction $createsTransaction, CalculatesBookingOutstanding $calculatesBookingOutstanding, CreatesBillplzBill $createsBillplzBill, UpdatesWalletBalance $updatesWalletBalance, UpdatesTransactionStatus $updatesTransactionStatus)
+    public function __construct(FetchesBookingQuotation $fetchBookingQuotation, FetchesCompanyPaymentAttemptLimit $fetchesCompanyPaymentAttemptLimit, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CreatesTransaction $createsTransaction, CalculatesBookingOutstanding $calculatesBookingOutstanding, CreatesBillplzBill $createsBillplzBill, UpdatesWalletBalance $updatesWalletBalance, UpdatesTransactionStatus $updatesTransactionStatus, CreateCashBackTransactionProcessor $createCashBackTransactionProcessor)
     {
         $this->fetchBookingQuotation = $fetchBookingQuotation;
         $this->fetchesCompanyPaymentAttemptLimit = $fetchesCompanyPaymentAttemptLimit;
@@ -85,6 +92,7 @@ class CreateBookingPaymentLogic extends AbstractControllerLogic
         $this->createsBillplzBill = $createsBillplzBill;
         $this->updatesWalletBalance = $updatesWalletBalance;
         $this->updatesTransactionStatus = $updatesTransactionStatus;
+        $this->createCashBackTransactionProcessor = $createCashBackTransactionProcessor;
     }
 
     /**
@@ -126,12 +134,13 @@ class CreateBookingPaymentLogic extends AbstractControllerLogic
             }
 
             $transaction_object = new TransactionObject($billNumber, TransactionType::PAYMENT, 1, $booking->company->id, 1, PaymentMethodType::WALLET, $amount, $amount, 1, 1, 1, 0, 0, null, ApprovalStatus::APPROVED, [], '');
-            $this->createsTransaction->execute($wallet, $transaction_object);
+            $transaction = $this->createsTransaction->execute($wallet, $transaction_object);
 
             $paymentReference = $billNumber;
 
             $this->updatesWalletBalance->execute($wallet, ($amount * -1));
 
+            $cash_back_transaction = $this->createCashBackTransactionProcessor->execute($transaction);
         }
 
         $billNumber = $this->generatesTransactionBillNumber->execute('PYMT-');
diff --git a/app/Classes/Modules/Transactions/Processors/CreateCashBackTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateCashBackTransactionProcessor.php
index ed6c2ab8..af9d646c 100644
--- a/app/Classes/Modules/Transactions/Processors/CreateCashBackTransactionProcessor.php
+++ b/app/Classes/Modules/Transactions/Processors/CreateCashBackTransactionProcessor.php
@@ -118,12 +118,14 @@ class CreateCashBackTransactionProcessor
                         0,
                         null,
                         ApprovalStatus::APPROVED,
+                        null,
+                        'cash back ' . $transaction->bill_no
                     );
 
                     $cash_back_transaction = $this->createsTransaction->execute($transaction, $object);
 
                     $company = $transaction->owner()->first()->company;
-                    $credit = $this->creditWalletProcessor->execute($company, $transaction->type, $cash_back_transaction->amount, '');
+                    $credit = $this->creditWalletProcessor->execute($company, $transaction->type, $cash_back_transaction->amount, 'cash back ' . $transaction->bill_no);
                 }
             }
         }

From 2b3d3edc1ba3e90082de65ea5f91f903a725ece2 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 6 Apr 2022 13:42:37 +0800
Subject: [PATCH 14/54] temp disable cashback until ready for release

---
 .../CreateCashBackTransactionProcessor.php    | 37 ++++---------------
 1 file changed, 7 insertions(+), 30 deletions(-)

diff --git a/app/Classes/Modules/Transactions/Processors/CreateCashBackTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateCashBackTransactionProcessor.php
index af9d646c..738cb2b7 100644
--- a/app/Classes/Modules/Transactions/Processors/CreateCashBackTransactionProcessor.php
+++ b/app/Classes/Modules/Transactions/Processors/CreateCashBackTransactionProcessor.php
@@ -24,71 +24,48 @@ use Carbon\Carbon;
 class CreateCashBackTransactionProcessor
 {
 
-    /** @var UpdatesTransactionStatus */
-    private $updatesTransactionStatus;
-
     /** @var CreatesTransaction */
     private $createsTransaction;
 
-    /** @var CreatesTransactionDetail */
-    private $createsTransactionDetail;
-
-    /** @var UpdatesTransaction */
-    private $updatesTransaction;
-
-    /** @var DeletesTransactionDetails */
-    private $deletesTransactionDetails;
 
     /** @var GeneratesTransactionBillNumber */
     private $generatesTransactionBillNumber;
 
-    /** @var CreatesWallet */
-    private $createsWallet;
-
-    /** @var GeneratesWalletCode */
-    private $generatesWalletCode;
 
     /** @var CreditWalletProcessor */
     private $creditWalletProcessor;
 
     /**
      * CreateCashBackTransactionProcessor constructor.
-     * @param UpdatesTransactionStatus $updatesTransactionStatus
      * @param CreatesTransaction $createsTransaction
-     * @param CreatesTransactionDetail $createsTransactionDetail
-     * @param UpdatesTransaction $updatesTransaction
-     * @param DeletesTransactionDetails $deletesTransactionDetails
      * @param GeneratesTransactionBillNumber $generatesTransactionBillNumber
+     * @param CreditWalletProcessor $creditWalletProcessor
      */
-    public function __construct(UpdatesTransactionStatus $updatesTransactionStatus, CreatesTransaction $createsTransaction, CreatesTransactionDetail $createsTransactionDetail, UpdatesTransaction $updatesTransaction, DeletesTransactionDetails $deletesTransactionDetails, GeneratesTransactionBillNumber $generatesTransactionBillNumber, GeneratesWalletCode $generatesWalletCode, CreditWalletProcessor $creditWalletProcessor)
+    public function __construct(CreatesTransaction $createsTransaction, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CreditWalletProcessor $creditWalletProcessor)
     {
         $this->createsTransaction = $createsTransaction;
-        $this->createsTransactionDetail = $createsTransactionDetail;
-        $this->updatesTransaction = $updatesTransaction;
-        $this->deletesTransactionDetails = $deletesTransactionDetails;
         $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
-
-        $this->generatesWalletCode = $generatesWalletCode;
-
         $this->creditWalletProcessor = $creditWalletProcessor;
     }
 
 
     /**
-     * @param Booking $booking
-     * @param TransactionObject $object
+     * @param Transaction $transaction
      * @return Transaction|\Illuminate\Database\Eloquent\Model
      * @throws \App\Classes\Exceptions\MalformedRequestException
      */
     public function execute(Transaction $transaction) 
     {
+        // leave this disabled until ready to launch to production
+        return;
+        // ((MYR) * (cash back %)) * (1/conversion rate)
         $current_total_cash_back = Transaction::
             where('type', TransactionType::CASH_BACK)
             ->whereMonth('created_at', Carbon::now()->month)->sum('amount');
 
         if (
             $current_total_cash_back < CashBack::MAX &&
-            $transaction->owner()->first()->transactions()->where('type', TransactionType::PURCHASE_ORDER)->count() > 0
+            $transaction->owner()->first()->transactions()->where('type', TransactionType::PURCHASE_ORDER)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED])->count() > 0
         ) {
 
             $cash_back_segemnt = CashBack::SEGMENT;

From 14947865f8e302a15f856608772f3e5c450365aa Mon Sep 17 00:00:00 2001
From: glovetleong <glovetleong@gmail.com>
Date: Wed, 6 Apr 2022 22:52:39 +0800
Subject: [PATCH 15/54] wallet pay cash back

---
 .../Bookings/ControllersLogic/CreateBookingPaymentLogic.php    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingPaymentLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingPaymentLogic.php
index fdd786e6..cf95ca2f 100644
--- a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingPaymentLogic.php
+++ b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingPaymentLogic.php
@@ -139,8 +139,6 @@ class CreateBookingPaymentLogic extends AbstractControllerLogic
             $paymentReference = $billNumber;
 
             $this->updatesWalletBalance->execute($wallet, ($amount * -1));
-
-            $cash_back_transaction = $this->createCashBackTransactionProcessor->execute($transaction);
         }
 
         $billNumber = $this->generatesTransactionBillNumber->execute('PYMT-');
@@ -153,6 +151,7 @@ class CreateBookingPaymentLogic extends AbstractControllerLogic
 
         /** @var Transaction $transaction */
         $transaction = $this->createsTransaction->execute($booking, $object);
+        $cash_back_transaction = $this->createCashBackTransactionProcessor->execute($transaction);
 
         if(PaymentMethodType::PAYMENT_METHODS[$request->input('payment_method')] == PaymentMethodType::WALLET){
             $this->updatesTransactionStatus->execute($transaction, ApprovalStatus::APPROVED);

From 17f6333030d222a585ab276379822dda77d02040 Mon Sep 17 00:00:00 2001
From: glovetleong <glovetleong@gmail.com>
Date: Sun, 10 Apr 2022 00:23:23 +0800
Subject: [PATCH 16/54] refund bug

---
 app/Http/Resources/TransactionResource.php                | 8 ++++----
 .../bookings/elements/PaymentHistoryComponent.vue         | 4 ++--
 .../bookings/elements/RefundVerificationComponent.vue     | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/Http/Resources/TransactionResource.php b/app/Http/Resources/TransactionResource.php
index 30ba223c..4bec5255 100644
--- a/app/Http/Resources/TransactionResource.php
+++ b/app/Http/Resources/TransactionResource.php
@@ -19,7 +19,7 @@ class TransactionResource extends JsonResource
     {
 
         $booking = in_array((int)$this->type, [TransactionType::BILL, TransactionType::REFUND])? $this->owner->owner : $this->owner;
-        $days = $this->created_at->endOfDay()->addWeekdays($booking->service_id === 3 ? 3 : 1);
+        // $days = $this->created_at->endOfDay()->addWeekdays($booking->service_id === 3 ? 3 : 1);
 
         return [
             'id' => $this->id,
@@ -28,7 +28,7 @@ class TransactionResource extends JsonResource
             'bill_no' => $this->bill_no,
             'payment_reference' => $this->payment_reference,
             'payment_method' => (float) $this->payment_method,
-            'recipient_bank_account' => new BankResource($booking->bank),
+            // 'recipient_bank_account' => new BankResource($booking->bank),
             'issuer_name' => $this->issuerCompany->name,
             'amount' => (double) $this->amount,
             'original_amount' => (double) $this->original_amount,
@@ -45,8 +45,8 @@ class TransactionResource extends JsonResource
             'expires_on' => Carbon::parse($this->expires_on)->format('d-m-Y h:i:s A'),
             'updated_at' => Carbon::parse($this->updated_at)->format('d-m-Y h:i:s A'),
             'interval' => [
-                'value' => $days->gt(Carbon::now()) ? '+' : '-',
-                'duration' => $days->diff(Carbon::now())->format('%d'),
+                // 'value' => $days->gt(Carbon::now()) ? '+' : '-',
+                // 'duration' => $days->diff(Carbon::now())->format('%d'),
             ]
         ];
     }
diff --git a/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue b/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
index 51352679..bd45c392 100644
--- a/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
@@ -123,7 +123,7 @@
                             <div class="font-heading all-caps fs-10">Requested Refund Amount</div>
                         </div>
                         <div class="col-auto text-right">
-                            <div class="font-heading fs-10">{{item.original_currency.short_code}} {{(Math.round((totalRequestedRefund + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div>
+                            <div class="font-heading fs-10">{{item.currency.short_code}} {{(Math.round((totalRequestedRefund + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div>
                         </div>
                     </div>
                     <div class="row align-items-end m-b-10 bold text-danger" v-if="totalRefunds != 0">
@@ -220,7 +220,7 @@
                         </div>
                     </div>
                     <div class="row m-t-10" v-show="[2, 3].includes(item.status) && totalRequestedRefund < data.booking.amount">
-                        <div class="col hide">
+                        <div class="col">
                             <button class="btn btn-xs all-caps b-rad-none bg-master-lighter btn-block no-border requestModal" data-type="transferSummary">Request Refund</button>
                             <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="transferSummary" size="large">
                                 <refund-confirmation-component :data="data" :section="section" :totalRefunds="totalRequestedRefund + totalRefunds"></refund-confirmation-component>
diff --git a/resources/assets/vue/components/bookings/elements/RefundVerificationComponent.vue b/resources/assets/vue/components/bookings/elements/RefundVerificationComponent.vue
index e78a14f6..42d5682e 100644
--- a/resources/assets/vue/components/bookings/elements/RefundVerificationComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/RefundVerificationComponent.vue
@@ -28,7 +28,7 @@
                                 <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">
-                                        {{(Math.round((data.amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}
+                                        {{(Math.round((data.original_amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}
                                     </div>
                                 </div>
                             </div>

From eee77325f71eaa961955cf94bd46f7d32cb03c0e Mon Sep 17 00:00:00 2001
From: glovetleong <glovetleong@gmail.com>
Date: Sun, 10 Apr 2022 00:24:22 +0800
Subject: [PATCH 17/54] back

---
 app/Http/Resources/TransactionResource.php                | 8 ++++----
 .../bookings/elements/PaymentHistoryComponent.vue         | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/Http/Resources/TransactionResource.php b/app/Http/Resources/TransactionResource.php
index 4bec5255..30ba223c 100644
--- a/app/Http/Resources/TransactionResource.php
+++ b/app/Http/Resources/TransactionResource.php
@@ -19,7 +19,7 @@ class TransactionResource extends JsonResource
     {
 
         $booking = in_array((int)$this->type, [TransactionType::BILL, TransactionType::REFUND])? $this->owner->owner : $this->owner;
-        // $days = $this->created_at->endOfDay()->addWeekdays($booking->service_id === 3 ? 3 : 1);
+        $days = $this->created_at->endOfDay()->addWeekdays($booking->service_id === 3 ? 3 : 1);
 
         return [
             'id' => $this->id,
@@ -28,7 +28,7 @@ class TransactionResource extends JsonResource
             'bill_no' => $this->bill_no,
             'payment_reference' => $this->payment_reference,
             'payment_method' => (float) $this->payment_method,
-            // 'recipient_bank_account' => new BankResource($booking->bank),
+            'recipient_bank_account' => new BankResource($booking->bank),
             'issuer_name' => $this->issuerCompany->name,
             'amount' => (double) $this->amount,
             'original_amount' => (double) $this->original_amount,
@@ -45,8 +45,8 @@ class TransactionResource extends JsonResource
             'expires_on' => Carbon::parse($this->expires_on)->format('d-m-Y h:i:s A'),
             'updated_at' => Carbon::parse($this->updated_at)->format('d-m-Y h:i:s A'),
             'interval' => [
-                // 'value' => $days->gt(Carbon::now()) ? '+' : '-',
-                // 'duration' => $days->diff(Carbon::now())->format('%d'),
+                'value' => $days->gt(Carbon::now()) ? '+' : '-',
+                'duration' => $days->diff(Carbon::now())->format('%d'),
             ]
         ];
     }
diff --git a/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue b/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
index bd45c392..b73081b9 100644
--- a/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
@@ -220,7 +220,7 @@
                         </div>
                     </div>
                     <div class="row m-t-10" v-show="[2, 3].includes(item.status) && totalRequestedRefund < data.booking.amount">
-                        <div class="col">
+                        <div class="col hide">
                             <button class="btn btn-xs all-caps b-rad-none bg-master-lighter btn-block no-border requestModal" data-type="transferSummary">Request Refund</button>
                             <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="transferSummary" size="large">
                                 <refund-confirmation-component :data="data" :section="section" :totalRefunds="totalRequestedRefund + totalRefunds"></refund-confirmation-component>

From 5647957e9fff932c8fd9f54ca2a99118eac9818d Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Sun, 10 Apr 2022 21:31:20 +0800
Subject: [PATCH 18/54] delete group transaction

---
 .../CreateSupplierTransactionLogic.php        |  2 +-
 .../ControllersLogic/DeleteGroupLogic.php     | 72 +++++++++++++++
 .../ControllersLogic/ListGroupsLogic.php      | 42 +++++++++
 .../Transactions/Services/FetchesGroup.php    | 31 +++++++
 .../Transactions/Services/ListsGroups.php     | 31 +++++++
 .../Transactions/DeleteGroupController.php    | 20 ++++
 .../Transactions/ListGroupsController.php     | 21 +++++
 app/Http/Resources/GroupResource.php          | 29 ++++++
 app/Models/Group.php                          | 21 ++++-
 app/Models/GroupTransaction.php               | 19 +++-
 ...170641_create_group_transactions_table.php |  5 +-
 .../elements/CurrencyOrderComponent.vue       |  2 +-
 .../elements/TransactionGroupComponent.vue    | 92 +++++++++++++++++++
 resources/views/pages/payments.blade.php      | 16 ++++
 routes/transaction.php                        |  3 +
 15 files changed, 399 insertions(+), 7 deletions(-)
 create mode 100644 app/Classes/Modules/Transactions/ControllersLogic/DeleteGroupLogic.php
 create mode 100644 app/Classes/Modules/Transactions/ControllersLogic/ListGroupsLogic.php
 create mode 100644 app/Classes/Modules/Transactions/Services/FetchesGroup.php
 create mode 100644 app/Classes/Modules/Transactions/Services/ListsGroups.php
 create mode 100644 app/Http/Controllers/Transactions/DeleteGroupController.php
 create mode 100644 app/Http/Controllers/Transactions/ListGroupsController.php
 create mode 100644 app/Http/Resources/GroupResource.php
 create mode 100644 resources/assets/vue/components/bookings/elements/TransactionGroupComponent.vue

diff --git a/app/Classes/Modules/Transactions/ControllersLogic/CreateSupplierTransactionLogic.php b/app/Classes/Modules/Transactions/ControllersLogic/CreateSupplierTransactionLogic.php
index 3dde2e45..0aa0fb7f 100644
--- a/app/Classes/Modules/Transactions/ControllersLogic/CreateSupplierTransactionLogic.php
+++ b/app/Classes/Modules/Transactions/ControllersLogic/CreateSupplierTransactionLogic.php
@@ -87,7 +87,7 @@ class CreateSupplierTransactionLogic extends AbstractControllerLogic
         $service_charge = 0;
 
         foreach ($this->createSupplierTransactionProcessor->getBills() as $key => $row) {
-            $group->transaction()->sync($row->id, false);
+            $group->transactions()->sync($row->id, false);
             $issuer = $row->issuer;
             $receiver = $row->receiver;
             $amount += $row->amount;
diff --git a/app/Classes/Modules/Transactions/ControllersLogic/DeleteGroupLogic.php b/app/Classes/Modules/Transactions/ControllersLogic/DeleteGroupLogic.php
new file mode 100644
index 00000000..b19a7159
--- /dev/null
+++ b/app/Classes/Modules/Transactions/ControllersLogic/DeleteGroupLogic.php
@@ -0,0 +1,72 @@
+<?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 ErrorException;
+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;
+
+    public function __construct(
+        UpdatesTransactionStatus $updatesTransactionStatus, 
+        FetchesGroup $fetchesGroup,
+        DeletesTransaction $deletesTransaction
+    )
+    {
+        $this->updatesTransactionStatus = $updatesTransactionStatus;
+        $this->fetchesGroup = $fetchesGroup;
+        $this->deletesTransaction = $deletesTransaction;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    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));
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Transactions/ControllersLogic/ListGroupsLogic.php b/app/Classes/Modules/Transactions/ControllersLogic/ListGroupsLogic.php
new file mode 100644
index 00000000..5cf99bbe
--- /dev/null
+++ b/app/Classes/Modules/Transactions/ControllersLogic/ListGroupsLogic.php
@@ -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));
+    }
+
+}
diff --git a/app/Classes/Modules/Transactions/Services/FetchesGroup.php b/app/Classes/Modules/Transactions/Services/FetchesGroup.php
new file mode 100644
index 00000000..6533664b
--- /dev/null
+++ b/app/Classes/Modules/Transactions/Services/FetchesGroup.php
@@ -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\AbstractFetchRecord;
+
+class FetchesGroup extends AbstractFetchRecord
+{
+    /** @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();
+    }
+}
diff --git a/app/Classes/Modules/Transactions/Services/ListsGroups.php b/app/Classes/Modules/Transactions/Services/ListsGroups.php
new file mode 100644
index 00000000..f9126739
--- /dev/null
+++ b/app/Classes/Modules/Transactions/Services/ListsGroups.php
@@ -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();
+    }
+}
diff --git a/app/Http/Controllers/Transactions/DeleteGroupController.php b/app/Http/Controllers/Transactions/DeleteGroupController.php
new file mode 100644
index 00000000..14ba54f9
--- /dev/null
+++ b/app/Http/Controllers/Transactions/DeleteGroupController.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\DeleteGroupLogic;
+
+class DeleteGroupController
+{
+    /**
+     * @param Request $request
+     * @param DeleteGroupTransactionLogic $logic
+     * @return JsonResponse
+     */
+    public function delete(Request $request, DeleteGroupLogic $logic) : JsonResponse {
+        return $logic->execute($request);
+    }
+}
diff --git a/app/Http/Controllers/Transactions/ListGroupsController.php b/app/Http/Controllers/Transactions/ListGroupsController.php
new file mode 100644
index 00000000..730633e9
--- /dev/null
+++ b/app/Http/Controllers/Transactions/ListGroupsController.php
@@ -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);
+    }
+}
diff --git a/app/Http/Resources/GroupResource.php b/app/Http/Resources/GroupResource.php
new file mode 100644
index 00000000..2d628d19
--- /dev/null
+++ b/app/Http/Resources/GroupResource.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Http\Resources;
+
+use Carbon\Carbon;
+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)
+    {
+        return [
+            'id' => $this->id,
+            'original_amount' => (double) $this->original_amount,
+            'original_currency' => new CurrencyResource($this->original_currency),
+            'amount' => (double) $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' => TransactionResource::collection($this->transactions()->get()),
+        ];
+    }
+}
diff --git a/app/Models/Group.php b/app/Models/Group.php
index eff309e2..6e785faa 100644
--- a/app/Models/Group.php
+++ b/app/Models/Group.php
@@ -3,11 +3,28 @@
 namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 class Group extends Model
 {
-	public function transaction()
+	public function transactions()
     {
-        return $this->belongsToMany('App\Models\Transaction', 'group_transaction');
+        return $this->belongsToMany(Transaction::class, GroupTransaction::class);
+    }
+
+    /**
+     * @return BelongsTo
+     */
+    public function currency(): BelongsTo
+    {
+        return $this->BelongsTo(Currency::class, 'currency_id', 'id');
+    }
+
+    /**
+     * @return BelongsTo
+     */
+    public function original_currency(): BelongsTo
+    {
+        return $this->BelongsTo(Currency::class, 'original_currency_id', 'id');
     }
 }
diff --git a/app/Models/GroupTransaction.php b/app/Models/GroupTransaction.php
index c8622ef9..9ab72d18 100644
--- a/app/Models/GroupTransaction.php
+++ b/app/Models/GroupTransaction.php
@@ -3,8 +3,25 @@
 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');
+    }
 }
diff --git a/database/migrations/2022_03_20_170641_create_group_transactions_table.php b/database/migrations/2022_03_20_170641_create_group_transactions_table.php
index 6ce7cedc..53f33356 100644
--- a/database/migrations/2022_03_20_170641_create_group_transactions_table.php
+++ b/database/migrations/2022_03_20_170641_create_group_transactions_table.php
@@ -13,7 +13,8 @@ class CreateGroupTransactionsTable extends Migration
      */
     public function up()
     {
-        Schema::create('group_transaction', function (Blueprint $table) {
+        Schema::create('group_transactions', function (Blueprint $table) {
+            $table->id();
             $table->foreignId('group_id')->unsigned();
             $table->foreignId('transaction_id')->unsigned();
         });
@@ -26,6 +27,6 @@ class CreateGroupTransactionsTable extends Migration
      */
     public function down()
     {
-        Schema::dropIfExists('group_transaction');
+        Schema::dropIfExists('group_transactions');
     }
 }
diff --git a/resources/assets/vue/components/bookings/elements/CurrencyOrderComponent.vue b/resources/assets/vue/components/bookings/elements/CurrencyOrderComponent.vue
index ad4c3e42..a88fd5a9 100644
--- a/resources/assets/vue/components/bookings/elements/CurrencyOrderComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/CurrencyOrderComponent.vue
@@ -40,7 +40,7 @@
                                                         <div class="row m-b-20">
                                                             <div class="col">
                                                                 <h5 class="all-caps">Currency Order Placed</h5>
-                                                                <div class="fs-11">Are you sure you that the currency order has been placed with the supplier?</div>
+                                                                <div class="fs-11">Are you sure that the currency order has been placed with the supplier?</div>
                                                             </div>
                                                         </div>
                                                         <div class="row">
diff --git a/resources/assets/vue/components/bookings/elements/TransactionGroupComponent.vue b/resources/assets/vue/components/bookings/elements/TransactionGroupComponent.vue
new file mode 100644
index 00000000..515e56aa
--- /dev/null
+++ b/resources/assets/vue/components/bookings/elements/TransactionGroupComponent.vue
@@ -0,0 +1,92 @@
+<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 p-b-5 b-b b-grey" v-show="!isLoading">
+                <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-auto">
+                            <div class="font-heading fs-10 muted all-caps">Currency Rate</div>
+                            <div class="font-heading fs-10">
+                                {{item.currency_rate}}
+                            </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.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>
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading fs-10 muted all-caps">reference</div>
+                            <span class="font-heading fs-10" v-for="transaction in item.transactions">
+                                <a :href="route('booking.details', transaction.booking.marking)">{{transaction.booking.marking}}&nbsp;</a>
+                            </span>
+                        </div>
+                        <div class="col-auto">
+                            <div class="row parentContainer">
+                                <div class="col p-l-0">
+                                    <button class="btn btn-xs btn-default bg-danger b-rad-none no-border requestModal" data-type="approveDocument">
+                                        <i class="fa fa-times text-white"></i>
+                                    </button>
+                                    <modal-component small type="approveDocument">
+                                        <div class="row">
+                                            <div class="col text-center">
+                                                <div class="row">
+                                                    <div class="col text-center">
+                                                        <div class="row m-b-20">
+                                                            <div class="col">
+                                                                <h5 class="all-caps">Delete Transaction Group</h5>
+                                                                <div class="fs-11">Are you sure that you want to delete this transaction group?</div>
+                                                            </div>
+                                                        </div>
+                                                        <div class="row">
+                                                            <div class="col p-r-5">
+                                                                <div data-dismiss="modal" class="btn btn-sm btn-default bg-master-lighter btn-block b-rad-none">Cancel</div>
+                                                            </div>
+                                                            <div class="col p-l-5">
+                                                                <div data-dismiss="modal" class="btn btn-sm btn-danger btn-block b-rad-none" @click="deleteGroupTransaction()">Confirm</div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </modal-component>
+                                </div>
+                            </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
+            }
+        },
+        methods: {
+            deleteGroupTransaction() {
+                this.isLoading = true;
+                this.submit(this.route('api.transaction.group.delete', this.item.id), 'delete', this.section, true, true);
+            }
+        },
+        mixins: [componentHandler, staticFormHandler]
+    }
+</script>
diff --git a/resources/views/pages/payments.blade.php b/resources/views/pages/payments.blade.php
index 12604a91..8dec0f8f 100644
--- a/resources/views/pages/payments.blade.php
+++ b/resources/views/pages/payments.blade.php
@@ -40,6 +40,22 @@
                         </div>
                     </div>
                 </div>
+                <div class="col-12 col-md-4">
+                    <div class="row m-b-15 p-b-10 b-b b-grey">
+                        <div class="col">
+                            <small class="all-caps muted fs-10">Transaction Groups</small>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            <list-component key="2" section="transactionGroupsListSection" :options="{'per_page': 2}" :endpoint="route('api.transaction.group.list')">
+                                <template slot="list" slot-scope="{data}">
+                                    <transaction-group-component section="transactionGroupsListSection" :data="data"></transaction-group-component>
+                                </template>
+                            </list-component>
+                        </div>
+                    </div>
+                </div>
             </div>
         </div>
     </div>
diff --git a/routes/transaction.php b/routes/transaction.php
index c3402b47..cbff706d 100644
--- a/routes/transaction.php
+++ b/routes/transaction.php
@@ -22,4 +22,7 @@ Route::group(['prefix' => 'transactions', 'namespace' => 'Transactions', 'as' =>
     Route::get('/company/{id}/account/balance', 'FetchCompanyAccountBalanceController@fetch')->name('company.account.balance');
 
     Route::get('/bank/{id}/account/balance', 'FetchBankAccountBalanceController@fetch')->name('bank.account.balance');
+
+    Route::get('/groups/list', 'ListGroupsController@list')->name('group.list');
+    Route::delete('/groups/{id}/delete', 'DeleteGroupController@delete')->name('group.delete');
 });
\ No newline at end of file

From 0bf3b1b3539a03e83182480efe4d16ba8cbd04fa Mon Sep 17 00:00:00 2001
From: glovetleong <glovetleong@gmail.com>
Date: Mon, 11 Apr 2022 23:50:15 +0800
Subject: [PATCH 19/54] refund bug

---
 .../ControllersLogic/CreateBookingRefundLogic.php |  6 ++++--
 app/Http/Resources/BookingResource.php            |  1 +
 .../bookings/elements/PaymentHistoryComponent.vue | 15 ++++++++++++++-
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundLogic.php
index 74e92fa6..d31ee2ce 100644
--- a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundLogic.php
+++ b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundLogic.php
@@ -84,12 +84,14 @@ class CreateBookingRefundLogic extends AbstractControllerLogic
 
         $billNumber = $this->generatesTransactionBillNumber->execute('RFD-');
 
-
         $refund = $transaction->transactions()->refunds()->sum('amount');
 
         if($refund + $request->input('amount') > $transaction->original_amount) throw new MalformedRequestException('Your refund must not be greater than '. $transaction->original_amount .'.');
 
-        $transactionRefundCalculationObject = new TransactionRefundCalculationObject($booking, $transaction, $request->input('amount'));
+        $amount = $transaction->booking->fix_currency_id == 1 ? $request->input('amount') : $request->input('amount') / $transaction->currency_rate;
+
+
+        $transactionRefundCalculationObject = new TransactionRefundCalculationObject($booking, $transaction, $amount);
         $transactionRefundCalculationObject->init();
 
         $object = new TransactionObject($billNumber, TransactionType::REFUND, 1, $booking->company->id,
diff --git a/app/Http/Resources/BookingResource.php b/app/Http/Resources/BookingResource.php
index 0eeb9670..0adfa65d 100644
--- a/app/Http/Resources/BookingResource.php
+++ b/app/Http/Resources/BookingResource.php
@@ -31,6 +31,7 @@ class BookingResource extends JsonResource
             'service' => new ServiceTypeResource($this->service),
             'marking' => $this->marking,
             'amount' => $this->fix_amount,
+            'amount' => $this->fix_amount,
             'floating_amount' => floatval((App()->make(CalculatesBookingFloatingAmount::class))->execute($this->resource, $this->fix_currency_id)),
             'paid_amount' => floatval((App()->make(CalculatesBookingPayableAmount::class))->execute($this->resource, $this->fix_currency_id)) - floatval((App()->make(CalculatesBookingRefundAmount::class))->execute($this->resource, $this->fix_currency_id)),
             'outstanding_amount' => floatval((App()->make(CalculatesBookingOutstanding::class))->execute($this->resource)) - floatval((App()->make(CalculatesBookingRefundAmount::class))->execute($this->resource, $this->fix_currency_id)),
diff --git a/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue b/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
index b73081b9..de39dfb0 100644
--- a/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
@@ -219,7 +219,7 @@
                             </div>
                         </div>
                     </div>
-                    <div class="row m-t-10" v-show="[2, 3].includes(item.status) && totalRequestedRefund < data.booking.amount">
+                    <div class="row m-t-10" v-show="[2, 3].includes(item.status) && totalRequestedConvertRefund < data.booking.amount">
                         <div class="col hide">
                             <button class="btn btn-xs all-caps b-rad-none bg-master-lighter btn-block no-border requestModal" data-type="transferSummary">Request Refund</button>
                             <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="transferSummary" size="large">
@@ -249,12 +249,25 @@
         },
         computed: {
             totalRequestedRefund() {
+                let vm = this;
                 var TotalRequestedRefund = 0;
                 this.data.transaction_refunds.forEach(function(refunds) {
                     TotalRequestedRefund += refunds.status === 1 ? refunds.original_amount : 0;
                 });
+               
                 return TotalRequestedRefund;
             },
+            totalRequestedConvertRefund() {
+                let vm = this;
+                var TotalRequestedRefund = 0;
+                this.data.transaction_refunds.forEach(function(refunds) {
+                    TotalRequestedRefund += refunds.status === 1 ? refunds.original_amount : 0;
+                });
+                if (vm.data.booking.fixed_currency.id != 1 && this.data.transaction_refunds[0]) {
+                    TotalRequestedRefund = (TotalRequestedRefund * this.data.transaction_refunds[0].currency_rate);
+                }
+                return ((Math.round((TotalRequestedRefund + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ","));
+            },
             totalRefunds() {
                 var TotalRequestedRefund = 0;
                 this.data.transaction_refunds.forEach(function(refunds) {

From 29b1f87966ce2f540b9ac877cc0a9a369d520083 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Sat, 16 Apr 2022 23:53:12 +0800
Subject: [PATCH 20/54] move notification API and UI from shipping portal

---
 app/Classes/General/Interfaces/Notifiable.php |  15 +++
 .../ApproveIdentificationDocumentLogic.php    |  24 ++++-
 .../ListNotificationsLogic.php                |  61 +++++++++++
 .../NotificationObject.php                    | 101 ++++++++++++++++++
 .../CreateNotificationProcessor.php           |  27 +++++
 .../Services/CreatesNotification.php          |  30 ++++++
 .../Services/ListsNotification.php            |  33 ++++++
 .../ListNotificationsController.php           |  19 ++++
 app/Http/Resources/NotificationResource.php   |  30 ++++++
 app/Models/AbstractModel.php                  |  28 ++++-
 app/Models/Notification.php                   |  18 ++++
 ...4_15_211421_create_notifications_table.php |  40 +++++++
 .../assets/sass/modules/_typography.scss      |   6 ++
 .../IdentificationVerificationComponent.vue   |  23 +---
 ...dentificationVerificationFormComponent.vue |  78 ++++++++++++++
 .../elements/NotificationSectionComponent.vue |  82 ++++++++++++++
 resources/views/partials/header.blade.php     |  10 +-
 routes/web.php                                |   4 +-
 18 files changed, 597 insertions(+), 32 deletions(-)
 create mode 100644 app/Classes/General/Interfaces/Notifiable.php
 create mode 100644 app/Classes/Modules/Notifications/ControllersLogic/ListNotificationsLogic.php
 create mode 100644 app/Classes/Modules/Notifications/DataTransferObjects/NotificationObject.php
 create mode 100644 app/Classes/Modules/Notifications/Processors/CreateNotificationProcessor.php
 create mode 100644 app/Classes/Modules/Notifications/Services/CreatesNotification.php
 create mode 100644 app/Classes/Modules/Notifications/Services/ListsNotification.php
 create mode 100644 app/Http/Controllers/Notifications/ListNotificationsController.php
 create mode 100644 app/Http/Resources/NotificationResource.php
 create mode 100644 app/Models/Notification.php
 create mode 100644 database/migrations/2022_04_15_211421_create_notifications_table.php
 create mode 100644 resources/assets/vue/components/companies/elements/RejectIdentificationVerificationFormComponent.vue
 create mode 100644 resources/assets/vue/components/general/elements/NotificationSectionComponent.vue

diff --git a/app/Classes/General/Interfaces/Notifiable.php b/app/Classes/General/Interfaces/Notifiable.php
new file mode 100644
index 00000000..e9d8f22d
--- /dev/null
+++ b/app/Classes/General/Interfaces/Notifiable.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Classes\General\Interfaces;
+
+
+use Illuminate\Database\Eloquent\Relations\MorphTo;
+
+interface Notifiable
+{
+    public function subject(): MorphTo;
+
+    public function target(): MorphTo;
+
+    public function causer(): MorphTo;
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Companies/ControllersLogic/ApproveIdentificationDocumentLogic.php b/app/Classes/Modules/Companies/ControllersLogic/ApproveIdentificationDocumentLogic.php
index d5e052a9..4374cd73 100644
--- a/app/Classes/Modules/Companies/ControllersLogic/ApproveIdentificationDocumentLogic.php
+++ b/app/Classes/Modules/Companies/ControllersLogic/ApproveIdentificationDocumentLogic.php
@@ -13,6 +13,9 @@ use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Documents\Services\FetchesDocument;
 
 use App\Classes\Modules\Documents\Services\ApprovesDocument;
+use App\Classes\Modules\Notifications\DataTransferObjects\NotificationObject;
+Use App\Classes\Modules\Notifications\Processors\CreateNotificationProcessor;
+use App\Classes\General\Interfaces\Notifiable;
 
 use App\Models\Document;
 use Illuminate\Http\JsonResponse;
@@ -46,6 +49,9 @@ class ApproveIdentificationDocumentLogic extends AbstractControllerLogic
     /** @var UpdatesCompanyStatus */
     private $updatesCompanyStatus;
 
+    /** @var CreateNotificationProcessor */
+    private $createNotificationProcessor;
+
     /**
      * ApproveIdentificationDocumentLogic constructor.
      * @param CanApproveDocument $canApproveDocument
@@ -53,14 +59,16 @@ class ApproveIdentificationDocumentLogic extends AbstractControllerLogic
      * @param RejectsDocument $rejectsDocument
      * @param FetchesDocument $fetchesDocument
      * @param UpdatesCompanyStatus $updatesCompanyStatus
+     * @param CreateNotificationProcessor $createNotificationProcessor
      */
-    public function __construct(CanApproveDocument $canApproveDocument, ApprovesDocument $approvesDocument, RejectsDocument $rejectsDocument, FetchesDocument $fetchesDocument, UpdatesCompanyStatus $updatesCompanyStatus)
+    public function __construct(CanApproveDocument $canApproveDocument, ApprovesDocument $approvesDocument, RejectsDocument $rejectsDocument, FetchesDocument $fetchesDocument, UpdatesCompanyStatus $updatesCompanyStatus, CreateNotificationProcessor $createNotificationProcessor)
     {
         $this->canApproveDocument = $canApproveDocument;
         $this->approvesDocument = $approvesDocument;
         $this->rejectsDocument = $rejectsDocument;
         $this->fetchesDocument = $fetchesDocument;
         $this->updatesCompanyStatus = $updatesCompanyStatus;
+        $this->createNotificationProcessor = $createNotificationProcessor;
     }
 
     /**
@@ -84,6 +92,20 @@ class ApproveIdentificationDocumentLogic extends AbstractControllerLogic
 
         $this->updatesCompanyStatus->execute($document->owner, $status === 'approve' ? ApprovalStatus::APPROVED : ApprovalStatus::REJECTED);
 
+        $object = new NotificationObject(
+            'ID Verification ' . ( $status === 'approve' ? 'Approved' : 'Rejected' ), 
+            ( $status === 'approve' ? 'Dear user, congratulations that your ' : 'Dear user, we are sorry to inform you that your ' ) . ( $document->type ===  'IDENTITY_CARD' ? 'IC' : 'SSM' ) . ( $status === 'approve' ? ' has been approved. Start your first order now!' : ' has been rejected due to ' . ( $request->input('rejectRemark') ?? '' ) . ', please resubmit it for further action.' ), 
+            $document->owner,
+            $document->owner->employees()->first(),
+            $document, 
+        );
+
+        $this->createNotificationProcessor->execute($object);
+
+        if($status === 'approve'){
+            $orders = $this->updatesOrdersStatus->execute($document->owner, ApprovalStatus::APPROVED);
+        }
+
         return $this->resourceResponse(new DocumentResource($document));
 
     }
diff --git a/app/Classes/Modules/Notifications/ControllersLogic/ListNotificationsLogic.php b/app/Classes/Modules/Notifications/ControllersLogic/ListNotificationsLogic.php
new file mode 100644
index 00000000..0fdbf6f9
--- /dev/null
+++ b/app/Classes/Modules/Notifications/ControllersLogic/ListNotificationsLogic.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace App\Classes\Modules\Notifications\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Notifications\Services\ListsNotification;
+use App\Http\Resources\NotificationResource;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ListNotificationsLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Retrieve Notifications',
+            'message' => 'You have successfully retrieved a list of Notifications'
+        ];
+    }
+
+    /** @var ListsNotification */
+    private $listsNotification;
+
+    /**
+     * ListNotificationsLogic constructor.
+     * @param ListsNotification $listsNotification
+     */
+    public function __construct(
+        ListsNotification $listsNotification
+    )
+    {
+        $this->listsNotification = $listsNotification;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+
+        $filters = [
+            // 'target_id'=>auth()->user()->id,
+            // 'per_page'=>$request->route('per_page')
+        ];
+
+        $notifications = $this->listsNotification->execute($filters);
+
+        return $this->collectionResponse(NotificationResource::collection($notifications));
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Notifications/DataTransferObjects/NotificationObject.php b/app/Classes/Modules/Notifications/DataTransferObjects/NotificationObject.php
new file mode 100644
index 00000000..40dc4f3c
--- /dev/null
+++ b/app/Classes/Modules/Notifications/DataTransferObjects/NotificationObject.php
@@ -0,0 +1,101 @@
+<?php
+
+namespace App\Classes\Modules\Notifications\DataTransferObjects;
+
+use App\Classes\General\Interfaces\Notifiable;
+use App\Classes\General\Interfaces\DataTransferObject;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+
+class NotificationObject  implements DataTransferObject
+{
+    /** @var string */
+    private $title;
+
+    /** @var string  */
+    private $description;
+
+    /** @var Notifiable  */
+    private $subject;
+
+    /** @var Notifiable  */
+    private $target;
+
+    /** @var Notifiable  */
+    private $causer;
+
+    /** @var int|null  */
+    private $status;
+
+    /**
+     * OrderObject constructor.
+     * @param string $reference
+     * @param int $type
+     * @param int|null $status
+     */
+    public function __construct(
+        string $title, 
+        string $description, 
+        Notifiable $subject, 
+        Notifiable $target, 
+        Notifiable $causer, 
+        ?int $status = ApprovalStatus::PENDING_VERIFICATION
+    )
+    {
+        $this->title = $title;
+        $this->description = $description;
+        $this->subject = $subject;
+        $this->target = $target;
+        $this->causer = $causer;
+        $this->status = $status;
+    }
+
+    /**
+     * @return int
+     */
+    public function getTitle(): string
+    {
+        return $this->title;
+    }
+
+    /**
+     * @return int
+     */
+    public function getDescription(): string
+    {
+        return $this->description;
+    }
+
+    /**
+     * @return Notifiable
+     */
+    public function getSubject(): Notifiable
+    {
+        return $this->subject;
+    }
+
+    /**
+     * @return Notifiable
+     */
+    public function getTarget(): Notifiable
+    {
+        return $this->target;
+    }
+
+    /**
+     * @return Notifiable
+     */
+    public function getCauser(): Notifiable
+    {
+        return $this->causer;
+    }
+
+    /**
+     * @return int
+     */
+    public function getStatus(): int
+    {
+        return $this->status;
+    }
+
+
+}
diff --git a/app/Classes/Modules/Notifications/Processors/CreateNotificationProcessor.php b/app/Classes/Modules/Notifications/Processors/CreateNotificationProcessor.php
new file mode 100644
index 00000000..d6b077f8
--- /dev/null
+++ b/app/Classes/Modules/Notifications/Processors/CreateNotificationProcessor.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Classes\Modules\Notifications\Processors;
+
+use App\Classes\Modules\Notifications\DataTransferObjects\NotificationObject;
+use App\Classes\Modules\Notifications\Services\CreatesNotification;
+
+class CreateNotificationProcessor
+{
+    /** @var CreatesNotification */
+    private $createsNotification;
+
+    /**
+     * CreateNotificationProcessor constructor.
+     * @param CreatesNotification $createsNotification
+     */
+    public function __construct(CreatesNotification $createsNotification)
+    {
+        $this->createsNotification = $createsNotification;
+    }
+   
+    public function execute(NotificationObject $object)
+    {
+        $notification = $this->createsNotification->execute($object);
+        return $notification;
+    }
+}
diff --git a/app/Classes/Modules/Notifications/Services/CreatesNotification.php b/app/Classes/Modules/Notifications/Services/CreatesNotification.php
new file mode 100644
index 00000000..4f5ca5fd
--- /dev/null
+++ b/app/Classes/Modules/Notifications/Services/CreatesNotification.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Classes\Modules\Notifications\Services;
+
+use App\Classes\Modules\Notifications\DataTransferObjects\NotificationObject;
+use App\Models\Notification;
+
+class CreatesNotification
+{
+    /**
+     * @param NotificationObject $object
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(NotificationObject $object) {
+        $model = new Notification();
+        $model->title = $object->getTitle();
+        $model->description = $object->getDescription();
+        $model->status = $object->getStatus();
+        $model->subject_type = get_class($object->getSubject());
+        $model->subject_id = $object->getSubject()->id;
+        $model->target_type = get_class($object->getTarget());
+        $model->target_id = $object->getTarget()->id;
+        $model->causer_type = get_class($object->getCauser());
+        $model->causer_id = $object->getCauser()->id;
+        $model->save();
+
+        return $model;
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Notifications/Services/ListsNotification.php b/app/Classes/Modules/Notifications/Services/ListsNotification.php
new file mode 100644
index 00000000..707e7ae8
--- /dev/null
+++ b/app/Classes/Modules/Notifications/Services/ListsNotification.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Classes\Modules\Notifications\Services;
+
+
+use App\Classes\General\Eloquent\AbstractListRecord;
+use Illuminate\Database\Eloquent\Builder;
+use App\Models\Notification;
+
+class ListsNotification extends AbstractListRecord
+{
+
+    /** @var Bank */
+    private $repository;
+
+    /**
+     * ListsBank constructor.
+     * @param Notification $repository
+     */
+    public function __construct(Notification $repository)
+    {
+        $this->repository = $repository;
+    }
+
+
+    /**
+     * @return Builder
+     */
+    function getRepository(): Builder
+    {
+        return $this->repository->newQuery();
+    }
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Notifications/ListNotificationsController.php b/app/Http/Controllers/Notifications/ListNotificationsController.php
new file mode 100644
index 00000000..58455fc2
--- /dev/null
+++ b/app/Http/Controllers/Notifications/ListNotificationsController.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Http\Controllers\Notifications;
+
+use App\Classes\Modules\Notifications\ControllersLogic\ListNotificationsLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ListNotificationsController
+{
+    /**
+     * @param Request $request
+     * @param ListNotificationsLogic $logic
+     * @return JsonResponse
+     */
+    public function list(Request $request, ListNotificationsLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+}
\ No newline at end of file
diff --git a/app/Http/Resources/NotificationResource.php b/app/Http/Resources/NotificationResource.php
new file mode 100644
index 00000000..564b7b31
--- /dev/null
+++ b/app/Http/Resources/NotificationResource.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Http\Resources;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\BusinessType;
+use App\Classes\ValueObjects\Constants\DocumentType;
+use Illuminate\Http\Resources\Json\JsonResource;
+use Illuminate\Support\Facades\Crypt;
+
+class NotificationResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        return [
+            'id' => $this->id,
+            'title' => $this->title,
+            'description' => $this->description,
+            'long_ago' => $this->created_at->diffForHumans(),
+            'created_at' => $this->created_at->format('d-m-Y')
+        ];
+
+    }
+}
diff --git a/app/Models/AbstractModel.php b/app/Models/AbstractModel.php
index 7a7c9c06..47d8754b 100644
--- a/app/Models/AbstractModel.php
+++ b/app/Models/AbstractModel.php
@@ -3,11 +3,37 @@
 namespace App\Models;
 
 
+use App\Classes\General\Interfaces\Notifiable;
 use Illuminate\Database\Eloquent\Model;
 use Spatie\Activitylog\Traits\LogsActivity;
+use Illuminate\Database\Eloquent\Relations\MorphTo;
 
-class AbstractModel extends Model
+class AbstractModel extends Model implements Notifiable
 {
     use LogsActivity;
     protected static $logFillable  = true;
+
+    /**
+     * @return MorphTo
+     */
+    public function subject(): MorphTo
+    {
+        return $this->MorphTo('subject');
+    }
+
+    /**
+     * @return MorphTo
+     */
+    public function target(): MorphTo
+    {
+        return $this->MorphTo('target');
+    }
+
+    /**
+     * @return MorphTo
+     */
+    public function causer(): MorphTo
+    {
+        return $this->MorphTo('causer');
+    }
 }
\ No newline at end of file
diff --git a/app/Models/Notification.php b/app/Models/Notification.php
new file mode 100644
index 00000000..06bd6024
--- /dev/null
+++ b/app/Models/Notification.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\SoftDeletes;
+
+class Notification extends AbstractModel
+{
+    use SoftDeletes;
+
+    protected $table = 'notifications';
+
+    public function package(): BelongsTo
+    {
+        return $this->BelongsTo(Package::class, 'package_id', 'id');
+    }
+}
diff --git a/database/migrations/2022_04_15_211421_create_notifications_table.php b/database/migrations/2022_04_15_211421_create_notifications_table.php
new file mode 100644
index 00000000..d14cdc89
--- /dev/null
+++ b/database/migrations/2022_04_15_211421_create_notifications_table.php
@@ -0,0 +1,40 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+
+class CreateNotificationsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('notifications', function (Blueprint $table) {
+            $table->id();
+            $table->string('title');
+            $table->text('description');
+            $table->morphs('subject');
+            $table->morphs('target');
+            $table->morphs('causer');
+            $table->integer('status')->default(ApprovalStatus::APPROVED);
+            $table->softDeletes();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('notifications');
+    }
+}
diff --git a/resources/assets/sass/modules/_typography.scss b/resources/assets/sass/modules/_typography.scss
index 605b8e7c..aa4506a9 100644
--- a/resources/assets/sass/modules/_typography.scss
+++ b/resources/assets/sass/modules/_typography.scss
@@ -316,6 +316,12 @@ hr{
     background-color: $color-primary-lighter !important;
 }
 
+.bg-primary-lighter-hover {
+    &:hover {
+        background-color: $color-primary-lighter !important;
+    }
+}
+
 /* Complete 
 ------------------------------------
 */
diff --git a/resources/assets/vue/components/companies/elements/IdentificationVerificationComponent.vue b/resources/assets/vue/components/companies/elements/IdentificationVerificationComponent.vue
index 64fc74e2..838764a3 100644
--- a/resources/assets/vue/components/companies/elements/IdentificationVerificationComponent.vue
+++ b/resources/assets/vue/components/companies/elements/IdentificationVerificationComponent.vue
@@ -123,28 +123,7 @@
                                             </button>
                                         </div>
                                         <modal-component small type="rejectDocument">
-                                            <div class="row">
-                                                <div class="col text-center">
-                                                    <div class="row">
-                                                        <div class="col text-center">
-                                                            <div class="row m-b-20">
-                                                                <div class="col">
-                                                                    <h5 class="all-caps">Reject Document</h5>
-                                                                    <div class="fs-11">Are you sure you want to reject this customer's identification?</div>
-                                                                </div>
-                                                            </div>
-                                                            <div class="row">
-                                                                <div class="col p-r-5">
-                                                                    <div data-dismiss="modal" class="btn btn-sm btn-default bg-master-lighter btn-block b-rad-none">Cancel</div>
-                                                                </div>
-                                                                <div class="col p-l-5">
-                                                                    <div data-dismiss="modal" class="btn btn-sm btn-danger btn-block b-rad-none" @click="approveDocument('reject')">Reject</div>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            </div>
+                                            <reject-identification-verification-form-component :section="section" :data="item"></reject-identification-verification-form-component>
                                         </modal-component>
                                         <div class="col no-padding ml-auto">
                                             <button class="btn btn-md btn-block btn-success b-rad-none p-t-10 p-b-10 requestModal" data-type="approveDocument">
diff --git a/resources/assets/vue/components/companies/elements/RejectIdentificationVerificationFormComponent.vue b/resources/assets/vue/components/companies/elements/RejectIdentificationVerificationFormComponent.vue
new file mode 100644
index 00000000..d8473234
--- /dev/null
+++ b/resources/assets/vue/components/companies/elements/RejectIdentificationVerificationFormComponent.vue
@@ -0,0 +1,78 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <div class="row justify-content-center">
+                <div class="col-auto text-center">
+                    <div class="row">
+                        <div class="col text-center">
+                            <div class="row">
+                                <div class="col">
+                                    <h5 class="all-caps">Reject Document</h5>
+                                    <div class="fs-11">Are you sure you want to reject this customer's identification?</div>
+                                </div>
+                            </div>
+                            <div class="row text-left margin-auto m-t-10 m-b-10">
+                                <div class="col">
+                                    <span class="text-danger fs-9">{{ error }}</span>
+                                    <div class="fs-11">Reason: </div>
+                                    <div class="row">
+                                        <div class="col fs-11">
+                                            <div class="b-a padding-5 w-100 m-b-5 pointer b-grey muted" :class="{'b-primary': rejectRemark === rejectRemarkItem, 'text-primary': rejectRemark === rejectRemarkItem}" v-for="rejectRemarkItem in rejectRemarkArray" @click="chooseRejectRemark(rejectRemarkItem)">{{ rejectRemarkItem }}</div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col p-r-5">
+                                    <div data-dismiss="modal" class="btn btn-sm btn-default bg-master-lighter btn-block b-rad-none">Cancel</div>
+                                </div>
+                                <div class="col p-l-5">
+                                    <div class="btn btn-sm btn-danger btn-block b-rad-none" @click="approveDocument('reject')">Reject</div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    import modalFormHandler from '../../../general/mixins/modalFormHandler';
+    import { required } from "vuelidate/lib/validators";
+    export default {
+        data(){
+            return {
+                rejectRemark: null,
+                rejectRemarkArray: null,
+                documentType: this.data.document_type === 'IDENTITY_CARD' ? 'IC' : 'SSM',
+                error: null,
+            }
+        },
+        validations: {
+            rejectRemark: { required },
+        },
+        created(){
+            this.rejectRemarkArray = [
+                this.documentType + ' not clear',
+                this.documentType + ' name different with registration name',
+                'Wrong Document uploaded',
+                'Non-Malaysian ' + this.documentType + ' Uploaded', 
+                this.documentType + ' not Genuine'
+            ];
+        },
+        methods: {
+            approveDocument(status){
+                this.rejectRemark === null ? this.error = 'Please choose a remark.' : null;
+                this.isLoading = true;
+                this.submit(this.route('api.company.identification.approval', this.item.owner.id, this.item.id, status), 'put', 'identificationVerificationSection', true, true);
+            },
+            chooseRejectRemark(remark) {
+                this.rejectRemark = remark;
+            }
+        },
+        mixins: [componentHandler, modalFormHandler]
+
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/general/elements/NotificationSectionComponent.vue b/resources/assets/vue/components/general/elements/NotificationSectionComponent.vue
new file mode 100644
index 00000000..cce6f6c0
--- /dev/null
+++ b/resources/assets/vue/components/general/elements/NotificationSectionComponent.vue
@@ -0,0 +1,82 @@
+<template>
+    <div class="row h-100">
+        <div class="col">
+            <div class="btn-group h-100">
+                <div class="row align-items-center justify-content-center b-a b-thick h-100 pointer" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" @click="openNotification()" style="border-color: #ffffff3d">
+                    <div class="col p-r-10 p-l-10">
+                        <i class="fa fa-bell fs-12 text-primary-lighter"></i>
+                    </div>
+                </div>
+                <div class="b-rad-md dropdown-menu dropdown-menu-right p-l-15 p-b-15 p-r-15 p-t-0 container-fluid container-fixed-lg" style="height: 100vh; background: transparent !important; box-shadow: none!important;" @click="openNotification()">
+                    <div class="row shadow" style="width: 320px; position: absolute; top: 50px; right: -50px; background: white!important;">
+                        <div class="col">
+                            <div class="row">
+                                <div class="bg-master-lighter col p-l-10 p-l-10 p-t-10 bg-white text-center">
+                                    <p>Notification Center</p>
+                                </div>
+                            </div>
+                            <loading-component style="height: 200px; top: 0;" key="1" color="primary" v-show="isLoading"></loading-component>
+                            <div class="row" :class="{'h-100' : notificationsLength >= 5}" v-show="!isLoading" style="max-height: 400px; ">
+                                <div class="col page-container overflow-hidden">
+                                    <div class="row b-b b-grey bg-primary-lighter-hover pointer w-100 m-l-0 m-r-0" v-for="(notification, index) in notifications">
+                                        <div class="col-auto justify-content-center align-items-center d-flex hide">
+                                            <div>
+                                                <i class="fa fa-check-circle fs-20 p-l-5 text-success"></i>
+                                            </div>
+                                        </div>
+                                        <div class="col padding-10 p-l-15 p-r-15">
+                                            <p class="bold m-b-5 lh-16">{{ notification.title }}</p>
+                                            <p class="fs-9 m-b-0 lh-10">{{ notification.description }}</p>
+                                            <p class="fs-9 m-b-0 m-t-10 lh-10">{{ notification.long_ago }}</p>
+                                        </div>
+                                        <div class="col-auto justify-content-center align-items-center d-none" :class="{'d-flex' : index === 0}">
+                                            <div>
+                                                <i class="fa fa-circle fs-10 text-primary"></i>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row b-t muted">
+                                <div class="col p-l-10 p-l-10 p-t-10 m-b-10 bg-white text-center">
+                                    <a href="#">View All Notifications</a>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import ModalFormHandler from '../../../general/mixins/modalFormHandler';
+    export default {
+        data(){
+            return {
+                isLoading: true,
+                error: '',
+                notifications: null,
+                isClicked: false,
+                notificationsLength: 0,
+            }
+        },
+        methods: {
+            openNotification(){
+                this.isClicked === false ? this.fetchNotification() : '';
+                if (this.isClicked == false) {console.log('cose');}
+                this.isClicked = !this.isClicked;
+            },
+            fetchNotification(){
+                this.isLoading = true;
+                this.submit(route('notifications.list'), 'get', this.section, false, false)
+            },
+            successHandler(response){
+                this.isLoading = false;
+                this.notifications = response.payload.data;
+                this.notificationsLength = response.payload.data.length;
+            },
+        },
+        mixins: [ModalFormHandler]
+    }
+</script>
\ No newline at end of file
diff --git a/resources/views/partials/header.blade.php b/resources/views/partials/header.blade.php
index 0f9754ae..5bf0bcca 100644
--- a/resources/views/partials/header.blade.php
+++ b/resources/views/partials/header.blade.php
@@ -67,13 +67,6 @@
                     </div>
                     <div class="col-auto p-r-30">
                         <div class="row no-margin">
-                            <div class="col-auto m-r-5 hide">
-                                <div class="row align-items-center justify-content-center b-a b-thick h-100" style="border-color: #ffffff3d">
-                                    <div class="col p-r-10 p-l-10">
-                                        <i class="fa fa-bell fs-12 text-primary-lighter"></i>
-                                    </div>
-                                </div>
-                            </div>
                             <div class="col-auto m-r-20 d-none d-md-inline">
                                 <div class="row align-items-center p-t-5 p-b-5 b-a b-thick d-inline-flex h-100" style="border-color: #ffffff3d">
                                     <div class="col-auto">
@@ -86,6 +79,9 @@
                                     </div>
                                 </div>
                             </div>
+                            <div class="col-auto m-r-5">
+                                <notification-section-component section="section"></notification-section-component>
+                            </div>
                             <div class="col-auto m-r-5 d-none d-md-inline">
                                 <a href="{{route('settings')}}">
                                     <div class="row align-items-center justify-content-center b-a b-thick h-100" style="border-color: #ffffff3d">
diff --git a/routes/web.php b/routes/web.php
index 99e07dd3..52a308d0 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -184,4 +184,6 @@ Route::get('purchase/sensitive/', function(Request $request){
     }
 });
 
-Route::get('/transactions/supplier/{id}/mock_up', 'Transactions\DownloadMockUpWhiteFormPdfController@download')->name('whiteForm.mockUp');
\ No newline at end of file
+Route::get('/transactions/supplier/{id}/mock_up', 'Transactions\DownloadMockUpWhiteFormPdfController@download')->name('whiteForm.mockUp');
+
+Route::get('/notifications/list', 'Notifications\ListNotificationsController@list')->name('notifications.list');

From 779f7643fbdbefa1f1285b9c7b45993f3544e4f4 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Sun, 17 Apr 2022 00:49:33 +0800
Subject: [PATCH 21/54] update responsive notification ui

---
 .../elements/NotificationSectionComponent.vue | 60 ++++++++++---------
 resources/views/partials/header.blade.php     |  9 +--
 2 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/resources/assets/vue/components/general/elements/NotificationSectionComponent.vue b/resources/assets/vue/components/general/elements/NotificationSectionComponent.vue
index cce6f6c0..468ed7a7 100644
--- a/resources/assets/vue/components/general/elements/NotificationSectionComponent.vue
+++ b/resources/assets/vue/components/general/elements/NotificationSectionComponent.vue
@@ -2,44 +2,47 @@
     <div class="row h-100">
         <div class="col">
             <div class="btn-group h-100">
-                <div class="row align-items-center justify-content-center b-a b-thick h-100 pointer" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" @click="openNotification()" style="border-color: #ffffff3d">
+                <div class="d-none d-md-flex row align-items-center justify-content-center b-a b-thick h-100 pointer" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" @click="openNotification()" style="border-color: #ffffff3d">
                     <div class="col p-r-10 p-l-10">
                         <i class="fa fa-bell fs-12 text-primary-lighter"></i>
                     </div>
                 </div>
-                <div class="b-rad-md dropdown-menu dropdown-menu-right p-l-15 p-b-15 p-r-15 p-t-0 container-fluid container-fixed-lg" style="height: 100vh; background: transparent !important; box-shadow: none!important;" @click="openNotification()">
-                    <div class="row shadow" style="width: 320px; position: absolute; top: 50px; right: -50px; background: white!important;">
-                        <div class="col">
-                            <div class="row">
-                                <div class="bg-master-lighter col p-l-10 p-l-10 p-t-10 bg-white text-center">
-                                    <p>Notification Center</p>
+                <i class="fa fa-bell fs-18 text-primary-lighter d-md-none" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" @click="openNotification()"></i>
+                <div class="b-rad-md dropdown-menu dropdown-menu-right p-l-15 p-b-15 p-r-15 p-t-0" style="height: 100vh; width:100vw; background: transparent !important; box-shadow: none!important;" @click="openNotification()">
+                    <div class="container-fluid container-fixed-lg" style="position: relative; background: transparent; height: 100vh; left: 0;">
+                        <div class="row shadow" style="width: 320px; position: absolute; top: 50px; right: 30px; background: white!important;">
+                            <div class="col">
+                                <div class="row">
+                                    <div class="bg-master-lighter col p-l-10 p-l-10 p-t-10 bg-white text-center">
+                                        <p>Notification Center</p>
+                                    </div>
                                 </div>
-                            </div>
-                            <loading-component style="height: 200px; top: 0;" key="1" color="primary" v-show="isLoading"></loading-component>
-                            <div class="row" :class="{'h-100' : notificationsLength >= 5}" v-show="!isLoading" style="max-height: 400px; ">
-                                <div class="col page-container overflow-hidden">
-                                    <div class="row b-b b-grey bg-primary-lighter-hover pointer w-100 m-l-0 m-r-0" v-for="(notification, index) in notifications">
-                                        <div class="col-auto justify-content-center align-items-center d-flex hide">
-                                            <div>
-                                                <i class="fa fa-check-circle fs-20 p-l-5 text-success"></i>
+                                <loading-component style="height: 200px; top: 0;" key="1" color="primary" v-show="isLoading"></loading-component>
+                                <div class="row" :class="{'h-100' : notificationsLength >= 5}" v-show="!isLoading" style="max-height: 400px; ">
+                                    <div class="col page-container overflow-hidden">
+                                        <div class="row b-b b-grey bg-primary-lighter-hover pointer w-100 m-l-0 m-r-0" v-for="(notification, index) in notifications">
+                                            <div class="col-auto justify-content-center align-items-center d-flex hide">
+                                                <div>
+                                                    <i class="fa fa-check-circle fs-20 p-l-5 text-success"></i>
+                                                </div>
                                             </div>
-                                        </div>
-                                        <div class="col padding-10 p-l-15 p-r-15">
-                                            <p class="bold m-b-5 lh-16">{{ notification.title }}</p>
-                                            <p class="fs-9 m-b-0 lh-10">{{ notification.description }}</p>
-                                            <p class="fs-9 m-b-0 m-t-10 lh-10">{{ notification.long_ago }}</p>
-                                        </div>
-                                        <div class="col-auto justify-content-center align-items-center d-none" :class="{'d-flex' : index === 0}">
-                                            <div>
-                                                <i class="fa fa-circle fs-10 text-primary"></i>
+                                            <div class="col padding-10 p-l-15 p-r-15">
+                                                <p class="bold m-b-5 lh-16">{{ notification.title }}</p>
+                                                <p class="fs-9 m-b-0 lh-10">{{ notification.description }}</p>
+                                                <p class="fs-9 m-b-0 m-t-10 lh-10">{{ notification.long_ago }}</p>
+                                            </div>
+                                            <div class="col-auto justify-content-center align-items-center d-none" :class="{'d-flex' : index === 0}">
+                                                <div>
+                                                    <i class="fa fa-circle fs-10 text-primary"></i>
+                                                </div>
                                             </div>
                                         </div>
                                     </div>
                                 </div>
-                            </div>
-                            <div class="row b-t muted">
-                                <div class="col p-l-10 p-l-10 p-t-10 m-b-10 bg-white text-center">
-                                    <a href="#">View All Notifications</a>
+                                <div class="row b-t muted">
+                                    <div class="col p-l-10 p-l-10 p-t-10 m-b-10 bg-white text-center">
+                                        <a href="#">View All Notifications</a>
+                                    </div>
                                 </div>
                             </div>
                         </div>
@@ -64,7 +67,6 @@
         methods: {
             openNotification(){
                 this.isClicked === false ? this.fetchNotification() : '';
-                if (this.isClicked == false) {console.log('cose');}
                 this.isClicked = !this.isClicked;
             },
             fetchNotification(){
diff --git a/resources/views/partials/header.blade.php b/resources/views/partials/header.blade.php
index 5bf0bcca..e616e80c 100644
--- a/resources/views/partials/header.blade.php
+++ b/resources/views/partials/header.blade.php
@@ -65,7 +65,7 @@
                             </div>
                         </div>
                     </div>
-                    <div class="col-auto p-r-30">
+                    <div class="col-auto pr-1 pr-md-4">
                         <div class="row no-margin">
                             <div class="col-auto m-r-20 d-none d-md-inline">
                                 <div class="row align-items-center p-t-5 p-b-5 b-a b-thick d-inline-flex h-100" style="border-color: #ffffff3d">
@@ -94,11 +94,12 @@
                             <div class="col-12 col-md-auto text-right d-none d-md-inline">
                                 <log-out-form-component></log-out-form-component>
                             </div>
+
+                            <div class="col-auto d-md-none pointer" @click="$store.dispatch('toggleSection', {name: 'sideMenu', status: true})">
+                                <i class="fa fa-bars fs-18 text-white"></i>
+                            </div>
                         </div>
                     </div>
-                    <div class="col-auto d-md-none pointer" @click="$store.dispatch('toggleSection', {name: 'sideMenu', status: true})">
-                        <i class="fa fa-bars fs-18 text-white"></i>
-                    </div>
                 </div>
             </div>
         </div>

From 9631f70350ab5b804eeee4763a413d8c43924963 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Sun, 17 Apr 2022 09:51:45 +0800
Subject: [PATCH 22/54] update icon color when notification center is open

---
 .../general/elements/NotificationSectionComponent.vue       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/assets/vue/components/general/elements/NotificationSectionComponent.vue b/resources/assets/vue/components/general/elements/NotificationSectionComponent.vue
index 468ed7a7..ec7c56e2 100644
--- a/resources/assets/vue/components/general/elements/NotificationSectionComponent.vue
+++ b/resources/assets/vue/components/general/elements/NotificationSectionComponent.vue
@@ -2,12 +2,12 @@
     <div class="row h-100">
         <div class="col">
             <div class="btn-group h-100">
-                <div class="d-none d-md-flex row align-items-center justify-content-center b-a b-thick h-100 pointer" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" @click="openNotification()" style="border-color: #ffffff3d">
+                <div class="d-none d-md-flex row align-items-center justify-content-center b-a b-thick h-100 pointer" :class="{'b-info' : isClicked}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" @click="openNotification()" style="border-color: #ffffff3d">
                     <div class="col p-r-10 p-l-10">
-                        <i class="fa fa-bell fs-12 text-primary-lighter"></i>
+                        <i class="fa fa-bell fs-12" :class="{'text-info' : isClicked, 'text-primary-lighter' : !isClicked}"></i>
                     </div>
                 </div>
-                <i class="fa fa-bell fs-18 text-primary-lighter d-md-none" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" @click="openNotification()"></i>
+                <i class="fa fa-bell fs-18 d-md-none" :class="{'text-info' : isClicked, 'text-white' : !isClicked}" style="margin-right: -10px;" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" @click="openNotification()"></i>
                 <div class="b-rad-md dropdown-menu dropdown-menu-right p-l-15 p-b-15 p-r-15 p-t-0" style="height: 100vh; width:100vw; background: transparent !important; box-shadow: none!important;" @click="openNotification()">
                     <div class="container-fluid container-fixed-lg" style="position: relative; background: transparent; height: 100vh; left: 0;">
                         <div class="row shadow" style="width: 320px; position: absolute; top: 50px; right: 30px; background: white!important;">

From 2865f2ef2c192bb7b99c246989b32e06b93a7a29 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Sun, 17 Apr 2022 10:18:23 +0800
Subject: [PATCH 23/54] remove debug message in BookingConfirmationComponent

---
 .../bookings/elements/BookingConfirmationComponent.vue           | 1 -
 1 file changed, 1 deletion(-)

diff --git a/resources/assets/vue/components/bookings/elements/BookingConfirmationComponent.vue b/resources/assets/vue/components/bookings/elements/BookingConfirmationComponent.vue
index cf8b727e..f08ea597 100644
--- a/resources/assets/vue/components/bookings/elements/BookingConfirmationComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/BookingConfirmationComponent.vue
@@ -148,7 +148,6 @@
                                             </div>
                                             <div class="row" v-show="createBank">
                                                 <div class="col">
-                                                    {{ data.company.id }}
                                                     <bank-account-form-component v-if="data.serviceType.id !== 4" section="customerProfileSection" :disabled="formDisabled" :data="Object.keys(parameters.bankAccount).length ? parameters.bankAccount  : {account_no: account_no, company_id: data.company.id, country_id: 2, account_type: 2}" :company_id="data.company.id" :country_id="2" :type="2" v-on:createdBank="updateBank($event)" :serviceType="data.serviceType" :closable=false v-on:close="clearAccount()"></bank-account-form-component>
                                                     <phone-account-form-component v-if="data.serviceType.id === 4" section="customerProfileSection" :disabled="formDisabled" :data="Object.keys(parameters.bankAccount).length ? parameters.bankAccount  : {account_no: account_no, company_id: data.company.id, country_id: 2, account_type: 2}" :company_id="data.company.id" :country_id="2" :type="2" v-on:createdBank="updateBank($event)" :serviceType="data.serviceType" :closable=false v-on:close="clearAccount()"></phone-account-form-component>
                                                 </div>

From d0c054bb0f33364ef7b3060f13940a393d00a6cb Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Sun, 17 Apr 2022 20:24:03 +0800
Subject: [PATCH 24/54] create update UI for transaction group

---
 app/Http/Resources/TransactionResource.php    |   1 +
 .../elements/TransactionGroupComponent.vue    |  10 +-
 .../EditTransactionGroupFormComponent.vue     | 128 ++++++++++++++++++
 3 files changed, 137 insertions(+), 2 deletions(-)
 create mode 100644 resources/assets/vue/components/bookings/forms/EditTransactionGroupFormComponent.vue

diff --git a/app/Http/Resources/TransactionResource.php b/app/Http/Resources/TransactionResource.php
index 30ba223c..e35dcc36 100644
--- a/app/Http/Resources/TransactionResource.php
+++ b/app/Http/Resources/TransactionResource.php
@@ -30,6 +30,7 @@ class TransactionResource extends JsonResource
             'payment_method' => (float) $this->payment_method,
             '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,
             'currency' => new CurrencyResource($this->currency),
diff --git a/resources/assets/vue/components/bookings/elements/TransactionGroupComponent.vue b/resources/assets/vue/components/bookings/elements/TransactionGroupComponent.vue
index 515e56aa..bad56836 100644
--- a/resources/assets/vue/components/bookings/elements/TransactionGroupComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/TransactionGroupComponent.vue
@@ -34,10 +34,16 @@
                         <div class="col-auto">
                             <div class="row parentContainer">
                                 <div class="col p-l-0">
-                                    <button class="btn btn-xs btn-default bg-danger b-rad-none no-border requestModal" data-type="approveDocument">
+                                    <button class="btn btn-xs btn-default bg-warning b-rad-none no-border requestModal" data-type="editTransactionGroup">
+                                        <i class="fa fa-pencil text-white"></i>
+                                    </button>
+                                    <modal-component small type="editTransactionGroup">
+                                        <edit-transaction-group-form-component :section="section" :currency_rate="item.currency_rate" :supplier_id ="data.transactions[0].issuer_id"></edit-transaction-group-form-component>
+                                    </modal-component>
+                                    <button class="btn btn-xs btn-default bg-danger b-rad-none no-border requestModal" data-type="deleteTransactionGroup">
                                         <i class="fa fa-times text-white"></i>
                                     </button>
-                                    <modal-component small type="approveDocument">
+                                    <modal-component small type="deleteTransactionGroup">
                                         <div class="row">
                                             <div class="col text-center">
                                                 <div class="row">
diff --git a/resources/assets/vue/components/bookings/forms/EditTransactionGroupFormComponent.vue b/resources/assets/vue/components/bookings/forms/EditTransactionGroupFormComponent.vue
new file mode 100644
index 00000000..a2094db9
--- /dev/null
+++ b/resources/assets/vue/components/bookings/forms/EditTransactionGroupFormComponent.vue
@@ -0,0 +1,128 @@
+<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</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">
+                            <div class="bg-white bg-hover-complete h-100 btn btn-xs btn-outline-none btn-block text-left b-rad-none p-t-0 p-b-0 p-l-15 p-r-15" @click="selectedSupplier.status = !selectedSupplier.status">
+                                <div class="row h-100">
+                                    <div class="col fs-9 d-flex align-items-center flex-column" style="padding-top: 7px; padding-bottom: 4px;">
+                                        <label class="all-caps w-100 m-b-0" style="font-size: 10.5px; letter-spacing: 0.06em; text-transform: uppercase; font-weight: 500;">Supplier</label>
+                                        <span class="w-100 fs-14">{{selectedSupplier.name}}</span>
+                                    </div>
+                                    <div class="col-auto b-l b-grey">
+                                        <div class="row h-100 align-items-center">
+                                            <div class="col">
+                                                <i class="fa" :class="[{'fa-angle-down': !selectedSupplier.status}, {'fa-angle-up': selectedSupplier.status}]"></i>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="relative w-100">
+                                <div class="absolute w-100 b-l b-b b-r b-grey" :class="[{'hide': !selectedSupplier.status}]" style="top: 100%; right: 0; z-index: 1;">
+                                    <div class="row text-left no-margin bg-white">
+                                        <div class="col no-padding">
+                                            <div class="row no-margin" v-for="supplier in suppliers"  v-bind:key="supplier.id" :data="supplier">
+                                                <div class="col b-b b-grey p-t-10 p-b-10 pointer hover-t-10 p-b-10" :class="[{'bg-primary-light': selectedSupplier.id === supplier.id}, {'text-white': selectedSupplier.id === supplier.id}, {'hover-primary': selectedSupplier.id !== supplier.id}, {'pointer': selectedSupplier.id !== supplier.id}]" @click="updateSupplier(supplier)">
+                                                    <div class="row align-items-center justify-content-center">
+                                                        <div class="col">
+                                                            <div class="font-heading fs-10">{{supplier.name}}</div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <validation-wrapper-component :validator="$v.rate">
+                                <label class="all-caps">Purchase Rate</label>
+                                <input type="text" class="form-control" v-model.lazy="rate" v-money="exchangeRate">
+                            </validation-wrapper-component>
+                        </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="submit(route('api.company.team.create'), 'post', section, true, false)">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: {
+            currency_rate:{
+                type: Number,
+                required: true
+            },
+            supplier_id: {
+                type: Number,
+                required: true
+            }
+        },
+        data(){
+            return {
+                error: '',
+                suppliers: [],
+                selectedSupplier: {
+                    id: '',
+                    name: '',
+                    status: false
+                },
+                email: '',
+                rate: (Math.round((this.currency_rate + Number.EPSILON) * 10000) / 10000).toFixed(5)
+            }
+        },
+        created(){
+            this.submit(route('api.company.list')  + '?filters=' + JSON.stringify({'business_type': 3, 'status_in': [2, 0]}), 'get', 'pendingOrdersSection', false, false)
+        },
+        validations: {
+            email: { },
+            rate: { },
+        },
+        methods: {
+            successHandler(response){
+                var selected_supplier_id = this.supplier_id;
+                var selected_supplier = null; 
+                this.suppliers = response.payload.data;
+
+                this.suppliers.forEach(function(supplier) {
+                    supplier.id === selected_supplier_id ? selected_supplier = supplier : ''; 
+                });
+
+                this.selectedSupplier = selected_supplier;
+                this.selectedSupplier.status = false;
+            },
+            updateSupplier(supplier){
+                this.selectedSupplier = supplier;
+                this.selectedSupplier.status = false;
+            },
+        },
+        mixins: [ModalFormHandler]
+    }
+</script>

From 3cff7a671af00222c2b9aa0b4c7b3093a1a4d188 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Sun, 17 Apr 2022 20:34:02 +0800
Subject: [PATCH 25/54] update UI for transaction group

---
 .../bookings/forms/EditTransactionGroupFormComponent.vue   | 7 ++++++-
 resources/views/pages/payments.blade.php                   | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/resources/assets/vue/components/bookings/forms/EditTransactionGroupFormComponent.vue b/resources/assets/vue/components/bookings/forms/EditTransactionGroupFormComponent.vue
index a2094db9..17658ff5 100644
--- a/resources/assets/vue/components/bookings/forms/EditTransactionGroupFormComponent.vue
+++ b/resources/assets/vue/components/bookings/forms/EditTransactionGroupFormComponent.vue
@@ -62,7 +62,8 @@
                             <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="submit(route('api.company.team.create'), 'post', section, true, false)">Update</div>
+                            <!-- <div class="btn btn-sm btn-success btn-block b-rad-none" @click="submit(route('api.company.team.create'), 'post', section, true, false)">Update</div> -->
+                            <div class="btn btn-sm btn-success btn-block b-rad-none" @click="submitForm()">Update</div>
                         </div>
                     </div>
                 </div>
@@ -122,6 +123,10 @@
                 this.selectedSupplier = supplier;
                 this.selectedSupplier.status = false;
             },
+            submitForm() {
+                console.log(this.rate);
+                console.log(this.selectedSupplier);
+            }
         },
         mixins: [ModalFormHandler]
     }
diff --git a/resources/views/pages/payments.blade.php b/resources/views/pages/payments.blade.php
index 8dec0f8f..848d7587 100644
--- a/resources/views/pages/payments.blade.php
+++ b/resources/views/pages/payments.blade.php
@@ -48,7 +48,7 @@
                     </div>
                     <div class="row">
                         <div class="col">
-                            <list-component key="2" section="transactionGroupsListSection" :options="{'per_page': 2}" :endpoint="route('api.transaction.group.list')">
+                            <list-component key="2" section="transactionGroupsListSection" :options="{'per_page': 5}" :endpoint="route('api.transaction.group.list')">
                                 <template slot="list" slot-scope="{data}">
                                     <transaction-group-component section="transactionGroupsListSection" :data="data"></transaction-group-component>
                                 </template>

From b9760d87391260573378b9b8b11ccaaf24225263 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Sun, 17 Apr 2022 21:11:11 +0800
Subject: [PATCH 26/54] update notification ui, display no result found if no
 notification

---
 .../elements/NotificationSectionComponent.vue | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/resources/assets/vue/components/general/elements/NotificationSectionComponent.vue b/resources/assets/vue/components/general/elements/NotificationSectionComponent.vue
index ec7c56e2..a14a0d49 100644
--- a/resources/assets/vue/components/general/elements/NotificationSectionComponent.vue
+++ b/resources/assets/vue/components/general/elements/NotificationSectionComponent.vue
@@ -39,6 +39,27 @@
                                         </div>
                                     </div>
                                 </div>
+                                <div class="row text-center m-t-50 m-b-50" v-if="notificationsLength === 0" v-show="!isLoading">
+                                    <div class="col">
+                                        <div class="row align-items-center justify-content-center hint-text">
+                                            <div class="col-4 hint-text"><img src="/images/not-found-illustration.png" class="w-100 hint-text"/></div>
+                                        </div>
+                                        <div class="row text-center">
+                                            <div class="col">
+                                                <div class="row m-t-20">
+                                                    <div class="col">
+                                                        <p class="all-caps no-margin fs-11" style="letter-spacing: 2px;">Nothing To Show Here</p>
+                                                    </div>
+                                                </div>
+                                                <div class="row m-t-5 align-items-center justify-content-center hide">
+                                                    <div class="col">
+                                                        <small class="fs-9 muted all-caps font-lato" style="letter-spacing: 2px">There is no results found.</small>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
                                 <div class="row b-t muted">
                                     <div class="col p-l-10 p-l-10 p-t-10 m-b-10 bg-white text-center">
                                         <a href="#">View All Notifications</a>

From 5795c4b499befd8060935901a26434fc05662113 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Mon, 18 Apr 2022 00:02:19 +0800
Subject: [PATCH 27/54] create and intergrate api for update group transaction

---
 .../ControllersLogic/UpdateGroupLogic.php     | 154 ++++++++++++++++++
 .../Transactions/UpdateGroupController.php    |  20 +++
 .../elements/TransactionGroupComponent.vue    |   2 +-
 .../EditTransactionGroupFormComponent.vue     |  79 +++------
 routes/transaction.php                        |   7 +-
 5 files changed, 199 insertions(+), 63 deletions(-)
 create mode 100644 app/Classes/Modules/Transactions/ControllersLogic/UpdateGroupLogic.php
 create mode 100644 app/Http/Controllers/Transactions/UpdateGroupController.php

diff --git a/app/Classes/Modules/Transactions/ControllersLogic/UpdateGroupLogic.php b/app/Classes/Modules/Transactions/ControllersLogic/UpdateGroupLogic.php
new file mode 100644
index 00000000..0f91042c
--- /dev/null
+++ b/app/Classes/Modules/Transactions/ControllersLogic/UpdateGroupLogic.php
@@ -0,0 +1,154 @@
+<?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 ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use App\Models\SegmentConstant;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+use App\Classes\Modules\Companies\Services\FetchesCompany;
+use App\Classes\Modules\Transactions\Services\CalculatesTransactionServiceCharge;
+use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use App\Classes\Modules\Transactions\Services\UpdatesTransaction;
+use App\Classes\Modules\Transactions\Services\CalculatesTransactionTransferFee;
+
+
+class UpdateGroupLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Update Group Transaction',
+            'message' => 'You have successfully updated this Group Transaction'
+        ];
+    }
+
+    /** @var UpdatesTransactionStatus */
+    private $updatesTransactionStatus;
+
+    /** @var FetchesGroup */
+    private $fetchesGroup;
+
+    /** @var DeletesTransaction */
+    private $deletesTransaction;
+
+    /** @var FetchesCompany */
+    private $fetchesCompany;
+
+    /** @var CalculatesTransactionServiceCharge */
+    private $calculatesTransactionServiceCharge;
+
+    /** @var UpdatesTransaction */
+    private $updatesTransaction;
+
+    /** @var CalculatesTransactionTransferFee */
+    private $calculatesTransactionTransferFee;
+
+    public function __construct(
+        UpdatesTransactionStatus $updatesTransactionStatus, 
+        FetchesGroup $fetchesGroup,
+        DeletesTransaction $deletesTransaction,
+        FetchesCompany $fetchesCompany,
+        CalculatesTransactionServiceCharge $calculatesTransactionServiceCharge,
+        UpdatesTransaction $updatesTransaction,
+        CalculatesTransactionTransferFee $calculatesTransactionTransferFee
+    )
+    {
+        $this->updatesTransactionStatus = $updatesTransactionStatus;
+        $this->fetchesGroup = $fetchesGroup;
+        $this->deletesTransaction = $deletesTransaction;
+        $this->fetchesCompany = $fetchesCompany;
+        $this->calculatesTransactionServiceCharge = $calculatesTransactionServiceCharge;
+        $this->updatesTransaction = $updatesTransaction;
+        $this->calculatesTransactionTransferFee = $calculatesTransactionTransferFee;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    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')]);
+
+        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->amount, $constant);
+
+            $object = new TransactionObject(
+                $transferTransaction->bill_no, 
+                TransactionType::TRANSFER_FEE, 
+                1, 
+                $supplier->id,
+                $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;
+        $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();
+        
+        return $this->resourceResponse(new GroupResource($group));
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Transactions/UpdateGroupController.php b/app/Http/Controllers/Transactions/UpdateGroupController.php
new file mode 100644
index 00000000..db0b3a17
--- /dev/null
+++ b/app/Http/Controllers/Transactions/UpdateGroupController.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\UpdateGroupLogic;
+
+class UpdateGroupController
+{
+    /**
+     * @param Request $request
+     * @param DeleteGroupTransactionLogic $logic
+     * @return JsonResponse
+     */
+    public function update(Request $request, UpdateGroupLogic $logic) : JsonResponse {
+        return $logic->execute($request);
+    }
+}
diff --git a/resources/assets/vue/components/bookings/elements/TransactionGroupComponent.vue b/resources/assets/vue/components/bookings/elements/TransactionGroupComponent.vue
index bad56836..51562c23 100644
--- a/resources/assets/vue/components/bookings/elements/TransactionGroupComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/TransactionGroupComponent.vue
@@ -38,7 +38,7 @@
                                         <i class="fa fa-pencil text-white"></i>
                                     </button>
                                     <modal-component small type="editTransactionGroup">
-                                        <edit-transaction-group-form-component :section="section" :currency_rate="item.currency_rate" :supplier_id ="data.transactions[0].issuer_id"></edit-transaction-group-form-component>
+                                        <edit-transaction-group-form-component :section="section" :currency_rate="item.currency_rate" :supplier_id ="data.transactions[0].issuer_id" :id="item.id"></edit-transaction-group-form-component>
                                     </modal-component>
                                     <button class="btn btn-xs btn-default bg-danger b-rad-none no-border requestModal" data-type="deleteTransactionGroup">
                                         <i class="fa fa-times text-white"></i>
diff --git a/resources/assets/vue/components/bookings/forms/EditTransactionGroupFormComponent.vue b/resources/assets/vue/components/bookings/forms/EditTransactionGroupFormComponent.vue
index 17658ff5..299dc061 100644
--- a/resources/assets/vue/components/bookings/forms/EditTransactionGroupFormComponent.vue
+++ b/resources/assets/vue/components/bookings/forms/EditTransactionGroupFormComponent.vue
@@ -15,45 +15,17 @@
                     </div>
                     <div class="row m-b-10">
                         <div class="col">
-                            <div class="bg-white bg-hover-complete h-100 btn btn-xs btn-outline-none btn-block text-left b-rad-none p-t-0 p-b-0 p-l-15 p-r-15" @click="selectedSupplier.status = !selectedSupplier.status">
-                                <div class="row h-100">
-                                    <div class="col fs-9 d-flex align-items-center flex-column" style="padding-top: 7px; padding-bottom: 4px;">
-                                        <label class="all-caps w-100 m-b-0" style="font-size: 10.5px; letter-spacing: 0.06em; text-transform: uppercase; font-weight: 500;">Supplier</label>
-                                        <span class="w-100 fs-14">{{selectedSupplier.name}}</span>
-                                    </div>
-                                    <div class="col-auto b-l b-grey">
-                                        <div class="row h-100 align-items-center">
-                                            <div class="col">
-                                                <i class="fa" :class="[{'fa-angle-down': !selectedSupplier.status}, {'fa-angle-up': selectedSupplier.status}]"></i>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="relative w-100">
-                                <div class="absolute w-100 b-l b-b b-r b-grey" :class="[{'hide': !selectedSupplier.status}]" style="top: 100%; right: 0; z-index: 1;">
-                                    <div class="row text-left no-margin bg-white">
-                                        <div class="col no-padding">
-                                            <div class="row no-margin" v-for="supplier in suppliers"  v-bind:key="supplier.id" :data="supplier">
-                                                <div class="col b-b b-grey p-t-10 p-b-10 pointer hover-t-10 p-b-10" :class="[{'bg-primary-light': selectedSupplier.id === supplier.id}, {'text-white': selectedSupplier.id === supplier.id}, {'hover-primary': selectedSupplier.id !== supplier.id}, {'pointer': selectedSupplier.id !== supplier.id}]" @click="updateSupplier(supplier)">
-                                                    <div class="row align-items-center justify-content-center">
-                                                        <div class="col">
-                                                            <div class="font-heading fs-10">{{supplier.name}}</div>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
+                            <validation-wrapper-component selectable :validator="$v.parameters.supplier_id">
+                                <label>Supplier</label>
+                                <selectable-component :endpoint="route('api.company.list') + '?filters=' + JSON.stringify({'business_type': 3, 'status_in': [2, 0]})" section="supplierListSection" valueColumn="id" :labelColumn="['name']" v-model="parameters.supplier_id"></selectable-component>
+                            </validation-wrapper-component>
                         </div>
                     </div>
                     <div class="row m-b-10">
                         <div class="col">
-                            <validation-wrapper-component :validator="$v.rate">
+                            <validation-wrapper-component :validator="$v.parameters.rate">
                                 <label class="all-caps">Purchase Rate</label>
-                                <input type="text" class="form-control" v-model.lazy="rate" v-money="exchangeRate">
+                                <input type="text" class="form-control" v-model.lazy="parameters.rate" v-money="exchangeRate">
                             </validation-wrapper-component>
                         </div>
                     </div>
@@ -62,7 +34,6 @@
                             <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="submit(route('api.company.team.create'), 'post', section, true, false)">Update</div> -->
                             <div class="btn btn-sm btn-success btn-block b-rad-none" @click="submitForm()">Update</div>
                         </div>
                     </div>
@@ -84,6 +55,10 @@
             supplier_id: {
                 type: Number,
                 required: true
+            },
+            id: {
+                type: Number,
+                required: true
             }
         },
         data(){
@@ -95,37 +70,21 @@
                     name: '',
                     status: false
                 },
-                email: '',
-                rate: (Math.round((this.currency_rate + Number.EPSILON) * 10000) / 10000).toFixed(5)
+                parameters: {
+                    supplier_id: this.supplier_id,
+                    rate: (Math.round((this.currency_rate + Number.EPSILON) * 10000) / 10000).toFixed(5)
+                },
             }
         },
-        created(){
-            this.submit(route('api.company.list')  + '?filters=' + JSON.stringify({'business_type': 3, 'status_in': [2, 0]}), 'get', 'pendingOrdersSection', false, false)
-        },
         validations: {
-            email: { },
-            rate: { },
+            parameters: {
+                supplier_id: { },
+                rate: { },
+            },
         },
         methods: {
-            successHandler(response){
-                var selected_supplier_id = this.supplier_id;
-                var selected_supplier = null; 
-                this.suppliers = response.payload.data;
-
-                this.suppliers.forEach(function(supplier) {
-                    supplier.id === selected_supplier_id ? selected_supplier = supplier : ''; 
-                });
-
-                this.selectedSupplier = selected_supplier;
-                this.selectedSupplier.status = false;
-            },
-            updateSupplier(supplier){
-                this.selectedSupplier = supplier;
-                this.selectedSupplier.status = false;
-            },
             submitForm() {
-                console.log(this.rate);
-                console.log(this.selectedSupplier);
+                this.submit(route('api.transaction.group.update', this.id), 'put', this.section, true, true);
             }
         },
         mixins: [ModalFormHandler]
diff --git a/routes/transaction.php b/routes/transaction.php
index cbff706d..9a820c11 100644
--- a/routes/transaction.php
+++ b/routes/transaction.php
@@ -23,6 +23,9 @@ Route::group(['prefix' => 'transactions', 'namespace' => 'Transactions', 'as' =>
 
     Route::get('/bank/{id}/account/balance', 'FetchBankAccountBalanceController@fetch')->name('bank.account.balance');
 
-    Route::get('/groups/list', 'ListGroupsController@list')->name('group.list');
-    Route::delete('/groups/{id}/delete', 'DeleteGroupController@delete')->name('group.delete');
+    Route::group(['prefix' => 'groups', 'as' => 'group.'], function () {
+        Route::get('/list', 'ListGroupsController@list')->name('list');
+        Route::delete('/{id}/delete', 'DeleteGroupController@delete')->name('delete');
+        Route::put('/{id}/update', 'UpdateGroupController@update')->name('update');
+    });
 });
\ No newline at end of file

From 6836e42ce40474201532f6ed2428b99dc2b013db Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Mon, 18 Apr 2022 00:16:10 +0800
Subject: [PATCH 28/54] tidy up update group controller logic

---
 .../ControllersLogic/UpdateGroupLogic.php     | 29 +++++--------------
 1 file changed, 8 insertions(+), 21 deletions(-)

diff --git a/app/Classes/Modules/Transactions/ControllersLogic/UpdateGroupLogic.php b/app/Classes/Modules/Transactions/ControllersLogic/UpdateGroupLogic.php
index 0f91042c..e353f06a 100644
--- a/app/Classes/Modules/Transactions/ControllersLogic/UpdateGroupLogic.php
+++ b/app/Classes/Modules/Transactions/ControllersLogic/UpdateGroupLogic.php
@@ -3,24 +3,21 @@
 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 ErrorException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
 use App\Models\SegmentConstant;
-use App\Classes\ValueObjects\Constants\SegmentConstants;
 use App\Classes\Modules\Companies\Services\FetchesCompany;
 use App\Classes\Modules\Transactions\Services\CalculatesTransactionServiceCharge;
 use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Classes\ValueObjects\Constants\PaymentMethodType;
+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;
 
 class UpdateGroupLogic extends AbstractControllerLogic
 {
@@ -35,15 +32,9 @@ class UpdateGroupLogic extends AbstractControllerLogic
         ];
     }
 
-    /** @var UpdatesTransactionStatus */
-    private $updatesTransactionStatus;
-
     /** @var FetchesGroup */
     private $fetchesGroup;
 
-    /** @var DeletesTransaction */
-    private $deletesTransaction;
-
     /** @var FetchesCompany */
     private $fetchesCompany;
 
@@ -57,18 +48,14 @@ class UpdateGroupLogic extends AbstractControllerLogic
     private $calculatesTransactionTransferFee;
 
     public function __construct(
-        UpdatesTransactionStatus $updatesTransactionStatus, 
         FetchesGroup $fetchesGroup,
-        DeletesTransaction $deletesTransaction,
         FetchesCompany $fetchesCompany,
         CalculatesTransactionServiceCharge $calculatesTransactionServiceCharge,
         UpdatesTransaction $updatesTransaction,
         CalculatesTransactionTransferFee $calculatesTransactionTransferFee
     )
     {
-        $this->updatesTransactionStatus = $updatesTransactionStatus;
         $this->fetchesGroup = $fetchesGroup;
-        $this->deletesTransaction = $deletesTransaction;
         $this->fetchesCompany = $fetchesCompany;
         $this->calculatesTransactionServiceCharge = $calculatesTransactionServiceCharge;
         $this->updatesTransaction = $updatesTransaction;

From cd80b75db61c4594870fd9e1763e9d72909bf9d6 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Tue, 19 Apr 2022 22:00:13 +0800
Subject: [PATCH 29/54] add marking in ExportsTransactions

---
 .../Exports/Services/ExportsTransactions.php   | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/app/Classes/Modules/Exports/Services/ExportsTransactions.php b/app/Classes/Modules/Exports/Services/ExportsTransactions.php
index f9bbecaf..9e328cca 100644
--- a/app/Classes/Modules/Exports/Services/ExportsTransactions.php
+++ b/app/Classes/Modules/Exports/Services/ExportsTransactions.php
@@ -11,8 +11,9 @@ use Maatwebsite\Excel\Concerns\Exportable;
 use Maatwebsite\Excel\Concerns\FromQuery;
 use Maatwebsite\Excel\Concerns\WithHeadingRow;
 use Maatwebsite\Excel\Concerns\WithMapping;
+use Maatwebsite\Excel\Concerns\ShouldAutoSize;
 
-class ExportsTransactions implements FromQuery, WithHeadingRow, WithMapping
+class ExportsTransactions implements FromQuery, WithHeadingRow, WithMapping, ShouldAutoSize
 {
 
     use Exportable;
@@ -58,6 +59,20 @@ class ExportsTransactions implements FromQuery, WithHeadingRow, WithMapping
             6 => 'EXPIRED'
         ];
 
+        switch ($transaction->owner_type) {
+            case "App\Models\Booking":
+                $marking = $transaction->booking->company->reference;
+                break;
+            case "App\Models\Transaction":
+                $marking = $transaction->transactions()->first()->booking->company->reference;
+                break;
+            case "App\Models\Wallet":
+                $marking = $transaction->owner->owner->reference;
+                break;
+            default:
+                $marking = '';
+          }
+
         return [
             $transaction->bill_no,
             $transaction->owner_id,
@@ -75,6 +90,7 @@ class ExportsTransactions implements FromQuery, WithHeadingRow, WithMapping
             $transactionStatus[$transaction->status],
             \PhpOffice\PhpSpreadsheet\Shared\Date::dateTimeToExcel($transaction->created_at),
             \PhpOffice\PhpSpreadsheet\Shared\Date::dateTimeToExcel($transaction->updated_at),
+            $marking
         ];
     }
 }
\ No newline at end of file

From f18d57949581af9dc4fb0de08896939c3c780bf8 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Wed, 20 Apr 2022 23:43:55 +0800
Subject: [PATCH 30/54] solve bug on ApproveIdentificationDocumentLogic

---
 .../ControllersLogic/ApproveIdentificationDocumentLogic.php   | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/Classes/Modules/Companies/ControllersLogic/ApproveIdentificationDocumentLogic.php b/app/Classes/Modules/Companies/ControllersLogic/ApproveIdentificationDocumentLogic.php
index 4374cd73..cf894bfd 100644
--- a/app/Classes/Modules/Companies/ControllersLogic/ApproveIdentificationDocumentLogic.php
+++ b/app/Classes/Modules/Companies/ControllersLogic/ApproveIdentificationDocumentLogic.php
@@ -102,10 +102,6 @@ class ApproveIdentificationDocumentLogic extends AbstractControllerLogic
 
         $this->createNotificationProcessor->execute($object);
 
-        if($status === 'approve'){
-            $orders = $this->updatesOrdersStatus->execute($document->owner, ApprovalStatus::APPROVED);
-        }
-
         return $this->resourceResponse(new DocumentResource($document));
 
     }

From 63ad9abc3c4b852691806fa8b0249ff510412cc8 Mon Sep 17 00:00:00 2001
From: ahmedsophyudden <saufiyuddin@gmail.com>
Date: Sat, 23 Apr 2022 06:52:23 +0800
Subject: [PATCH 31/54] Update supplier's status (front-end & back-end)

---
 .../UpdateCompanyStatusLogic.php              | 62 +++++++++++++++++++
 .../UpdateCompanyStatusController.php         | 20 ++++++
 .../companies/elements/SupplierComponent.vue  | 12 ++++
 .../forms/ActivateSupplierFormComponent.vue   | 45 ++++++++++++++
 .../forms/SuspendSupplierFormComponent.vue    | 45 ++++++++++++++
 routes/company.php                            |  1 +
 6 files changed, 185 insertions(+)
 create mode 100644 app/Classes/Modules/Companies/ControllersLogic/UpdateCompanyStatusLogic.php
 create mode 100644 app/Http/Controllers/Companies/UpdateCompanyStatusController.php
 create mode 100644 resources/assets/vue/components/companies/forms/ActivateSupplierFormComponent.vue
 create mode 100644 resources/assets/vue/components/companies/forms/SuspendSupplierFormComponent.vue

diff --git a/app/Classes/Modules/Companies/ControllersLogic/UpdateCompanyStatusLogic.php b/app/Classes/Modules/Companies/ControllersLogic/UpdateCompanyStatusLogic.php
new file mode 100644
index 00000000..92278bef
--- /dev/null
+++ b/app/Classes/Modules/Companies/ControllersLogic/UpdateCompanyStatusLogic.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace App\Classes\Modules\Companies\ControllersLogic;
+
+use App\Http\Resources\CompanyResource;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Companies\Services\FetchesCompany;
+use App\Classes\Modules\Companies\Services\UpdatesCompanyStatus;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateCompanyStatusLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Update Company Account Status',
+            'message' => 'You have successfully updated the Company Account Status'
+        ];
+    }
+
+    /** @var FetchesCompany */
+    private $fetchesCompany;
+
+    /** @var UpdatesCompanyStatus */
+    private $updatesCompanyStatus;
+
+    /**
+     * UpdateCompanyStatusLogic constructor.
+     * @param FetchesCompany $fetchesCompany
+     * @param UpdatesCompanyStatus $updatesCompanyStatus
+     */
+    public function __construct(
+        FetchesCompany $fetchesCompany,
+        UpdatesCompanyStatus $updatesCompanyStatus
+    )
+    {
+        $this->fetchesCompany = $fetchesCompany;
+        $this->updatesCompanyStatus = $updatesCompanyStatus;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $company = $this->fetchesCompany->execute(['id' => $request->route('id')]);
+
+        $company_query = $this->updatesCompanyStatus->execute($company, $request->input('status'));
+
+        return $this->resourceResponse(new CompanyResource($company_query));
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Companies/UpdateCompanyStatusController.php b/app/Http/Controllers/Companies/UpdateCompanyStatusController.php
new file mode 100644
index 00000000..43b3ba3c
--- /dev/null
+++ b/app/Http/Controllers/Companies/UpdateCompanyStatusController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Companies;
+
+use App\Classes\Modules\Companies\ControllersLogic\UpdateCompanyStatusLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateCompanyStatusController
+{
+    /**
+     * @param Request $request
+     * @param UpdateCompanyStatusLogic $logic
+     * @return JsonResponse
+     */
+    public function update(Request $request, UpdateCompanyStatusLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
\ No newline at end of file
diff --git a/resources/assets/vue/components/companies/elements/SupplierComponent.vue b/resources/assets/vue/components/companies/elements/SupplierComponent.vue
index f6944c4c..a2e45bd7 100644
--- a/resources/assets/vue/components/companies/elements/SupplierComponent.vue
+++ b/resources/assets/vue/components/companies/elements/SupplierComponent.vue
@@ -61,6 +61,18 @@
                 <div class="col-auto">
                     <div class="row">
                         <div class="col">
+                            <button class="btn btn-xs btn-outline-primary b-rad-none m-r-5 requestModal" data-type="activateSupplierModal" v-if="item.status === 5">
+                                Activate
+                            </button>
+                            <modal-component type="activateSupplierModal">
+                                <activate-supplier-form-component :data="item" section="suppliersSection"></activate-supplier-form-component>
+                            </modal-component>
+                            <button class="btn btn-xs btn-outline-danger b-rad-none m-r-5 requestModal" data-type="suspendSupplierModal" v-if="item.status !== 5">
+                                Suspend
+                            </button>
+                            <modal-component type="suspendSupplierModal">
+                                <suspend-supplier-form-component :data="item" section="suppliersSection"></suspend-supplier-form-component>
+                            </modal-component>
                             <button class="btn btn-xs btn-outline-warning b-rad-none m-r-5 requestModal" data-type="editServiceCharge">
                                 <i class="fa fa-pencil"></i>
                             </button>
diff --git a/resources/assets/vue/components/companies/forms/ActivateSupplierFormComponent.vue b/resources/assets/vue/components/companies/forms/ActivateSupplierFormComponent.vue
new file mode 100644
index 00000000..2a26136d
--- /dev/null
+++ b/resources/assets/vue/components/companies/forms/ActivateSupplierFormComponent.vue
@@ -0,0 +1,45 @@
+<template>
+    <div class="row text-center">
+        <div class="col">
+            <loading-component style="height: 300px; top: 0;" key="1" color="success" v-show="isLoading" ></loading-component>
+            <div class="row justify-content-center" v-show="!isLoading">
+                <div class="col">
+                    <div class="row m-b-20">
+                        <div class="col">
+                            <h3 class="all-caps">Are you Sure?</h3>
+                            <div class="fs-11">Are you sure you want to activate this Supplier?</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col p-r-5">
+                            <div class="btn btn-sm btn-success btn-block b-rad-none" data-dismiss="modal">Cancel</div>
+                        </div>
+                        <div class="col p-l-5">
+                            <div class="btn btn-sm btn-danger btn-block b-rad-none" @click="submitForm()">Confirm</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    import ModalFormHandler from '../../../general/mixins/modalFormHandler';
+
+    export default {
+        props: {
+            section: {
+                default: 'suppliersSection'
+            }
+        },
+        methods: {
+            submitForm() {
+                this.parameters.status = 1;
+                this.submit(this.route('api.company.status.update', this.data.id), 'put', this.section, true, false);
+            }
+        },
+        mixins: [componentHandler, ModalFormHandler]
+
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/companies/forms/SuspendSupplierFormComponent.vue b/resources/assets/vue/components/companies/forms/SuspendSupplierFormComponent.vue
new file mode 100644
index 00000000..4e18ed51
--- /dev/null
+++ b/resources/assets/vue/components/companies/forms/SuspendSupplierFormComponent.vue
@@ -0,0 +1,45 @@
+<template>
+    <div class="row text-center">
+        <div class="col">
+            <loading-component style="height: 300px; top: 0;" key="1" color="success" v-show="isLoading" ></loading-component>
+            <div class="row justify-content-center" v-show="!isLoading">
+                <div class="col">
+                    <div class="row m-b-20">
+                        <div class="col">
+                            <h3 class="all-caps">Are you Sure?</h3>
+                            <div class="fs-11">Are you sure you want to suspend this Supplier?</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col p-r-5">
+                            <div class="btn btn-sm btn-success btn-block b-rad-none" data-dismiss="modal">Cancel</div>
+                        </div>
+                        <div class="col p-l-5">
+                            <div class="btn btn-sm btn-danger btn-block b-rad-none" @click="submitForm()">Confirm</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    import ModalFormHandler from '../../../general/mixins/modalFormHandler';
+
+    export default {
+        props: {
+            section: {
+                default: 'suppliersSection'
+            }
+        },
+        methods: {
+            submitForm() {
+                this.parameters.status = 5;
+                this.submit(this.route('api.company.status.update', this.data.id), 'put', this.section, true, false);
+            }
+        },
+        mixins: [componentHandler, ModalFormHandler]
+
+    }
+</script>
\ No newline at end of file
diff --git a/routes/company.php b/routes/company.php
index a0ca19a5..cb1b059c 100644
--- a/routes/company.php
+++ b/routes/company.php
@@ -7,6 +7,7 @@ Route::group(['prefix' => 'company', 'as' => 'company.', 'namespace' => 'Compani
     Route::get('/list', 'ListCompaniesController@list')->name('list');
     Route::post('/create', 'CreateCompanyController@create')->name('create');
     Route::put('/update/{id}', 'UpdateCompanyController@update')->name('update');
+    Route::put('update/{id}/status', 'UpdateCompanyStatusController@update')->name('status.update');
     Route::delete('/delete/{id}', 'DeleteCompanyController@destroy')->name('delete');
 
     Route::put('/update/debtor/{id}', 'UpdateCompanyDebtorController@update')->name('delete');

From d81c8b17bd6c46f969348f3caf7e9a89d6f8597f Mon Sep 17 00:00:00 2001
From: Fairuz <fairuz.tester@gmail.com>
Date: Sat, 23 Apr 2022 16:14:55 +0800
Subject: [PATCH 32/54] Laravel dusk implementation for testing

---
  phpunit.dusk.xml                             |  4 ++
 composer.json                                 |  3 +-
 .../accounts/forms/LoginFormComponent.vue     |  8 +--
 tests/Browser/CreateBooking.php               | 23 ++++++++
 tests/Browser/ExampleTest.php                 | 28 +++++++++
 tests/Browser/Pages/HomePage.php              | 41 +++++++++++++
 tests/Browser/Pages/Page.php                  | 20 +++++++
 tests/Browser/console/.gitignore              |  2 +
 tests/Browser/screenshots/.gitignore          |  2 +
 tests/Browser/source/.gitignore               |  2 +
 tests/DuskTestCase.php                        | 59 +++++++++++++++++++
 11 files changed, 187 insertions(+), 5 deletions(-)
 create mode 100644  phpunit.dusk.xml
 create mode 100644 tests/Browser/CreateBooking.php
 create mode 100644 tests/Browser/ExampleTest.php
 create mode 100644 tests/Browser/Pages/HomePage.php
 create mode 100644 tests/Browser/Pages/Page.php
 create mode 100644 tests/Browser/console/.gitignore
 create mode 100644 tests/Browser/screenshots/.gitignore
 create mode 100644 tests/Browser/source/.gitignore
 create mode 100644 tests/DuskTestCase.php

diff --git a/ phpunit.dusk.xml b/ phpunit.dusk.xml
new file mode 100644
index 00000000..40848a84
--- /dev/null
+++ b/ phpunit.dusk.xml	
@@ -0,0 +1,4 @@
+<php>
+    <ini name="display_errors" value="On" />
+    <ini name="display_startup_errors" value="On" />
+</php>
diff --git a/composer.json b/composer.json
index 32f52d83..32305073 100644
--- a/composer.json
+++ b/composer.json
@@ -10,7 +10,7 @@
     "require": {
         "php": "^7.2.5",
         "ext-fileinfo": "*",
-        "ext-json": "^1.6",
+        "ext-json": "*",
         "ext-zip": "*",
         "barryvdh/laravel-dompdf": "^0.9.0",
         "carlos-meneses/laravel-mpdf": "^2.1",
@@ -31,6 +31,7 @@
     "require-dev": {
         "facade/ignition": "^2.0",
         "fzaninotto/faker": "^1.9.1",
+        "laravel/dusk": "^6.23",
         "mockery/mockery": "^1.3.1",
         "nunomaduro/collision": "^4.1",
         "phpunit/phpunit": "^8.5"
diff --git a/resources/assets/vue/components/accounts/forms/LoginFormComponent.vue b/resources/assets/vue/components/accounts/forms/LoginFormComponent.vue
index ed097c68..5ddfdadb 100644
--- a/resources/assets/vue/components/accounts/forms/LoginFormComponent.vue
+++ b/resources/assets/vue/components/accounts/forms/LoginFormComponent.vue
@@ -7,13 +7,13 @@
                     <validation-wrapper-component class="m-b-15" :validator="$v.parameters.email">
                         <label class="text-primary">Email Address</label>
                         <div class="controls">
-                            <input type="text" class="form-control fs-12" v-model.trim="parameters.email">
+                            <input id="email" name="email" type="text" class="form-control fs-12" v-model.trim="parameters.email">
                         </div>
                     </validation-wrapper-component>
                     <validation-wrapper-component :validator="$v.parameters.password">
                         <label class="text-primary">Password</label>
                         <div class="controls">
-                            <input type="password" class="form-control fs-12" v-model="parameters.password">
+                            <input id="password" name="password" type="password" class="form-control fs-12" v-model="parameters.password">
                         </div>
                     </validation-wrapper-component>
                     <div class="row m-t-15 align-items-center justify-content-center">
@@ -21,7 +21,7 @@
                             <p class="muted fs-11 font-arial m-b-0 pointer" @click="$store.dispatch('toggleSection', {name: 'forgetPassword', status: true})">Forgot password?</p>
                         </div>
                         <div class="col text-right">
-                            <div class="btn btn-sm p-l-30 p-r-30 btn-primary bold v-align-middle b-rad-none all-caps" @click="submitForm">Sign In</div>
+                            <div class="btn btn-sm p-l-30 p-r-30 btn-primary bold v-align-middle b-rad-none all-caps" @click="submitForm" id="sign-in">Sign In</div>
                         </div>
                     </div>
                 </div>
@@ -55,4 +55,4 @@
         mixins: [loginFormValidation]
     }
 
-</script>
\ No newline at end of file
+</script>
diff --git a/tests/Browser/CreateBooking.php b/tests/Browser/CreateBooking.php
new file mode 100644
index 00000000..e7391624
--- /dev/null
+++ b/tests/Browser/CreateBooking.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Tests\Browser;
+
+use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Laravel\Dusk\Browser;
+use Tests\DuskTestCase;
+
+class CreateBooking extends DuskTestCase
+{
+    /**
+     * A Dusk test example.
+     *
+     * @test
+     */
+    public function testCreateBooking()
+    {
+        $this->browse(function (Browser $browser) {
+            $browser->visit('/')
+                    ->assertSee('Laravel');
+        });
+    }
+}
diff --git a/tests/Browser/ExampleTest.php b/tests/Browser/ExampleTest.php
new file mode 100644
index 00000000..37f076bd
--- /dev/null
+++ b/tests/Browser/ExampleTest.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace Tests\Browser;
+
+use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Laravel\Dusk\Browser;
+use Tests\DuskTestCase;
+
+class ExampleTest extends DuskTestCase
+{
+    /**
+     * A basic browser test example.
+     *
+     * @return void
+     */
+    public function testBasicExample()
+    {
+        $this->browse(function (Browser $browser) {
+            $browser->visit('http://localhost:86')
+                    ->pause(500)
+                    ->type('email', 'junkit.mah@bioloop.com.my')
+                    ->type('password', '123456abcabc')
+                    ->click('#sign-in')
+                    ->pause(5000)
+                    ->assertPathIs('/dashboard');
+        });
+    }
+}
diff --git a/tests/Browser/Pages/HomePage.php b/tests/Browser/Pages/HomePage.php
new file mode 100644
index 00000000..26bf174f
--- /dev/null
+++ b/tests/Browser/Pages/HomePage.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace Tests\Browser\Pages;
+
+use Laravel\Dusk\Browser;
+
+class HomePage extends Page
+{
+    /**
+     * Get the URL for the page.
+     *
+     * @return string
+     */
+    public function url()
+    {
+        return '/';
+    }
+
+    /**
+     * Assert that the browser is on the page.
+     *
+     * @param  \Laravel\Dusk\Browser  $browser
+     * @return void
+     */
+    public function assert(Browser $browser)
+    {
+        //
+    }
+
+    /**
+     * Get the element shortcuts for the page.
+     *
+     * @return array
+     */
+    public function elements()
+    {
+        return [
+            '@element' => '#selector',
+        ];
+    }
+}
diff --git a/tests/Browser/Pages/Page.php b/tests/Browser/Pages/Page.php
new file mode 100644
index 00000000..f8d76222
--- /dev/null
+++ b/tests/Browser/Pages/Page.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Tests\Browser\Pages;
+
+use Laravel\Dusk\Page as BasePage;
+
+abstract class Page extends BasePage
+{
+    /**
+     * Get the global element shortcuts for the site.
+     *
+     * @return array
+     */
+    public static function siteElements()
+    {
+        return [
+            '@element' => '#selector',
+        ];
+    }
+}
diff --git a/tests/Browser/console/.gitignore b/tests/Browser/console/.gitignore
new file mode 100644
index 00000000..d6b7ef32
--- /dev/null
+++ b/tests/Browser/console/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
diff --git a/tests/Browser/screenshots/.gitignore b/tests/Browser/screenshots/.gitignore
new file mode 100644
index 00000000..d6b7ef32
--- /dev/null
+++ b/tests/Browser/screenshots/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
diff --git a/tests/Browser/source/.gitignore b/tests/Browser/source/.gitignore
new file mode 100644
index 00000000..d6b7ef32
--- /dev/null
+++ b/tests/Browser/source/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
diff --git a/tests/DuskTestCase.php b/tests/DuskTestCase.php
new file mode 100644
index 00000000..2aabaad9
--- /dev/null
+++ b/tests/DuskTestCase.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace Tests;
+
+use Facebook\WebDriver\Chrome\ChromeOptions;
+use Facebook\WebDriver\Remote\DesiredCapabilities;
+use Facebook\WebDriver\Remote\RemoteWebDriver;
+use Laravel\Dusk\TestCase as BaseTestCase;
+
+abstract class DuskTestCase extends BaseTestCase
+{
+    use CreatesApplication;
+
+    /**
+     * Prepare for Dusk test execution.
+     *
+     * @beforeClass
+     * @return void
+     */
+    public static function prepare()
+    {
+        if (! static::runningInSail()) {
+            static::startChromeDriver();
+        }
+    }
+
+    /**
+     * Create the RemoteWebDriver instance.
+     *
+     * @return \Facebook\WebDriver\Remote\RemoteWebDriver
+     */
+    protected function driver()
+    {
+        $options = (new ChromeOptions)->addArguments([
+            '--no-sandbox'
+        ]);
+
+
+        return RemoteWebDriver::create(
+            //'http://localhost:86',
+            'http://localhost:9515',
+            DesiredCapabilities::chrome()->setCapability(
+                ChromeOptions::CAPABILITY, $options
+            )
+        );
+    }
+
+    /**
+     * Determine whether the Dusk command has disabled headless mode.
+     *
+     * @return bool
+     */
+    protected function hasHeadlessDisabled()
+    {
+        return true;
+                //isset($_SERVER['DUSK_HEADLESS_DISABLED']) ||
+                //isset($_ENV['DUSK_HEADLESS_DISABLED']);
+    }
+}

From e2faeb4bff1bbcf4a94b03ae42abf108777470cb Mon Sep 17 00:00:00 2001
From: ahmedsophyudden <saufiyuddin@gmail.com>
Date: Sat, 23 Apr 2022 17:20:07 +0800
Subject: [PATCH 33/54] Add reference in supplier (Settings Ui & Pending Order
 Ui & API)

---
 .../Processors/CreateCompanyProcessor.php          |  3 ++-
 .../SupplierPendingOrdersSectionComponent.vue      |  4 ++--
 .../companies/forms/SupplierFormComponent.vue      | 14 +++++++++++++-
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/app/Classes/Modules/Companies/Processors/CreateCompanyProcessor.php b/app/Classes/Modules/Companies/Processors/CreateCompanyProcessor.php
index fc84e9cc..0f852dda 100644
--- a/app/Classes/Modules/Companies/Processors/CreateCompanyProcessor.php
+++ b/app/Classes/Modules/Companies/Processors/CreateCompanyProcessor.php
@@ -46,9 +46,10 @@ class CreateCompanyProcessor
     public function execute(Request $request, int $businessType = BusinessType::IMPORTER, ?int $companyType = CompanyType::COMPANY_BUSINESS, ?int $status = ApprovalStatus::PENDING_SUBMISSION): Model {
 
         $companyName = $companyType === CompanyType::COMPANY_BUSINESS ? $request->input('company_name') : $request->input('name');
+        $companyReference = $request->input('company_name') ? $request->input('company_name') : mt_rand(1000, 9999).(new GeneratesInitials())->name($companyName)->length(3)->generate();
         $company_object = new CompanyObject(
             $companyName,
-            mt_rand(1000, 9999).(new GeneratesInitials())->name($companyName)->length(3)->generate(),
+            $companyReference,
             $businessType, $companyType, $status);
 
         $this->canCreateCompany->passes($company_object);
diff --git a/resources/assets/vue/components/bookings/sections/SupplierPendingOrdersSectionComponent.vue b/resources/assets/vue/components/bookings/sections/SupplierPendingOrdersSectionComponent.vue
index 5e43314b..a08a16c9 100644
--- a/resources/assets/vue/components/bookings/sections/SupplierPendingOrdersSectionComponent.vue
+++ b/resources/assets/vue/components/bookings/sections/SupplierPendingOrdersSectionComponent.vue
@@ -12,7 +12,7 @@
                                             <div class="btn btn-xs btn-outline-primary btn-block text-left b-rad-none p-t-0 p-b-0 p-l-15 p-r-15" @click="selectedSupplier.status = !selectedSupplier.status">
                                                 <div class="row">
                                                     <div class="col p-t-5 p-b-5 fs-9">
-                                                        {{selectedSupplier.name}}
+                                                        {{selectedSupplier.name}} - {{selectedSupplier.reference}}
                                                     </div>
                                                     <div class="col-auto b-l b-success">
                                                         <div class="row h-100 align-items-center">
@@ -31,7 +31,7 @@
                                                                 <div class="col b-b b-grey p-t-10 p-b-10 pointer hover-t-10 p-b-10" :class="[{'bg-primary-light': selectedSupplier.id === supplier.id}, {'text-white': selectedSupplier.id === supplier.id}, {'hover-primary': selectedSupplier.id !== supplier.id}, {'pointer': selectedSupplier.id !== supplier.id}]" @click="updateSupplier(supplier)">
                                                                     <div class="row align-items-center justify-content-center">
                                                                         <div class="col">
-                                                                            <div class="font-heading fs-10">{{supplier.name}}</div>
+                                                                            <div class="font-heading fs-10">{{supplier.name}} - {{supplier.reference}}</div>
                                                                         </div>
                                                                     </div>
                                                                 </div>
diff --git a/resources/assets/vue/components/companies/forms/SupplierFormComponent.vue b/resources/assets/vue/components/companies/forms/SupplierFormComponent.vue
index 6c346db6..8b53a970 100644
--- a/resources/assets/vue/components/companies/forms/SupplierFormComponent.vue
+++ b/resources/assets/vue/components/companies/forms/SupplierFormComponent.vue
@@ -22,6 +22,14 @@
                             </validation-wrapper-component>
                         </div>
                     </div>
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <validation-wrapper-component :validator="$v.parameters.company_reference">
+                                <label>Reference</label>
+                                <input type="text" class="form-control" v-model="parameters.company_reference">
+                            </validation-wrapper-component>
+                        </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>
@@ -43,6 +51,7 @@
             return {
                 parameters: {
                     company_name: '',
+                    company_reference: '',
                 }
             }
         },
@@ -50,7 +59,10 @@
             parameters: {
                 company_name: {
                     required: true
-                }
+                },
+                company_reference: {
+                    required: true
+                },
             }
         },
         mixins: [ModalFormHandler]

From ac690be428d90c526bfc1fb2a9b18a8b547daf20 Mon Sep 17 00:00:00 2001
From: glovetleong <glovetleong@gmail.com>
Date: Sun, 24 Apr 2022 12:24:01 +0800
Subject: [PATCH 34/54] Invoice + PO + DO Invoice + PO + DO + SDO

---
 .../DownloadBookingDocumentLogic.php          | 34 +++++++++++++++----
 .../bookings/elements/BillingComponent.vue    |  9 ++++-
 2 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/app/Classes/Modules/Bookings/ControllersLogic/DownloadBookingDocumentLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/DownloadBookingDocumentLogic.php
index d8fdb0df..de4b59f1 100644
--- a/app/Classes/Modules/Bookings/ControllersLogic/DownloadBookingDocumentLogic.php
+++ b/app/Classes/Modules/Bookings/ControllersLogic/DownloadBookingDocumentLogic.php
@@ -14,6 +14,7 @@ use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Storage;
 use App\Classes\Exceptions\MalformedRequestException;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\DocumentType;
 
 class DownloadBookingDocumentLogic
 {
@@ -26,9 +27,9 @@ class DownloadBookingDocumentLogic
      */
     public function execute(Request $request)
     {
-
         Auth::login(User::findOrFail(1));
-        $zip_file = $request->input('type').'.zip';
+        $document_type = str_replace(' ', '', $request->input('type'));
+        $zip_file = $document_type.'.zip';
         $attachment = storage_path().'/app/documents/collections/' . $zip_file;
 
         $zip = new ZipArchive();
@@ -36,19 +37,40 @@ class DownloadBookingDocumentLogic
 
             $bookings = Booking::where('status', ApprovalStatus::COMPLETED)
                 ->whereDate('created_at', '>=', Carbon::parse($request->input('startDate')))
-                ->whereDate('created_at', '<=', Carbon::parse($request->input('endDate')))->whereHas('transactions', function ($query) use ($request){
+                ->whereDate('created_at', '<=', Carbon::parse($request->input('endDate')))
+                ->whereHas('transactions', function ($query) use ($request){
                     return $query->where('type', TransactionType::PAYMENT)->whereHas('transactions', function ($query) use ($request){
                         return $query->where('type', TransactionType::BILL)->where('issuer', $request->input('supplier'));
                     });
                 })->get();
 
+
             if (!count($bookings)) throw new MalformedRequestException('No available file to download');
 
             foreach ($bookings as $booking) {
-                $file = $booking->documents()->where('document_type', $request->input('type'))->first()->files()->first();
-                $zip->addFile(Storage::disk('documents')->path($file->file->file_info->original->file), $booking->created_at->format('d_m_Y') . '_' . $booking->marking . '.pdf');
-            }
 
+                if ($document_type == 'INVOICEPODO' || $document_type == 'INVOICEPODOSDO') {
+                    $invoice_file = $booking->documents()->where('document_type', DocumentType::INVOICE)->first()->files()->first();
+                    $purchase_file = $booking->documents()->where('document_type', DocumentType::PURCHASE_ORDER)->first()->files()->first();
+                    $deliver_file = $booking->documents()->where('document_type', DocumentType::DELIVER_ORDER)->first()->files()->first();
+                    if ($document_type == 'INVOICEPODOSDO') {
+                        $supplier_deliver_order_file = $booking->documents()->where('document_type', DocumentType::SUPPLIER_DELIVER_ORDER)->first()->files()->first();
+                    }
+
+                    $zip->addFile(Storage::disk('documents')->path($invoice_file->file->file_info->original->file), 'invoice-' . $booking->created_at->format('d_m_Y') . '_' . $booking->marking . '.pdf');
+
+                    $zip->addFile(Storage::disk('documents')->path($purchase_file->file->file_info->original->file), 'purchase-order-' .  $booking->created_at->format('d_m_Y') . '_' . $booking->marking . '.pdf');
+
+                    $zip->addFile(Storage::disk('documents')->path($deliver_file->file->file_info->original->file), 'deliver-' . $booking->created_at->format('d_m_Y') . '_' . $booking->marking . '.pdf');
+
+                    $zip->addFile(Storage::disk('documents')->path($supplier_deliver_order_file->file->file_info->original->file), 'supplier-deliver-order-' . $booking->created_at->format('d_m_Y') . '_' . $booking->marking . '.pdf');
+                }
+                else {
+                    $file = $booking->documents()->where('document_type', $document_type)->first()->files()->first();
+                    $zip->addFile(Storage::disk('documents')->path($file->file->file_info->original->file), $booking->created_at->format('d_m_Y') . '_' . $booking->marking . '.pdf');
+                }
+
+            }
             $zip->close();
             while (ob_get_level()) {
                 ob_end_clean();
diff --git a/resources/assets/vue/components/bookings/elements/BillingComponent.vue b/resources/assets/vue/components/bookings/elements/BillingComponent.vue
index 70f511ed..f24078ed 100644
--- a/resources/assets/vue/components/bookings/elements/BillingComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/BillingComponent.vue
@@ -84,7 +84,14 @@ export default {
                 type: 'INVOICE',
                 supplier: null
             },
-            documents: ['INVOICE', 'PURCHASE_ORDER', 'DELIVER_ORDER', 'SUPPLIER_DELIVER_ORDER'],
+            documents: [
+                'INVOICE', 
+                'PURCHASE_ORDER', 
+                'DELIVER_ORDER', 
+                'SUPPLIER_DELIVER_ORDER',
+                'INVOICE + PO + DO',
+                'INVOICE + PO + DO + SDO'
+                ],
             selectedDocumentStatus: false
         }
     },

From 1af96a26cea4e0011f5906226c7b08a9fb3e3f54 Mon Sep 17 00:00:00 2001
From: Uwais Al-Qarni <uwais_1@yahoo.com>
Date: Sun, 24 Apr 2022 23:12:14 +0800
Subject: [PATCH 35/54] refactoring invoice transaction processor

---
 .../CreateInvoiceDocumentProcessor.php        | 69 +++++++++++++++++
 .../CreateInvoiceTransactionProcessor.php     | 75 +++++--------------
 2 files changed, 86 insertions(+), 58 deletions(-)
 create mode 100644 app/Classes/Modules/Transactions/Processors/CreateInvoiceDocumentProcessor.php

diff --git a/app/Classes/Modules/Transactions/Processors/CreateInvoiceDocumentProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateInvoiceDocumentProcessor.php
new file mode 100644
index 00000000..95aa933d
--- /dev/null
+++ b/app/Classes/Modules/Transactions/Processors/CreateInvoiceDocumentProcessor.php
@@ -0,0 +1,69 @@
+<?php
+
+namespace App\Classes\Modules\Transactions\Processors;
+
+use App\Classes\Modules\Documents\Services\CreatesDocument;
+use App\Classes\Modules\Documents\Services\CreatesFiles;
+use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\DocumentType;
+use App\Models\Booking;
+use Meneses\LaravelMpdf\Facades\LaravelMpdf;
+
+class CreateInvoiceTransactionProcessor
+{
+    /** @var CreatesDocument */
+    private $createsDocument;
+
+    /** @var CreatesFiles */
+    private $createsFile;
+
+    /**
+     * CreateInvoiceTransactionProcessor constructor.
+     * @param CreatesDocument $createsDocument
+     * @param CreatesFiles $createsFile
+     */
+    public function __construct(CreatesDocument $createsDocument, CreatesFiles $createsFile)
+    {
+        $this->createsDocument = $createsDocument;
+        $this->createsFile = $createsFile;
+    }
+
+    /**
+     * @param Booking $booking
+     * @return void
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute($transaction, $po_order_transaction, $supplier, $document_type)
+    {
+        $lowercaseDocumentType = strtolower($document_type);
+
+        if ($document_type !== DocumentType::SUPPLIER_DELIVER_ORDER) {
+
+            $order_pdf = LaravelMpdf::loadView('pages.pdfs.' . $lowercaseDocumentType, ['invoice_transaction' => $transaction, 'po_order_transaction' => $po_order_transaction, 'supplier' => $supplier]);
+            $document_object = new DocumentObject(
+                $document_type,
+                [chunk_split('data:application/pdf;base64,' . base64_encode($order_pdf->output()))],
+                '',
+                ApprovalStatus::COMPLETED,
+                $lowercaseDocumentType . 's'
+            );
+
+        }
+        else {
+
+            $order_pdf = LaravelMpdf::loadView('pages.pdfs.supplier_deliver_order', ['supplier_deliver_order_transaction' => $transaction, 'po_order_transaction' => $po_order_transaction, 'supplier' => $supplier]);
+            $document_object = new DocumentObject(
+                $document_type,
+                [chunk_split('data:application/pdf;base64,'.base64_encode($order_pdf->output()))],
+                '',
+                ApprovalStatus::COMPLETED,
+                $lowercaseDocumentType . 's'
+            );
+
+        }
+
+        $document = $this->createsDocument->execute($po_order_transaction->booking, $document_object);
+        $this->createsFile->execute($document, $document_object);
+    }
+}
diff --git a/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php
index 5a29a1a2..3f98af4e 100644
--- a/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php
+++ b/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php
@@ -55,15 +55,12 @@ class CreateInvoiceTransactionProcessor
     /** @var FetchesCompany */
     private $fetchesCompany;
 
-    /** @var CreatesDocument */
-    private $createsDocument;
-
-    /** @var CreatesFiles */
-    private $createsFile;
-
     /** @var UpdatesBookingStatus */
     private $updatesBookingStatus;
 
+    /** @var CreateInvoiceDocumentProcessor */
+    private $invoiceDocumentProcessor;
+
     /**
      * CreateInvoiceTransactionProcessor constructor.
      * @param ListsTransactions $listsTransactions
@@ -75,11 +72,10 @@ class CreateInvoiceTransactionProcessor
      * @param FetchesServiceConfigurations $fetchesServiceConfigurations
      * @param CalculatesBookingCurrencyAverageRate $calculatesBookingCurrencyAverageRate
      * @param FetchesCompany $fetchesCompany
-     * @param CreatesDocument $createsDocument
-     * @param CreatesFiles $createsFile
      * @param UpdatesBookingStatus $updatesBookingStatus
+     * @param CreateInvoiceDocumentProcessor $invoiceDocumentProcessor
      */
-    public function __construct(ListsTransactions $listsTransactions, CreatesTransaction $createsTransaction, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CalculatesBookingPaidAmount $calculatesBookingPaidAmount, CalculatesBookingPayableAmount $calculatesBookingPayableAmount, CalculatesBookingTransferredAmount $calculatesBookingTransferredAmount, FetchesServiceConfigurations $fetchesServiceConfigurations, CalculatesBookingCurrencyAverageRate $calculatesBookingCurrencyAverageRate, FetchesCompany $fetchesCompany, CreatesDocument $createsDocument, CreatesFiles $createsFile, UpdatesBookingStatus $updatesBookingStatus)
+    public function __construct(ListsTransactions $listsTransactions, CreatesTransaction $createsTransaction, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CalculatesBookingPaidAmount $calculatesBookingPaidAmount, CalculatesBookingPayableAmount $calculatesBookingPayableAmount, CalculatesBookingTransferredAmount $calculatesBookingTransferredAmount, FetchesServiceConfigurations $fetchesServiceConfigurations, CalculatesBookingCurrencyAverageRate $calculatesBookingCurrencyAverageRate, FetchesCompany $fetchesCompany, UpdatesBookingStatus $updatesBookingStatus, CreateInvoiceTransactionProcessor $invoiceDocumentProcessor)
     {
         $this->listsTransactions = $listsTransactions;
         $this->createsTransaction = $createsTransaction;
@@ -90,9 +86,8 @@ class CreateInvoiceTransactionProcessor
         $this->fetchesServiceConfigurations = $fetchesServiceConfigurations;
         $this->calculatesBookingCurrencyAverageRate = $calculatesBookingCurrencyAverageRate;
         $this->fetchesCompany = $fetchesCompany;
-        $this->createsDocument = $createsDocument;
-        $this->createsFile = $createsFile;
         $this->updatesBookingStatus = $updatesBookingStatus;
+        $this->invoiceDocumentProcessor = $invoiceDocumentProcessor;
     }
 
 
@@ -101,7 +96,7 @@ class CreateInvoiceTransactionProcessor
      * @return void
      * @throws \App\Classes\Exceptions\MalformedRequestException
      */
-    public function execute(Booking $booking) 
+    public function execute(Booking $booking)
     {
 
         if ($booking->status === ApprovalStatus::COMPLETED) {
@@ -116,7 +111,7 @@ class CreateInvoiceTransactionProcessor
             return;
         }
         // confirm that all payments has been transferred
-        if($this->calculatesBookingTransferredAmount->execute($booking) !== $this->calculatesBookingPaidAmount->execute($booking)){
+        if ($this->calculatesBookingTransferredAmount->execute($booking) !== $this->calculatesBookingPaidAmount->execute($booking)) {
             return;
         }
 
@@ -127,7 +122,7 @@ class CreateInvoiceTransactionProcessor
 
         $constants = SegmentConstant::where('reference', SegmentConstants::SERVICE_TYPE)->where('detail->id', $booking->service->id)->first();
 
-        if($constants->detail->is_billable && !$po_order_transaction) {
+        if ($constants->detail->is_billable && !$po_order_transaction) {
             return;
         }
 
@@ -170,42 +165,14 @@ class CreateInvoiceTransactionProcessor
 
         $supplier = $this->fetchesCompany->execute(['id' => $transaction->receiver]);
 
-        $purchase_order_pdf = LaravelMpdf::loadView('pages.pdfs.purchase_order', ['invoice_transaction' => $invoice_transaction, 'po_order_transaction' => $po_order_transaction, 'supplier' => $supplier]);
-        $document_object = new DocumentObject(
-            DocumentType::PURCHASE_ORDER,
-            [chunk_split('data:application/pdf;base64,'.base64_encode($purchase_order_pdf->output()))],
-            '',
-            ApprovalStatus::COMPLETED,
-            'purchase_orders'
-        );
-        /** @var Document $document */
-        $document = $this->createsDocument->execute($po_order_transaction->booking, $document_object);
-        $this->createsFile->execute($document, $document_object);
+        // purchase order
+        $this->invoiceDocumentProcessor->execute($invoice_transaction, $po_order_transaction, $supplier, DocumentType::PURCHASE_ORDER);
 
-        $deliver_order_pdf = LaravelMpdf::loadView('pages.pdfs.deliver_order', ['invoice_transaction' => $invoice_transaction, 'po_order_transaction' => $po_order_transaction, 'supplier' => $supplier]);
-        $document_object = new DocumentObject(
-            DocumentType::DELIVER_ORDER,
-            [chunk_split('data:application/pdf;base64,'.base64_encode($deliver_order_pdf->output()))],
-            '',
-            ApprovalStatus::COMPLETED,
-            'delivery_orders'
-        );
+        // deliver order
+        $this->invoiceDocumentProcessor->execute($invoice_transaction, $po_order_transaction, $supplier, DocumentType::DELIVER_ORDER);
 
-        /** @var Document $document */
-        $document = $this->createsDocument->execute($po_order_transaction->booking, $document_object);
-        $this->createsFile->execute($document, $document_object);
-
-
-        $invoice_pdf = LaravelMpdf::loadView('pages.pdfs.invoice', ['invoice_transaction' => $invoice_transaction, 'po_order_transaction' => $po_order_transaction, 'supplier' => $supplier]);
-        $document_object = new DocumentObject(
-            DocumentType::INVOICE,
-            [chunk_split('data:application/pdf;base64,'.base64_encode($invoice_pdf->output()))],
-            '',
-            ApprovalStatus::COMPLETED,
-            'invoices'
-        );
-        $document = $this->createsDocument->execute($po_order_transaction->booking, $document_object);
-        $this->createsFile->execute($document, $document_object);
+        // invoice
+        $this->invoiceDocumentProcessor->execute($invoice_transaction, $po_order_transaction, $supplier, DocumentType::INVOICE);
 
         $billNumber = $this->generatesTransactionBillNumber->execute('SPDO-');
 
@@ -233,16 +200,8 @@ class CreateInvoiceTransactionProcessor
         );
         $supplier_deliver_order_transaction = $this->createsTransaction->execute($po_order_transaction->booking, $transaction_object);
 
-        $supplier_order_pdf = LaravelMpdf::loadView('pages.pdfs.supplier_deliver_order', ['supplier_deliver_order_transaction' => $supplier_deliver_order_transaction, 'po_order_transaction' => $po_order_transaction, 'supplier' => $supplier]);
-        $document_object = new DocumentObject(
-            DocumentType::SUPPLIER_DELIVER_ORDER,
-            [chunk_split('data:application/pdf;base64,'.base64_encode($supplier_order_pdf->output()))],
-            '',
-            ApprovalStatus::COMPLETED,
-            'supplier_delivery_orders'
-        );
-        $document = $this->createsDocument->execute($po_order_transaction->booking, $document_object);
-        $this->createsFile->execute($document, $document_object);
+        // supply deliver order
+        $this->invoiceDocumentProcessor->execute($supplier_deliver_order_transaction, $po_order_transaction, $supplier, DocumentType::SUPPLIER_DELIVER_ORDER);
 
         $this->updatesBookingStatus->execute($booking, ApprovalStatus::COMPLETED);
     }

From dc69314eee09d5d6e3bd729b7889a124f5f74077 Mon Sep 17 00:00:00 2001
From: Fairuz <fairuz.tester@gmail.com>
Date: Mon, 25 Apr 2022 05:12:03 +0800
Subject: [PATCH 36/54] Create booking test

---
  phpunit.dusk.xml                             | 12 ++++++++
 .../elements/BookingConfirmationComponent.vue |  6 ++--
 .../bookings/forms/BookingFormComponent.vue   |  4 +--
 .../forms/CurrencyConverterComponent.vue      |  4 +--
 .../forms/PurchaseOrderFormComponent.vue      | 18 ++++++------
 .../forms/PurchaseOrderItemFormComponent.vue  | 14 +++++-----
 .../forms/confirmBookingComponent.vue         |  6 ++--
 tests/Browser/CreateBooking.php               | 23 ---------------
 tests/Browser/ExampleTest.php                 | 28 -------------------
 9 files changed, 38 insertions(+), 77 deletions(-)
 delete mode 100644 tests/Browser/CreateBooking.php
 delete mode 100644 tests/Browser/ExampleTest.php

diff --git a/ phpunit.dusk.xml b/ phpunit.dusk.xml
index 40848a84..db1abe1e 100644
--- a/ phpunit.dusk.xml	
+++ b/ phpunit.dusk.xml	
@@ -1,4 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <php>
     <ini name="display_errors" value="On" />
     <ini name="display_startup_errors" value="On" />
 </php>
+    <phpunit
+            colors="true"
+    >
+        <testsuites>
+            <testsuite name="dryrun">
+               <directory suffix="php">./tests/Browser/DryRun/</directory>
+            </testsuite>
+        </testsuites>
+    </phpunit>
+
+
diff --git a/resources/assets/vue/components/bookings/elements/BookingConfirmationComponent.vue b/resources/assets/vue/components/bookings/elements/BookingConfirmationComponent.vue
index f08ea597..26c036b7 100644
--- a/resources/assets/vue/components/bookings/elements/BookingConfirmationComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/BookingConfirmationComponent.vue
@@ -100,7 +100,7 @@
                                             </div>
                                             <div class="row" v-show="!createBank">
                                                 <div class="col-7 p-r-0">
-                                                    <div class="row">
+                                                    <div class="row" id="select-list" name="select-list">
                                                         <div class="col">
                                                             <div class="form-group no-margin form-group-default">
                                                                 <label>{{ data.serviceType.id === 4 ? 'Alipay recipient Email / Phone' : 'Account No.' }}</label>
@@ -115,7 +115,7 @@
                                                                     <div class="row text-left no-margin bg-white">
                                                                         <div class="col no-padding">
                                                                             <div class="row no-margin"  v-for="bank in data.recipientBanks.filter(AccountNumber)" v-bind:key="bank.id" >
-                                                                                <div class="col b-b b-grey p-t-10 p-b-10 pointer  p-t-10 p-b-10" :class="[{'bg-master-lightest': parameters.bankAccount.id === bank.id}, {'text-master': parameters.bankAccount.id === bank.id}, {'hover-primary': parameters.bankAccount.id !== bank.id}, {'pointer': parameters.bankAccount.id !== bank.id}]" @click="selectBank(bank)">
+                                                                                <div id="select-option" name="select-option" class="col b-b b-grey p-t-10 p-b-10 pointer  p-t-10 p-b-10" :class="[{'bg-master-lightest': parameters.bankAccount.id === bank.id}, {'text-master': parameters.bankAccount.id === bank.id}, {'hover-primary': parameters.bankAccount.id !== bank.id}, {'pointer': parameters.bankAccount.id !== bank.id}]" @click="selectBank(bank)">
                                                                                     <div class="row align-items-center justify-content-center">
                                                                                         <div class="col">
                                                                                             <div class="row">
@@ -320,4 +320,4 @@
         },
         mixins: [FormHandler]
     }
-</script>
\ No newline at end of file
+</script>
diff --git a/resources/assets/vue/components/bookings/forms/BookingFormComponent.vue b/resources/assets/vue/components/bookings/forms/BookingFormComponent.vue
index 57cbe49e..4ce30e7d 100644
--- a/resources/assets/vue/components/bookings/forms/BookingFormComponent.vue
+++ b/resources/assets/vue/components/bookings/forms/BookingFormComponent.vue
@@ -133,7 +133,7 @@
                                     </div>
                                     <div class="row p-b-15" v-if="(summary.calculation.total > 0 && (data.status === 1 || data.status === 2)) || ($store.getters.isAdmin && summary.calculation.total > 0)">
                                         <div class="col">
-                                            <div class="btn btn-sm btn-block btn-success b-rad-none shadow-sm pointer requestModal" data-type="transferSummary" >Transfer Now</div>
+                                            <div class="btn btn-sm btn-block btn-success b-rad-none shadow-sm pointer requestModal" data-type="transferSummary" id="transfer-now" name="transfer-now">Transfer Now</div>
                                         </div>
                                     </div>
                                     <div class="row"  v-if="summary.calculation.total > 0 && data.status === 0">
@@ -152,7 +152,7 @@
                                             </modal-component>
                                         </div>
                                     </div>
-                                    <modal-component v-if="summary.calculation.total > 0" class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="transferSummary" size="large">
+                                    <modal-component id="select-account-modal" v-if="summary.calculation.total > 0" class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="transferSummary" size="large">
                                         <booking-confirmation-component :data="summary" :section="section"></booking-confirmation-component>
                                     </modal-component>
                                 </div>
diff --git a/resources/assets/vue/components/bookings/forms/CurrencyConverterComponent.vue b/resources/assets/vue/components/bookings/forms/CurrencyConverterComponent.vue
index a9b0ba80..6e21140f 100644
--- a/resources/assets/vue/components/bookings/forms/CurrencyConverterComponent.vue
+++ b/resources/assets/vue/components/bookings/forms/CurrencyConverterComponent.vue
@@ -17,7 +17,7 @@
                         <div class="col no-padding">
                             <div class="form-group form-group-default m-b-0">
                                 <label>Recipient Gets</label>
-                                <input type="text" placeholder="0.00" value="0" class="form-control" v-model="recipientInput" @keyup="updateAmount($event, 1)" v-money="money">
+                                <input id="cc_get" name="cc_get" type="text" placeholder="0.00" value="0" class="form-control" v-model="recipientInput" @keyup="updateAmount($event, 1)" v-money="money">
                             </div>
                         </div>
                         <div class="col-auto bg-primary text-white">
@@ -111,7 +111,7 @@
                         <div class="col no-padding">
                             <div class="form-group form-group-default m-b-0">
                                 <label>You'r Sending</label>
-                                <input type="text" placeholder="0.00" value="0.00" v-model="senderInput" class="form-control"  @keyup="updateAmount($event, 0)"  v-money="money">
+                                <input id="cc_sending" name="cc_sending" type="text" placeholder="0.00" value="0.00" v-model="senderInput" class="form-control"  @keyup="updateAmount($event, 0)"  v-money="money">
                             </div>
                         </div>
                         <div class="col-auto bg-primary text-white">
diff --git a/resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue b/resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue
index cde4d84d..0608fcb2 100644
--- a/resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue
+++ b/resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue
@@ -23,13 +23,13 @@
                                         <div class="col-sm-12 col-md-4 pr-md-1">
                                             <div class="form-group form-group-default b-rad-none">
                                                 <label>Stock Code</label>
-                                                <input type="text" class="form-control b-rad-none" v-model="product.stockCode" />
+                                                <input id="stock_code" name="stock_code" type="text" class="form-control b-rad-none" v-model="product.stockCode" />
                                             </div>
                                         </div>
                                         <div class="col-sm-12 col-md pl-md-1">
                                             <div class="form-group form-group-default b-rad-none required">
                                                 <label>description</label>
-                                                <input class="form-control b-rad-none" rows="1" @keyup="onlyEnglish($event)" v-model="product.description">
+                                                <input id="desc" name="desc" class="form-control b-rad-none" rows="1" @keyup="onlyEnglish($event)" v-model="product.description">
                                             </div>
                                         </div>
                                     </div>
@@ -37,13 +37,13 @@
                                         <div class="col-sm-12 col-md-6 pr-md-1">
                                             <div class="form-group form-group-default b-rad-none required">
                                                 <label>Unit Price</label>
-                                                <input type="text" class="form-control b-rad-none" placeholder="Unit Price" v-model.lazy="product.unit_price" v-money="productPrice" />
+                                                <input id="unit_price" name="unit_price" type="text" class="form-control b-rad-none" placeholder="Unit Price" v-model.lazy="product.unit_price" v-money="productPrice" />
                                             </div>
                                         </div>
                                         <div class="col-sm-12 col-md-6 pl-md-1">
                                             <div class="form-group form-group-default b-rad-none no-padding no-border">
                                                 <div class="row no-margin">
-                                                    <div class="col-auto bg-master-lightest pointer" @mousedown="updateQuantity" @mouseleave="clearInterval" @mouseup="clearInterval" @touchstart="updateQuantity" @touchend="clearInterval" @touchcancel="clearInterval">
+                                                    <div  id="minus-quantity" name="minus-quantity" class="col-auto bg-master-lightest pointer" @mousedown="updateQuantity" @mouseleave="clearInterval" @mouseup="clearInterval" @touchstart="updateQuantity" @touchend="clearInterval" @touchcancel="clearInterval">
                                                         <div class="row h-100 align-items-center">
                                                             <div class="col">
                                                                 <i class="fa fa-minus"></i>
@@ -52,9 +52,9 @@
                                                     </div>
                                                     <div class="col no-padding">
                                                         <label class="p-t-5 p-l-5 text-center">Quantity</label>
-                                                        <input type="text" class="form-control m-b-5 b-rad-none no-border text-center" v-model.lazy="product.quantity" v-mask="'#########'"/>
+                                                        <input  id="quantity" name="quantity" type="text" class="form-control m-b-5 b-rad-none no-border text-center" v-model.lazy="product.quantity" v-mask="'#########'"/>
                                                     </div>
-                                                    <div class="col-auto bg-master-lightest pointer" @mousedown="updateQuantity('add')" @mouseleave="clearInterval" @mouseup="clearInterval" @touchstart="updateQuantity('add')" @touchend="clearInterval" @touchcancel="clearInterval">
+                                                    <div id="add-quantity" name="add-quantity" class="col-auto bg-master-lightest pointer" @mousedown="updateQuantity('add')" @mouseleave="clearInterval" @mouseup="clearInterval" @touchstart="updateQuantity('add')" @touchend="clearInterval" @touchcancel="clearInterval">
                                                         <div class="row h-100 align-items-center">
                                                             <div class="col">
                                                                 <i class="fa fa-plus"></i>
@@ -71,7 +71,7 @@
                                             <h6 class="no-margin bold text-complete">{{data.fixed_currency.short_code}} {{productTotal.toFixed(3)}}</h6>
                                         </div>
                                         <div class="col-sm-12 col-md">
-                                            <button class="btn btn-sm btn-block btn-complete b-rad-none" @click="addProduct()">Add Product</button>
+                                            <button id="add-product" name="add-product" class="btn btn-sm btn-block btn-complete b-rad-none" @click="addProduct()">Add Product</button>
                                         </div>
                                     </div>
                                 </div>
@@ -112,7 +112,7 @@
                         <div class="col">
                             <div class="row m-b-10">
                                 <div class="col">
-                                    <button class="btn btn-xs all-caps b-rad-none btn-primary btn-block" @click="submitForm()">{{(Math.round((poTotal + Number.EPSILON) * 1000) / 1000).toFixed(3) !== (Math.round((data.amount + Number.EPSILON) * 1000) / 1000).toFixed(3) ? 'Save Purchase Order' : 'Save & Confirm'}}</button>
+                                    <button id="save-purchase-order" name="save-purchase-order" class="btn btn-xs all-caps b-rad-none btn-primary btn-block" @click="submitForm()">{{(Math.round((poTotal + Number.EPSILON) * 1000) / 1000).toFixed(3) !== (Math.round((data.amount + Number.EPSILON) * 1000) / 1000).toFixed(3) ? 'Save Purchase Order' : 'Save & Confirm'}}</button>
                                 </div>
                             </div>
                             <div class="row" v-if="(Math.round((poTotal + Number.EPSILON) * 1000) / 1000).toFixed(3) !== data.amount">
@@ -262,4 +262,4 @@
         },
         mixins: [formHandler]
     }
-</script>
\ No newline at end of file
+</script>
diff --git a/resources/assets/vue/components/bookings/forms/PurchaseOrderItemFormComponent.vue b/resources/assets/vue/components/bookings/forms/PurchaseOrderItemFormComponent.vue
index 80e28394..d91d2661 100644
--- a/resources/assets/vue/components/bookings/forms/PurchaseOrderItemFormComponent.vue
+++ b/resources/assets/vue/components/bookings/forms/PurchaseOrderItemFormComponent.vue
@@ -58,13 +58,13 @@
                         <div class="col-4 p-r-5">
                             <div class="form-group form-group-default b-rad-none">
                                 <label>Stock Code</label>
-                                <input type="text" class="form-control b-rad-none" v-model="product.stockCode" />
+                                <input id="stock_code" name="stock_code"  type="text" class="form-control b-rad-none" v-model="product.stockCode" />
                             </div>
                         </div>
                         <div class="col p-l-5">
                             <div class="form-group form-group-default b-rad-none required">
                                 <label>description</label>
-                                <input class="form-control b-rad-none" rows="1" @keyup="onlyEnglish($event)" v-model="product.description">
+                                <input id="desc" name="desc" class="form-control b-rad-none" rows="1" @keyup="onlyEnglish($event)" v-model="product.description">
                             </div>
                         </div>
                     </div>
@@ -72,13 +72,13 @@
                         <div class="col-6 p-r-5">
                             <div class="form-group form-group-default b-rad-none required">
                                 <label>Unit Price</label>
-                                <input type="text" class="form-control b-rad-none" placeholder="Unit Price" v-model.lazy="product.unit_price" v-money="productPrice" />
+                                <input id="unit_price" name="unit_price" type="text" class="form-control b-rad-none" placeholder="Unit Price" v-model.lazy="product.unit_price" v-money="productPrice" />
                             </div>
                         </div>
                         <div class="col-6 p-l-5">
                             <div class="form-group form-group-default b-rad-none no-padding no-border">
                                 <div class="row no-margin">
-                                    <div class="col-auto bg-master-lighter pointer" @mousedown="updateQuantity" @mouseleave="clearInterval" @mouseup="clearInterval" @touchstart="updateQuantity" @touchend="clearInterval" @touchcancel="clearInterval">
+                                    <div id="minus-quantity" name="minus-quantity" class="col-auto bg-master-lighter pointer" @mousedown="updateQuantity" @mouseleave="clearInterval" @mouseup="clearInterval" @touchstart="updateQuantity" @touchend="clearInterval" @touchcancel="clearInterval">
                                         <div class="row h-100 align-items-center">
                                             <div class="col">
                                                 <i class="fa fa-minus"></i>
@@ -87,9 +87,9 @@
                                     </div>
                                     <div class="col no-padding">
                                         <label class="p-t-5 p-l-5 text-center">Quantity</label>
-                                        <input type="text" class="form-control m-b-5 b-rad-none no-border text-center" v-model.lazy="product.quantity" v-mask="'#########'"/>
+                                        <input id="quantity" name="quantity" type="text" class="form-control m-b-5 b-rad-none no-border text-center" v-model.lazy="product.quantity" v-mask="'#########'"/>
                                     </div>
-                                    <div class="col-auto bg-master-lighter pointer" @mousedown="updateQuantity('add')" @mouseleave="clearInterval" @mouseup="clearInterval" @touchstart="updateQuantity('add')" @touchend="clearInterval" @touchcancel="clearInterval">
+                                    <div id="add-quantity" name="add-quantity" class="col-auto bg-master-lighter pointer" @mousedown="updateQuantity('add')" @mouseleave="clearInterval" @mouseup="clearInterval" @touchstart="updateQuantity('add')" @touchend="clearInterval" @touchcancel="clearInterval">
                                         <div class="row h-100 align-items-center">
                                             <div class="col">
                                                 <i class="fa fa-plus"></i>
@@ -185,4 +185,4 @@
         },
         mixins: [formHandler]
     }
-</script>
\ No newline at end of file
+</script>
diff --git a/resources/assets/vue/components/bookings/forms/confirmBookingComponent.vue b/resources/assets/vue/components/bookings/forms/confirmBookingComponent.vue
index 5897646c..2cb67ca0 100644
--- a/resources/assets/vue/components/bookings/forms/confirmBookingComponent.vue
+++ b/resources/assets/vue/components/bookings/forms/confirmBookingComponent.vue
@@ -1,10 +1,10 @@
 <template>
     <div class="row">
         <div class="col-auto">
-            <button class="btn btn-lg btn-default bg-master-lightest b-rad-none all-caps fs-12" data-dismiss="modal">Cancel</button>
+            <button id="cancel-new-booking" name="cancel-new-booking" class="btn btn-lg btn-default bg-master-lightest b-rad-none all-caps fs-12" data-dismiss="modal">Cancel</button>
         </div>
         <div class="col text-right">
-            <button class="btn btn-lg btn-success b-rad-none all-caps fs-12" v-if="Object.keys(data.bankAccount).length" @click="submitForm()">Confirm & Proceed</button>
+            <button id="confirm-new-booking" name="confirm-new-booking" class="btn btn-lg btn-success b-rad-none all-caps fs-12" v-if="Object.keys(data.bankAccount).length" @click="submitForm()">Confirm & Proceed</button>
         </div>
     </div>
 </template>
@@ -37,4 +37,4 @@
         },
         mixins: [ModalFormHandler]
     }
-</script>
\ No newline at end of file
+</script>
diff --git a/tests/Browser/CreateBooking.php b/tests/Browser/CreateBooking.php
deleted file mode 100644
index e7391624..00000000
--- a/tests/Browser/CreateBooking.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-namespace Tests\Browser;
-
-use Illuminate\Foundation\Testing\DatabaseMigrations;
-use Laravel\Dusk\Browser;
-use Tests\DuskTestCase;
-
-class CreateBooking extends DuskTestCase
-{
-    /**
-     * A Dusk test example.
-     *
-     * @test
-     */
-    public function testCreateBooking()
-    {
-        $this->browse(function (Browser $browser) {
-            $browser->visit('/')
-                    ->assertSee('Laravel');
-        });
-    }
-}
diff --git a/tests/Browser/ExampleTest.php b/tests/Browser/ExampleTest.php
deleted file mode 100644
index 37f076bd..00000000
--- a/tests/Browser/ExampleTest.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-namespace Tests\Browser;
-
-use Illuminate\Foundation\Testing\DatabaseMigrations;
-use Laravel\Dusk\Browser;
-use Tests\DuskTestCase;
-
-class ExampleTest extends DuskTestCase
-{
-    /**
-     * A basic browser test example.
-     *
-     * @return void
-     */
-    public function testBasicExample()
-    {
-        $this->browse(function (Browser $browser) {
-            $browser->visit('http://localhost:86')
-                    ->pause(500)
-                    ->type('email', 'junkit.mah@bioloop.com.my')
-                    ->type('password', '123456abcabc')
-                    ->click('#sign-in')
-                    ->pause(5000)
-                    ->assertPathIs('/dashboard');
-        });
-    }
-}

From 9f59f9110aa6abc0554732d8e29f493e4ff89916 Mon Sep 17 00:00:00 2001
From: Fairuz <fairuz.tester@gmail.com>
Date: Mon, 25 Apr 2022 05:12:16 +0800
Subject: [PATCH 37/54] Create booking test

---
 tests/Browser/DryRun/CreateBookingTest.php | 68 ++++++++++++++++++++++
 tests/Browser/DryRun/LoginTe.php           | 26 +++++++++
 2 files changed, 94 insertions(+)
 create mode 100644 tests/Browser/DryRun/CreateBookingTest.php
 create mode 100644 tests/Browser/DryRun/LoginTe.php

diff --git a/tests/Browser/DryRun/CreateBookingTest.php b/tests/Browser/DryRun/CreateBookingTest.php
new file mode 100644
index 00000000..98a47da7
--- /dev/null
+++ b/tests/Browser/DryRun/CreateBookingTest.php
@@ -0,0 +1,68 @@
+<?php
+
+namespace Tests\Browser\DryRun;
+
+use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Laravel\Dusk\Browser;
+use Tests\DuskTestCase;
+use App\Classes\Modules\Transactions\Services\FetchesTransaction;
+
+
+class CreateBookingTest extends DuskTestCase
+{
+     public function testLogin()
+    {
+        $this->browse(function (Browser $browser) {
+            $browser->visit('http://localhost:86')
+                    ->pause(500)
+                    ->typeSlowly('email', 'junkit.mah@bioloop.com.my')
+                    ->typeSlowly('password', '123456abcabc')
+                    ->click('#sign-in')
+                    ->pause(5000)
+                    ->assertPathIs('/dashboard');
+        });
+    }
+
+    /**
+    * @test
+    * @depends testLogin
+    */
+    public function testCreateBooking()
+    {
+        $this->browse(function (Browser $browser) {
+            $browser->waitForLocation('/dashboard')
+                    ->waitForText('X1 Service')
+                    ->typeSlowly('cc_sending', '10000')
+                    ->pause(5000)
+                    ->waitForText('Transfer Now',5000)
+                    ->click('#transfer-now')
+                    ->whenAvailable('#select-account-modal', function ($modal) {
+                        $modal->pause(1000)
+                            ->press('#select-list')
+                            ->press('#select-option')
+                            ->pause(5000)
+                            ->click('#confirm-new-booking');
+                            #->click('#cancel-new-booking');
+                    })
+                    ->pause(7000)
+                    ->typeSlowly('stock_code', '123')
+                    ->typeSlowly('desc', 'Product A')
+                    ->typeSlowly('unit_price', '100')
+                    ->pause(7000)
+                    ->click('#add-quantity')
+                    ->click('#add-quantity')
+                    ->pause(7000)
+                    ->click('#minus-quantity')
+                    ->click('#minus-quantity')
+                    ->pause(7000)
+                    ->typeSlowly('quantity', '5')
+                    ->pause(7000)
+                    ->click('#add-product')
+                    ->pause(7000)
+                    ->click('#save-purchase-order')
+                    ->pause(10000);
+                    //Assert if booking created successfully
+
+        });
+    }
+}
diff --git a/tests/Browser/DryRun/LoginTe.php b/tests/Browser/DryRun/LoginTe.php
new file mode 100644
index 00000000..13ebc523
--- /dev/null
+++ b/tests/Browser/DryRun/LoginTe.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Tests\Browser\DryRun;
+
+use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Laravel\Dusk\Browser;
+use Tests\DuskTestCase;
+
+class LoginTest extends DuskTestCase
+{
+    /**
+    * @test
+    */
+    public function testLogin()
+    {
+        $this->browse(function (Browser $browser) {
+            $browser->visit('http://localhost:86')
+                    ->pause(500)
+                    ->type('email', 'junkit.mah@bioloop.com.my')
+                    ->type('password', '123456abcabc')
+                    ->click('#sign-in')
+                    ->pause(5000)
+                    ->assertPathIs('/dashboard');
+        });
+    }
+}

From 32cea19480c6403cef69edc860226ebfca129ee1 Mon Sep 17 00:00:00 2001
From: ahmedsophyudden <saufiyuddin@gmail.com>
Date: Mon, 25 Apr 2022 07:19:03 +0800
Subject: [PATCH 38/54] Fix bug reference in supplier (Settings Ui & Pending
 Order Ui & API)

---
 .../vue/components/companies/elements/SupplierComponent.vue     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/assets/vue/components/companies/elements/SupplierComponent.vue b/resources/assets/vue/components/companies/elements/SupplierComponent.vue
index a2e45bd7..19cf37c2 100644
--- a/resources/assets/vue/components/companies/elements/SupplierComponent.vue
+++ b/resources/assets/vue/components/companies/elements/SupplierComponent.vue
@@ -18,7 +18,7 @@
                     </div>
                     <div class="row">
                         <div class="col">
-                            <div class="font-heading all-caps fs-10">{{item.name}}</div>
+                            <div class="font-heading all-caps fs-10">{{item.name}} - {{item.reference}}</div>
                         </div>
                     </div>
                 </div>

From 2e3a94e4f443e9c0674adf88a92b7f605c26666b Mon Sep 17 00:00:00 2001
From: ahmedsophyudden <saufiyuddin@gmail.com>
Date: Mon, 25 Apr 2022 08:34:40 +0800
Subject: [PATCH 39/54] Fix bug reference in supplier (Settings Ui & Pending
 Order Ui & API)

---
 .../Modules/Companies/Processors/CreateCompanyProcessor.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Classes/Modules/Companies/Processors/CreateCompanyProcessor.php b/app/Classes/Modules/Companies/Processors/CreateCompanyProcessor.php
index 0f852dda..3579e46a 100644
--- a/app/Classes/Modules/Companies/Processors/CreateCompanyProcessor.php
+++ b/app/Classes/Modules/Companies/Processors/CreateCompanyProcessor.php
@@ -46,7 +46,7 @@ class CreateCompanyProcessor
     public function execute(Request $request, int $businessType = BusinessType::IMPORTER, ?int $companyType = CompanyType::COMPANY_BUSINESS, ?int $status = ApprovalStatus::PENDING_SUBMISSION): Model {
 
         $companyName = $companyType === CompanyType::COMPANY_BUSINESS ? $request->input('company_name') : $request->input('name');
-        $companyReference = $request->input('company_name') ? $request->input('company_name') : mt_rand(1000, 9999).(new GeneratesInitials())->name($companyName)->length(3)->generate();
+        $companyReference = $request->input('company_referece') ? $request->input('company_referece') : mt_rand(1000, 9999).(new GeneratesInitials())->name($companyName)->length(3)->generate();
         $company_object = new CompanyObject(
             $companyName,
             $companyReference,

From 4cce57874f2b336d45ea933c906461f7189ceef9 Mon Sep 17 00:00:00 2001
From: ahmedsophyudden <saufiyuddin@gmail.com>
Date: Mon, 25 Apr 2022 08:40:46 +0800
Subject: [PATCH 40/54] Fix bug reference in supplier (Settings Ui & Pending
 Order Ui & API)

---
 .../Modules/Companies/Processors/CreateCompanyProcessor.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Classes/Modules/Companies/Processors/CreateCompanyProcessor.php b/app/Classes/Modules/Companies/Processors/CreateCompanyProcessor.php
index 3579e46a..ad9abeb8 100644
--- a/app/Classes/Modules/Companies/Processors/CreateCompanyProcessor.php
+++ b/app/Classes/Modules/Companies/Processors/CreateCompanyProcessor.php
@@ -46,7 +46,7 @@ class CreateCompanyProcessor
     public function execute(Request $request, int $businessType = BusinessType::IMPORTER, ?int $companyType = CompanyType::COMPANY_BUSINESS, ?int $status = ApprovalStatus::PENDING_SUBMISSION): Model {
 
         $companyName = $companyType === CompanyType::COMPANY_BUSINESS ? $request->input('company_name') : $request->input('name');
-        $companyReference = $request->input('company_referece') ? $request->input('company_referece') : mt_rand(1000, 9999).(new GeneratesInitials())->name($companyName)->length(3)->generate();
+        $companyReference = $request->input('company_reference') ? $request->input('company_reference') : mt_rand(1000, 9999).(new GeneratesInitials())->name($companyName)->length(3)->generate();
         $company_object = new CompanyObject(
             $companyName,
             $companyReference,

From dfa47fae8f6766bfed4255d72c93ec0469b708ea Mon Sep 17 00:00:00 2001
From: Uwais Al-Qarni <uwais_1@yahoo.com>
Date: Mon, 25 Apr 2022 12:02:56 +0800
Subject: [PATCH 41/54] change class name of CreateInvoiceDocumentProcessor
 correctly

---
 .../Processors/CreateInvoiceDocumentProcessor.php            | 4 ++--
 .../Processors/CreateInvoiceTransactionProcessor.php         | 5 -----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/app/Classes/Modules/Transactions/Processors/CreateInvoiceDocumentProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateInvoiceDocumentProcessor.php
index 95aa933d..7a12a6ad 100644
--- a/app/Classes/Modules/Transactions/Processors/CreateInvoiceDocumentProcessor.php
+++ b/app/Classes/Modules/Transactions/Processors/CreateInvoiceDocumentProcessor.php
@@ -10,7 +10,7 @@ use App\Classes\ValueObjects\Constants\DocumentType;
 use App\Models\Booking;
 use Meneses\LaravelMpdf\Facades\LaravelMpdf;
 
-class CreateInvoiceTransactionProcessor
+class CreateInvoiceDocumentProcessor
 {
     /** @var CreatesDocument */
     private $createsDocument;
@@ -19,7 +19,7 @@ class CreateInvoiceTransactionProcessor
     private $createsFile;
 
     /**
-     * CreateInvoiceTransactionProcessor constructor.
+     * CreateInvoiceDocumentProcessor constructor.
      * @param CreatesDocument $createsDocument
      * @param CreatesFiles $createsFile
      */
diff --git a/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php
index 3f98af4e..e1d7f400 100644
--- a/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php
+++ b/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php
@@ -11,20 +11,15 @@ use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
 use App\Classes\Modules\Bookings\Services\CalculatesBookingPaidAmount;
 use App\Classes\Modules\Bookings\Services\CalculatesBookingCurrencyAverageRate;
 use App\Classes\Modules\Companies\Services\FetchesCompany;
-use App\Classes\Modules\Documents\Services\CreatesDocument;
-use App\Classes\Modules\Documents\Services\CreatesFiles;
 use App\Classes\Modules\Bookings\Services\UpdatesBookingStatus;
 
 use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
-use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\SegmentConstants;
 use App\Classes\ValueObjects\Constants\TransactionType;
 use App\Classes\ValueObjects\Constants\DocumentType;
 use App\Models\Booking;
-use App\Models\Document;
 use App\Models\SegmentConstant;
-use Meneses\LaravelMpdf\Facades\LaravelMpdf;
 
 class CreateInvoiceTransactionProcessor
 {

From 6a546ea80f03c46776bbd0ef42768b0b616b7884 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Tue, 26 Apr 2022 19:45:30 +0800
Subject: [PATCH 42/54] export booking transaction

---
 .../Services/ExportsBookingTransactions.php   | 74 +++++++++++++++++
 .../ExportCustomersToExcelController.php      |  7 ++
 .../ExportBookingTransactionFormComponent.vue | 79 +++++++++++++++++++
 .../views/pages/currency_orders.blade.php     |  1 +
 routes/web.php                                |  1 +
 5 files changed, 162 insertions(+)
 create mode 100644 app/Classes/Modules/Exports/Services/ExportsBookingTransactions.php
 create mode 100644 resources/assets/vue/components/bookings/forms/ExportBookingTransactionFormComponent.vue

diff --git a/app/Classes/Modules/Exports/Services/ExportsBookingTransactions.php b/app/Classes/Modules/Exports/Services/ExportsBookingTransactions.php
new file mode 100644
index 00000000..7da82a31
--- /dev/null
+++ b/app/Classes/Modules/Exports/Services/ExportsBookingTransactions.php
@@ -0,0 +1,74 @@
+<?php
+
+namespace App\Classes\Modules\Exports\Services;
+
+use App\Models\Transaction;
+use Maatwebsite\Excel\Concerns\Exportable;
+use Maatwebsite\Excel\Concerns\FromQuery;
+use Maatwebsite\Excel\Concerns\WithHeadingRow;
+use Maatwebsite\Excel\Concerns\WithMapping;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\ShouldAutoSize;
+use Illuminate\Http\Request;
+use Carbon\Carbon;
+
+class ExportsBookingTransactions implements FromQuery, WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize
+{
+    use Exportable;
+
+    private $request;
+
+    public function __construct(Request $request)
+    {
+        $this->request = $request;
+    }
+
+    public function headings(): array
+    {
+        return [
+            'Ref No',
+            'Creted Date',
+            'Amount',
+            'Rate'
+        ];
+    }
+
+    /**
+     * @return \Illuminate\Support\Collection|mixed
+     */
+    public function query()
+    {
+        $supplierIds = array_map(function($value){
+            return ['id' => $value];
+        }, json_decode($this->request->input('supplierIds')));
+
+        $dateFrom =Carbon::parse($this->request->input('startDate'))->format('Y-m-d');
+        $dateTo =Carbon::parse($this->request->input('endDate'))->format('Y-m-d');
+
+        return Transaction::where('type', 3)->whereIn('issuer', $supplierIds)->whereBetween('created_at', [$dateFrom, $dateTo]);
+    }
+
+    /**
+     * @param $transaction
+     * @return array
+     */
+    public function map($transaction): array
+    {
+        if ($transaction->owner->owner == null){
+            $refNo = $transaction->owner->marking;
+        } else {
+            $refNo = $transaction->owner->owner->marking;
+        }
+        
+        $createdAt = $transaction->created_at->format('d-m-Y');
+        $amount = $transaction->amount;
+        $rate = $transaction->currency_rate;
+
+        return [
+            $refNo,
+            $createdAt,
+            $amount,
+            $rate,
+        ];
+    }
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Exports/ExportCustomersToExcelController.php b/app/Http/Controllers/Exports/ExportCustomersToExcelController.php
index 39ea3dc5..8563f78a 100644
--- a/app/Http/Controllers/Exports/ExportCustomersToExcelController.php
+++ b/app/Http/Controllers/Exports/ExportCustomersToExcelController.php
@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Exports;
 
 use App\Classes\Modules\Exports\Services\ExportsCustomers;
 use App\Classes\Modules\Exports\Services\ExportsTransactions;
+use App\Classes\Modules\Exports\Services\ExportsBookingTransactions;
 use App\Classes\Modules\Exports\Services\ExportsNullDebtors;
 use App\Classes\Modules\Exports\Services\ExportsPaymentTransactions;
 
@@ -54,4 +55,10 @@ class ExportCustomersToExcelController
         ob_end_clean();
         return $response;
     }
+
+    public function bookingTransactions(ExportsBookingTransactions $exportsBookingTransactions, Request $request){
+        $response = $exportsBookingTransactions->download('bookingTransactions.xls', Excel::XLS, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']);
+        ob_end_clean();
+        return $response;
+    }
 }
\ No newline at end of file
diff --git a/resources/assets/vue/components/bookings/forms/ExportBookingTransactionFormComponent.vue b/resources/assets/vue/components/bookings/forms/ExportBookingTransactionFormComponent.vue
new file mode 100644
index 00000000..24ad2317
--- /dev/null
+++ b/resources/assets/vue/components/bookings/forms/ExportBookingTransactionFormComponent.vue
@@ -0,0 +1,79 @@
+<template>
+    <div class="row m-b-20">
+        <div class="col">
+            <div class="row">
+                <div class="col">
+                    <div class="row m-l-0 m-r-0 bg-master-light padding-10">
+                        <div class="col">
+                            <validation-wrapper-component selectable :validator="$v.parameters.supplier">
+                                <label>Supplier</label>
+                                <selectable-component :endpoint="route('api.company.list')+'?filters={%22business_type%22:3}'" section="supplierListSection" valueColumn="id" :labelColumn="['name']" v-model="parameters.supplier"></selectable-component>
+                            </validation-wrapper-component>
+                        </div>
+                        <div class="col-12 col-md mb-2 mb-md-0">
+                            <validation-wrapper-component :validator="$v.parameters.startDate">
+                                <label class="all-caps">Start Date</label>
+                                <date-picker-component :parameters="parameters" v-model.lazy="parameters.startDate"></date-picker-component>
+                            </validation-wrapper-component>
+                        </div>
+                        <div class="col-12 col-md mb-2 mb-md-0">
+                            <validation-wrapper-component :validator="$v.parameters.endDate">
+                                <label class="all-caps">End Date</label>
+                                <date-picker-component :parameters="parameters" v-model.lazy="parameters.endDate"></date-picker-component>
+                            </validation-wrapper-component>
+                        </div>
+                        <div class="col-12 col-md-auto d-flex justify-content-center align-items-center">
+                            <button type="button" class="btn btn-lg btn-primary fs-11 w-100" @click="submitSearch()">Download</button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+import componentHandler from "../../../general/mixins/componentHandler";
+import { required, minValue} from "vuelidate/lib/validators";
+import {VMoney} from 'v-money'
+
+export default {
+    data(){
+        return {
+            parameters: {
+                startDate: '',
+                endDate: '',
+                supplier: null,
+                supplierIds: [] 
+            },
+        }
+    },
+    validations: {
+        parameters: {
+            startDate: {
+                required
+            },
+            endDate: {
+                required
+            },
+            supplier: {
+                required
+            },
+        }
+    },
+    methods: {
+        submitSearch(){
+            if(!this.validate()){ return; }
+
+            var supplierIds = [];
+            supplierIds.push(parseInt(this.parameters.supplier));
+            supplierIds = JSON.stringify(supplierIds);
+
+            console.log(supplierIds);
+
+            window.open(route('export.transactions.booking')+'?startDate='+this.parameters.startDate+'&endDate='+this.parameters.endDate+'&supplierIds='+supplierIds, '_blank');
+        },
+    },
+    mixins: [componentHandler]
+};
+</script>
diff --git a/resources/views/pages/currency_orders.blade.php b/resources/views/pages/currency_orders.blade.php
index 269591e1..daf804cf 100644
--- a/resources/views/pages/currency_orders.blade.php
+++ b/resources/views/pages/currency_orders.blade.php
@@ -2,6 +2,7 @@
 @section('inner_content')
     <div class="row">
         <div class="col p-t-15 p-b-15">
+            <export-booking-transaction-form-component></export-booking-transaction-form-component>
             <div class="row">
                 <div class="col-4">
                     <div class="row tabsContainer">
diff --git a/routes/web.php b/routes/web.php
index 99e07dd3..91e3657b 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -151,6 +151,7 @@ Route::get('/export/transactions/f614e339d7058904a831aad742e24d55', 'Exports\Exp
 Route::get('/export/null-debtor/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@nullDebtor');
 Route::get('/export/payment-transactions/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@paymentTransactions');
 Route::get('/export/wallet-transactions/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@walletTransactions');
+Route::get('/export/booking-transactions', 'Exports\ExportCustomersToExcelController@bookingTransactions')->name('export.transactions.booking');
 
 Route::get('/products', function (\App\Classes\Modules\Exports\Services\ExportsProducts $exportsProducts) {
     $bookings = Booking::where(function($query){

From ef77463c06f01340ff3e3178bfae8e401c18961b Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Tue, 26 Apr 2022 21:52:38 +0800
Subject: [PATCH 43/54] export booking transaction ui

---
 .../ExportBookingTransactionFormComponent.vue | 41 +++++++++----
 .../SelectIndividualSupplierFormComponent.vue | 43 ++++++++++++++
 .../forms/SelectSupplierFormComponent.vue     | 59 +++++++++++++++++++
 3 files changed, 131 insertions(+), 12 deletions(-)
 create mode 100644 resources/assets/vue/components/bookings/forms/SelectIndividualSupplierFormComponent.vue
 create mode 100644 resources/assets/vue/components/bookings/forms/SelectSupplierFormComponent.vue

diff --git a/resources/assets/vue/components/bookings/forms/ExportBookingTransactionFormComponent.vue b/resources/assets/vue/components/bookings/forms/ExportBookingTransactionFormComponent.vue
index 24ad2317..889ea3e7 100644
--- a/resources/assets/vue/components/bookings/forms/ExportBookingTransactionFormComponent.vue
+++ b/resources/assets/vue/components/bookings/forms/ExportBookingTransactionFormComponent.vue
@@ -3,12 +3,19 @@
         <div class="col">
             <div class="row">
                 <div class="col">
-                    <div class="row m-l-0 m-r-0 bg-master-light padding-10">
+                    <div class="row m-l-0 m-r-0 bg-master-light padding-10 parentContainer">
                         <div class="col">
-                            <validation-wrapper-component selectable :validator="$v.parameters.supplier">
-                                <label>Supplier</label>
-                                <selectable-component :endpoint="route('api.company.list')+'?filters={%22business_type%22:3}'" section="supplierListSection" valueColumn="id" :labelColumn="['name']" v-model="parameters.supplier"></selectable-component>
-                            </validation-wrapper-component>
+                            <div class="row requestModal pointer" data-type="deleteBank">
+                                <div class="col">
+                                    <validation-wrapper-component :validator="$v.parameters.supplierNames">
+                                        <label>Supplier</label>
+                                        <input type="text" class="form-control fs-12 pointer" v-model="parameters.supplierNames" disabled>
+                                    </validation-wrapper-component>
+                                </div>
+                            </div>
+                            <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="deleteBank">
+                                <select-supplier-form-component section="supplierListSection" v-on:input="updateList($event)"></select-supplier-form-component>
+                            </modal-component>
                         </div>
                         <div class="col-12 col-md mb-2 mb-md-0">
                             <validation-wrapper-component :validator="$v.parameters.startDate">
@@ -44,7 +51,8 @@ export default {
                 startDate: '',
                 endDate: '',
                 supplier: null,
-                supplierIds: [] 
+                supplierIds: [],
+                supplierNames: []
             },
         }
     },
@@ -56,7 +64,10 @@ export default {
             endDate: {
                 required
             },
-            supplier: {
+            supplierIds: {
+                required
+            },
+            supplierNames: {
                 required
             },
         }
@@ -65,14 +76,20 @@ export default {
         submitSearch(){
             if(!this.validate()){ return; }
 
-            var supplierIds = [];
-            supplierIds.push(parseInt(this.parameters.supplier));
-            supplierIds = JSON.stringify(supplierIds);
-
-            console.log(supplierIds);
+            var supplierIds = JSON.stringify(this.parameters.supplierIds);
 
             window.open(route('export.transactions.booking')+'?startDate='+this.parameters.startDate+'&endDate='+this.parameters.endDate+'&supplierIds='+supplierIds, '_blank');
         },
+        updateList(supplierList){
+            let supplierIds = [];
+            let supplierNames = [];
+            supplierList.forEach(function(supplier) {
+                supplierIds.push(supplier.id);
+                supplierNames.push(supplier.name);
+            });
+            this.parameters.supplierIds = supplierIds;
+            this.parameters.supplierNames = supplierNames;
+        },
     },
     mixins: [componentHandler]
 };
diff --git a/resources/assets/vue/components/bookings/forms/SelectIndividualSupplierFormComponent.vue b/resources/assets/vue/components/bookings/forms/SelectIndividualSupplierFormComponent.vue
new file mode 100644
index 00000000..56b86b86
--- /dev/null
+++ b/resources/assets/vue/components/bookings/forms/SelectIndividualSupplierFormComponent.vue
@@ -0,0 +1,43 @@
+<template>
+    <div class="row">
+        <div class="col b-a b-grey" :class="{'b-gray': !selected, 'b-primary': selected, 'bg-primary-lighter': selected}">
+            <div class="row">
+                <div class="col padding-20">
+                    <div class="row align-items-center">
+                        <div class="col-auto pointer align-items-center" @click="selectSupplier()">
+                            <i class="fa fs-30 fa-fw" :class="{'fa-square-o': !selected, 'fa-check-square': selected, 'text-primary':selected}" ></i>
+                        </div>
+                        <div class="col">
+                            <h5 class="no-margin">{{ item.name }}</h5>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+import componentHandler from "../../../general/mixins/componentHandler";
+
+export default {
+    props: {
+        selectedSupplier: {
+            type: Array,
+            required: false,
+        }  
+    },
+    data(){
+        return {
+            selected: false
+        }
+    },
+    methods: {
+        selectSupplier(){
+            this.selected = !this.selected;
+            this.$emit('input', this.item);
+        }
+    },
+    mixins: [componentHandler]
+};
+</script>
diff --git a/resources/assets/vue/components/bookings/forms/SelectSupplierFormComponent.vue b/resources/assets/vue/components/bookings/forms/SelectSupplierFormComponent.vue
new file mode 100644
index 00000000..2895d76e
--- /dev/null
+++ b/resources/assets/vue/components/bookings/forms/SelectSupplierFormComponent.vue
@@ -0,0 +1,59 @@
+<template>
+    <div class="row bg-white padding-40">
+        <div class="col">
+            <loading-component style="height: 300px; top: 0;" key="1" color="success" v-show="isLoading" ></loading-component>
+            <div class="row justify-content-center" v-show="!isLoading">
+                <div class="col">
+                    <div class="row m-b-20">
+                        <div class="col">
+                            <h3 class="all-caps text-center">Please select the supplier.</h3>
+                        </div>
+                    </div>
+                    <div class="row m-b-20">
+                        <div class="col">
+                            <list-component section="supplierListSection" :endpoint="route('api.company.list')" :options="{business_type: 3}">
+                                <template slot="list" slot-scope="{data}">
+                                    <div class="row">
+                                        <div class="col">
+                                            <select-individual-supplier-form-component :data="data" :selectedSupplier="selectedSupplier" v-on:input="updateList($event)"></select-individual-supplier-form-component>
+                                        </div>
+                                    </div>
+                                </template>
+                            </list-component>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            <div class="btn btn-sm btn-success btn-block b-rad-none" @click="submitForm()">Confirm</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+import componentHandler from "../../../general/mixins/componentHandler";
+import ModalFormHandler from '../../../general/mixins/modalFormHandler';
+import { required, minValue} from "vuelidate/lib/validators";
+import {VMoney} from 'v-money'
+
+export default {
+    data(){
+        return {
+            selectedSupplier: [],
+        }
+    },
+    methods: {
+        submitForm() {
+            this.$emit('input', this.selectedSupplier);
+            this.closeModal();
+        },
+        updateList(supplier){
+            this.selectedSupplier.includes(supplier) ? this.selectedSupplier.splice(this.selectedSupplier.indexOf(supplier), 1) : this.selectedSupplier.push(supplier);
+        },
+    },
+    mixins: [componentHandler, ModalFormHandler]
+};
+</script>

From 27e25a38f1de265441ed12ebc1e8a91bb364b51e Mon Sep 17 00:00:00 2001
From: Uwais Al-Qarni <uwais_1@yahoo.com>
Date: Tue, 26 Apr 2022 21:52:42 +0800
Subject: [PATCH 44/54] refactoring InvoiceTransactionProcessor.php part II

---
 .../CreateInvoiceDocumentProcessor.php        | 40 +++++--------------
 .../CreateInvoiceTransactionProcessor.php     | 18 ++++-----
 .../views/pages/pdfs/deliver_order.blade.php  | 34 ++++++++--------
 resources/views/pages/pdfs/invoice.blade.php  | 32 +++++++--------
 .../views/pages/pdfs/purchase_order.blade.php | 28 ++++++-------
 .../pdfs/supplier_deliver_order.blade.php     | 34 ++++++++--------
 6 files changed, 82 insertions(+), 104 deletions(-)

diff --git a/app/Classes/Modules/Transactions/Processors/CreateInvoiceDocumentProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateInvoiceDocumentProcessor.php
index 7a12a6ad..39b42576 100644
--- a/app/Classes/Modules/Transactions/Processors/CreateInvoiceDocumentProcessor.php
+++ b/app/Classes/Modules/Transactions/Processors/CreateInvoiceDocumentProcessor.php
@@ -6,8 +6,6 @@ use App\Classes\Modules\Documents\Services\CreatesDocument;
 use App\Classes\Modules\Documents\Services\CreatesFiles;
 use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\DocumentType;
-use App\Models\Booking;
 use Meneses\LaravelMpdf\Facades\LaravelMpdf;
 
 class CreateInvoiceDocumentProcessor
@@ -30,40 +28,22 @@ class CreateInvoiceDocumentProcessor
     }
 
     /**
-     * @param Booking $booking
      * @return void
-     * @throws \App\Classes\Exceptions\MalformedRequestException
      */
-    public function execute($transaction, $po_order_transaction, $supplier, $document_type)
+    public function execute($transaction, $purchaseOrder, $supplier, $document_type)
     {
         $lowercaseDocumentType = strtolower($document_type);
 
-        if ($document_type !== DocumentType::SUPPLIER_DELIVER_ORDER) {
+        $order_pdf = LaravelMpdf::loadView('pages.pdfs.' . $lowercaseDocumentType, ['transaction' => $transaction, 'po_order_transaction' => $purchaseOrder, 'supplier' => $supplier]);
+        $document_object = new DocumentObject(
+            $document_type,
+            [chunk_split('data:application/pdf;base64,' . base64_encode($order_pdf->output()))],
+            '',
+            ApprovalStatus::COMPLETED,
+            $lowercaseDocumentType . 's'
+        );
 
-            $order_pdf = LaravelMpdf::loadView('pages.pdfs.' . $lowercaseDocumentType, ['invoice_transaction' => $transaction, 'po_order_transaction' => $po_order_transaction, 'supplier' => $supplier]);
-            $document_object = new DocumentObject(
-                $document_type,
-                [chunk_split('data:application/pdf;base64,' . base64_encode($order_pdf->output()))],
-                '',
-                ApprovalStatus::COMPLETED,
-                $lowercaseDocumentType . 's'
-            );
-
-        }
-        else {
-
-            $order_pdf = LaravelMpdf::loadView('pages.pdfs.supplier_deliver_order', ['supplier_deliver_order_transaction' => $transaction, 'po_order_transaction' => $po_order_transaction, 'supplier' => $supplier]);
-            $document_object = new DocumentObject(
-                $document_type,
-                [chunk_split('data:application/pdf;base64,'.base64_encode($order_pdf->output()))],
-                '',
-                ApprovalStatus::COMPLETED,
-                $lowercaseDocumentType . 's'
-            );
-
-        }
-
-        $document = $this->createsDocument->execute($po_order_transaction->booking, $document_object);
+        $document = $this->createsDocument->execute($purchaseOrder->booking, $document_object);
         $this->createsFile->execute($document, $document_object);
     }
 }
diff --git a/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php
index e1d7f400..5b7987b4 100644
--- a/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php
+++ b/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php
@@ -12,7 +12,6 @@ use App\Classes\Modules\Bookings\Services\CalculatesBookingPaidAmount;
 use App\Classes\Modules\Bookings\Services\CalculatesBookingCurrencyAverageRate;
 use App\Classes\Modules\Companies\Services\FetchesCompany;
 use App\Classes\Modules\Bookings\Services\UpdatesBookingStatus;
-
 use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\SegmentConstants;
@@ -85,7 +84,6 @@ class CreateInvoiceTransactionProcessor
         $this->invoiceDocumentProcessor = $invoiceDocumentProcessor;
     }
 
-
     /**
      * @param Booking $booking
      * @return void
@@ -110,14 +108,14 @@ class CreateInvoiceTransactionProcessor
             return;
         }
 
-        $po_order_transaction = $booking->transactions()
+        $purchaseOrder = $booking->transactions()
             ->where('type', TransactionType::PURCHASE_ORDER)
             ->complete()
             ->first();
 
         $constants = SegmentConstant::where('reference', SegmentConstants::SERVICE_TYPE)->where('detail->id', $booking->service->id)->first();
 
-        if ($constants->detail->is_billable && !$po_order_transaction) {
+        if ($constants->detail->is_billable && !$purchaseOrder) {
             return;
         }
 
@@ -156,18 +154,18 @@ class CreateInvoiceTransactionProcessor
             null,
             ApprovalStatus::APPROVED
         );
-        $invoice_transaction = $this->createsTransaction->execute($po_order_transaction->booking, $transaction_object);
+        $invoice_transaction = $this->createsTransaction->execute($purchaseOrder->booking, $transaction_object);
 
         $supplier = $this->fetchesCompany->execute(['id' => $transaction->receiver]);
 
         // purchase order
-        $this->invoiceDocumentProcessor->execute($invoice_transaction, $po_order_transaction, $supplier, DocumentType::PURCHASE_ORDER);
+        $this->invoiceDocumentProcessor->execute($invoice_transaction, $purchaseOrder, $supplier, DocumentType::PURCHASE_ORDER);
 
         // deliver order
-        $this->invoiceDocumentProcessor->execute($invoice_transaction, $po_order_transaction, $supplier, DocumentType::DELIVER_ORDER);
+        $this->invoiceDocumentProcessor->execute($invoice_transaction, $purchaseOrder, $supplier, DocumentType::DELIVER_ORDER);
 
         // invoice
-        $this->invoiceDocumentProcessor->execute($invoice_transaction, $po_order_transaction, $supplier, DocumentType::INVOICE);
+        $this->invoiceDocumentProcessor->execute($invoice_transaction, $purchaseOrder, $supplier, DocumentType::INVOICE);
 
         $billNumber = $this->generatesTransactionBillNumber->execute('SPDO-');
 
@@ -193,10 +191,10 @@ class CreateInvoiceTransactionProcessor
             null,
             ApprovalStatus::APPROVED
         );
-        $supplier_deliver_order_transaction = $this->createsTransaction->execute($po_order_transaction->booking, $transaction_object);
+        $supplier_deliver_order_transaction = $this->createsTransaction->execute($purchaseOrder->booking, $transaction_object);
 
         // supply deliver order
-        $this->invoiceDocumentProcessor->execute($supplier_deliver_order_transaction, $po_order_transaction, $supplier, DocumentType::SUPPLIER_DELIVER_ORDER);
+        $this->invoiceDocumentProcessor->execute($supplier_deliver_order_transaction, $purchaseOrder, $supplier, DocumentType::SUPPLIER_DELIVER_ORDER);
 
         $this->updatesBookingStatus->execute($booking, ApprovalStatus::COMPLETED);
     }
diff --git a/resources/views/pages/pdfs/deliver_order.blade.php b/resources/views/pages/pdfs/deliver_order.blade.php
index 8ad9004a..d16a0060 100644
--- a/resources/views/pages/pdfs/deliver_order.blade.php
+++ b/resources/views/pages/pdfs/deliver_order.blade.php
@@ -3,7 +3,7 @@
     <br>
     <htmlpageheader name="page-header">
         <br><br>
-        <div class="separator"><strong><i>{{ $invoice_transaction->bill_no }}</i></strong></div>
+        <div class="separator"><strong><i>{{ $transaction->bill_no }}</i></strong></div>
     </htmlpageheader>
 
     <table>
@@ -30,10 +30,10 @@
                     </strong>
                 </div>
 
-                <div class="number">EDO: {{ $invoice_transaction->bill_no }}</div>
+                <div class="number">EDO: {{ $transaction->bill_no }}</div>
 
 
-                <div class="ref">REF: {{ $invoice_transaction->booking->marking }}</div>
+                <div class="ref">REF: {{ $transaction->booking->marking }}</div>
                 <div class="date">Date: {{ $po_order_transaction->created_at }}</div>
                 <div>&nbsp;</div>
                 </div>
@@ -93,19 +93,19 @@
                     <td class="description">{{ $transaction_detail->product_name }}</td>
                     <td width="10%" class="center top">{{ $transaction_detail->quantity }}</td>
                     <td width="15%" class="center top">
-                        @if($invoice_transaction->booking()->first()->fix_currency_id !== 1)
-                            {{ number_format( (1/$invoice_transaction->currency_rate) * $transaction_detail->price, 2) }}
+                        @if($transaction->booking()->first()->fix_currency_id !== 1)
+                            {{ number_format( (1/$transaction->currency_rate) * $transaction_detail->price, 2) }}
                         @else
                             {{ number_format($transaction_detail->price, 2) }}
                         @endif
                     </td>
                     <td width="20%" class="right top">
-                        @if($invoice_transaction->booking()->first()->fix_currency_id !== 1)
+                        @if($transaction->booking()->first()->fix_currency_id !== 1)
                         
-                            {{  number_format((float)number_format( (1/$invoice_transaction->currency_rate) * $transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2) }}
+                            {{  number_format((float)number_format( (1/$transaction->currency_rate) * $transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2) }}
                             
                             @php
-                                $subtotal += number_format((float)number_format( (1/$invoice_transaction->currency_rate) * $transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2,'.','');
+                                $subtotal += number_format((float)number_format( (1/$transaction->currency_rate) * $transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2,'.','');
                             @endphp
                         @else                            
                             {{ number_format((float)number_format($transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2) }}
@@ -130,35 +130,35 @@
                 <td colspan="4"></td>
                 <td class="right">Service Charges</td>
                 <td class="right">
-                    {{ number_format($invoice_transaction->service_charge, 2) }}
+                    {{ number_format($transaction->service_charge, 2) }}
                 </td>
             </tr>
             <tr class="billingcharges">
                 <td colspan="4"></td>
                 <td class="right">Adjustment</td>
                 <td class="right">
-                    @if($invoice_transaction->booking()->first()->fix_currency_id !== 1)                        
-                        {{ number_format((float)number_format( (1/$invoice_transaction->currency_rate) * $invoice_transaction->amount, 2,'.','') - (float)number_format($subtotal, 2,'.',''),2) }}
+                    @if($transaction->booking()->first()->fix_currency_id !== 1)                        
+                        {{ number_format((float)number_format( (1/$transaction->currency_rate) * $transaction->amount, 2,'.','') - (float)number_format($subtotal, 2,'.',''),2) }}
                     @else                        
-                        {{ number_format((float)number_format($invoice_transaction->amount, 2,'.','') - (float)number_format($subtotal, 2,'.',''),2) }}
+                        {{ number_format((float)number_format($transaction->amount, 2,'.','') - (float)number_format($subtotal, 2,'.',''),2) }}
                     @endif
                 </td>
             </tr>
-            @if($invoice_transaction->tax > 0)
+            @if($transaction->tax > 0)
                 <tr class="billingcharges">
                     <td colspan="4"></td>
                     <td class="right">Tax</td>
-                    <td class="right">{{ number_format($invoice_transaction->tax, 2) }}</td>
+                    <td class="right">{{ number_format($transaction->tax, 2) }}</td>
                 </tr>
             @endif
             <tr>
                 <td colspan="4"></td>
                 <td class="right middle">Total</td>
                 <td class="total right middle">
-                    @if($invoice_transaction->booking()->first()->fix_currency_id !== 1)
-                        {{ number_format( ((1/$invoice_transaction->currency_rate) * $invoice_transaction->amount) + $invoice_transaction->service_charge + $invoice_transaction->tax, 2) }}
+                    @if($transaction->booking()->first()->fix_currency_id !== 1)
+                        {{ number_format( ((1/$transaction->currency_rate) * $transaction->amount) + $transaction->service_charge + $transaction->tax, 2) }}
                     @else
-                        {{ number_format($invoice_transaction->amount + $invoice_transaction->service_charge + $invoice_transaction->tax, 2) }}
+                        {{ number_format($transaction->amount + $transaction->service_charge + $transaction->tax, 2) }}
                     @endif
                 </td>
             </tr>
diff --git a/resources/views/pages/pdfs/invoice.blade.php b/resources/views/pages/pdfs/invoice.blade.php
index 5d2cb5d1..a2a33daa 100644
--- a/resources/views/pages/pdfs/invoice.blade.php
+++ b/resources/views/pages/pdfs/invoice.blade.php
@@ -3,7 +3,7 @@
     <br>
     <htmlpageheader name="page-header">
         <br><br>
-        <div class="separator"><strong><i>{{ $invoice_transaction->bill_no }}</i></strong></div>
+        <div class="separator"><strong><i>{{ $transaction->bill_no }}</i></strong></div>
     </htmlpageheader>
     <table>
         <tr>
@@ -29,7 +29,7 @@
                     </strong>
                 </div>
 
-                <div class="number">EI#: {{ $invoice_transaction->bill_no }}</div>
+                <div class="number">EI#: {{ $transaction->bill_no }}</div>
 
 
                 <div class="ref">Ref# {{ $po_order_transaction->booking->marking }}</div>
@@ -92,19 +92,19 @@
                     <td class="description">{{ $transaction_detail->product_name }}</td>
                     <td width="10%" class="center top">{{ $transaction_detail->quantity }}</td>
                     <td width="15%" class="center top">
-                        @if($invoice_transaction->booking()->first()->fix_currency_id !== 1)
-                            {{ number_format( (1/$invoice_transaction->currency_rate) * $transaction_detail->price, 2) }}
+                        @if($transaction->booking()->first()->fix_currency_id !== 1)
+                            {{ number_format( (1/$transaction->currency_rate) * $transaction_detail->price, 2) }}
                         @else
                             {{ number_format($transaction_detail->price, 2) }}
                         @endif
                     </td>
                     <td width="20%" class="right top">
-                        @if($invoice_transaction->booking()->first()->fix_currency_id !== 1)
+                        @if($transaction->booking()->first()->fix_currency_id !== 1)
                         
-                            {{  number_format((float)number_format( (1/$invoice_transaction->currency_rate) * $transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2) }}
+                            {{  number_format((float)number_format( (1/$transaction->currency_rate) * $transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2) }}
                             
                             @php
-                                $subtotal += number_format((float)number_format( (1/$invoice_transaction->currency_rate) * $transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2,'.','');
+                                $subtotal += number_format((float)number_format( (1/$transaction->currency_rate) * $transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2,'.','');
                             @endphp
                         @else                            
                             {{ number_format((float)number_format($transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2) }}
@@ -129,35 +129,35 @@
                 <td colspan="4"></td>
                 <td class="right">Service Charges</td>
                 <td class="right">
-                    {{ number_format($invoice_transaction->service_charge, 2) }}
+                    {{ number_format($transaction->service_charge, 2) }}
                 </td>
             </tr>
             <tr class="billingcharges">
                 <td colspan="4"></td>
                 <td class="right">Adjustment</td>
                 <td class="right">
-                    @if($invoice_transaction->booking()->first()->fix_currency_id !== 1)                        
-                        {{ number_format((float)number_format( (1/$invoice_transaction->currency_rate) * $invoice_transaction->amount, 2,'.','') - (float)number_format($subtotal, 2,'.',''),2) }}
+                    @if($transaction->booking()->first()->fix_currency_id !== 1)                        
+                        {{ number_format((float)number_format( (1/$transaction->currency_rate) * $transaction->amount, 2,'.','') - (float)number_format($subtotal, 2,'.',''),2) }}
                     @else                        
-                        {{ number_format((float)number_format($invoice_transaction->amount, 2,'.','') - (float)number_format($subtotal, 2,'.',''),2) }}
+                        {{ number_format((float)number_format($transaction->amount, 2,'.','') - (float)number_format($subtotal, 2,'.',''),2) }}
                     @endif
                 </td>
             </tr>
-            @if($invoice_transaction->tax > 0)
+            @if($transaction->tax > 0)
                 <tr class="billingcharges">
                     <td colspan="4"></td>
                     <td class="right">Tax</td>
-                    <td class="right">{{ number_format($invoice_transaction->tax, 2) }}</td>
+                    <td class="right">{{ number_format($transaction->tax, 2) }}</td>
                 </tr>
             @endif
             <tr>
                 <td colspan="4"></td>
                 <td class="right middle">Total</td>
                 <td class="total right middle">
-                    @if($invoice_transaction->booking()->first()->fix_currency_id !== 1)
-                        {{ number_format( ((1/$invoice_transaction->currency_rate) * $invoice_transaction->amount) + $invoice_transaction->service_charge + $invoice_transaction->tax, 2) }}
+                    @if($transaction->booking()->first()->fix_currency_id !== 1)
+                        {{ number_format( ((1/$transaction->currency_rate) * $transaction->amount) + $transaction->service_charge + $transaction->tax, 2) }}
                     @else
-                        {{ number_format($invoice_transaction->amount + $invoice_transaction->service_charge + $invoice_transaction->tax, 2) }}
+                        {{ number_format($transaction->amount + $transaction->service_charge + $transaction->tax, 2) }}
                     @endif
                 </td>
             </tr>
diff --git a/resources/views/pages/pdfs/purchase_order.blade.php b/resources/views/pages/pdfs/purchase_order.blade.php
index d190f285..84205178 100644
--- a/resources/views/pages/pdfs/purchase_order.blade.php
+++ b/resources/views/pages/pdfs/purchase_order.blade.php
@@ -97,19 +97,19 @@
                     <td class="description">{{ $transaction_detail->product_name }}</td>
                     <td width="10%" class="center top">{{ $transaction_detail->quantity }}</td>
                     <td width="15%" class="center top">
-                        @if($invoice_transaction->booking()->first()->fix_currency_id !== 1)
-                            {{ number_format( (1/$invoice_transaction->currency_rate) * $transaction_detail->price, 2) }}
+                        @if($transaction->booking()->first()->fix_currency_id !== 1)
+                            {{ number_format( (1/$transaction->currency_rate) * $transaction_detail->price, 2) }}
                         @else
                             {{ number_format($transaction_detail->price, 2) }}
                         @endif
                     </td>
                     <td width="20%" class="right top">
-                        @if($invoice_transaction->booking()->first()->fix_currency_id !== 1)
+                        @if($transaction->booking()->first()->fix_currency_id !== 1)
                         
-                            {{  number_format((float)number_format( (1/$invoice_transaction->currency_rate) * $transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2) }}
+                            {{  number_format((float)number_format( (1/$transaction->currency_rate) * $transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2) }}
                             
                             @php
-                                $subtotal += number_format((float)number_format( (1/$invoice_transaction->currency_rate) * $transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2,'.','');
+                                $subtotal += number_format((float)number_format( (1/$transaction->currency_rate) * $transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2,'.','');
                             @endphp
                         @else                            
                             {{ number_format((float)number_format($transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2) }}
@@ -134,35 +134,35 @@
                 <td colspan="4"></td>
                 <td class="right">Service Charges</td>
                 <td class="right">
-                    {{ number_format($invoice_transaction->service_charge, 2) }}
+                    {{ number_format($transaction->service_charge, 2) }}
                 </td>
             </tr>
             <tr class="billingcharges">
                 <td colspan="4"></td>
                 <td class="right">Adjustment</td>
                 <td class="right">
-                    @if($invoice_transaction->booking()->first()->fix_currency_id !== 1)                        
-                        {{ number_format((float)number_format( (1/$invoice_transaction->currency_rate) * $invoice_transaction->amount, 2,'.','') - (float)number_format($subtotal, 2,'.',''),2) }}
+                    @if($transaction->booking()->first()->fix_currency_id !== 1)                        
+                        {{ number_format((float)number_format( (1/$transaction->currency_rate) * $transaction->amount, 2,'.','') - (float)number_format($subtotal, 2,'.',''),2) }}
                     @else                        
-                        {{ number_format((float)number_format($invoice_transaction->amount, 2,'.','') - (float)number_format($subtotal, 2,'.',''),2) }}
+                        {{ number_format((float)number_format($transaction->amount, 2,'.','') - (float)number_format($subtotal, 2,'.',''),2) }}
                     @endif
                 </td>
             </tr>
-            @if($invoice_transaction->tax > 0)
+            @if($transaction->tax > 0)
                 <tr class="billingcharges">
                     <td colspan="4"></td>
                     <td class="right">Tax</td>
-                    <td class="right">{{ number_format($invoice_transaction->tax, 2) }}</td>
+                    <td class="right">{{ number_format($transaction->tax, 2) }}</td>
                 </tr>
             @endif
             <tr>
                 <td colspan="4"></td>
                 <td class="right middle">Total</td>
                 <td class="total right middle">
-                    @if($invoice_transaction->booking()->first()->fix_currency_id !== 1)
-                        {{ number_format( ((1/$invoice_transaction->currency_rate) * $invoice_transaction->amount) + $invoice_transaction->service_charge + $invoice_transaction->tax, 2) }}
+                    @if($transaction->booking()->first()->fix_currency_id !== 1)
+                        {{ number_format( ((1/$transaction->currency_rate) * $transaction->amount) + $transaction->service_charge + $transaction->tax, 2) }}
                     @else
-                        {{ number_format($invoice_transaction->amount + $invoice_transaction->service_charge + $invoice_transaction->tax, 2) }}
+                        {{ number_format($transaction->amount + $transaction->service_charge + $transaction->tax, 2) }}
                     @endif
                 </td>
             </tr>
diff --git a/resources/views/pages/pdfs/supplier_deliver_order.blade.php b/resources/views/pages/pdfs/supplier_deliver_order.blade.php
index 17c0bcf2..4f299878 100644
--- a/resources/views/pages/pdfs/supplier_deliver_order.blade.php
+++ b/resources/views/pages/pdfs/supplier_deliver_order.blade.php
@@ -6,16 +6,16 @@
         <table width="100%" style="border-bottom: 1px solid black;">
             <tr>
                 <td style="text-align: center; color: red; text-transform: uppercase; font-weight: bold; font-size: 18px;  padding-bottom: 5px;">
-                    @if(in_array($supplier_deliver_order_transaction->issuer, [2, 1921]))
+                    @if(in_array($transactions->issuer, [2, 1921]))
                         Atvantic Import & Export Snd. Bhd (1309816-P)
                     @endif
-                    @if(in_array($supplier_deliver_order_transaction->issuer, [1937, 1970]))
+                    @if(in_array($transactions->issuer, [1937, 1970]))
                         BK Gemilang Sdn Bhd (1403513-U)
                     @endif
-                    @if(in_array($supplier_deliver_order_transaction->issuer, [2165, 2185]))
+                    @if(in_array($transactions->issuer, [2165, 2185]))
                         YSN SOLUTION TRADING SDN BHD (1393892-D)
                     @endif
-                    @if(in_array($supplier_deliver_order_transaction->issuer, [2210]))
+                    @if(in_array($transactions->issuer, [2210]))
                         RACK SOLUTION INDUSTRIES SDN BHD (954723-W)
                     @endif
                 </td>
@@ -29,8 +29,8 @@
                 <strong>Delivery Order</strong>
             </td>
             <td class="document-detail">
-                PO#: {{ $supplier_deliver_order_transaction->bill_no }} <br>
-                Ref#: {{ $supplier_deliver_order_transaction->booking->marking }} <br>
+                PO#: {{ $transactions->bill_no }} <br>
+                Ref#: {{ $transactions->booking->marking }} <br>
                 Date: {{ $po_order_transaction->created_at }}
             </td>
         </tr>
@@ -93,19 +93,19 @@
                     <td class="description">{{ $transaction_detail->product_name }}</td>
                     <td width="10%" class="center top">{{ $transaction_detail->quantity }}</td>
                     <td width="15%" class="center top">
-                        @if($supplier_deliver_order_transaction->booking()->first()->fix_currency_id !== 1)
-                            {{ number_format( (1/$supplier_deliver_order_transaction->currency_rate) * $transaction_detail->price, 2) }}
+                        @if($transactions->booking()->first()->fix_currency_id !== 1)
+                            {{ number_format( (1/$transactions->currency_rate) * $transaction_detail->price, 2) }}
                         @else
                             {{ number_format($transaction_detail->price, 2) }}
                         @endif
                     </td>
                     <td width="20%" class="right top">
-                        @if($supplier_deliver_order_transaction->booking()->first()->fix_currency_id !== 1)
+                        @if($transactions->booking()->first()->fix_currency_id !== 1)
 
-                            {{  number_format((float)number_format( (1/$supplier_deliver_order_transaction->currency_rate) * $transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2) }}
+                            {{  number_format((float)number_format( (1/$transactions->currency_rate) * $transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2) }}
                             
                             @php
-                                $subtotal += number_format((float)number_format( (1/$supplier_deliver_order_transaction->currency_rate) * $transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2,'.','');
+                                $subtotal += number_format((float)number_format( (1/$transactions->currency_rate) * $transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2,'.','');
                             @endphp
                         @else                                                        
                             {{ number_format((float)number_format($transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2) }}
@@ -130,10 +130,10 @@
                 <td colspan="4"></td>
                 <td class="right">Adjustment</td>
                 <td class="right">
-                    @if($supplier_deliver_order_transaction->booking()->first()->fix_currency_id !== 1)                        
-                        {{ number_format((float)number_format( (1/$supplier_deliver_order_transaction->currency_rate) * $supplier_deliver_order_transaction->amount, 2,'.','') - (float)number_format($subtotal, 2,'.',''),2) }}
+                    @if($transactions->booking()->first()->fix_currency_id !== 1)                        
+                        {{ number_format((float)number_format( (1/$transactions->currency_rate) * $transactions->amount, 2,'.','') - (float)number_format($subtotal, 2,'.',''),2) }}
                     @else                        
-                        {{ number_format((float)number_format($supplier_deliver_order_transaction->amount, 2,'.','') - (float)number_format($subtotal, 2,'.',''),2) }}
+                        {{ number_format((float)number_format($transactions->amount, 2,'.','') - (float)number_format($subtotal, 2,'.',''),2) }}
                     @endif
                 </td>
             </tr>
@@ -141,10 +141,10 @@
                 <td colspan="4"></td>
                 <td class="right middle">Total</td>
                 <td class="total right middle">
-                    @if($supplier_deliver_order_transaction->booking()->first()->fix_currency_id !== 1)
-                        {{ number_format( ((1/$supplier_deliver_order_transaction->currency_rate) * $supplier_deliver_order_transaction->amount), 2) }}
+                    @if($transactions->booking()->first()->fix_currency_id !== 1)
+                        {{ number_format( ((1/$transactions->currency_rate) * $transactions->amount), 2) }}
                     @else
-                        {{ number_format($supplier_deliver_order_transaction->amount, 2) }}
+                        {{ number_format($transactions->amount, 2) }}
                     @endif
                 </td>
             </tr>

From 7756726ea8ddf45144b7fc47eee083f639f6b231 Mon Sep 17 00:00:00 2001
From: glovetleong <glovetleong@gmail.com>
Date: Fri, 29 Apr 2022 09:09:58 +0800
Subject: [PATCH 45/54] no file error

---
 .../ControllersLogic/DownloadBookingDocumentLogic.php         | 4 +++-
 .../Bookings/DownloadBookingDocumentController.php            | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/Classes/Modules/Bookings/ControllersLogic/DownloadBookingDocumentLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/DownloadBookingDocumentLogic.php
index de4b59f1..ff9427fe 100644
--- a/app/Classes/Modules/Bookings/ControllersLogic/DownloadBookingDocumentLogic.php
+++ b/app/Classes/Modules/Bookings/ControllersLogic/DownloadBookingDocumentLogic.php
@@ -45,7 +45,9 @@ class DownloadBookingDocumentLogic
                 })->get();
 
 
-            if (!count($bookings)) throw new MalformedRequestException('No available file to download');
+            if (!count($bookings)) {
+                return response()->json(['no file to download']);
+            }
 
             foreach ($bookings as $booking) {
 
diff --git a/app/Http/Controllers/Bookings/DownloadBookingDocumentController.php b/app/Http/Controllers/Bookings/DownloadBookingDocumentController.php
index d2a7d85c..95427363 100644
--- a/app/Http/Controllers/Bookings/DownloadBookingDocumentController.php
+++ b/app/Http/Controllers/Bookings/DownloadBookingDocumentController.php
@@ -15,7 +15,7 @@ class DownloadBookingDocumentController
      * @throws \App\Classes\Exceptions\MalformedRequestException
      */
     public function download(Request $request, DownloadBookingDocumentLogic $logic) {
-        $logic->execute($request);
+        return $logic->execute($request);
     }
 
 }
\ No newline at end of file

From 6e1d31159ba88ff2b1bdac198f1013f9ed86772e Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Sun, 1 May 2022 12:21:31 +0800
Subject: [PATCH 46/54] update export booking transaction add in supplier name

---
 .../Exports/Services/ExportsBookingTransactions.php  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/Classes/Modules/Exports/Services/ExportsBookingTransactions.php b/app/Classes/Modules/Exports/Services/ExportsBookingTransactions.php
index 7da82a31..aed106ea 100644
--- a/app/Classes/Modules/Exports/Services/ExportsBookingTransactions.php
+++ b/app/Classes/Modules/Exports/Services/ExportsBookingTransactions.php
@@ -2,6 +2,7 @@
 
 namespace App\Classes\Modules\Exports\Services;
 
+use App\Models\Company;
 use App\Models\Transaction;
 use Maatwebsite\Excel\Concerns\Exportable;
 use Maatwebsite\Excel\Concerns\FromQuery;
@@ -29,7 +30,8 @@ class ExportsBookingTransactions implements FromQuery, WithHeadings, WithHeading
             'Ref No',
             'Creted Date',
             'Amount',
-            'Rate'
+            'Rate',
+            'Supplier'
         ];
     }
 
@@ -54,11 +56,8 @@ class ExportsBookingTransactions implements FromQuery, WithHeadings, WithHeading
      */
     public function map($transaction): array
     {
-        if ($transaction->owner->owner == null){
-            $refNo = $transaction->owner->marking;
-        } else {
-            $refNo = $transaction->owner->owner->marking;
-        }
+        $supplierName = Company::where('id', $transaction->issuer)->get()->first()->name;
+        $refNo = $transaction->owner->owner == null ?  $transaction->owner->marking : $transaction->owner->owner->marking;
         
         $createdAt = $transaction->created_at->format('d-m-Y');
         $amount = $transaction->amount;
@@ -69,6 +68,7 @@ class ExportsBookingTransactions implements FromQuery, WithHeadings, WithHeading
             $createdAt,
             $amount,
             $rate,
+            $supplierName
         ];
     }
 }
\ No newline at end of file

From 0004d53901d2dfd17d2d4f586b101ba3c7b238f3 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Sun, 1 May 2022 23:11:38 +0800
Subject: [PATCH 47/54] update code on export analytic booking data for Hybrid
 paymentMethod

---
 .../ExportsAnalyticBookingTransactions.php    | 29 ++++++++-----------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/app/Classes/Modules/Exports/Services/ExportsAnalyticBookingTransactions.php b/app/Classes/Modules/Exports/Services/ExportsAnalyticBookingTransactions.php
index 9861b78f..791c0de3 100644
--- a/app/Classes/Modules/Exports/Services/ExportsAnalyticBookingTransactions.php
+++ b/app/Classes/Modules/Exports/Services/ExportsAnalyticBookingTransactions.php
@@ -65,6 +65,18 @@ class ExportsAnalyticBookingTransactions implements FromQuery, WithHeadings, Wit
         $companyType[companyType::PERSONAL_BUSINESS] = 'PERSONAL_BUSINESS';
 
         $payments = $booking->transactions()->where('type', 1)->whereIn('status', [2, 3]);
+        
+        $paymentmethondArray = PaymentMethodType::PAYMENT_METHODS_ID;
+        $paymentmethondArray[0] = 'Hybrid';
+        $paymentMethod = '';
+        foreach ($payments->get() as $payment) {
+            if ( $paymentMethod == '' ) { 
+                $paymentMethod = $payment->payment_method;
+            } else if ( $payment->payment_method != $paymentMethod ) {
+                $paymentMethod = 0; // set it to Hybrid
+            }
+        }
+        $paymentMethod === '' ? '' : $paymentMethod = $paymentmethondArray[$paymentMethod];
 
         $firstPayment = $payments->first();
 
@@ -74,23 +86,6 @@ class ExportsAnalyticBookingTransactions implements FromQuery, WithHeadings, Wit
 
         $lastPayment = $booking->transactions()->where('type', 1)->whereIn('status', [2, 3])->orderBy('id', 'desc')->first();
 
-        $paymentMethod = '';
-        foreach ($payments->get() as $payment) {
-
-            if ( $paymentMethod == '' ) { 
-                $paymentMethod = $payment->payment_method;
-            } else {
-                if ( $payment->payment_method != $paymentMethod ) {
-                    $paymentMethod = 0; // set it to Hybrid
-                }
-            }
-        }
-
-        $paymentmethondArray = PaymentMethodType::PAYMENT_METHODS_ID;
-        $paymentmethondArray[0] = 'Hybrid';
-
-        $paymentMethod == '' ? '' : $paymentMethod = $paymentmethondArray[$paymentMethod];
-
         return [
             $booking->id,
             $booking->company_id,

From d85bcfe2de199c3898031d250fdb8ec1e3af7311 Mon Sep 17 00:00:00 2001
From: glovetleong <glovetleong@gmail.com>
Date: Wed, 4 May 2022 11:54:56 +0800
Subject: [PATCH 48/54] register test

---
 .env.dusk                                     | 59 +++++++++++++++++++
 .../ControllersLogic/CreateCustomerLogic.php  |  2 +-
 config/database.php                           | 20 +++++++
 .../forms/RegistrationFormComponent.vue       | 20 +++----
 tests/Browser/DryRun/CreateBookingTest.php    |  4 +-
 tests/Browser/DryRun/LoginTe.php              |  2 +-
 .../Browser/DryRun/UserRegisterLoginTest.php  | 28 +++++++++
 7 files changed, 121 insertions(+), 14 deletions(-)
 create mode 100644 .env.dusk
 create mode 100644 tests/Browser/DryRun/UserRegisterLoginTest.php

diff --git a/.env.dusk b/.env.dusk
new file mode 100644
index 00000000..4041ae24
--- /dev/null
+++ b/.env.dusk
@@ -0,0 +1,59 @@
+APP_NAME=Laravel
+APP_ENV=local
+APP_KEY=base64:X521H/hWdbsG6S/JG0Q/BZgTo1azoV18kzqkqMQSDrQ=
+APP_DEBUG=true
+APP_URL=http://localhost
+
+LOG_CHANNEL=stack
+
+DB_CONNECTION=dusk
+DB_HOST=127.0.0.1
+DB_PORT=3306
+DB_DATABASE=exchange-test
+DB_USERNAME=root
+DB_PASSWORD=
+
+BROADCAST_DRIVER=log
+CACHE_DRIVER=file
+QUEUE_CONNECTION=sync
+SESSION_DRIVER=file
+SESSION_LIFETIME=120
+
+REDIS_HOST=127.0.0.1
+REDIS_PASSWORD=null
+REDIS_PORT=6379
+
+MAIL_MAILER=smtp
+MAIL_HOST=smtp.mailtrap.io
+MAIL_PORT=2525
+MAIL_USERNAME=null
+MAIL_PASSWORD=null
+MAIL_ENCRYPTION=null
+MAIL_FROM_ADDRESS=null
+MAIL_FROM_NAME="${APP_NAME}"
+
+AWS_ACCESS_KEY_ID=
+AWS_SECRET_ACCESS_KEY=
+AWS_DEFAULT_REGION=us-east-1
+AWS_BUCKET=
+
+PUSHER_APP_ID=
+PUSHER_APP_KEY=
+PUSHER_APP_SECRET=
+PUSHER_APP_CLUSTER=mt1
+
+MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
+MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
+
+FILESYSTEM_DRIVER="documents"
+
+JWT_SECRET=
+JWT_TTL=1440
+
+SHIPPING_URL=http://shipping-portal.test/
+MIX_SHIPPING_URL="${SHIPPING_URL}"
+
+BILLPLZ_BASE_URL="https://www.billplz-sandbox.com"
+BILLPLZ_API_KEY="0fa4c710-761b-4a7a-a501-c2c2d02643d5"
+BILLPLZ_X_SIGNATURE_KEY="S-pbNVthVRsvnPfZlgLwqqOg"
+BILLPLZ_COLLECTION_ID="hev2wdjy"
\ No newline at end of file
diff --git a/app/Classes/Modules/Accounts/ControllersLogic/CreateCustomerLogic.php b/app/Classes/Modules/Accounts/ControllersLogic/CreateCustomerLogic.php
index 3fe7b382..84c995cf 100644
--- a/app/Classes/Modules/Accounts/ControllersLogic/CreateCustomerLogic.php
+++ b/app/Classes/Modules/Accounts/ControllersLogic/CreateCustomerLogic.php
@@ -100,7 +100,7 @@ class CreateCustomerLogic extends AbstractControllerLogic
 
         $this->assignSegmentProcessor->execute($company);
 
-         $this->generateEmailVerificationAttemptProcessor->execute($user);
+         // $this->generateEmailVerificationAttemptProcessor->execute($user);
 
         return $this->response($this->authenticationProcessor->execute($request));
 
diff --git a/config/database.php b/config/database.php
index aeabec6f..ac0b718b 100644
--- a/config/database.php
+++ b/config/database.php
@@ -63,6 +63,26 @@ return [
             ]) : [],
         ],
 
+        'dusk' => [
+            'driver' => 'mysql',
+            'url' => env('DATABASE_URL'),
+            'host' => env('DB_HOST', '127.0.0.1'),
+            'port' => env('DB_PORT', '3306'),
+            'database' => env('DB_DATABASE', 'forge'),
+            'username' => env('DB_USERNAME', 'forge'),
+            'password' => env('DB_PASSWORD', ''),
+            'unix_socket' => env('DB_SOCKET', ''),
+            'charset' => 'utf8mb4',
+            'collation' => 'utf8mb4_unicode_ci',
+            'prefix' => '',
+            'prefix_indexes' => true,
+            'strict' => false,
+            'engine' => null,
+            'options' => extension_loaded('pdo_mysql') ? array_filter([
+                PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
+            ]) : [],
+        ],
+
         'pgsql' => [
             'driver' => 'pgsql',
             'url' => env('DATABASE_URL'),
diff --git a/resources/assets/vue/components/accounts/forms/RegistrationFormComponent.vue b/resources/assets/vue/components/accounts/forms/RegistrationFormComponent.vue
index 429d0b9a..9f49275e 100644
--- a/resources/assets/vue/components/accounts/forms/RegistrationFormComponent.vue
+++ b/resources/assets/vue/components/accounts/forms/RegistrationFormComponent.vue
@@ -33,7 +33,7 @@
                                                                          viewBox="0 0 172 172"
                                                                          style=" fill:#000000;"><defs><linearGradient x1="107.5" y1="82.30469" x2="107.5" y2="101.12525" gradientUnits="userSpaceOnUse" id="color-1_114458_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="107.5" y1="56.10156" x2="107.5" y2="73.73962" gradientUnits="userSpaceOnUse" id="color-2_114458_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="123.625" y1="82.30469" x2="123.625" y2="101.12525" gradientUnits="userSpaceOnUse" id="color-3_114458_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="123.625" y1="56.10156" x2="123.625" y2="73.73962" gradientUnits="userSpaceOnUse" id="color-4_114458_gr4"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="25.98006" x2="86" y2="147.8125" gradientUnits="userSpaceOnUse" id="color-5_114458_gr5"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="115.5625" y1="25.98006" x2="115.5625" y2="147.8125" gradientUnits="userSpaceOnUse" id="color-6_114458_gr6"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="115.5625" y1="25.98006" x2="115.5625" y2="147.8125" gradientUnits="userSpaceOnUse" id="color-7_114458_gr7"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="53.75" y1="99.4375" x2="53.75" y2="106.82813" gradientUnits="userSpaceOnUse" id="color-8_114458_gr8"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="63.15625" y1="85.88713" x2="63.15625" y2="94.23719" gradientUnits="userSpaceOnUse" id="color-9_114458_gr9"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="44.34375" y1="85.94356" x2="44.34375" y2="94.00606" gradientUnits="userSpaceOnUse" id="color-10_114458_gr10"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><path d="M104.8125,83.3125h5.375v16.125h-5.375z" fill="url(#color-1_114458_gr1)"></path><path d="M104.8125,56.4375h5.375v16.125h-5.375z" fill="url(#color-2_114458_gr2)"></path><path d="M120.9375,83.3125h5.375v16.125h-5.375z" fill="url(#color-3_114458_gr3)"></path><path d="M120.9375,56.4375h5.375v16.125h-5.375z" fill="url(#color-4_114458_gr4)"></path><path d="M155.875,37.625v-5.375c0,-2.96431 -2.41069,-5.375 -5.375,-5.375h-102.125c-2.96431,0 -5.375,2.41069 -5.375,5.375v5.375c0,2.96431 2.41069,5.375 5.375,5.375v16.7485c-10.01631,2.28438 -17.68644,10.78494 -18.69425,21.2205c-4.68431,1.15831 -8.18075,5.36694 -8.18075,10.406c0,5.47444 4.12531,9.9545 9.42506,10.61563c0.47569,1.36256 1.05888,2.67406 1.75763,3.91569c-10.38181,7.02512 -16.55769,18.57062 -16.55769,31.15619v8.0625h69.875h5.375h64.5v-5.375h-5.375v-96.75c2.96431,0 5.375,-2.41069 5.375,-5.375zM48.375,32.25h102.125l0.00538,5.375h-102.13038zM34.9375,83.3125c0,-10.37106 8.44144,-18.8125 18.8125,-18.8125c10.37106,0 18.8125,8.44144 18.8125,18.8125v10.75c0,10.37106 -8.44144,18.8125 -18.8125,18.8125c-10.37106,0 -18.8125,-8.44144 -18.8125,-18.8125zM26.875,91.375c0,-1.98069 1.08844,-3.69531 2.6875,-4.62788v7.31538c0,0.67188 0.04838,1.33569 0.10213,1.99412c-1.6555,-0.91644 -2.78963,-2.66062 -2.78963,-4.68162zM53.75,118.25c7.095,0 13.46437,-3.08794 17.89338,-7.97113c1.51575,1.01319 2.90788,2.15 4.20862,3.37281c-5.58194,6.28069 -13.62831,9.97331 -22.102,9.97331c-8.47637,0 -16.52275,-3.68994 -22.102,-9.97062c1.30075,-1.22281 2.69288,-2.35963 4.20863,-3.37281c4.429,4.8805 10.79838,7.96844 17.89338,7.96844zM21.5,139.75v-2.6875c0,-7.14875 2.3435,-13.89169 6.49837,-19.393c6.57631,7.15681 15.9315,11.3305 25.75163,11.3305c9.81744,0 19.17531,-4.17369 25.75163,-11.33319c4.15487,5.504 6.49837,12.24962 6.49837,19.39569v2.6875zM115.5625,139.75v-5.375h29.5625v5.375zM145.125,118.25h-18.8125v5.375h18.8125v5.375h-29.5625v-13.4375c0,-4.44512 -3.61738,-8.0625 -8.0625,-8.0625h-13.4375v5.375h13.4375c1.4835,0 2.6875,1.204 2.6875,2.6875v24.1875h-18.8125v-2.6875c0,-12.58556 -6.17588,-24.13106 -16.55769,-31.15619c0.70144,-1.24162 1.28463,-2.55044 1.75762,-3.91569c5.29975,-0.66112 9.42506,-5.14119 9.42506,-10.61562c0,-5.03906 -3.49644,-9.24769 -8.18075,-10.406c-1.1825,-12.24156 -11.52131,-21.844 -24.06925,-21.844v-16.125h91.375zM77.9375,94.0625v-7.31538c1.59906,0.93256 2.6875,2.64719 2.6875,4.62788c0,2.021 -1.13412,3.76519 -2.78963,4.68162c0.05375,-0.65844 0.10213,-1.32225 0.10213,-1.99412z" fill="url(#color-5_114458_gr5)"></path><path d="M99.4375,102.125h32.25c2.96431,0 5.375,-2.41069 5.375,-5.375v-10.75c0,-2.96431 -2.41069,-5.375 -5.375,-5.375h-32.25c-2.96431,0 -5.375,2.41069 -5.375,5.375v10.75c0,2.96431 2.41069,5.375 5.375,5.375zM99.4375,86h32.25l0.00538,10.75h-32.25538z" fill="url(#color-6_114458_gr6)"></path><path d="M99.4375,75.25h32.25c2.96431,0 5.375,-2.41069 5.375,-5.375v-10.75c0,-2.96431 -2.41069,-5.375 -5.375,-5.375h-32.25c-2.96431,0 -5.375,2.41069 -5.375,5.375v10.75c0,2.96431 2.41069,5.375 5.375,5.375zM99.4375,59.125h32.25l0.00538,10.75h-32.25538z" fill="url(#color-7_114458_gr7)"></path><path d="M53.75,107.5c4.45319,0 8.0625,-3.60931 8.0625,-8.0625h-16.125c0,4.45319 3.60931,8.0625 8.0625,8.0625z" fill="url(#color-8_114458_gr8)"></path><path d="M63.15625,86c-2.2264,0 -4.03125,1.80485 -4.03125,4.03125c0,2.2264 1.80485,4.03125 4.03125,4.03125c2.2264,0 4.03125,-1.80485 4.03125,-4.03125c0,-2.2264 -1.80485,-4.03125 -4.03125,-4.03125z" fill="url(#color-9_114458_gr9)"></path><path d="M44.34375,86c-2.2264,0 -4.03125,1.80485 -4.03125,4.03125c0,2.2264 1.80485,4.03125 4.03125,4.03125c2.2264,0 4.03125,-1.80485 4.03125,-4.03125c0,-2.2264 -1.80485,-4.03125 -4.03125,-4.03125z" fill="url(#color-10_114458_gr10)"></path></g></g></svg>
                                                                 </div>
-                                                                <p class="no-margin bold">Company</p>
+                                                                <p id="company-select" class="no-margin bold">Company</p>
                                                             </div>
                                                         </div>
                                                         <div class="col-auto">
@@ -43,7 +43,7 @@
                                                                          width="45" height="45"
                                                                          viewBox="0 0 172 172"
                                                                          style=" fill:#000000;"><defs><linearGradient x1="99.4375" y1="82.64063" x2="99.4375" y2="95.42506" gradientUnits="userSpaceOnUse" id="color-1_43595_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="72.5625" y1="82.64063" x2="72.5625" y2="95.42506" gradientUnits="userSpaceOnUse" id="color-2_43595_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="99.21444" x2="86" y2="110.1875" gradientUnits="userSpaceOnUse" id="color-3_43595_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="16.57381" x2="86" y2="157.67563" gradientUnits="userSpaceOnUse" id="color-4_43595_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><path d="M99.4375,83.3125c-2.96853,0 -5.375,2.40647 -5.375,5.375c0,2.96853 2.40647,5.375 5.375,5.375c2.96853,0 5.375,-2.40647 5.375,-5.375c0,-2.96853 -2.40647,-5.375 -5.375,-5.375z" fill="url(#color-1_43595_gr1)"></path><path d="M72.5625,83.3125c-2.96853,0 -5.375,2.40647 -5.375,5.375c0,2.96853 2.40647,5.375 5.375,5.375c2.96853,0 5.375,-2.40647 5.375,-5.375c0,-2.96853 -2.40647,-5.375 -5.375,-5.375z" fill="url(#color-2_43595_gr2)"></path><path d="M91.375,99.4375h-10.75c-1.4835,0 -2.6875,1.204 -2.6875,2.6875c0,4.45319 3.60931,8.0625 8.0625,8.0625c4.45319,0 8.0625,-3.60931 8.0625,-8.0625c0,-1.4835 -1.204,-2.6875 -2.6875,-2.6875z" fill="url(#color-3_43595_gr3)"></path><path d="M120.40538,103.85575c1.02662,-2.31931 1.83288,-4.75419 2.37575,-7.29119c6.53062,-0.91106 11.59387,-6.47419 11.59387,-13.25206c0,-4.37256 -2.13119,-8.22644 -5.375,-10.68281v-5.44219c0,-18.00625 -11.137,-33.43787 -26.875,-39.83412v-5.84263c0,-2.96969 -2.41606,-5.38575 -5.38575,-5.38575h-2.67675c-3.225,0 -6.08987,1.45662 -8.0625,3.71412c-1.97263,-2.2575 -4.8375,-3.71412 -8.0625,-3.71412h-2.6875c-2.96431,0 -5.375,2.41069 -5.375,5.375v5.85338c-15.738,6.39625 -26.875,21.82787 -26.875,39.83413v5.44219c-3.24381,2.45637 -5.375,6.31025 -5.375,10.68281c0,6.77787 5.06325,12.341 11.59387,13.25206c0.54288,2.537 1.34913,4.97187 2.37575,7.29119c-12.30875,10.25281 -19.34462,25.18456 -19.34462,41.26925v10.75h107.5v-10.75c0,-16.08469 -7.03588,-31.01644 -19.34463,-41.26925zM120.97781,111.72206l-19.64025,19.64025c-1.01856,1.01319 -2.78156,1.01319 -3.80013,0l-5.5685,-5.5685c10.87631,-1.74419 20.19119,-8.14581 25.84569,-17.11131c1.10994,0.9675 2.15538,1.98875 3.16319,3.03956zM53.75,88.6875v-13.4375h5.375c6.84775,0 12.83281,-3.68994 16.125,-9.17513c3.29219,5.48519 9.27725,9.17513 16.125,9.17513h26.875v13.4375c0,17.78319 -14.46681,32.25 -32.25,32.25c-17.78319,0 -32.25,-14.46681 -32.25,-32.25zM123.51213,90.91544c0.043,-0.74175 0.11288,-1.47544 0.11288,-2.22794v-12.943c3.12287,1.11531 5.375,4.06888 5.375,7.568c0,3.53944 -2.30856,6.52256 -5.48788,7.60294zM94.0625,21.5l2.6875,0.01075v4.09038c-2.39725,-0.62081 -4.86706,-1.04813 -7.40675,-1.24431c0.90838,-1.69044 2.67137,-2.85681 4.71925,-2.85681zM75.25,21.5h2.6875c2.04788,0 3.81087,1.16637 4.71925,2.85681c-2.53969,0.19619 -5.0095,0.6235 -7.40675,1.24431zM86,29.5625c17.97669,0 33.02938,12.67963 36.73275,29.5625h-31.35775c-1.4835,0 -2.6875,-1.204 -2.6875,-2.6875v-5.375h-5.375v5.375c0,4.44512 3.61738,8.0625 8.0625,8.0625h32.11294c0.0645,0.89225 0.13706,1.78181 0.13706,2.6875v2.6875h-2.6875h-2.6875h-26.875c-7.40944,0 -13.4375,-6.02806 -13.4375,-13.4375v-5.375h-5.375v5.375c0,7.40944 -6.02806,13.4375 -13.4375,13.4375h-5.375h-2.6875h-2.6875v-2.6875c0,-0.90569 0.07256,-1.79525 0.13706,-2.6875h10.61294c4.44512,0 8.0625,-3.61738 8.0625,-8.0625v-5.375h-5.375v5.375c0,1.4835 -1.204,2.6875 -2.6875,2.6875h-9.85775c3.70338,-16.88287 18.75606,-29.5625 36.73275,-29.5625zM43,83.3125c0,-3.49912 2.25212,-6.45269 5.375,-7.568v12.943c0,0.7525 0.06987,1.48619 0.11288,2.22794c-3.17931,-1.08038 -5.48788,-4.0635 -5.48788,-7.60294zM80.07406,125.79919l-5.6115,5.6115c-1.01856,1.01319 -2.78156,1.01319 -3.80013,0l-19.66175,-19.66175c1.01319,-1.05887 2.06669,-2.08819 3.18469,-3.06375c5.66256,8.97356 14.99356,15.37788 25.88869,17.114zM37.625,145.125c0,-10.7715 3.51525,-20.96519 9.8685,-29.283l19.36881,19.36881c1.57219,1.57219 3.63619,2.35694 5.70019,2.35694c2.064,0 4.128,-0.78475 5.70019,-2.35694l5.04981,-5.04981v20.339h-45.6875zM134.375,150.5h-5.375c0,-2.96431 -2.41069,-5.375 -5.375,-5.375h-10.75c-2.96431,0 -5.375,2.41069 -5.375,5.375h-18.8125v-20.38737l5.04981,5.04981c1.57219,1.57219 3.63619,2.35694 5.70019,2.35694c2.064,0 4.128,-0.78475 5.70019,-2.35694l19.34731,-19.34731c6.36669,8.32319 9.89,18.52494 9.89,29.30987z" fill="url(#color-4_43595_gr4)"></path></g></g></svg></div>
-                                                                <p class="no-margin bold">Personal</p>
+                                                                <p id="personal-select" class="no-margin bold">Personal</p>
                                                             </div>
                                                         </div>
                                                     </div>
@@ -62,7 +62,7 @@
                                                 <div class="col">
                                                     <validation-wrapper-component :validator="$v.parameters.company_name">
                                                         <label>Company Name</label>
-                                                        <input class="form-control" v-model="parameters.company_name">
+                                                        <input id="company_name" name="company_name" class="form-control" v-model="parameters.company_name">
                                                     </validation-wrapper-component>
                                                 </div>
                                             </div>
@@ -70,13 +70,13 @@
                                                 <div class="col p-r-5">
                                                     <validation-wrapper-component :validator="$v.parameters.name">
                                                         <label>Full Name</label>
-                                                        <input class="form-control" v-model="parameters.name">
+                                                        <input id="name" name="name" class="form-control" v-model="parameters.name">
                                                     </validation-wrapper-component>
                                                 </div>
                                                 <div class="col p-l-5">
                                                     <validation-wrapper-component :validator="$v.parameters.phone">
                                                         <label>Phone</label>
-                                                        <input class="form-control" v-model="parameters.phone">
+                                                        <input id="phone" name="phone" class="form-control" v-model="parameters.phone">
                                                     </validation-wrapper-component>
                                                 </div>
                                             </div>
@@ -95,7 +95,7 @@
                                         <div class="col">
                                             <validation-wrapper-component :validator="$v.parameters.email">
                                                 <label>Email</label>
-                                                <input class="form-control" v-model="parameters.email">
+                                                <input id="email" name="email" class="form-control" v-model="parameters.email">
                                             </validation-wrapper-component>
                                         </div>
                                     </div>
@@ -103,13 +103,13 @@
                                         <div class="col p-r-5">
                                             <validation-wrapper-component :validator="$v.parameters.password">
                                                 <label>Password</label>
-                                                <input class="form-control" type="password" v-model="parameters.password">
+                                                <input id="password" name="password" class="form-control" type="password" v-model="parameters.password">
                                             </validation-wrapper-component>
                                         </div>
                                         <div class="col p-l-5">
                                             <validation-wrapper-component :validator="$v.parameters.password_confirmation">
                                                 <label>Password Confirmation</label>
-                                                <input class="form-control" type="password" v-model="parameters.password_confirmation">
+                                                <input id="password_confirmation" name="password_confirmation" class="form-control" type="password" v-model="parameters.password_confirmation">
                                             </validation-wrapper-component>
                                         </div>
                                     </div>
@@ -135,7 +135,7 @@
                                     </a>
                                 </div>
                                 <div class="col text-right">
-                                    <button type="button" class="btn btn-sm p-t-10 p-b-10 p-r-35 p-l-35 btn-success b-rad-none" @click="changeStep('next')">Next</button>
+                                    <button type="button" id="next" class="btn btn-sm p-t-10 p-b-10 p-r-35 p-l-35 btn-success b-rad-none" @click="changeStep('next')">Next</button>
                                 </div>
                             </div>
                         </div>
@@ -156,7 +156,7 @@
                                     </button>
                                 </div>
                                 <div class="col text-right">
-                                    <button type="button" class="btn btn-sm p-t-10 p-b-10 p-r-35 p-l-35 btn-success b-rad-none" @click="submitForm">Complete Registration</button>
+                                    <button type="button" id="complete" class="btn btn-sm p-t-10 p-b-10 p-r-35 p-l-35 btn-success b-rad-none" @click="submitForm">Complete Registration</button>
                                 </div>
                             </div>
                         </div>
diff --git a/tests/Browser/DryRun/CreateBookingTest.php b/tests/Browser/DryRun/CreateBookingTest.php
index 98a47da7..75299c22 100644
--- a/tests/Browser/DryRun/CreateBookingTest.php
+++ b/tests/Browser/DryRun/CreateBookingTest.php
@@ -13,8 +13,8 @@ class CreateBookingTest extends DuskTestCase
      public function testLogin()
     {
         $this->browse(function (Browser $browser) {
-            $browser->visit('http://localhost:86')
-                    ->pause(500)
+            $browser->visit('http://exchange-2.0.test')
+                    ->pause(5000)
                     ->typeSlowly('email', 'junkit.mah@bioloop.com.my')
                     ->typeSlowly('password', '123456abcabc')
                     ->click('#sign-in')
diff --git a/tests/Browser/DryRun/LoginTe.php b/tests/Browser/DryRun/LoginTe.php
index 13ebc523..3694dfde 100644
--- a/tests/Browser/DryRun/LoginTe.php
+++ b/tests/Browser/DryRun/LoginTe.php
@@ -14,7 +14,7 @@ class LoginTest extends DuskTestCase
     public function testLogin()
     {
         $this->browse(function (Browser $browser) {
-            $browser->visit('http://localhost:86')
+            $browser->visit('http://exchange-2.0.test')
                     ->pause(500)
                     ->type('email', 'junkit.mah@bioloop.com.my')
                     ->type('password', '123456abcabc')
diff --git a/tests/Browser/DryRun/UserRegisterLoginTest.php b/tests/Browser/DryRun/UserRegisterLoginTest.php
new file mode 100644
index 00000000..d288fddd
--- /dev/null
+++ b/tests/Browser/DryRun/UserRegisterLoginTest.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace Tests\Browser\DryRun;
+
+use Laravel\Dusk\Browser;
+use Tests\DuskTestCase;
+
+class UserRegisterTest extends DuskTestCase
+{
+    public function testRegister()
+    {
+        $this->browse(function (Browser $browser) {
+            $browser->visit('http://exchange-2.0.test/signup')
+                    ->pause(5000)
+                    ->click('#company-select')
+                    ->type('company_name', 'lazada')
+                    ->type('name', 'Someone')
+                    ->type('phone', '0128888888')
+                    ->click('#next')
+                    ->type('email', 'someone@gmail.com')
+                    ->type('password', 'pass123')
+                    ->type('password_confirmation', 'pass123')
+                    ->click('#complete')
+                    ->pause(5000)
+                    ->assertPathIs('/dashboard');
+        });
+    }
+}

From 06dd1efa247202e279f35784fb189d4b696918ce Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 6 May 2022 13:49:37 +0800
Subject: [PATCH 49/54] remove raya announcement

---
 .../companies/sections/CustomerDashboardSectionComponent.vue | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/resources/assets/vue/components/companies/sections/CustomerDashboardSectionComponent.vue b/resources/assets/vue/components/companies/sections/CustomerDashboardSectionComponent.vue
index bcfafad5..9d11ecd0 100644
--- a/resources/assets/vue/components/companies/sections/CustomerDashboardSectionComponent.vue
+++ b/resources/assets/vue/components/companies/sections/CustomerDashboardSectionComponent.vue
@@ -3,11 +3,6 @@
         <div class="col">
             <div class="row">
                 <div class="col">
-                    <div class="row m-b-20">
-                        <div class="col text-center no-padding">
-                            <img src="https://izyim.cief-malaysia.com/images/raya-announcement.jpg" class="w-75">
-                        </div>
-                    </div>
                     <div class="row">
                         <div class="col-12">
                             <list-component style="min-height: auto;" section="customerAnnouncements" :emptyListSection=false :endpoint="route('api.announcement.list')" :options="{has_segments:true,is_published:true}">

From e29cd2cb798d39ebef52a14cd91d5d67e607e599 Mon Sep 17 00:00:00 2001
From: glovetleong <glovetleong@gmail.com>
Date: Tue, 10 May 2022 23:27:41 +0800
Subject: [PATCH 50/54] create booking online payment

---
 .../forms/BookingPaymentQuotationComponent.vue     | 14 +++++++-------
 .../forms/ConfirmQuotationFormComponent.vue        |  2 +-
 tests/Browser/DryRun/CreateBookingTest.php         | 12 ++++++++++--
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue b/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue
index b03b6447..79a428bc 100644
--- a/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue
+++ b/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue
@@ -124,7 +124,7 @@
                             </div>
                             <div class="row m-t-20" v-if="data.company.employee.status === 2 && data.company.status === 2 && data.outstanding_amount > 0">
                                 <div class="col">
-                                    <button class="btn btn-sm all-caps b-rad-none btn-success btn-block" @click="makePayment()">Make Payment</button>
+                                    <button id="payment-btn" class="btn btn-sm all-caps b-rad-none btn-success btn-block" @click="makePayment()">Make Payment</button>
                                 </div>
                             </div>
                         </div>
@@ -233,7 +233,7 @@
                                                             <div class="m-b-15 m-t-10 text-center">
                                                             <img src="/images/fpx-logo-vector-01.png" alt="logo" height="25">
                                                             </div>
-                                                            <p class="no-margin bold all-caps">Online Banking</p>
+                                                            <p id="online-banking" class="no-margin bold all-caps">Online Banking</p>
                                                         </div>
                                                     </div>
                                                 </div>
@@ -266,7 +266,7 @@
                                                 </div>
                                             </div>
                                             <div class="row m-t-10 m-b-10">
-                                                <div class="col text-center"><div class="padding-10 bg-master-lightest pointer" @click="$store.dispatch('toggleSection', {name: 'otherPaymentMethods', status: !$store.getters.isShowing('otherPaymentMethods')})"><i class="fa m-r-10" :class="[{'fa-angle-up': $store.getters.isShowing('otherPaymentMethods')}, {'fa-angle-down': !$store.getters.isShowing('otherPaymentMethods')}]"></i>{{$store.getters.isShowing('otherPaymentMethods') ? 'Hide' : 'Show'}} Alternative Methods <i class="fa m-l-10" :class="[{'fa-angle-up': $store.getters.isShowing('otherPaymentMethods')}, {'fa-angle-down': !$store.getters.isShowing('otherPaymentMethods')}]"></i></div></div>
+                                                <div class="col text-center"><div id="expend-method" class="padding-10 bg-master-lightest pointer" @click="$store.dispatch('toggleSection', {name: 'otherPaymentMethods', status: !$store.getters.isShowing('otherPaymentMethods')})"><i class="fa m-r-10" :class="[{'fa-angle-up': $store.getters.isShowing('otherPaymentMethods')}, {'fa-angle-down': !$store.getters.isShowing('otherPaymentMethods')}]"></i>{{$store.getters.isShowing('otherPaymentMethods') ? 'Hide' : 'Show'}} Alternative Methods <i class="fa m-l-10" :class="[{'fa-angle-up': $store.getters.isShowing('otherPaymentMethods')}, {'fa-angle-down': !$store.getters.isShowing('otherPaymentMethods')}]"></i></div></div>
                                             </div>
                                             <div class="row" v-show="$store.getters.isShowing('otherPaymentMethods')">
                                                 <div class="col">
@@ -280,7 +280,7 @@
                                                                              viewBox="0 0 172 172"
                                                                              style=" fill:#000000;"><defs><linearGradient x1="86" y1="15.45313" x2="86" y2="157.24562" gradientUnits="userSpaceOnUse" id="color-1_46094_gr1"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="86" y1="62.14844" x2="86" y2="87.68238" gradientUnits="userSpaceOnUse" id="color-2_46094_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><path d="M142.4375,26.875h-18.8125v-5.375c0,-2.96431 -2.41069,-5.375 -5.375,-5.375h-64.5c-2.96431,0 -5.375,2.41069 -5.375,5.375v5.375h-18.8125c-4.44513,0 -8.0625,3.61737 -8.0625,8.0625v86c0,4.44512 3.61737,8.0625 8.0625,8.0625h40.3125v10.75h-10.75c-4.44512,0 -8.0625,3.61738 -8.0625,8.0625v2.6875h-10.75v5.375h10.75h69.875h10.75v-5.375h-10.75v-2.6875c0,-4.44512 -3.61738,-8.0625 -8.0625,-8.0625h-10.75v-10.75h40.3125c4.44512,0 8.0625,-3.61738 8.0625,-8.0625v-86c0,-4.44513 -3.61737,-8.0625 -8.0625,-8.0625zM123.625,96.75v-53.75h10.75v64.5h-96.75v-64.5h10.75v53.75zM107.5,91.375h-43v-48.64644c5.25675,-1.06962 9.40894,-5.22181 10.47856,-10.47856h22.04019c1.06963,5.25675 5.22181,9.40894 10.47856,10.47856v48.64644zM53.75,21.5h64.5v69.875h-5.375v-53.75h-2.6875c-4.44512,0 -8.0625,-3.61738 -8.0625,-8.0625v-2.6875h-32.25v2.6875c0,4.44512 -3.61737,8.0625 -8.0625,8.0625h-2.6875v53.75h-5.375zM112.875,145.125c1.4835,0 2.6875,1.204 2.6875,2.6875v2.6875h-59.125v-2.6875c0,-1.4835 1.204,-2.6875 2.6875,-2.6875h10.75h32.25zM96.75,139.75h-21.5v-10.75h21.5zM145.125,120.9375c0,1.4835 -1.204,2.6875 -2.6875,2.6875h-40.3125h-32.25h-40.3125c-1.4835,0 -2.6875,-1.204 -2.6875,-2.6875v-86c0,-1.4835 1.204,-2.6875 2.6875,-2.6875h18.8125v5.375h-10.75c-2.96431,0 -5.375,2.41069 -5.375,5.375v64.5c0,2.96431 2.41069,5.375 5.375,5.375h96.75c2.96431,0 5.375,-2.41069 5.375,-5.375v-64.5c0,-2.96431 -2.41069,-5.375 -5.375,-5.375h-10.75v-5.375h18.8125c1.4835,0 2.6875,1.204 2.6875,2.6875z" fill="url(#color-1_46094_gr1)"></path><path d="M86,64.5c-5.93706,0 -10.75,4.81294 -10.75,10.75c0,5.93706 4.81294,10.75 10.75,10.75c5.93706,0 10.75,-4.81294 10.75,-10.75c0,-5.93706 -4.81294,-10.75 -10.75,-10.75z" fill="url(#color-2_46094_gr2)"></path></g></g></svg>
                                                                     </div>
-                                                                    <p class="no-margin bold">Manual Transfer</p>
+                                                                    <p id="manual-transfer" class="no-margin bold">Manual Transfer</p>
                                                                 </div>
                                                             </div>
                                                         </div>
@@ -406,7 +406,7 @@
                                     <button class="btn btn-xs all-caps b-rad-none btn-default bg-master-lighter btn-block" @click="expandPayment = false">Cancel</button>
                                 </div>
                                 <div class="col p-l-0">
-                                    <button class="btn btn-xs all-caps b-rad-none btn-success btn-block" :class="[{'hide': paymentMethod.name === ''}]" @click="submitForm()">Create Booking</button>
+                                    <button id="create-booking" class="btn btn-xs all-caps b-rad-none btn-success btn-block" :class="[{'hide': paymentMethod.name === ''}]" @click="submitForm()">Create Booking</button>
                                 </div>
                             </div>
                         </div>
@@ -506,9 +506,9 @@
                                     <button class="btn btn-sm all-caps b-rad-none btn-default bg-master-lighter btn-block" @click="cancelQuotation()">Cancel</button>
                                 </div>
                                 <div class="col p-l-0" >
-                                    <button class="btn btn-sm all-caps b-rad-none btn-success btn-block requestModal" data-type="paymentSummary" v-if="paymentMethod.id !== 'wallet' || walletOutstanding >= 0">Lock Booking</button>
+                                    <button id="lock-booking" class="btn btn-sm all-caps b-rad-none btn-success btn-block requestModal" data-type="paymentSummary" v-if="paymentMethod.id !== 'wallet' || walletOutstanding >= 0">Lock Booking</button>
                                 </div>
-                                <modal-component v-if="calculation.total > 0" class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="paymentSummary">
+                                <modal-component id="confirm-booking-modal" v-if="calculation.total > 0" class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="paymentSummary">
                                     <confirm-quotation-form-component v-on:cancelQuotation="cancelQuotation()" :calculation="calculation" :section="section" :id="item.id" :payment_method="paymentMethod.id" :bank_code="onlinePayment.id" :amount="amount"></confirm-quotation-form-component>
                                 </modal-component>
                             </div>
diff --git a/resources/assets/vue/components/bookings/forms/ConfirmQuotationFormComponent.vue b/resources/assets/vue/components/bookings/forms/ConfirmQuotationFormComponent.vue
index f8db5603..db136e28 100644
--- a/resources/assets/vue/components/bookings/forms/ConfirmQuotationFormComponent.vue
+++ b/resources/assets/vue/components/bookings/forms/ConfirmQuotationFormComponent.vue
@@ -71,7 +71,7 @@
                                     <button class="btn btn-sm all-caps b-rad-none btn-default bg-master-lighter" data-dismiss="modal">Cancel</button>
                                 </div>
                                 <div class="col-auto">
-                                    <button class="btn btn-sm all-caps b-rad-none btn-success" @click="submitForm()">Confirm Booking</button>
+                                    <button id="confirm-booking" class="btn btn-sm all-caps b-rad-none btn-success" @click="submitForm()">Confirm Booking</button>
                                 </div>
                             </div>
                             <div class="row text-right" v-if="payment_method !== 'wallet'">
diff --git a/tests/Browser/DryRun/CreateBookingTest.php b/tests/Browser/DryRun/CreateBookingTest.php
index 75299c22..989dd565 100644
--- a/tests/Browser/DryRun/CreateBookingTest.php
+++ b/tests/Browser/DryRun/CreateBookingTest.php
@@ -15,8 +15,8 @@ class CreateBookingTest extends DuskTestCase
         $this->browse(function (Browser $browser) {
             $browser->visit('http://exchange-2.0.test')
                     ->pause(5000)
-                    ->typeSlowly('email', 'junkit.mah@bioloop.com.my')
-                    ->typeSlowly('password', '123456abcabc')
+                    ->type('email', 'giftolavie@hotmail.com')
+                    ->type('password', 'pass123')
                     ->click('#sign-in')
                     ->pause(5000)
                     ->assertPathIs('/dashboard');
@@ -60,6 +60,14 @@ class CreateBookingTest extends DuskTestCase
                     ->click('#add-product')
                     ->pause(7000)
                     ->click('#save-purchase-order')
+                    ->click('#payment-btn')
+                    ->click('#online-banking')
+                    ->click('#create-booking')
+                    ->pause(3000)
+                    ->click('#lock-booking')
+                    ->whenAvailable('#confirm-booking-modal', function ($modal) {
+                        $modal->click('#confirm-booking');
+                    })  
                     ->pause(10000);
                     //Assert if booking created successfully
 

From b52f5dde962210759617efcd8ed675fc78a68906 Mon Sep 17 00:00:00 2001
From: glovetleong <glovetleong@gmail.com>
Date: Sun, 22 May 2022 11:40:15 +0800
Subject: [PATCH 51/54] unit test basic

---
 tests/Unit/QualityControlTest.php | 108 +++++++++++++++---------------
 1 file changed, 54 insertions(+), 54 deletions(-)

diff --git a/tests/Unit/QualityControlTest.php b/tests/Unit/QualityControlTest.php
index 3ed9d19a..1496259a 100644
--- a/tests/Unit/QualityControlTest.php
+++ b/tests/Unit/QualityControlTest.php
@@ -25,70 +25,70 @@ class QualityControlTest extends TestCase
 
     public function __construct(?string $name = null, array $data = [], string $dataName = '')
     {
-        //Unit test defaults
-        parent::__construct($name, $data, $dataName);
+        // //Unit test defaults
+        // parent::__construct($name, $data, $dataName);
 
-        $fullPath = dirname(__FILE__, 3).'/app/Classes/Modules';
-        $dirs = $files = [];
+        // $fullPath = dirname(__FILE__, 3).'/app/Classes/Modules';
+        // $dirs = $files = [];
 
-        $modules_dir_count = [];
+        // $modules_dir_count = [];
 
-        $current_directory = "";
-        $allowed_folders = ['ControllersLogic','DataTransferObjects','Processors','Services','Standards'];
-        $allowed_standards_folders = ['Criteria','Criterias','Rules','Validators'];
-        $ignore_folders = ['Rates'];
+        // $current_directory = "";
+        // $allowed_folders = ['ControllersLogic','DataTransferObjects','Processors','Services','Standards'];
+        // $allowed_standards_folders = ['Criteria','Criterias','Rules','Validators'];
+        // $ignore_folders = ['Rates'];
 
-        $directory = new RecursiveDirectoryIterator($fullPath, FilesystemIterator::SKIP_DOTS);
+        // $directory = new RecursiveDirectoryIterator($fullPath, FilesystemIterator::SKIP_DOTS);
 
-        $modules = array_map('basename',glob($fullPath.'/*', GLOB_ONLYDIR));
+        // $modules = array_map('basename',glob($fullPath.'/*', GLOB_ONLYDIR));
 
-        foreach (new RecursiveIteratorIterator($directory, RecursiveIteratorIterator::SELF_FIRST) as $path ) {
+        // foreach (new RecursiveIteratorIterator($directory, RecursiveIteratorIterator::SELF_FIRST) as $path ) {
 
-            //Note: $path is SplFileInfo class. For all the options/methods , please check here: https://www.php.net/manual/en/class.splfileinfo.php
+        //     //Note: $path is SplFileInfo class. For all the options/methods , please check here: https://www.php.net/manual/en/class.splfileinfo.php
 
-            if($path->isDir()){
-                //Check Modules directory for allowed folders
-                //TODO: Check folder in correct orders, e.g. if Validators inside Standards folder
+        //     if($path->isDir()){
+        //         //Check Modules directory for allowed folders
+        //         //TODO: Check folder in correct orders, e.g. if Validators inside Standards folder
 
-                $dirs[] = $path->__toString();
+        //         $dirs[] = $path->__toString();
 
-                if(in_array($path->getFileName(),$modules)){
-                    $current_directory = $path->getFileName();
-                    $modules_dir_count[$path->getFileName()]=['count'=>0,'standards_count'=>0];
-                }else if(in_array($path->getFileName(),$allowed_folders)){
-                    $modules_dir_count[$current_directory]['count'] += 1;
-                }else if(in_array($path->getFileName(),$allowed_standards_folders)){
-                    $modules_dir_count[$current_directory]['standards_count'] += 1;
-                } else if(!in_array($path->getFileName(),$ignore_folders)){
-                    $this->non_standard_folders[]= $path->__toString();
-                }
-            }else{
-                $files[] = realpath($path->__toString());
+        //         if(in_array($path->getFileName(),$modules)){
+        //             $current_directory = $path->getFileName();
+        //             $modules_dir_count[$path->getFileName()]=['count'=>0,'standards_count'=>0];
+        //         }else if(in_array($path->getFileName(),$allowed_folders)){
+        //             $modules_dir_count[$current_directory]['count'] += 1;
+        //         }else if(in_array($path->getFileName(),$allowed_standards_folders)){
+        //             $modules_dir_count[$current_directory]['standards_count'] += 1;
+        //         } else if(!in_array($path->getFileName(),$ignore_folders)){
+        //             $this->non_standard_folders[]= $path->__toString();
+        //         }
+        //     }else{
+        //         $files[] = realpath($path->__toString());
 
-                //TODO: Read files (.php) & check for class name format & if possible variable name format
+        //         //TODO: Read files (.php) & check for class name format & if possible variable name format
 
-                $file = $path->openFile('r');
-                if(!isset($this->file_check[$path->getFileName()]['files'])){
-                    $this->file_check[$path->getFileName()]=['lines'=>0,'methods_count'=>0];
-                }
-                $file->seek(PHP_INT_MAX);
-                $linesTotal = $file->key();
-                $this->file_check[$path->getFileName()]['lines'] = $linesTotal;
+        //         $file = $path->openFile('r');
+        //         if(!isset($this->file_check[$path->getFileName()]['files'])){
+        //             $this->file_check[$path->getFileName()]=['lines'=>0,'methods_count'=>0];
+        //         }
+        //         $file->seek(PHP_INT_MAX);
+        //         $linesTotal = $file->key();
+        //         $this->file_check[$path->getFileName()]['lines'] = $linesTotal;
 
 
-                //Note: Use reflection to get class info :  https://www.php.net/manual/en/class.reflectionclass.php
-                $namespace = str_replace($fullPath."/","",$file->getPath());
-                $namespace = str_replace("/","\\",$namespace);
-                $class_name = "App\Classes\Modules\\".$namespace."\\".$file->getBasename('.php');
+        //         //Note: Use reflection to get class info :  https://www.php.net/manual/en/class.reflectionclass.php
+        //         $namespace = str_replace($fullPath."/","",$file->getPath());
+        //         $namespace = str_replace("/","\\",$namespace);
+        //         $class_name = "App\Classes\Modules\\".$namespace."\\".$file->getBasename('.php');
 
-                $class = new \ReflectionClass($class_name);
-                $class_methods = $class->getMethods();
+        //         $class = new \ReflectionClass($class_name);
+        //         $class_methods = $class->getMethods();
 
-                $this->file_check[$path->getFileName()]['methods_count'] = count($class_methods);
+        //         $this->file_check[$path->getFileName()]['methods_count'] = count($class_methods);
 
-            }
+        //     }
 
-        }
+        // }
 
         //var_dump($files, $dirs);
         //var_dump($this->file_check);
@@ -98,22 +98,22 @@ class QualityControlTest extends TestCase
 
     public function checkCodeStandards()
     {
-        foreach ($this->file_check as $filename => $file) {
-            $this->results['code line'] = $this->assertLessThanOrEqual($this::CODE_LINE_COUNT, $file['lines'],'Please check '.$filename.', the code line is '.$file['lines']);
-            $this->results['code method'] = $this->assertLessThanOrEqual($this::METHOD_COUNT,$file['methods_count']);
-        }
+        // foreach ($this->file_check as $filename => $file) {
+        //     $this->results['code line'] = $this->assertLessThanOrEqual($this::CODE_LINE_COUNT, $file['lines'],'Please check '.$filename.', the code line is '.$file['lines']);
+        //     $this->results['code method'] = $this->assertLessThanOrEqual($this::METHOD_COUNT,$file['methods_count']);
+        // }
     }
 
     public function checkFolderStandards()
     {
-        $this->results['folder check'] = $this->assertCount(0,$this->non_standard_folders ,"Found non standard folders");
+        // $this->results['folder check'] = $this->assertCount(0,$this->non_standard_folders ,"Found non standard folders");
     }
 
     public function testQualityCheck(){
-        $this->checkCodeStandards();
-        $this->checkFolderStandards();
+        // $this->checkCodeStandards();
+        // $this->checkFolderStandards();
 
-        print_r($this->results);
+        // print_r($this->results);
     }
 
 }

From eebfc09c0a45c25ec4a70b9f9c5257648c615ade Mon Sep 17 00:00:00 2001
From: glovetleong <glovetleong@gmail.com>
Date: Sun, 22 May 2022 11:49:13 +0800
Subject: [PATCH 52/54] delete

---
 tests/Unit/QualityControlTest.php | 119 ------------------------------
 1 file changed, 119 deletions(-)
 delete mode 100644 tests/Unit/QualityControlTest.php

diff --git a/tests/Unit/QualityControlTest.php b/tests/Unit/QualityControlTest.php
deleted file mode 100644
index 1496259a..00000000
--- a/tests/Unit/QualityControlTest.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-
-namespace Tests\Unit;
-
-use PHPUnit\Exception;
-use PHPUnit\Framework\AssertionFailedError;
-use PHPUnit\Framework\ExpectationFailedException;
-use PHPUnit\Framework\PHPTAssertionFailedError;
-use PHPUnit\Framework\TestCase;
-use RecursiveIteratorIterator;
-use RecursiveDirectoryIterator;
-use FilesystemIterator;
-
-class QualityControlTest extends TestCase
-{
-    private $non_standard_folders = [];
-
-    private $file_check=[];
-
-    private $results = [];
-
-    public const CODE_LINE_COUNT = 400;
-
-    public const METHOD_COUNT = 20;
-
-    public function __construct(?string $name = null, array $data = [], string $dataName = '')
-    {
-        // //Unit test defaults
-        // parent::__construct($name, $data, $dataName);
-
-        // $fullPath = dirname(__FILE__, 3).'/app/Classes/Modules';
-        // $dirs = $files = [];
-
-        // $modules_dir_count = [];
-
-        // $current_directory = "";
-        // $allowed_folders = ['ControllersLogic','DataTransferObjects','Processors','Services','Standards'];
-        // $allowed_standards_folders = ['Criteria','Criterias','Rules','Validators'];
-        // $ignore_folders = ['Rates'];
-
-        // $directory = new RecursiveDirectoryIterator($fullPath, FilesystemIterator::SKIP_DOTS);
-
-        // $modules = array_map('basename',glob($fullPath.'/*', GLOB_ONLYDIR));
-
-        // foreach (new RecursiveIteratorIterator($directory, RecursiveIteratorIterator::SELF_FIRST) as $path ) {
-
-        //     //Note: $path is SplFileInfo class. For all the options/methods , please check here: https://www.php.net/manual/en/class.splfileinfo.php
-
-        //     if($path->isDir()){
-        //         //Check Modules directory for allowed folders
-        //         //TODO: Check folder in correct orders, e.g. if Validators inside Standards folder
-
-        //         $dirs[] = $path->__toString();
-
-        //         if(in_array($path->getFileName(),$modules)){
-        //             $current_directory = $path->getFileName();
-        //             $modules_dir_count[$path->getFileName()]=['count'=>0,'standards_count'=>0];
-        //         }else if(in_array($path->getFileName(),$allowed_folders)){
-        //             $modules_dir_count[$current_directory]['count'] += 1;
-        //         }else if(in_array($path->getFileName(),$allowed_standards_folders)){
-        //             $modules_dir_count[$current_directory]['standards_count'] += 1;
-        //         } else if(!in_array($path->getFileName(),$ignore_folders)){
-        //             $this->non_standard_folders[]= $path->__toString();
-        //         }
-        //     }else{
-        //         $files[] = realpath($path->__toString());
-
-        //         //TODO: Read files (.php) & check for class name format & if possible variable name format
-
-        //         $file = $path->openFile('r');
-        //         if(!isset($this->file_check[$path->getFileName()]['files'])){
-        //             $this->file_check[$path->getFileName()]=['lines'=>0,'methods_count'=>0];
-        //         }
-        //         $file->seek(PHP_INT_MAX);
-        //         $linesTotal = $file->key();
-        //         $this->file_check[$path->getFileName()]['lines'] = $linesTotal;
-
-
-        //         //Note: Use reflection to get class info :  https://www.php.net/manual/en/class.reflectionclass.php
-        //         $namespace = str_replace($fullPath."/","",$file->getPath());
-        //         $namespace = str_replace("/","\\",$namespace);
-        //         $class_name = "App\Classes\Modules\\".$namespace."\\".$file->getBasename('.php');
-
-        //         $class = new \ReflectionClass($class_name);
-        //         $class_methods = $class->getMethods();
-
-        //         $this->file_check[$path->getFileName()]['methods_count'] = count($class_methods);
-
-        //     }
-
-        // }
-
-        //var_dump($files, $dirs);
-        //var_dump($this->file_check);
-        //var_dump($modules_dir_count,$non_standard_folders);
-        //die('debug');
-    }
-
-    public function checkCodeStandards()
-    {
-        // foreach ($this->file_check as $filename => $file) {
-        //     $this->results['code line'] = $this->assertLessThanOrEqual($this::CODE_LINE_COUNT, $file['lines'],'Please check '.$filename.', the code line is '.$file['lines']);
-        //     $this->results['code method'] = $this->assertLessThanOrEqual($this::METHOD_COUNT,$file['methods_count']);
-        // }
-    }
-
-    public function checkFolderStandards()
-    {
-        // $this->results['folder check'] = $this->assertCount(0,$this->non_standard_folders ,"Found non standard folders");
-    }
-
-    public function testQualityCheck(){
-        // $this->checkCodeStandards();
-        // $this->checkFolderStandards();
-
-        // print_r($this->results);
-    }
-
-}

From 47e287e3ad572f0825beb228e41227eff0cb229e Mon Sep 17 00:00:00 2001
From: ahmedsophyudden <saufiyuddin@gmail.com>
Date: Sun, 12 Jun 2022 18:23:21 +0800
Subject: [PATCH 53/54] Fix create order button not working at dashboard

---
 .../CalculatesTransactionServiceCharge.php        | 15 +++++++++------
 .../Services/CalculatesTransactionTransferFee.php | 14 +++++++++-----
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/app/Classes/Modules/Transactions/Services/CalculatesTransactionServiceCharge.php b/app/Classes/Modules/Transactions/Services/CalculatesTransactionServiceCharge.php
index 29751d80..695b465e 100644
--- a/app/Classes/Modules/Transactions/Services/CalculatesTransactionServiceCharge.php
+++ b/app/Classes/Modules/Transactions/Services/CalculatesTransactionServiceCharge.php
@@ -25,15 +25,18 @@ class CalculatesTransactionServiceCharge
      * @param SegmentConstant|null $service_charge
      * @return float
      */
-    public function execute(float $amount, float $rate, ?SegmentConstant $service_charge) {
+    public function execute(float $amount, float $rate, ?SegmentConstant $service_charge)
+    {
 
-        if(!$service_charge) {
+        if (!$service_charge) {
             return 0;
         }
 
         $transfer_fee = $this->calculatesTransactionTransferFee->execute(($amount * (1 / $rate)), $service_charge);
-        return $service_charge->detail->amount->type === 'percentage' ? (($amount + $transfer_fee) * ( (float) $service_charge->detail->amount->value /100) * (1/$rate)) :  (float) $service_charge->detail->amount->value;
-
+        if (isset($service_charge->detail->amount)) {
+            return $service_charge->detail->amount->type === 'percentage' ? (($amount + $transfer_fee) * ((float) $service_charge->detail->amount->value / 100) * (1 / $rate)) :  (float) $service_charge->detail->amount->value;
+        } else {
+            return 0;
+        }
     }
-
-}
\ No newline at end of file
+}
diff --git a/app/Classes/Modules/Transactions/Services/CalculatesTransactionTransferFee.php b/app/Classes/Modules/Transactions/Services/CalculatesTransactionTransferFee.php
index 5a02a394..0bcaba28 100644
--- a/app/Classes/Modules/Transactions/Services/CalculatesTransactionTransferFee.php
+++ b/app/Classes/Modules/Transactions/Services/CalculatesTransactionTransferFee.php
@@ -12,13 +12,17 @@ class CalculatesTransactionTransferFee
      * @param SegmentConstant|null $service_charge
      * @return float
      */
-    public function execute(float $amount,  ?SegmentConstant $service_charge) {
+    public function execute(float $amount,  ?SegmentConstant $service_charge)
+    {
 
-        if(!$service_charge) {
+        if (!$service_charge) {
             return 0;
         }
 
-       return $service_charge->detail->transferFee->type === 'percentage' ? $amount * ((float) $service_charge->detail->transferFee->value /100) :  (float) $service_charge->detail->transferFee->value;
+        if (isset($service_charge->detail->transferFee)) {
+            return $service_charge->detail->transferFee->type === 'percentage' ? $amount * ((float) $service_charge->detail->transferFee->value / 100) :  (float) $service_charge->detail->transferFee->value;
+        } else {
+            return 0;
+        }
     }
-
-}
\ No newline at end of file
+}

From a5fbc4bcb327f1c90addb28f01fcdc6b82c7a6d9 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 28 Jun 2022 14:26:02 +0800
Subject: [PATCH 54/54] show refund

---
 .../components/bookings/elements/PaymentHistoryComponent.vue    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue b/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
index de39dfb0..abec64a7 100644
--- a/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
@@ -220,7 +220,7 @@
                         </div>
                     </div>
                     <div class="row m-t-10" v-show="[2, 3].includes(item.status) && totalRequestedConvertRefund < data.booking.amount">
-                        <div class="col hide">
+                        <div class="col">
                             <button class="btn btn-xs all-caps b-rad-none bg-master-lighter btn-block no-border requestModal" data-type="transferSummary">Request Refund</button>
                             <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="transferSummary" size="large">
                                 <refund-confirmation-component :data="data" :section="section" :totalRefunds="totalRequestedRefund + totalRefunds"></refund-confirmation-component>