mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2026-11-03 04:40:20 -06:00
Move form thing the old position.
This commit is contained in:
1 parent
f8ac18e458
commit
1264831598
3 files changed
+11
-2
No files matched your search
@@ -78,6 +78,7 @@ export function createEmptySplit() {
|
||||
return {
|
||||
transaction_journal_id: 0,
|
||||
description: "",
|
||||
reconciled: false,
|
||||
|
||||
// amount information:
|
||||
amount: "",
|
||||
|
||||
@@ -32,6 +32,7 @@ export function parseDownloadedSplits(downloads, groupId) {
|
||||
// meta data
|
||||
current.transaction_journal_id = parseInt(download.transaction_journal_id);
|
||||
current.transaction_group_id = groupId;
|
||||
current.reconciled = download.reconciled;
|
||||
current.bill_id = null === download.bill_id ? 0 : parseInt(download.bill_id);
|
||||
current.bill_name = download.bill_name;
|
||||
current.budget_id = download.budget_id;
|
||||
|
||||
@@ -1,5 +1,10 @@
|
||||
<div :class="{'tab-pane fade pt-2':true, 'show active': index ===0 }" :id="'split-'+index+'-pane'" role="tabpanel"
|
||||
:aria-labelledby="'split-'+index+'-tab'" tabindex="0" x-init="addedSplit()">
|
||||
<template x-if="entries[0].reconciled">
|
||||
<div class="alert alert-warning fade show" role="alert">
|
||||
{{ __('firefly.is_reconciled_fields_dropped') }}
|
||||
</div>
|
||||
</template>
|
||||
<div class="row mb-2">
|
||||
<div class="col-xl-6 col-lg-6 col-md-12 col-xs-12 mb-2">
|
||||
<!-- BASIC TRANSACTION INFORMATION -->
|
||||
@@ -46,7 +51,7 @@
|
||||
</div>
|
||||
</div>
|
||||
<!-- META DATA -->
|
||||
<div class="col-xl-4 col-lg-6 col-md-12 col-xs-12 mb-2">
|
||||
<div class="col-xl-6 col-lg-6 col-md-12 col-xs-12 mb-2">
|
||||
<div class="card mb-2">
|
||||
<div class="card-header">
|
||||
<h3 class="card-title">
|
||||
@@ -76,7 +81,7 @@
|
||||
|
||||
</div>
|
||||
<!-- EXTRA THINGS -->
|
||||
<div class="col-xl-4 col-lg-6 col-md-12 col-xs-12 mb-2">
|
||||
<div class="col-xl-6 col-lg-6 col-md-12 col-xs-12 mb-2">
|
||||
<div class="card mb-2">
|
||||
<div class="card-header">
|
||||
<h3 class="card-title">
|
||||
@@ -104,6 +109,8 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-xl-4 col-lg-6 col-md-12 col-xs-12 mb-2">
|
||||
<div class="card mb-2">
|
||||
<div class="card-header">
|
||||
|
||||
Reference in new issue
Block a user