From 5f8fa00853dc48c0912d107df668c3f6f97b6ab6 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Wed, 19 Apr 2023 22:32:44 +0800
Subject: [PATCH 01/11] update modal to approve match and reject match

---
 .../StatementTransactionComponent.vue         | 24 +++++++++----------
 .../sections/TransactionsMappingComponent.vue |  8 +++----
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue b/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue
index 357db4be..25fbc62d 100644
--- a/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue
+++ b/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue
@@ -45,21 +45,21 @@
                 </div>
                 <div class="col-1">{{ item.amount }}</div>
                 <div class="col-1" v-if="stage === 1">
-                    <button class="btn btn-xs btn-outline-danger b-rad-none m-r-5 requestModal" data-type="deleteAnnouncement">
+                    <button class="btn btn-xs btn-outline-danger b-rad-none m-r-5 requestModal" data-type="deleteMappingTransaction">
                         <i class="fa fa-times fa-fw"></i>
                     </button>
+                    <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="deleteMappingTransaction">
+                        <general-confirmation-form-component 
+                            contentText="Are you sure you want to reject this mapping?" 
+                            modalType="delete" 
+                            class="text-center"
+                            :apiRoute="route('api.company.delete', 1)"
+                            apiMethod="post"
+                            section="statementTransactionComponent"
+                        >
+                        </general-confirmation-form-component>
+                    </modal-component>
                 </div>
-                <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="deleteAnnouncement">
-                    <general-confirmation-form-component 
-                        contentText="Are you sure you want to reject this mapping?" 
-                        modalType="delete" 
-                        class="text-center"
-                        :apiRoute="route('api.company.delete', 1)"
-                        apiMethod="post"
-                        section="statementTransactionComponent"
-                    >
-                    </general-confirmation-form-component>
-                </modal-component>
             </div>
 <!--            <span v-for="owner in item.owners">{{owner.system + ' - ' + owner.owner_id}}</span>-->
 <!--            [0].system + ' - ' + item.owner_guess[0].bill_no-->
diff --git a/resources/assets/vue/components/accounting/sections/TransactionsMappingComponent.vue b/resources/assets/vue/components/accounting/sections/TransactionsMappingComponent.vue
index 39480482..616e4f63 100644
--- a/resources/assets/vue/components/accounting/sections/TransactionsMappingComponent.vue
+++ b/resources/assets/vue/components/accounting/sections/TransactionsMappingComponent.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="row parentContainer">
+    <div class="row">
         <div class="col">
             <div class="row">
                 <div class="col">
@@ -55,13 +55,13 @@
                 <div class="col"></div>
                 <div class="col-auto pointer bold text-danger" @click="step=0">X</div>
             </div>
-            <div class="row" v-if="step > 0 && stage !== 4">
+            <div class="row parentContainer" v-if="step > 0 && stage !== 4">
                 <div class="col">
                     <div class="row">
                         <div class="col">
                             <div v-if="stage === 1">
-                                <div class="btn btn-primary btn-sm m-t-10 requestModal" data-type="deleteAnnouncement">Approve all the Mapping Below</div>
-                                <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="deleteAnnouncement">
+                                <div class="btn btn-primary btn-sm m-t-10 requestModal" data-type="approveMappingTransaction">Approve all the Mapping Below</div>
+                                <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="approveMappingTransaction">
                                     <general-confirmation-form-component 
                                         contentText="Are you sure you want to approve all these Transaction?" 
                                         modalType="confirm" 

From 011e993cfd89866ed36a2b5f45a36375f57ba8c4 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Wed, 19 Apr 2023 22:39:39 +0800
Subject: [PATCH 02/11] update modal to approve match and reject match

---
 .../accounting/elements/StatementTransactionComponent.vue       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue b/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue
index 25fbc62d..74c3ed37 100644
--- a/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue
+++ b/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="row m-b-10">
+    <div class="row m-b-10 parentContainer">
         <div class="col">
             <div class="row p-b-10 b-b b-grey">
                 <div class="col-2">{{ item.posting_date }}</div>

From 082c9de572188e908bdf41cbfd5050651d253f11 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Wed, 19 Apr 2023 22:47:45 +0800
Subject: [PATCH 03/11] reverse commit

---
 .../CreateBankStatementTransactionOwnersProcessor.php           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Classes/Modules/Accounting/Processors/CreateBankStatementTransactionOwnersProcessor.php b/app/Classes/Modules/Accounting/Processors/CreateBankStatementTransactionOwnersProcessor.php
index 79ee5018..f3d61595 100644
--- a/app/Classes/Modules/Accounting/Processors/CreateBankStatementTransactionOwnersProcessor.php
+++ b/app/Classes/Modules/Accounting/Processors/CreateBankStatementTransactionOwnersProcessor.php
@@ -32,7 +32,7 @@ class CreateBankStatementTransactionOwnersProcessor
 //       })->get();
 
        $transactions = StatementTransaction::whereDoesntHave('owners')->where('amount', '<', 0)->get();
