From cb3782b0bbc63f79f42d1c5f92b0600a66b386d8 Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Thu, 16 Jun 2022 12:27:19 +0300 Subject: [PATCH] connect js function moved to global --- app/Models/Banking/Transaction.php | 2 +- resources/assets/js/mixins/global.js | 37 ++++++++++++++++++- resources/assets/js/views/banking/accounts.js | 32 ---------------- .../assets/js/views/banking/transactions.js | 32 ---------------- .../transactions/show/more-buttons.blade.php | 2 +- 5 files changed, 37 insertions(+), 68 deletions(-) diff --git a/app/Models/Banking/Transaction.php b/app/Models/Banking/Transaction.php index 013301fc2..0d97bf0d7 100644 --- a/app/Models/Banking/Transaction.php +++ b/app/Models/Banking/Transaction.php @@ -480,7 +480,7 @@ class Transaction extends Model 'permission' => 'create-banking-transactions', 'attributes' => [ 'id' => 'index-transactions-more-actions-connect-' . $this->id, - '@click' => 'onConnect(\'' . route('transactions.dial', $this->id) . '\')', + '@click' => 'onConnectTransactions(\'' . route('transactions.dial', $this->id) . '\')', ], ]; diff --git a/resources/assets/js/mixins/global.js b/resources/assets/js/mixins/global.js index b393a4281..6d7a29814 100644 --- a/resources/assets/js/mixins/global.js +++ b/resources/assets/js/mixins/global.js @@ -85,7 +85,12 @@ export default { "thousands_separator":",", }, all_currencies: [], - content_loading: true + content_loading: true, + connect: { + show: false, + currency: {}, + documents: [], + }, } }, @@ -656,6 +661,34 @@ export default { copy_badge.classList.remove('flex'); copy_html.classList.remove('hidden'); }, 800); - } + }, + + //connect transactions for account, document or etc. + onConnectTransactions(route) { + let dial_promise = Promise.resolve(window.axios.get(route)); + + dial_promise.then(response => { + this.connect.show = true; + + this.connect.transaction = JSON.parse(response.data.transaction); + + let currency = JSON.parse(response.data.currency); + + this.connect.currency = { + decimal_mark: currency.decimal_mark, + precision: currency.precision, + symbol: currency.symbol, + symbol_first: currency.symbol_first, + thousands_separator: currency.thousands_separator, + }; + + this.connect.documents = JSON.parse(response.data.documents); + }) + .catch(error => { + }) + .finally(function () { + // always executed + }); + }, } } diff --git a/resources/assets/js/views/banking/accounts.js b/resources/assets/js/views/banking/accounts.js index f2b5f97b7..13c00a7de 100644 --- a/resources/assets/js/views/banking/accounts.js +++ b/resources/assets/js/views/banking/accounts.js @@ -29,11 +29,6 @@ const app = new Vue({ return { form: new Form('account'), bulk_action: new BulkAction('accounts'), - connect: { - show: false, - currency: {}, - documents: [], - }, } }, @@ -60,32 +55,5 @@ const app = new Vue({ onBank() { }, - - onConnect(route) { - let dial_promise = Promise.resolve(window.axios.get(route)); - - dial_promise.then(response => { - this.connect.show = true; - - this.connect.transaction = JSON.parse(response.data.transaction); - - let currency = JSON.parse(response.data.currency); - - this.connect.currency = { - decimal_mark: currency.decimal_mark, - precision: currency.precision, - symbol: currency.symbol, - symbol_first: currency.symbol_first, - thousands_separator: currency.thousands_separator, - }; - - this.connect.documents = JSON.parse(response.data.documents); - }) - .catch(error => { - }) - .finally(function () { - // always executed - }); - }, } }); diff --git a/resources/assets/js/views/banking/transactions.js b/resources/assets/js/views/banking/transactions.js index d15ef0cd7..8f5735c3b 100644 --- a/resources/assets/js/views/banking/transactions.js +++ b/resources/assets/js/views/banking/transactions.js @@ -29,42 +29,10 @@ const app = new Vue({ return { form: new Form('transaction'), bulk_action: new BulkAction('transactions'), - connect: { - show: false, - currency: {}, - documents: [], - }, } }, methods: { - onConnect(route) { - let dial_promise = Promise.resolve(window.axios.get(route)); - - dial_promise.then(response => { - this.connect.show = true; - - this.connect.transaction = JSON.parse(response.data.transaction); - - let currency = JSON.parse(response.data.currency); - - this.connect.currency = { - decimal_mark: currency.decimal_mark, - precision: currency.precision, - symbol: currency.symbol, - symbol_first: currency.symbol_first, - thousands_separator: currency.thousands_separator, - }; - - this.connect.documents = JSON.parse(response.data.documents); - }) - .catch(error => { - }) - .finally(function () { - // always executed - }); - }, - async onEmail(route) { let email = { modal: false, diff --git a/resources/views/components/transactions/show/more-buttons.blade.php b/resources/views/components/transactions/show/more-buttons.blade.php index 3a69517ef..a44332004 100644 --- a/resources/views/components/transactions/show/more-buttons.blade.php +++ b/resources/views/components/transactions/show/more-buttons.blade.php @@ -29,7 +29,7 @@ type="button" class="w-full flex items-center text-purple px-2 h-9 leading-9 whitespace-nowrap" title="{{ trans('general.connect') }}" - @click="onConnect('{{ route('transactions.dial', $transaction->id) }}')"> + @click="onConnectTransactions('{{ route('transactions.dial', $transaction->id) }}')"> {{ trans('general.connect') }} @endcan