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 @@
{{item.created_at}}
{{ convertTransactionType(item.type) }} {{ item.payment_reference ? ' - ' + item.payment_reference : '' }}
- {{[5, 9].includes(parseFloat(item.type)) ? (Math.round((parseFloat(item.amount) + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",") : ''}}
+ {{[5, 9].includes(parseFloat(item.type)) ? (Math.round((parseFloat(item.amount) + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",") : ''}}
+ {{(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, ",")}}
{{[1, 11].includes(parseFloat(item.type)) ? '- ' + (Math.round((parseFloat(item.amount) + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",") : ''}}
{{remainingBalance(index)}}
@@ -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);
}
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 @@
-
Bank Transfer Security: Safeguard Your Transactions with Corporate Account Payment (公对公转账)
-
This payment is designed to facilitate CNY payments from a corporate bank account to your suppliers' corporate bank accounts.
+
Bank Transfer Security: Safeguard Your Transactions with Enterprise Account Payment (公对公转账)
+
This payment is designed to facilitate CNY payments from an enterprise bank account to your suppliers' enterprise bank accounts
With this method, you can:
- Enjoy a worry-free transaction experience
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 @@
To activate the service, please take note of the following important details:
- - The minimum transfer amount for each transaction is CNY 10,000.
+ - First point: The minimum amount is CNY 10,000 for each transfer.
- The purchase order must be filled in before making payments.
- The processing time for each transaction is 3-7 working days.