From c61acc26fe255572b969f553a8e01a906d71a9ac Mon Sep 17 00:00:00 2001
From: Dillon <dillonngoweijoon@gmail.com>
Date: Mon, 31 Jul 2023 18:34:52 +0800
Subject: [PATCH 01/13] Insert voucherify order source id + new component to
 list WELCOME50%OFF voucher to user

---
 .../CreateVoucherifyOrderObject.php           | 15 ++-
 .../BookingToVoucherifyProcessor.php          |  2 +-
 .../Voucherify/CreatesVoucherifyOrder.php     |  1 +
 ...ers.vue => AvailableVouchersComponent.vue} |  7 +-
 .../elements/ListVouchersComponent.vue        | 93 +++++++++++++++++++
 .../BookingPaymentQuotationComponent.vue      | 12 +--
 6 files changed, 116 insertions(+), 14 deletions(-)
 rename resources/assets/vue/components/bookings/elements/{ListVouchers.vue => AvailableVouchersComponent.vue} (90%)
 create mode 100644 resources/assets/vue/components/bookings/elements/ListVouchersComponent.vue

diff --git a/app/Classes/Modules/Vouchers/DataTransferObjects/CreateVoucherifyOrderObject.php b/app/Classes/Modules/Vouchers/DataTransferObjects/CreateVoucherifyOrderObject.php
index 92dfd592..c483d45e 100644
--- a/app/Classes/Modules/Vouchers/DataTransferObjects/CreateVoucherifyOrderObject.php
+++ b/app/Classes/Modules/Vouchers/DataTransferObjects/CreateVoucherifyOrderObject.php
@@ -14,6 +14,9 @@ class CreateVoucherifyOrderObject implements DataTransferObject
     /** @var int */
     private $companyId;
 
+    /** @var int */
+    private $transactionId;
+
     /** @var float */
     private $amount;
 
@@ -27,14 +30,16 @@ class CreateVoucherifyOrderObject implements DataTransferObject
      * CreateVoucherifyOrderObject constructor.
      * @param User $employee
      * @param int $companyId
+     * @param int $transactionId
      * @param float $amount
      * @param bool $isNoVoucher
      * @param bool $isTopUpWallet
      */
-    public function __construct(User $employee, int $companyId, float $amount, bool $isNoVoucher, bool $isTopUpWallet)
+    public function __construct(User $employee, int $companyId, int $transactionId, float $amount, bool $isNoVoucher, bool $isTopUpWallet)
     {
         $this->employee = $employee;
         $this->companyId = $companyId;
+        $this->transactionId = $transactionId;
         $this->amount = $amount;
         $this->isNoVoucher = $isNoVoucher;
         $this->isTopUpWallet = $isTopUpWallet;
@@ -48,6 +53,14 @@ class CreateVoucherifyOrderObject implements DataTransferObject
         return $this->companyId;
     }
 
+    /**
+     * @return int
+     */
+    public function getTransactionId(): int
+    {
+        return $this->transactionId;
+    }
+
     /**
      * @return float
      */