-dd($transactions);
+
         foreach ($transactions as $transaction) {
 
             if($transaction->amount > 0){

From 9e865ea5b26a296cc0ebd808f737214dc95471fa Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Wed, 19 Apr 2023 22:51:52 +0800
Subject: [PATCH 04/11] update modal to approve match and reject match

---
 .../elements/StatementTransactionComponent.vue | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue b/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue
index 74c3ed37..015f3bb0 100644
--- a/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue
+++ b/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue
@@ -28,9 +28,25 @@
                             </div>
                         </div>
                         <div class="col">
-                            <div class="row" v-for="owner in item.owners">
+                            <div class="row parentContainer" v-for="owner in item.owners">
                                 <div class="col">
                                     <a :href="owner.reference_link" target="_blank">{{ owner.reference }}</a>
+                                    <div v-if="stage === 2">
+                                        <button class="btn btn-xs btn-outline-primary b-rad-none m-r-5 requestModal" data-type="approveCorrectMappingTransaction">
+                                            <i class="fa fa-times fa-fw"></i>
+                                        </button>
+                                        <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="approveCorrectMappingTransaction">
+                                            <general-confirmation-form-component 
+                                                contentText="Are you sure you want to choose this mapping?" 
+                                                modalType="confirm" 
+                                                class="text-center"
+                                                :apiRoute="route('api.company.delete', 1)"
+                                                apiMethod="post"
+                                                section="statementTransactionComponent"
+                                            >
+                                            </general-confirmation-form-component>
+                                        </modal-component>
+                                    </div>
                                 </div>
                             </div>
                         </div>

From 74c3f6a6d390159b72eb6a5c16f763ef26124e20 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Wed, 19 Apr 2023 22:57:15 +0800
Subject: [PATCH 05/11] update modal to approve match and reject match

---
 .../accounting/elements/StatementTransactionComponent.vue       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue b/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue
index 015f3bb0..a1ad4d3a 100644
--- a/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue
+++ b/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue
@@ -29,7 +29,7 @@
                         </div>
                         <div class="col">
                             <div class="row parentContainer" v-for="owner in item.owners">
-                                <div class="col">
+                                <div class="col d-flex justify-content-between">
                                     <a :href="owner.reference_link" target="_blank">{{ owner.reference }}</a>
                                     <div v-if="stage === 2">
                                         <button class="btn btn-xs btn-outline-primary b-rad-none m-r-5 requestModal" data-type="approveCorrectMappingTransaction">

From ae4b826f1ea803901ade0ebdfe9d51e2b3d2c1c4 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Wed, 19 Apr 2023 22:58:46 +0800
Subject: [PATCH 06/11] update modal to approve match and reject match

---
 .../accounting/elements/StatementTransactionComponent.vue     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue b/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue
index a1ad4d3a..8624f910 100644
--- a/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue
+++ b/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue
@@ -29,11 +29,11 @@
                         </div>
                         <div class="col">
                             <div class="row parentContainer" v-for="owner in item.owners">
-                                <div class="col d-flex justify-content-between">
+                                <div class="col d-flex justify-content-start">
                                     <a :href="owner.reference_link" target="_blank">{{ owner.reference }}</a>
                                     <div v-if="stage === 2">
                                         <button class="btn btn-xs btn-outline-primary b-rad-none m-r-5 requestModal" data-type="approveCorrectMappingTransaction">
-                                            <i class="fa fa-times fa-fw"></i>
+                                            <i class="fa fa-times fa-check"></i>
                                         </button>
                                         <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="approveCorrectMappingTransaction">
                                             <general-confirmation-form-component 

From 6a80d4cbe50fb77076170a506a392433e5f62cf9 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Wed, 19 Apr 2023 23:01:15 +0800
Subject: [PATCH 07/11] update modal to approve match and reject match

---
 .../accounting/elements/StatementTransactionComponent.vue     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue b/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue
index 8624f910..e6d1b6cd 100644
--- a/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue
+++ b/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue
@@ -29,11 +29,11 @@
                         </div>
                         <div class="col">
                             <div class="row parentContainer" v-for="owner in item.owners">
-                                <div class="col d-flex justify-content-start">
+                                <div class="col d-flex justify-content-between">
                                     <a :href="owner.reference_link" target="_blank">{{ owner.reference }}</a>
                                     <div v-if="stage === 2">
                                         <button class="btn btn-xs btn-outline-primary b-rad-none m-r-5 requestModal" data-type="approveCorrectMappingTransaction">
-                                            <i class="fa fa-times fa-check"></i>
+                                            <i class="fa fa-check fa-fw"></i>
                                         </button>
                                         <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="approveCorrectMappingTransaction">
                                             <general-confirmation-form-component 

From 22b0ebbe5dd0c668b2649c47bddc4e467bf171e0 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Wed, 19 Apr 2023 23:14:56 +0800
Subject: [PATCH 08/11] update modal to approve match and reject match

---
 .../elements/StatementTransactionComponent.vue           | 9 ++++++---
 .../accounting/sections/TransactionsMappingComponent.vue | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue b/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue
index e6d1b6cd..90d012ba 100644
--- a/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue
+++ b/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue
@@ -35,9 +35,9 @@
                                         <button class="btn btn-xs btn-outline-primary b-rad-none m-r-5 requestModal" data-type="approveCorrectMappingTransaction">
                                             <i class="fa fa-check fa-fw"></i>
                                         </button>
-                                        <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="approveCorrectMappingTransaction">
+                                        <modal-component class="animate__animated animate__fast animate__fadeIn" type="approveCorrectMappingTransaction">
                                             <general-confirmation-form-component 
-                                                contentText="Are you sure you want to choose this mapping?" 
+                                                :contentText="returnTextWithVariable(owner.reference)" 
                                                 modalType="confirm" 
                                                 class="text-center"
                                                 :apiRoute="route('api.company.delete', 1)"
@@ -64,7 +64,7 @@
                     <button class="btn btn-xs btn-outline-danger b-rad-none m-r-5 requestModal" data-type="deleteMappingTransaction">
                         <i class="fa fa-times fa-fw"></i>
                     </button>
-                    <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="deleteMappingTransaction">
+                    <modal-component class="animate__animated animate__fast animate__fadeIn" type="deleteMappingTransaction">
                         <general-confirmation-form-component 
                             contentText="Are you sure you want to reject this mapping?" 
                             modalType="delete" 
@@ -124,6 +124,9 @@
                     case 14:
                         return 'Non-Operational Payment';
                 }
+            }, 
+            returnTextWithVariable(variable) {
+                return "Are you sure you want to choose this mapping " + variable + "?";
             }
         },
         mixins: [componentHandler]
