diff --git a/app/Http/Controllers/Banking/Transactions.php b/app/Http/Controllers/Banking/Transactions.php index f1a48b3ea..5f5d03695 100644 --- a/app/Http/Controllers/Banking/Transactions.php +++ b/app/Http/Controllers/Banking/Transactions.php @@ -70,11 +70,8 @@ class Transactions extends Controller 'profit_for_humans' => $profit_amount->formatForHumans(), ]; - $translations = $this->getTranslationsForConnect('income'); - return $this->response('banking.transactions.index', compact( 'transactions', - 'translations', 'summary_amounts' )); } @@ -381,10 +378,13 @@ class Transactions extends Controller ->toJson(); } + $translations = collect($this->getTranslationsForConnect($transaction->type)); + $data = [ 'transaction' => $transaction->load(['account', 'category'])->toJson(), 'currency' => $transaction->currency->toJson(), 'documents' => $documents, + 'translations' => $translations->toJson(), ]; return response()->json($data); diff --git a/public/css/app.css b/public/css/app.css index 35e0b0e7c..f2a36a4e0 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -66785,27 +66785,6 @@ body{ animation: submit 0.7s ease alternate infinite; } -@keyframes submit_second{ - - 0%{ - content: var(--tw-content); - -webkit-box-shadow: 0 28px 0 -28px #55588b; - box-shadow: 0 28px 0 -28px #55588b; - } - - 100%{ - content: var(--tw-content); - -webkit-box-shadow: 0 28px 0 #55588b; - box-shadow: 0 28px 0 #55588b; - } -} - -.before\:animate-submit_second::before{ - content: var(--tw-content); - -webkit-animation: submit_second 0.7s ease alternate infinite; - animation: submit_second 0.7s ease alternate infinite; -} - .before\:rounded-full::before{ content: var(--tw-content); border-radius: 9999px; @@ -66936,27 +66915,6 @@ body{ animation: submit 0.7s ease alternate infinite; } -@keyframes submit_second{ - - 0%{ - content: var(--tw-content); - -webkit-box-shadow: 0 28px 0 -28px #55588b; - box-shadow: 0 28px 0 -28px #55588b; - } - - 100%{ - content: var(--tw-content); - -webkit-box-shadow: 0 28px 0 #55588b; - box-shadow: 0 28px 0 #55588b; - } -} - -.after\:animate-submit_second::after{ - content: var(--tw-content); - -webkit-animation: submit_second 0.7s ease alternate infinite; - animation: submit_second 0.7s ease alternate infinite; -} - .after\:rounded-full::after{ content: var(--tw-content); border-radius: 9999px; @@ -67133,10 +67091,6 @@ body{ background-size: 100% 2px; } -.hover\:font-bold:hover{ - font-weight: 700; -} - .hover\:font-medium:hover{ font-weight: 500; } @@ -69871,6 +69825,10 @@ body{ margin-top: 1rem; } + .lg\:mt-5{ + margin-top: 1.25rem; + } + .lg\:mt-60{ margin-top: 15rem; } @@ -70297,6 +70255,10 @@ body{ padding-left: 6rem; } + :is([dir="ltr"] .lg\:ltr\:pr-10){ + padding-right: 2.5rem; + } + :is([dir="ltr"] .lg\:ltr\:pr-12){ padding-right: 3rem; } @@ -70313,6 +70275,10 @@ body{ margin-right: 18rem; } + :is([dir="rtl"] .lg\:rtl\:pl-10){ + padding-left: 2.5rem; + } + :is([dir="rtl"] .lg\:rtl\:pl-12){ padding-left: 3rem; } diff --git a/resources/assets/js/components/AkauntingConnectTransactions.vue b/resources/assets/js/components/AkauntingConnectTransactions.vue index 5f4d62395..dc2072c98 100644 --- a/resources/assets/js/components/AkauntingConnectTransactions.vue +++ b/resources/assets/js/components/AkauntingConnectTransactions.vue @@ -299,7 +299,7 @@ export default { transaction: Object, currency: Object, documents: Array, - translations: Object, + translations: Array|Object, modalDialogClass: { type: String, default: '', diff --git a/resources/assets/js/mixins/global.js b/resources/assets/js/mixins/global.js index f6dfd64f2..abb11cf46 100644 --- a/resources/assets/js/mixins/global.js +++ b/resources/assets/js/mixins/global.js @@ -110,6 +110,7 @@ export default { show: false, currency: {}, documents: [], + translations: [], }, cardData: { @@ -1425,8 +1426,10 @@ export default { symbol_first: currency.symbol_first, thousands_separator: currency.thousands_separator, }; - + this.connect.documents = JSON.parse(response.data.documents); + + this.connect.translations = JSON.parse(response.data.translations); }) .catch(error => { }) diff --git a/resources/views/banking/accounts/show.blade.php b/resources/views/banking/accounts/show.blade.php index 36b18ecb5..d12ab97a1 100644 --- a/resources/views/banking/accounts/show.blade.php +++ b/resources/views/banking/accounts/show.blade.php @@ -462,7 +462,7 @@ :transaction="connect.transaction" :currency="connect.currency" :documents="connect.documents" - :translations="{{ json_encode($transactions) }}" + :translations="connect.translations" modal-dialog-class="max-w-screen-lg" v-on:close-modal="connect.show = false" > diff --git a/resources/views/banking/transactions/index.blade.php b/resources/views/banking/transactions/index.blade.php index c4ed26b1e..dd726be77 100644 --- a/resources/views/banking/transactions/index.blade.php +++ b/resources/views/banking/transactions/index.blade.php @@ -220,7 +220,7 @@ :transaction="connect.transaction" :currency="connect.currency" :documents="connect.documents" - :translations="{{ json_encode($translations) }}" + :translations="connect.translations" modal-dialog-class="max-w-screen-lg" v-on:close-modal="connect.show = false" > diff --git a/resources/views/components/transactions/show/template.blade.php b/resources/views/components/transactions/show/template.blade.php index 72a6dd215..617290c57 100644 --- a/resources/views/components/transactions/show/template.blade.php +++ b/resources/views/components/transactions/show/template.blade.php @@ -62,13 +62,13 @@ @default @include($transactionTemplate) @endswitch - +