diff --git a/app/Classes/Modules/Vouchers/Processors/Voucherify/BookingToVoucherifyProcessor.php b/app/Classes/Modules/Vouchers/Processors/Voucherify/BookingToVoucherifyProcessor.php
index 3df08a4c..5e31f2eb 100644
--- a/app/Classes/Modules/Vouchers/Processors/Voucherify/BookingToVoucherifyProcessor.php
+++ b/app/Classes/Modules/Vouchers/Processors/Voucherify/BookingToVoucherifyProcessor.php
@@ -100,7 +100,7 @@ class BookingToVoucherifyProcessor
                 $this->recordVoucherForUserInfo($user, $voucher);
             }
             else{
-                $createVoucherifyOrderObject = new CreateVoucherifyOrderObject($user, $companyId, $amount, true, $transaction->type == TransactionType::TOP_UP);
+                $createVoucherifyOrderObject = new CreateVoucherifyOrderObject($user, $companyId, $transaction->id, $amount, true, $transaction->type == TransactionType::TOP_UP);
                 $createVoucherufyOrderResult = $this->createsVoucherifyOrder->execute($createVoucherifyOrderObject);
 
                 if($createVoucherufyOrderResult && isset($createVoucherufyOrderResult->id)){
diff --git a/app/Classes/Modules/Vouchers/Services/Voucherify/CreatesVoucherifyOrder.php b/app/Classes/Modules/Vouchers/Services/Voucherify/CreatesVoucherifyOrder.php
index e5e6d404..90e5d682 100644
--- a/app/Classes/Modules/Vouchers/Services/Voucherify/CreatesVoucherifyOrder.php
+++ b/app/Classes/Modules/Vouchers/Services/Voucherify/CreatesVoucherifyOrder.php
@@ -31,6 +31,7 @@ class CreatesVoucherifyOrder
     {
         try {
             $orderObj = [
+                "source_id" => $obj->getTransactionId(),
                 "customer" => [
                     "source_id" => $obj->getEmployee()->id,
                     "name" => $obj->getEmployee()->name,
diff --git a/resources/assets/vue/components/bookings/elements/ListVouchers.vue b/resources/assets/vue/components/bookings/elements/AvailableVouchersComponent.vue
similarity index 90%
rename from resources/assets/vue/components/bookings/elements/ListVouchers.vue
rename to resources/assets/vue/components/bookings/elements/AvailableVouchersComponent.vue
index e59ff653..45722aaf 100644
--- a/resources/assets/vue/components/bookings/elements/ListVouchers.vue
+++ b/resources/assets/vue/components/bookings/elements/AvailableVouchersComponent.vue
@@ -1,7 +1,6 @@
 <template>
      <div class="row">
         <div class="col">
-            <loading-component style="height: 100px; top: 0;" key="1" color="success" v-show="isLoading"></loading-component>
             <div class="row text-left no-margin bg-white" v-if="!isLoading" v-for="item in vouchers" v-bind:key="item.id" >
                 <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" @click="selectVoucher(item)">
                     <div class="row parentContainer">
@@ -28,11 +27,7 @@
         props: {
             section: {
                 type: String,
-                default: 'vouchersDropDownListSection',
-            },
-            isClicked: {
-                type: Boolean,
-                default: false,
+                default: 'availableVouchersSection',
             },
             employee: {
                 type: Object,
diff --git a/resources/assets/vue/components/bookings/elements/ListVouchersComponent.vue b/resources/assets/vue/components/bookings/elements/ListVouchersComponent.vue
new file mode 100644
index 00000000..e55e5151
--- /dev/null
+++ b/resources/assets/vue/components/bookings/elements/ListVouchersComponent.vue
@@ -0,0 +1,93 @@
+<template>
+     <div class="row">
+        <div class="col">
+            <loading-component style="height: 100px; top: 0;" key="1" color="success" v-show="isLoading"></loading-component>
+            <div class="row align-items-center justify-content-center bg-white p-t-50 p-b-50"  v-show="!isLoading && vouchers.length === 0">
+                <div class="col-10">
+                    <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;">You have no vouchers</p>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row text-left no-margin bg-white" v-if="!isLoading" v-for="item in vouchers" v-bind:key="item.id" >
+                <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" @click="selectVoucher(item)">
+                    <div class="row parentContainer">
+                        <div class="col">
+                            <p>{{ item.voucher.code }}</p>
+                            <p v-if="item.voucher.type == 'AMOUNT'">RM{{ item.voucher.value/100 }} Discount</p>
+                            <p v-if="item.voucher.type == 'PERCENT'">{{ item.voucher.value }}% Discount</p>
+                        </div>
+                        <div class="col" v-if="item.voucher.end_date">
+                            Valid till {{ item.voucher.end_date }}
+                        </div>
+                        <div class="col" v-else>
+                            No expiry date
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+    export default {
+        props: {
+            section: {
+                type: String,
+                default: 'vouchersDropDownListSection',
+            },
+            employee: {
+                type: Object,
+                default: null
+            },
+        },
+        data(){
+            return {
+                vouchers: null,
+                isLoading: true,
+            }
+        },
+        computed: {
+            pendingQueue () {
+                return this.$store.getters.isInCompleteQueue(this.section);
+            },
+        },
+        watch: {
+            pendingQueue(inComplete){
+                if(inComplete){
+                    this.fetchVouchers();
+                }
+            },
+        },
+        created(){
+            this.$store.dispatch('updateListQueue', {'name': this.section});
+        },
+        methods: {
+            fetchVouchers(){
+                this.isLoading = true;
+                if(this.employee){
+                    this.submit(route('api.voucher.user.list') + '?filters=' + JSON.stringify( { 'has_active_reward':  this.employee.id} ), 'get', this.section, false, false);
+                }
+            },
+            successHandler(response){
+                this.isLoading = false;
+                this.$store.dispatch('completeList', {'name': this.section, 'data': []});
+                this.vouchers = response.payload.data;
+            },
+            selectVoucher(item){
+                this.$emit('selected-voucher', item.voucher.code);
+                this.closeModal();
+            },
+        }
+    }
+</script>
diff --git a/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue b/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue
index 554530af..d62fe843 100644
--- a/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue
+++ b/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue
@@ -253,7 +253,7 @@
                                             </validation-wrapper-component>
                                         </div>
                                         <!-- <modal-component id="choose-voucher-modal" class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="voucherList">
-                                            <list-vouchers :isClicked="!voucherListDropDownStatus" :employee="data.company.employee" @selected-voucher="handleSelectedVoucher"></list-vouchers>
+                                            <list-vouchers-component :employee="data.company.employee" @selected-voucher="handleSelectedVoucher"></list-vouchers-component>
                                         </modal-component> -->
                                     </div>
                                     <span class="text-primary bold text-underline m-l-5 cursor text-small fs-12" style="margin-bottom: -10px; margin-top: -5px;" @click="showApplyVoucher=!showApplyVoucher" v-show="!showApplyVoucher">Apply a voucher</span>
@@ -262,6 +262,11 @@
                                         <span class="text-danger" v-if="voucherCodeFailedReason">{{ voucherCodeFailedReason }}</span>
                                         <span class="text-success" v-if="voucherCodeFailedReason === '' && voucherValidated">Voucher applied</span>
                                     </div>
+                                    <div class="row m-l-0 m-r-0">
+                                        <div class="col">
+                                            <available-vouchers-component :employee="data.company.employee" @selected-voucher="handleSelectedVoucher"></available-vouchers-component>
+                                        </div>
+                                    </div>
                                     <div class="row m-t-5">
                                         <div class="col">
                                             <div class="row p-l-15 p-r-15">
@@ -600,7 +605,6 @@
                 voucherValidated: false,
                 voucherIsChecking: false,
                 showApplyVoucher: false,
-                voucherListDropDownStatus: false,
             }
         },
         validations () {
@@ -702,12 +706,8 @@
                 this.voucherValidated = false;
                 this.voucherCode = event.target.value;
             },
-            toggleDropdown() {
-                this.voucherListDropDownStatus = !this.voucherListDropDownStatus;
-            },
             handleSelectedVoucher(value){
                 this.voucherCode = value;
-                this.voucherListDropDownStatus = !this.voucherListDropDownStatus;
             }
         },
         mixins: [componentHandler],

From 0bc501b35d96bc28b32ccc46e3643646c1171a67 Mon Sep 17 00:00:00 2001
From: Dillon <dillonngoweijoon@gmail.com>
Date: Mon, 31 Jul 2023 19:05:27 +0800
Subject: [PATCH 02/13] Insert voucherify order source id

---
 .../RedeemVoucherifyVoucherObject.php            | 16 +++++++++++++++-
 .../Voucherify/BookingToVoucherifyProcessor.php  |  2 +-
 .../Voucherify/RedeemsVoucherifyVoucher.php      |  1 +
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/app/Classes/Modules/Vouchers/DataTransferObjects/RedeemVoucherifyVoucherObject.php b/app/Classes/Modules/Vouchers/DataTransferObjects/RedeemVoucherifyVoucherObject.php
index 01f5431c..325df2f4 100644
--- a/app/Classes/Modules/Vouchers/DataTransferObjects/RedeemVoucherifyVoucherObject.php
+++ b/app/Classes/Modules/Vouchers/DataTransferObjects/RedeemVoucherifyVoucherObject.php
@@ -9,6 +9,9 @@ class RedeemVoucherifyVoucherObject implements DataTransferObject
     /** @var int */
     private $companyId;
 
+    /** @var int */
+    private $transactionId;
+
     /** @var string */
     private $promoCode;
 
@@ -21,13 +24,15 @@ class RedeemVoucherifyVoucherObject implements DataTransferObject
     /**
      * RedeemVoucherifyVoucherObject constructor.
      * @param int $companyId
+     * @param int $transactionId
      * @param string $name
      * @param string $email
      * @param object $employee
      */
-    public function __construct(int $companyId, string $promoCode, string $amount, object $employee)
+    public function __construct(int $companyId, int $transactionId, string $promoCode, string $amount, object $employee)
     {
         $this->companyId = $companyId;
+        $this->transactionId = $transactionId;
         $this->promoCode = $promoCode;
         $this->amount = $amount;
         $this->employee = $employee;
@@ -42,6 +47,15 @@ class RedeemVoucherifyVoucherObject implements DataTransferObject
     }
 
 
+    /**
+     * @return int
+     */
+    public function getTransactionId(): int
+    {
+        return $this->transactionId;
+    }
+
+
     /**
      * @return string
      */
diff --git a/app/Classes/Modules/Vouchers/Processors/Voucherify/BookingToVoucherifyProcessor.php b/app/Classes/Modules/Vouchers/Processors/Voucherify/BookingToVoucherifyProcessor.php
index 5e31f2eb..323b2eaf 100644
--- a/app/Classes/Modules/Vouchers/Processors/Voucherify/BookingToVoucherifyProcessor.php
+++ b/app/Classes/Modules/Vouchers/Processors/Voucherify/BookingToVoucherifyProcessor.php
@@ -82,7 +82,7 @@ class BookingToVoucherifyProcessor
             $voucherify_customer_id = "";
             $voucherify_order_id = "";
             if($voucherCode){
-                $redeemVoucherifyVoucherObject = new RedeemVoucherifyVoucherObject($companyId, $voucherCode, $amount, $user);
+                $redeemVoucherifyVoucherObject = new RedeemVoucherifyVoucherObject($companyId, $transaction->id, $voucherCode, $amount, $user);
                 $redeemVoucherResult = $this->redeemsVoucherifyVoucher->execute($redeemVoucherifyVoucherObject);
                 $redeemedVoucher = $redeemVoucherResult->voucher;
                 $redemptionId = $redeemVoucherResult->id;
diff --git a/app/Classes/Modules/Vouchers/Services/Voucherify/RedeemsVoucherifyVoucher.php b/app/Classes/Modules/Vouchers/Services/Voucherify/RedeemsVoucherifyVoucher.php
index bd12e27f..3b8fe6ca 100644
--- a/app/Classes/Modules/Vouchers/Services/Voucherify/RedeemsVoucherifyVoucher.php
+++ b/app/Classes/Modules/Vouchers/Services/Voucherify/RedeemsVoucherifyVoucher.php
@@ -29,6 +29,7 @@ class RedeemsVoucherifyVoucher
     {
         try {
             $result = $this->voucherifyClient->redemptions->redeem($redeemVoucherifyVoucherObject->getPromoCode(), [
+                "source_id" => $redeemVoucherifyVoucherObject->getTransactionId(),
                 "customer" => [
                     "source_id" => $redeemVoucherifyVoucherObject->getEmployee()->id,
                     "name" => $redeemVoucherifyVoucherObject->getEmployee()->name,

From 7cd3dd876c1e27b2663dcda9849d47a406591b98 Mon Sep 17 00:00:00 2001
From: Dillon <dillonngoweijoon@gmail.com>
Date: Mon, 31 Jul 2023 19:17:03 +0800
Subject: [PATCH 03/13] Insert voucherify order source id

---
 .../Vouchers/Services/Voucherify/RedeemsVoucherifyVoucher.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Classes/Modules/Vouchers/Services/Voucherify/RedeemsVoucherifyVoucher.php b/app/Classes/Modules/Vouchers/Services/Voucherify/RedeemsVoucherifyVoucher.php
index 3b8fe6ca..7c44889b 100644
--- a/app/Classes/Modules/Vouchers/Services/Voucherify/RedeemsVoucherifyVoucher.php
+++ b/app/Classes/Modules/Vouchers/Services/Voucherify/RedeemsVoucherifyVoucher.php
@@ -29,7 +29,6 @@ class RedeemsVoucherifyVoucher
     {
         try {
             $result = $this->voucherifyClient->redemptions->redeem($redeemVoucherifyVoucherObject->getPromoCode(), [
-                "source_id" => $redeemVoucherifyVoucherObject->getTransactionId(),
                 "customer" => [
                     "source_id" => $redeemVoucherifyVoucherObject->getEmployee()->id,
                     "name" => $redeemVoucherifyVoucherObject->getEmployee()->name,
@@ -40,6 +39,7 @@ class RedeemsVoucherifyVoucher
                     ]
                 ],
                 "order" => [
+                    "source_id" => $redeemVoucherifyVoucherObject->getTransactionId(),
                     "amount" => $redeemVoucherifyVoucherObject->getAmount() * 100  //converting it to cents
                 ]
             ]);

From a79ce7e2b75a6852966ca809925d0256ba2c3e29 Mon Sep 17 00:00:00 2001
From: JiaSheng <jiasheng224@gmail.com>
Date: Tue, 15 Aug 2023 22:56:42 +0800
Subject: [PATCH 04/13] transaction not tally

---
 .../FetchCompanyTransactionStatementLogic.php            | 9 +++++++++
 .../CustomerTransactionHistorySectionComponent.vue       | 9 +++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/app/Classes/Modules/Transactions/ControllersLogic/FetchCompanyTransactionStatementLogic.php b/app/Classes/Modules/Transactions/ControllersLogic/FetchCompanyTransactionStatementLogic.php
index c16ac453..a078a01d 100644
--- a/app/Classes/Modules/Transactions/ControllersLogic/FetchCompanyTransactionStatementLogic.php
+++ b/app/Classes/Modules/Transactions/ControllersLogic/FetchCompanyTransactionStatementLogic.php
@@ -55,6 +55,15 @@ class FetchCompanyTransactionStatementLogic extends AbstractControllerLogic
                 ->where('owner_type', Wallet::class)
                 ->where('type', '!=', TransactionType::PAYMENT);
             })
+            ->orWhere(function ($query) use ($companyId) {
+                $query
+                    ->where('type', TransactionType::INVOICE)
+                    ->where('owner_type', Booking::class)
+                    ->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])
+                    ->whereHas('booking', function ($query) use ($companyId) {
+                        $query->where('company_id', $companyId);
+                });
+            })
             ->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])
             ->orderBy('created_at', 'desc')
             ->get();
diff --git a/resources/assets/vue/components/bookings/elements/CustomerTransactionHistorySectionComponent.vue b/resources/assets/vue/components/bookings/elements/CustomerTransactionHistorySectionComponent.vue
index 7b0aee28..026a76c5 100644
--- a/resources/assets/vue/components/bookings/elements/CustomerTransactionHistorySectionComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/CustomerTransactionHistorySectionComponent.vue
@@ -24,7 +24,8 @@
                                 <div class="col-2 fs-12">{{item.created_at}}</div>
                                 <div class="col-3 fs-12">{{ convertTransactionType(item.type) }} {{ item.payment_reference ? ' - ' + item.payment_reference : '' }} <a target=”_blank” v-if="[9,11].includes(item.type) " :href="route('transaction.credit_note.download', item.id)"><i class="fa fa-download fs-11 m-l-5 text-secondary hover-primary"></i></a></div>
                                 <div class="col fs-12"><a :href="route('booking.details', item.booking_marking)">{{item.booking_marking}}</a></div>
-                                <div class="col-2 text-success text-center">{{[5, 9].includes(parseFloat(item.type)) ? (Math.round((parseFloat(item.amount) + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",") : ''}}</div>
+                                <div class="col-2 text-success text-center" v-if="parseFloat(item.type) !== 2">{{[5, 9].includes(parseFloat(item.type)) ? (Math.round((parseFloat(item.amount) + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",") : ''}}</div>
+                                <div class="col-2 text-success text-center"  v-if="parseFloat(item.type) === 2">{{(Math.round(((parseFloat(item.amount) / parseFloat(item.currency_rate) + parseFloat(item.service_charge)) + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div>
                                 <div class="col-2 text-danger text-center">{{[1, 11].includes(parseFloat(item.type)) ? '- ' + (Math.round((parseFloat(item.amount) + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",") : ''}}</div>
                                 <div class="col-2 text-right">{{remainingBalance(index)}}</div>
                             </div>  
@@ -104,7 +105,11 @@ export default {
             if(this.transaction){
                 let transactions = this.transaction.slice().reverse();
                 transactions.slice(0, transactions.length - index).map(function(transaction) {
-                    [1, 11].includes(transaction.type) ? tempBalance -= (transaction.amount) : tempBalance += (transaction.amount);
+                    if (transaction.type === 2) {
+                        tempBalance += (transaction.amount / transaction.currency_rate + transaction.service_charge);
+                    } else {
+                        [1, 11].includes(transaction.type) ? tempBalance -= (transaction.amount) : tempBalance += (transaction.amount);
+                    }
                     return tempBalance
                 }, 0);
             }

From 3df2d307c4f1c0d9c8b0fc7554d1ac04e95bb989 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Wed, 16 Aug 2023 01:46:59 +0800
Subject: [PATCH 05/13] c2c onboarding

---
 .../NewServiceAnnouncementComponent.vue       | 78 ++++++++++++++++++-
 .../forms/C2cConfirmationFormComponent.vue    | 56 +++++++++++++
 2 files changed, 133 insertions(+), 1 deletion(-)
 create mode 100644 resources/assets/vue/components/general/forms/C2cConfirmationFormComponent.vue

diff --git a/resources/assets/vue/components/companies/elements/NewServiceAnnouncementComponent.vue b/resources/assets/vue/components/companies/elements/NewServiceAnnouncementComponent.vue
index ebcf3851..0b59c459 100644
--- a/resources/assets/vue/components/companies/elements/NewServiceAnnouncementComponent.vue
+++ b/resources/assets/vue/components/companies/elements/NewServiceAnnouncementComponent.vue
@@ -1,6 +1,7 @@
 <template>
     <div class="row m-b-15 align-items-end parentContainer">
         <div class="col">
+            <!-- 1688 consent -->
             <div class="row m-l-0 m-r-0 m-b-15 animate__animated animate__tada animate__repeat-2 animate__delay-3s" v-if="!data.segments.some(item => item.id === 13 || item.id === 16)">
                 <div class="col bg-white padding-15">
                     <div class="row">
@@ -37,7 +38,7 @@
                             </div>
                             <div class="row">
                                 <div class="col text-center">
-                                    <div class="btn btn-lg block btn m-b-5 no-border text-white" :class="[{'bg-primary': acknowledge}, {'bg-primary-lighter': !acknowledge}]" :style="{ cursor: acknowledge ? 'pointer' : 'no-drop' }" @click="activateService">Activate Service</div>
+                                    <div class="btn btn-lg block btn m-b-5 no-border text-white" :class="[{'bg-primary': acknowledge}, {'bg-primary-lighter': !acknowledge}]" :style="{ cursor: acknowledge ? 'pointer' : 'no-drop' }" @click="activateServiceC2C">Activate Service</div>
                                     <!--<p class="text-danger fs-12 bold pointer">Didn't meet the requirements?</p>-->
                                 </div>
                             </div>
@@ -68,6 +69,69 @@
                     </div>
                 </div>
             </div>
+            <!-- C2C consent -->
+            <div class="row m-l-0 m-r-0 m-b-15 animate__animated animate__tada animate__repeat-2 animate__delay-3s" v-if="!data.segments.some(item => item.id === 13 || item.id === 16)">
+                <div class="col bg-white padding-15">
+                    <!-- <div class="row">
+                        <div class="col-4">
+                            <img class="m-b-10 w-100" src="/images/1688_approved.png" />
+                        </div>
+                        <div class="col"></div>
+                        <div class="col-4">
+                            <img class="m-b-10 w-100" src="/images/best-rate-300x127.png" />
+                        </div>
+                    </div> -->
+                    <div class="row">
+                        <div class="col">
+                            <div class="row ">
+                                <div class="col">
+                                    <h4 class="m-t-0">Bank Transfer Security: Safeguard Your Transactions with <span class="bold">Corporate Account Payment (公对公转账)</span></h4>
+                                    <p>This payment is designed to facilitate CNY payments from <span class="bold text-primary">a corporate bank account to your suppliers' corporate bank accounts.</span></p>
+                                    <p class="m-t-15">With this method, you can:</p>
+                                    <ul>
+                                        <li>Enjoy a worry-free transaction experience</li>
+                                        <li>Obtain detailed and transparent invoices</li>
+                                    </ul>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col">
+                                    <div class="row">
+                                        <div class="col">
+                                            <div class="checkbox check-primary m-t-0">
+                                                <input type="checkbox" v-model="acknowledge_c2c" id="acknowledge_c2c">
+                                                <label for="acknowledge_c2c" style="white-space: pre-wrap;">I hereby acknowledge that I have read the requirements and my 1688 account is eligible for this service.</label>
+                                            </div>
+                                        </div>
+                                    </div>
+
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col text-center">
+                                    <!-- <div class="btn btn-lg block btn m-b-5 no-border text-white" :class="[{'bg-primary': acknowledge_c2c}, {'bg-primary-lighter': !acknowledge_c2c}]" :style="{ cursor: acknowledge_c2c ? 'pointer' : 'no-drop' }" @click="activateServiceC2C">Activate Service</div> -->
+                                    <div class="btn btn-lg block btn m-b-5 no-border text-white requestModal" :class="[{'bg-primary': acknowledge_c2c}, {'bg-primary-lighter': !acknowledge_c2c}]" :style="{ cursor: acknowledge_c2c ? 'pointer' : 'no-drop' }" data-type="deleteMappingTransaction">Activate Service</div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <modal-component class="animate__animated animate__fast animate__fadeIn" type="deleteMappingTransaction">
+                <c2c-confirmation-form-component
+                    contentText="To activate the service, please take note of the following important details:
+                    <ol>
+                        <li class='text-left'>The minimum transfer amount for each transaction is <strong>CNY 10,000</strong>.</li>
+                        <li class='text-left'>The purchase order must be filled in before making payments.</li>
+                        <li class='text-left'>The processing time for each transaction is <strong>3-7 working days</strong>.</li>
+                    </ol>"
+                    modalType="confirm"
+                    class="text-center"
+                    apiMethod="post"
+                    :section="section"
+                >
+                </c2c-confirmation-form-component>
+            </modal-component>
             <modal-component small type="requirements">
                 <div class="row" v-if="!failed">
                     <div class="col text-center">
@@ -144,6 +208,7 @@
         data(){
             return {
                 acknowledge: false,
+                acknowledge_c2c: false,
                 parameters: {
                     segment_id: ''
                 },
@@ -164,6 +229,17 @@
 
                 // location.reload();
             },
+            activateServiceC2C(){
+                this.parameters = {
+                    segment_id: 13
+                };
+                this.part = 1;
+                if(this.acknowledge_c2c){
+                    this.submit(this.route('api.company.segment.assign', this.data.id), 'post', 'activateService', true, false);
+                }
+
+                // location.reload();
+            },
             ServiceWaitingList(){
                 this.acknowledge = true;
                 this.parameters = {
diff --git a/resources/assets/vue/components/general/forms/C2cConfirmationFormComponent.vue b/resources/assets/vue/components/general/forms/C2cConfirmationFormComponent.vue
new file mode 100644
index 00000000..2d093413
--- /dev/null
+++ b/resources/assets/vue/components/general/forms/C2cConfirmationFormComponent.vue
@@ -0,0 +1,56 @@
+<template>
+    <div class="row">
+        <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">
+                            <div class="fs-11" v-html="contentText"></div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col p-r-5">
+                            <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> -->
+                            <div class="btn btn-sm btn-block b-rad-none" :class="[{'btn-danger': modalType !== 'confirm'}, {'btn-success': modalType === 'confirm'}]">{{ buttonText }}</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    import ModalFormHandler from '../../../general/mixins/modalFormHandler';
+    export default {
+        props: {
+            contentText: {
+                type: String,
+                required: true
+            },
+            modalType: {
+                type: String,
+                default: 'confirm'
+            },
+            buttonText: {
+                type: String,
+                default: 'Confirm'
+            },
+            apiMethod: {
+                type: String,
+                required: true
+            },
+        },
+        methods: {
+            test() {
+                console.log('sjhb');
+            },
+        },
+        mixins: [componentHandler, ModalFormHandler]
+
+    }
+</script>

From 2a678ce9a0665dbfe90d1dea4cbdb8b7ef9773d1 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Wed, 16 Aug 2023 13:46:08 +0800
Subject: [PATCH 06/13] c2c onboarding

---
 .../NewServiceAnnouncementComponent.vue       | 44 ++-----------
 .../forms/C2cConfirmationFormComponent.vue    | 61 +++++++++++--------
 2 files changed, 42 insertions(+), 63 deletions(-)

diff --git a/resources/assets/vue/components/companies/elements/NewServiceAnnouncementComponent.vue b/resources/assets/vue/components/companies/elements/NewServiceAnnouncementComponent.vue
index 0b59c459..8e8d01c5 100644
--- a/resources/assets/vue/components/companies/elements/NewServiceAnnouncementComponent.vue
+++ b/resources/assets/vue/components/companies/elements/NewServiceAnnouncementComponent.vue
@@ -38,7 +38,7 @@
                             </div>
                             <div class="row">
                                 <div class="col text-center">
-                                    <div class="btn btn-lg block btn m-b-5 no-border text-white" :class="[{'bg-primary': acknowledge}, {'bg-primary-lighter': !acknowledge}]" :style="{ cursor: acknowledge ? 'pointer' : 'no-drop' }" @click="activateServiceC2C">Activate Service</div>
+                                    <div class="btn btn-lg block btn m-b-5 no-border text-white" :class="[{'bg-primary': acknowledge}, {'bg-primary-lighter': !acknowledge}]" :style="{ cursor: acknowledge ? 'pointer' : 'no-drop' }" @click="activateService">Activate Service</div>
                                     <!--<p class="text-danger fs-12 bold pointer">Didn't meet the requirements?</p>-->
                                 </div>
                             </div>
@@ -70,7 +70,7 @@
                 </div>
             </div>
             <!-- C2C consent -->
-            <div class="row m-l-0 m-r-0 m-b-15 animate__animated animate__tada animate__repeat-2 animate__delay-3s" v-if="!data.segments.some(item => item.id === 13 || item.id === 16)">
+            <div class="row m-l-0 m-r-0 m-b-15 animate__animated animate__tada animate__repeat-2 animate__delay-3s" v-if="!data.segments.some(item => item.id === 28)">
                 <div class="col bg-white padding-15">
                     <!-- <div class="row">
                         <div class="col-4">
@@ -94,41 +94,21 @@
                                     </ul>
                                 </div>
                             </div>
-                            <div class="row">
-                                <div class="col">
-                                    <div class="row">
-                                        <div class="col">
-                                            <div class="checkbox check-primary m-t-0">
-                                                <input type="checkbox" v-model="acknowledge_c2c" id="acknowledge_c2c">
-                                                <label for="acknowledge_c2c" style="white-space: pre-wrap;">I hereby acknowledge that I have read the requirements and my 1688 account is eligible for this service.</label>
-                                            </div>
-                                        </div>
-                                    </div>
-
-                                </div>
-                            </div>
                             <div class="row">
                                 <div class="col text-center">
                                     <!-- <div class="btn btn-lg block btn m-b-5 no-border text-white" :class="[{'bg-primary': acknowledge_c2c}, {'bg-primary-lighter': !acknowledge_c2c}]" :style="{ cursor: acknowledge_c2c ? 'pointer' : 'no-drop' }" @click="activateServiceC2C">Activate Service</div> -->
-                                    <div class="btn btn-lg block btn m-b-5 no-border text-white requestModal" :class="[{'bg-primary': acknowledge_c2c}, {'bg-primary-lighter': !acknowledge_c2c}]" :style="{ cursor: acknowledge_c2c ? 'pointer' : 'no-drop' }" data-type="deleteMappingTransaction">Activate Service</div>
+                                    <div class="btn btn-lg block btn m-b-5 no-border text-white requestModal pointer bg-primary" data-type="deleteMappingTransaction">Activate Service</div>
                                 </div>
                             </div>
                         </div>
                     </div>
                 </div>
             </div>
-            <modal-component class="animate__animated animate__fast animate__fadeIn" type="deleteMappingTransaction">
+            <modal-component class="animate__animated animate__fast animate__fadeIn" type="deleteMappingTransaction" styleType="fill-in" size="large">
                 <c2c-confirmation-form-component
-                    contentText="To activate the service, please take note of the following important details:
-                    <ol>
-                        <li class='text-left'>The minimum transfer amount for each transaction is <strong>CNY 10,000</strong>.</li>
-                        <li class='text-left'>The purchase order must be filled in before making payments.</li>
-                        <li class='text-left'>The processing time for each transaction is <strong>3-7 working days</strong>.</li>
-                    </ol>"
-                    modalType="confirm"
                     class="text-center"
-                    apiMethod="post"
-                    :section="section"
+                    section="activateService"
+                    :data="data"
                 >
                 </c2c-confirmation-form-component>
             </modal-component>
@@ -208,7 +188,6 @@
         data(){
             return {
                 acknowledge: false,
-                acknowledge_c2c: false,
                 parameters: {
                     segment_id: ''
                 },
@@ -229,17 +208,6 @@
 
                 // location.reload();
             },
-            activateServiceC2C(){
-                this.parameters = {
-                    segment_id: 13
-                };
-                this.part = 1;
-                if(this.acknowledge_c2c){
-                    this.submit(this.route('api.company.segment.assign', this.data.id), 'post', 'activateService', true, false);
-                }
-
-                // location.reload();
-            },
             ServiceWaitingList(){
                 this.acknowledge = true;
                 this.parameters = {
diff --git a/resources/assets/vue/components/general/forms/C2cConfirmationFormComponent.vue b/resources/assets/vue/components/general/forms/C2cConfirmationFormComponent.vue
index 2d093413..0e7ac452 100644
--- a/resources/assets/vue/components/general/forms/C2cConfirmationFormComponent.vue
+++ b/resources/assets/vue/components/general/forms/C2cConfirmationFormComponent.vue
@@ -1,21 +1,33 @@
 <template>
-    <div class="row">
+    <div class="row bg-white padding-25">
         <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="row">
                         <div class="col">
-                            <div class="fs-11" v-html="contentText"></div>
+                        <h3>To activate the service, please take note of the following important details:</h3>
+                        <ol class="m-t-15">
+                            <li class='text-left'>The minimum transfer amount for each transaction is <strong>CNY 10,000</strong>.</li>
+                            <li class='text-left'>The purchase order must be filled in before making payments.</li>
+                            <li class='text-left'>The processing time for each transaction is <strong>3-7 working days</strong>.</li>
+                        </ol>
+                        </div>
+                    </div>
+                    <div class="row m-t-10">
+                        <div class="col">
+                            <div class="checkbox check-primary m-t-0">
+                                <input type="checkbox" v-model="acknowledge_c2c" id="acknowledge_c2c">
+                                <label for="acknowledge_c2c" style="white-space: pre-wrap;">I hereby acknowledge that I have read the requirements for this service.</label>
+                            </div>
                         </div>
                     </div>
                     <div class="row">
                         <div class="col p-r-5">
-                            <div class="btn btn-sm btn-default btn-block bg-master-lighter" data-dismiss="modal">Cancel</div>
+                            <div class="btn btn-lg block btn m-b-5 no-border 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> -->
-                            <div class="btn btn-sm btn-block b-rad-none" :class="[{'btn-danger': modalType !== 'confirm'}, {'btn-success': modalType === 'confirm'}]">{{ buttonText }}</div>
+                            <div class="btn btn-lg block btn m-b-5 no-border text-white" :class="[{'bg-primary': acknowledge_c2c}, {'bg-primary-lighter': !acknowledge_c2c}]" :style="{ cursor: acknowledge_c2c ? 'pointer' : 'no-drop' }" @click="activateServiceC2C">Activate Service</div>
                         </div>
                     </div>
                 </div>
@@ -27,28 +39,27 @@
     import componentHandler from '../../../general/mixins/componentHandler';
     import ModalFormHandler from '../../../general/mixins/modalFormHandler';
     export default {
-        props: {
-            contentText: {
-                type: String,
-                required: true
-            },
-            modalType: {
-                type: String,
-                default: 'confirm'
-            },
-            buttonText: {
-                type: String,
-                default: 'Confirm'
-            },
-            apiMethod: {
-                type: String,
-                required: true
-            },
+        data(){
+            return {
+                acknowledge_c2c: false,
+                parameters: {
+                    segment_id: ''
+                },
+            }
         },
         methods: {
-            test() {
-                console.log('sjhb');
+            activateServiceC2C(){
+                this.parameters = {
+                    segment_id: 28
+                };
+                if(this.acknowledge_c2c){
+                    this.submit(this.route('api.company.segment.assign', this.data.id), 'post', 'activateService', true, true);
+                }
+                // location.reload();
             },
+            successHandler(){
+                location.reload();
+            }
         },
         mixins: [componentHandler, ModalFormHandler]
 

From a0cf610a283e53e83997ad973b9082b79f04dca0 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Wed, 16 Aug 2023 13:53:54 +0800
Subject: [PATCH 07/13] update c2c id

---
 .../companies/elements/NewServiceAnnouncementComponent.vue      | 2 +-
 .../components/general/forms/C2cConfirmationFormComponent.vue   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/assets/vue/components/companies/elements/NewServiceAnnouncementComponent.vue b/resources/assets/vue/components/companies/elements/NewServiceAnnouncementComponent.vue
index 8e8d01c5..2857ff1f 100644
--- a/resources/assets/vue/components/companies/elements/NewServiceAnnouncementComponent.vue
+++ b/resources/assets/vue/components/companies/elements/NewServiceAnnouncementComponent.vue
@@ -70,7 +70,7 @@
                 </div>
             </div>
             <!-- C2C consent -->
-            <div class="row m-l-0 m-r-0 m-b-15 animate__animated animate__tada animate__repeat-2 animate__delay-3s" v-if="!data.segments.some(item => item.id === 28)">
+            <div class="row m-l-0 m-r-0 m-b-15 animate__animated animate__tada animate__repeat-2 animate__delay-3s" v-if="!data.segments.some(item => item.id === 29)">
                 <div class="col bg-white padding-15">
                     <!-- <div class="row">
                         <div class="col-4">
diff --git a/resources/assets/vue/components/general/forms/C2cConfirmationFormComponent.vue b/resources/assets/vue/components/general/forms/C2cConfirmationFormComponent.vue
index 0e7ac452..4d2998bc 100644
--- a/resources/assets/vue/components/general/forms/C2cConfirmationFormComponent.vue
+++ b/resources/assets/vue/components/general/forms/C2cConfirmationFormComponent.vue
@@ -50,7 +50,7 @@
         methods: {
             activateServiceC2C(){
                 this.parameters = {
-                    segment_id: 28
+                    segment_id: 29
                 };
                 if(this.acknowledge_c2c){
                     this.submit(this.route('api.company.segment.assign', this.data.id), 'post', 'activateService', true, true);

From 89e9271c3f0277b2377bf5f795810078ff46555e Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Thu, 17 Aug 2023 16:49:58 +0800
Subject: [PATCH 08/13] show latest invoice in html

---
 routes/web.php | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/routes/web.php b/routes/web.php
index 324c03a9..5cc38fbd 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -110,6 +110,27 @@ Route::get('/transfer/{marking}', function ($marking) {
     return view('pages.bookings.profile', ['marking' => $marking]);
 })->name('booking.details');
 
+Route::get('/transfer/{marking}/latest-invoice', function ($marking) {
+    $booking= Booking::where('marking', $marking)->first();
+
+    $purchaseOrder = $booking->transactions()
+    ->where('type', TransactionType::PURCHASE_ORDER)
+    ->complete()
+    ->first();
+
+    $transaction = $booking->transactions()
+    ->where('type', TransactionType::PAYMENT)
+    ->latest()->get()[0];
+    
+    $supplier = Company::where('id', $transaction->receiver)->first();
+
+    $lowercaseDocumentType = strtolower(DocumentType::INVOICE);
+
+    $voucherRedemption = $transaction->voucherRedemption;
+
+    return view('pages.pdfs.' . $lowercaseDocumentType, ['transaction' => $transaction, 'po_order_transaction' => $purchaseOrder, 'supplier' => $supplier, 'voucher_redemption' => $voucherRedemption]);
+})->name('booking.details.latest_invoice');
+
 Route::get('/transfer/merge/{marking}', function ($marking) {
     return view('pages.bookings.merge', ['marking' => $marking]);
 })->name('booking.merge');

From 00c2672d16de4a004c225f93d0d221925be49715 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Thu, 17 Aug 2023 23:19:03 +0800
Subject: [PATCH 09/13] update invoice amount

---
 resources/views/pages/pdfs/invoice.blade.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/views/pages/pdfs/invoice.blade.php b/resources/views/pages/pdfs/invoice.blade.php
index 98d6dc05..db6c42c5 100644
--- a/resources/views/pages/pdfs/invoice.blade.php
+++ b/resources/views/pages/pdfs/invoice.blade.php
@@ -79,11 +79,11 @@
 
         @foreach ($po_order_transaction->transactionDetails as $key => $transaction_detail)
             @php
-                $exactUnitPrice = bcdiv($transaction_detail->price, $transaction->currency_rate, 5);
+                $exactUnitPrice = bcdiv($transaction_detail->price, $transaction->currency_rate, 7);
                 $itemTotal = bcmul($exactUnitPrice, $transaction_detail->quantity, 5);
                 $displayedItemTotal = bcmul($exactUnitPrice, $transaction_detail->quantity, 2);
                 $displayedSubtotal = bcadd($displayedSubtotal, $displayedItemTotal, 2);
-                $subtotal = bcadd($subtotal, $displayedItemTotal, 2);
+                $subtotal = bcadd($subtotal, $itemTotal, 5);
             @endphp
             <tr>
                 <td width="5%" class="center top">{{ $key + 1 }}</td>
@@ -130,7 +130,7 @@
             </tr>
         @endif
         @php
-            $displayedTotal = bcadd(bcadd(bcadd($displayedSubtotal, $transaction->service_charge, 2), $transaction->tax, 2), $voucherDiscount, 2);
+            $displayedTotal = bcadd(bcadd(bcadd($subtotal, $transaction->service_charge, 5), $transaction->tax, 5), $voucherDiscount, 5);
             $expectedTotal = bcadd(bcadd(bcadd($subtotal, $transaction->service_charge, 5), $transaction->tax, 5), $voucherDiscount, 5);
             $discrepancy = bcsub($displayedTotal, $expectedTotal, 5);
             $total = bcadd(bcadd(bcadd($subtotal, $transaction->service_charge, 5), $transaction->tax, 5), $voucherDiscount, 5);

From dbae9687d60e5a3b548686487b44956884588045 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Fri, 18 Aug 2023 13:56:22 +0800
Subject: [PATCH 10/13] update c2c terms and condition text

---
 .../companies/elements/NewServiceAnnouncementComponent.vue    | 4 ++--
 .../components/general/forms/C2cConfirmationFormComponent.vue | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/assets/vue/components/companies/elements/NewServiceAnnouncementComponent.vue b/resources/assets/vue/components/companies/elements/NewServiceAnnouncementComponent.vue
index 2857ff1f..5b2fd27a 100644
--- a/resources/assets/vue/components/companies/elements/NewServiceAnnouncementComponent.vue
+++ b/resources/assets/vue/components/companies/elements/NewServiceAnnouncementComponent.vue
@@ -85,8 +85,8 @@
                         <div class="col">
                             <div class="row ">
                                 <div class="col">
-                                    <h4 class="m-t-0">Bank Transfer Security: Safeguard Your Transactions with <span class="bold">Corporate Account Payment (公对公转账)</span></h4>
-                                    <p>This payment is designed to facilitate CNY payments from <span class="bold text-primary">a corporate bank account to your suppliers' corporate bank accounts.</span></p>
+                                    <h4 class="m-t-0">Bank Transfer Security: Safeguard Your Transactions with <span class="bold">Enterprise Account Payment (公对公转账)</span></h4>
+                                    <p>This payment is designed to facilitate CNY payments from <span class="bold text-primary">an enterprise bank account to your suppliers' enterprise bank accounts</span></p>
                                     <p class="m-t-15">With this method, you can:</p>
                                     <ul>
                                         <li>Enjoy a worry-free transaction experience</li>
diff --git a/resources/assets/vue/components/general/forms/C2cConfirmationFormComponent.vue b/resources/assets/vue/components/general/forms/C2cConfirmationFormComponent.vue
index 4d2998bc..1c4c9647 100644
--- a/resources/assets/vue/components/general/forms/C2cConfirmationFormComponent.vue
+++ b/resources/assets/vue/components/general/forms/C2cConfirmationFormComponent.vue
@@ -8,7 +8,7 @@
                         <div class="col">
                         <h3>To activate the service, please take note of the following important details:</h3>
                         <ol class="m-t-15">
-                            <li class='text-left'>The minimum transfer amount for each transaction is <strong>CNY 10,000</strong>.</li>
+                            <li class='text-left'>First point: The minimum amount is <strong>CNY 10,000</strong> for each transfer.</li>
                             <li class='text-left'>The purchase order must be filled in before making payments.</li>
                             <li class='text-left'>The processing time for each transaction is <strong>3-7 working days</strong>.</li>
                         </ol>

From a8ff89c8c0617e4b245bec5808628eb7eaeb9231 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Fri, 18 Aug 2023 14:17:34 +0800
Subject: [PATCH 11/13] update c2c tnc

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

diff --git a/resources/assets/vue/components/general/forms/C2cConfirmationFormComponent.vue b/resources/assets/vue/components/general/forms/C2cConfirmationFormComponent.vue
index 1c4c9647..30c879a2 100644
--- a/resources/assets/vue/components/general/forms/C2cConfirmationFormComponent.vue
+++ b/resources/assets/vue/components/general/forms/C2cConfirmationFormComponent.vue
@@ -8,7 +8,7 @@
                         <div class="col">
                         <h3>To activate the service, please take note of the following important details:</h3>
                         <ol class="m-t-15">
-                            <li class='text-left'>First point: The minimum amount is <strong>CNY 10,000</strong> for each transfer.</li>
+                            <li class='text-left'>The minimum amount is <strong>CNY 10,000</strong> for each transfer.</li>
                             <li class='text-left'>The purchase order must be filled in before making payments.</li>
                             <li class='text-left'>The processing time for each transaction is <strong>3-7 working days</strong>.</li>
                         </ol>

From 85682905e4d467080e957722f0bca73dda64f218 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Sat, 19 Aug 2023 17:04:43 +0800
Subject: [PATCH 12/13] fix refunded bookings

---
 app/Console/Commands/DeleteOrderCommand.php | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/app/Console/Commands/DeleteOrderCommand.php b/app/Console/Commands/DeleteOrderCommand.php
index a4702ff0..6f048ce3 100644
--- a/app/Console/Commands/DeleteOrderCommand.php
+++ b/app/Console/Commands/DeleteOrderCommand.php
@@ -5,6 +5,7 @@ namespace App\Console\Commands;
 use Illuminate\Console\Command;
 use Carbon\Carbon;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\TransactionType;
 use App\Models\Booking;
 
 class DeleteOrderCommand extends Command
@@ -40,7 +41,8 @@ class DeleteOrderCommand extends Command
      */
     public function handle()
     {
-        $bookings_reference = $this->argument('bookings_reference');
+        // $bookings_reference = $this->argument('bookings_reference');
+        $bookings_reference = '28546,38599,44487,71086,70133,58580,42831,96028,41188,33894,95877,86732,31894,50962,44215,92894,40968,30303,89762,74693,45271,27169';
         $bookings_reference = explode(',', $bookings_reference);
 
         $start   = new Carbon();
@@ -52,9 +54,18 @@ class DeleteOrderCommand extends Command
             if (!$booking) {
                 $this->logOutput('Booking not found: ' . $reference);
             } else {
-                $booking->status = ApprovalStatus::EXPIRED;
+                $booking->status = ApprovalStatus::APPROVED;
                 $booking->save();
-                $this->logOutput('Booking deleted: ' . $reference);
+                // $this->logOutput('Booking deleted: ' . $reference);
+
+                $payment = $booking->transactions()
+                    ->payments()->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])
+                    ->first();
+
+                $payment->status = ApprovalStatus::EXPIRED;
+                $payment->save();
+
+                $this->logOutput('Booking ' . $reference . ' Payment deleted: ' . $payment->id);
             }
         }
 

From f35bc37f72b852224692fdb2f0938a7f9cc5cefc Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Sat, 19 Aug 2023 17:07:34 +0800
Subject: [PATCH 13/13] fix refunded bookings

---
 app/Console/Commands/DeleteOrderCommand.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/Console/Commands/DeleteOrderCommand.php b/app/Console/Commands/DeleteOrderCommand.php
index 6f048ce3..849a0106 100644
--- a/app/Console/Commands/DeleteOrderCommand.php
+++ b/app/Console/Commands/DeleteOrderCommand.php
@@ -54,10 +54,6 @@ class DeleteOrderCommand extends Command
             if (!$booking) {
                 $this->logOutput('Booking not found: ' . $reference);
             } else {
-                $booking->status = ApprovalStatus::APPROVED;
-                $booking->save();
-                // $this->logOutput('Booking deleted: ' . $reference);
-
                 $payment = $booking->transactions()
                     ->payments()->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])
                     ->first();