Fixed Transactions connect language issue..
This commit is contained in:
parent
7ffec9dc2e
commit
2e0c2091a9
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -299,7 +299,7 @@ export default {
|
|||
transaction: Object,
|
||||
currency: Object,
|
||||
documents: Array,
|
||||
translations: Object,
|
||||
translations: Array|Object,
|
||||
modalDialogClass: {
|
||||
type: String,
|
||||
default: '',
|
||||
|
|
|
|||
|
|
@ -110,6 +110,7 @@ export default {
|
|||
show: false,
|
||||
currency: {},
|
||||
documents: [],
|
||||
translations: [],
|
||||
},
|
||||
|
||||
cardData: {
|
||||
|
|
@ -1427,6 +1428,8 @@ export default {
|
|||
};
|
||||
|
||||
this.connect.documents = JSON.parse(response.data.documents);
|
||||
|
||||
this.connect.translations = JSON.parse(response.data.translations);
|
||||
})
|
||||
.catch(error => {
|
||||
})
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
></akaunting-connect-transactions>
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
></akaunting-connect-transactions>
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@
|
|||
:transaction="connect.transaction"
|
||||
:currency="connect.currency"
|
||||
:documents="connect.documents"
|
||||
:translations="{{ json_encode($connectTranslations) }}"
|
||||
:translations="connect.translations"
|
||||
modal-dialog-class="max-w-screen-lg"
|
||||
v-on:close-modal="connect.show = false"
|
||||
></akaunting-connect-transactions>
|
||||
|
|
|
|||
Loading…
Reference in New Issue