From 2795e5f107552228ddfaff3f8de1931a134491f7 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 22 Mar 2022 14:06:38 +0800 Subject: [PATCH 1/4] update debtor export format --- .../Exports/ExportCustomersToExcelController.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Exports/ExportCustomersToExcelController.php b/app/Http/Controllers/Exports/ExportCustomersToExcelController.php index 2a22422f..f1e14fde 100644 --- a/app/Http/Controllers/Exports/ExportCustomersToExcelController.php +++ b/app/Http/Controllers/Exports/ExportCustomersToExcelController.php @@ -36,16 +36,22 @@ class ExportCustomersToExcelController } public function nullDebtor(ExportsNullDebtors $exportsNullDebtors, Request $request){ - return $exportsNullDebtors->download('nullDebtor.csv', Excel::CSV, ['Content-Type' => 'text/csv']); + $response = $exportsNullDebtors->download('nullDebtor.xls', Excel::XLS, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']); + ob_end_clean(); + return $response; } public function paymentTransactions(Request $request){ $exportsTransactions = new ExportsPaymentTransactions($request); - return $exportsTransactions->download('payment-transactions.csv', Excel::CSV, ['Content-Type' => 'text/csv']); + $response = $exportsTransactions->download('payment-transactions.xls', Excel::XLSX, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']); + ob_end_clean(); + return $response; } public function walletTransactions(Request $request){ $exportsTransactions = new ExportsWalletTransactions($request); - return $exportsTransactions->download('wallet-transactions.csv', Excel::CSV, ['Content-Type' => 'text/csv']); + $response = $exportsTransactions->download('wallet-transactions.xls', Excel::XLS, ['Content-Type' => 'application/vnd.ms-excel']); + ob_end_clean(); + return $response; } } \ No newline at end of file From b3a1fff11cc55a42cbeab172f9b3e66ca8836c4d Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 22 Mar 2022 19:53:00 +0800 Subject: [PATCH 2/4] fix payment proof issuer ids --- resources/views/pages/currency_orders.blade.php | 2 +- resources/views/pages/dashboards/admin.blade.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/pages/currency_orders.blade.php b/resources/views/pages/currency_orders.blade.php index 2c663904..51dbc000 100644 --- a/resources/views/pages/currency_orders.blade.php +++ b/resources/views/pages/currency_orders.blade.php @@ -35,7 +35,7 @@
- + diff --git a/resources/views/pages/dashboards/admin.blade.php b/resources/views/pages/dashboards/admin.blade.php index 2719cfec..369698fa 100644 --- a/resources/views/pages/dashboards/admin.blade.php +++ b/resources/views/pages/dashboards/admin.blade.php @@ -180,7 +180,7 @@
- + From 68dff304a05ccdf653cf3900fb9d659d7258f781 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 22 Mar 2022 20:28:32 +0800 Subject: [PATCH 3/4] fix payment proof issuer ids --- resources/views/pages/currency_orders.blade.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/views/pages/currency_orders.blade.php b/resources/views/pages/currency_orders.blade.php index 51dbc000..5c981374 100644 --- a/resources/views/pages/currency_orders.blade.php +++ b/resources/views/pages/currency_orders.blade.php @@ -125,7 +125,7 @@
- + @@ -134,7 +134,7 @@
- + @@ -143,7 +143,7 @@
- + From 8f0d872ae71066aaab92f3c78b5ca7807d37956a Mon Sep 17 00:00:00 2001 From: omair saleh Date: Wed, 23 Mar 2022 12:50:47 +0800 Subject: [PATCH 4/4] fix ali pay account --- .../vue/components/banks/elements/BankAccountComponent.vue | 2 +- .../assets/vue/components/banks/elements/BankInComponent.vue | 2 +- .../components/bookings/elements/UrgentTransactionComponent.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/assets/vue/components/banks/elements/BankAccountComponent.vue b/resources/assets/vue/components/banks/elements/BankAccountComponent.vue index 1fb6ac43..380080e3 100644 --- a/resources/assets/vue/components/banks/elements/BankAccountComponent.vue +++ b/resources/assets/vue/components/banks/elements/BankAccountComponent.vue @@ -26,7 +26,7 @@
{{item.holder_name}}
-
{{item.account_no.replace(/[^\dA-Z]/g, '').replace(/(.{4})/g, '$1 ').trim()}}
+
{{item.bank.type === 3 ? item.bank.account_no : item.bank.account_no.replace(/[^\dA-Z]/g, '').replace(/(.{4})/g, '$1 ').trim() }}
diff --git a/resources/assets/vue/components/banks/elements/BankInComponent.vue b/resources/assets/vue/components/banks/elements/BankInComponent.vue index ff42850a..98401544 100644 --- a/resources/assets/vue/components/banks/elements/BankInComponent.vue +++ b/resources/assets/vue/components/banks/elements/BankInComponent.vue @@ -16,7 +16,7 @@
-
{{item.recipient_bank_account.bank_name}}({{item.recipient_bank_account.bank_branch}}): {{item.recipient_bank_account.account_no.replace(/[^\dA-Z]/g, '').replace(/(.{4})/g, '$1 ').trim()}}
+
{{item.recipient_bank_account.bank_name}}({{item.recipient_bank_account.bank_branch}}): {{item.recipient_bank_account.type === 3 ? item.recipient_bank_account.account_no : item.recipient_bank_account.account_no.replace(/[^\dA-Z]/g, '').replace(/(.{4})/g, '$1 ').trim() }}
diff --git a/resources/assets/vue/components/bookings/elements/UrgentTransactionComponent.vue b/resources/assets/vue/components/bookings/elements/UrgentTransactionComponent.vue index 564e6bb2..b684c6cc 100644 --- a/resources/assets/vue/components/bookings/elements/UrgentTransactionComponent.vue +++ b/resources/assets/vue/components/bookings/elements/UrgentTransactionComponent.vue @@ -15,7 +15,7 @@

{{item.recipient_bank_account.holder_name}}

{{item.recipient_bank_account.bank_name}}({{item.recipient_bank_account.bank_branch}})

-

{{item.recipient_bank_account.account_no.replace(/[^\dA-Z]/g, '').replace(/(.{4})/g, '$1 ').trim()}}

+

{{item.recipient_bank_account.type === 3 ? item.recipient_bank_account.account_no : item.recipient_bank_account.account_no.replace(/[^\dA-Z]/g, '').replace(/(.{4})/g, '$1 ').trim()}}

{{item.booking.company.reference}}