diff --git a/resources/assets/vue/components/accounting/sections/TransactionsMappingComponent.vue b/resources/assets/vue/components/accounting/sections/TransactionsMappingComponent.vue
index 616e4f63..8944e035 100644
--- a/resources/assets/vue/components/accounting/sections/TransactionsMappingComponent.vue
+++ b/resources/assets/vue/components/accounting/sections/TransactionsMappingComponent.vue
@@ -61,7 +61,7 @@
                         <div class="col">
                             <div v-if="stage === 1">
                                 <div class="btn btn-primary btn-sm m-t-10 requestModal" data-type="approveMappingTransaction">Approve all the Mapping Below</div>
-                                <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="approveMappingTransaction">
+                                <modal-component class="animate__animated animate__fast animate__fadeIn" type="approveMappingTransaction">
                                     <general-confirmation-form-component 
                                         contentText="Are you sure you want to approve all these Transaction?" 
                                         modalType="confirm" 

From 89c69771faa0af1e6c4772a443965a217a620b1c Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Wed, 19 Apr 2023 23:28:55 +0800
Subject: [PATCH 09/11] update modal to approve match and reject match

---
 .../general/forms/GeneralConfirmationFormComponent.vue          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/assets/vue/components/general/forms/GeneralConfirmationFormComponent.vue b/resources/assets/vue/components/general/forms/GeneralConfirmationFormComponent.vue
index 7ac446dd..45a4b007 100644
--- a/resources/assets/vue/components/general/forms/GeneralConfirmationFormComponent.vue
+++ b/resources/assets/vue/components/general/forms/GeneralConfirmationFormComponent.vue
@@ -12,7 +12,7 @@
                     </div>
                     <div class="row">
                         <div class="col p-r-5">
-                            <div class="btn btn-sm btn-secondary btn-block b-rad-none" data-dismiss="modal">Cancel</div>
+                            <div class="btn btn-sm btn-default btn-block bg-master-lighter" data-dismiss="modal">Cancel</div>
                         </div>
                         <div class="col p-l-5">
                             <!-- <div class="btn btn-sm btn-block b-rad-none" :class="[{'btn-danger': modalType !== 'confirm'}, {'btn-success': modalType === 'confirm'}]" @click="submit(apiRoute, apiMethod, section, true, true)">{{ buttonText }}</div> -->

From 50b538e3b957b1d4d2f556d38f834263feba7ab0 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Wed, 19 Apr 2023 23:31:15 +0800
Subject: [PATCH 10/11] update modal to approve match and reject match

---
 .../accounting/elements/StatementTransactionComponent.vue       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue b/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue
index 90d012ba..09bd3060 100644
--- a/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue
+++ b/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue
@@ -126,7 +126,7 @@
                 }
             }, 
             returnTextWithVariable(variable) {
-                return "Are you sure you want to choose this mapping " + variable + "?";
+                return "Are you sure you want to choose this mapping <b>" + variable + "</b>?";
             }
         },
         mixins: [componentHandler]

From b6b736a5813c46ef14688af913d2430b615c0c10 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Wed, 19 Apr 2023 23:33:43 +0800
Subject: [PATCH 11/11] revert

---
 .../accounting/elements/StatementTransactionComponent.vue       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue b/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue
index 09bd3060..90d012ba 100644
--- a/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue
+++ b/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue
@@ -126,7 +126,7 @@
                 }
             }, 
             returnTextWithVariable(variable) {
-                return "Are you sure you want to choose this mapping <b>" + variable + "</b>?";
+                return "Are you sure you want to choose this mapping " + variable + "?";
             }
         },
         mixins: [componentHandler]