Skip to content

Firefly III: a personal finances manager

Fix https://github.com/firefly-iii/firefly-iii/issues/12744

James Coleb3ac87ce802e
diff --git a/app/Http/Controllers/Transaction/CreateController.php b/app/Http/Controllers/Transaction/CreateController.php
index 817d3e0f62..32f9f4fc8f 100644
--- a/app/Http/Controllers/Transaction/CreateController.php
+++ b/app/Http/Controllers/Transaction/CreateController.php
@@ -75,7 +75,7 @@ final class CreateController extends Controller
Preferences::mark();
- $title = $newGroup->title ?? $newGroup->transactionJournals->first()->description;
+ $title = '' === (string) $newGroup->title ? $newGroup->transactionJournals()->first()->description: $newGroup->title;
$link = route('transactions.show', [$newGroup->id]);
session()->flash('success', trans('firefly.stored_journal', ['description' => $title]));
session()->flash('success_url', $link);
diff --git a/public/v1/js/ff/transactions/show.js b/public/v1/js/ff/transactions/show.js
index 5e416f78f8..7d3cb3ce18 100644
--- a/public/v1/js/ff/transactions/show.js
+++ b/public/v1/js/ff/transactions/show.js
@@ -20,17 +20,49 @@
$(function () {
"use strict";
- $('.clone-transaction').click(cloneTransaction);
- $('.clone-transaction-and-edit').click(cloneTransactionAndEdit);
- $('[data-toggle="tooltip"]').tooltip();
+ $('.clone-transaction').on('click', cloneTransaction);
+ $('.clone-transaction-and-edit').on('click', cloneTransactionAndEdit);
+ // $('[data-toggle="tooltip"]').tooltip();
+
+ $('.switch-link').on('click', switchLink);
+ $('.reconcile-button').on('click', unreconcile);
+
});
+function unreconcile(e) {
+ e.preventDefault();
+ var obj = $(e.currentTarget);
+ $.post(obj.attr('href'), {
+ _token: token
+ }).done(function () {
+ location.reload();
+ }).fail(function () {
+ console.error('I failed :(');
+ });
+
+ return false
+}
+
+function switchLink(e) {
+ e.preventDefault();
+ var obj = $(e.currentTarget);
+ $.post(switchLinkUrl, {
+ _token: token,
+ id: obj.data('id')
+ }).done(function () {
+ location.reload();
+ }).fail(function () {
+ console.error('I failed :(');
+ });
+
+ return false
+}
function cloneTransaction(e) {
+ e.preventDefault();
var button = $(e.currentTarget);
var groupId = parseInt(button.data('id'));
-
$.post(cloneGroupUrl, {
id: groupId
}).done(function (data) {
@@ -43,6 +75,7 @@ function cloneTransaction(e) {
}
function cloneTransactionAndEdit(e) {
+ e.preventDefault();
var button = $(e.currentTarget);
var groupId = parseInt(button.data('id'));
diff --git a/resources/assets/v3/js/pages/transactions/show.js b/resources/assets/v3/js/pages/transactions/show.js
index 9873354c7d..abe293e1cc 100644
--- a/resources/assets/v3/js/pages/transactions/show.js
+++ b/resources/assets/v3/js/pages/transactions/show.js
@@ -23,8 +23,9 @@ import sidebar from "../../pages/shared/sidebar.js";
import dates from "../shared/dates.js";
import i18next from "i18next";
import Get from "../../api/model/transaction/get.js";
-import { format } from "date-fns";
+import {format} from "date-fns";
import Alpine from "alpinejs";
+import "bootstrap";
window.enableDates = false;
@@ -43,7 +44,7 @@ let show = function () {
const page = window.location.href.split("/");
this.group.id = parseInt(page[page.length - 1]);
this.downloadTransactionGroup();
- // console.log('Generic JS for page with few features.');
+
},
downloadTransactionGroup() {
new Get().show(this.group.id).then((response) => {
diff --git a/resources/views/transactions/show.blade.php b/resources/views/transactions/show.blade.php
index 4503fe8ba3..63b2dd958b 100644
--- a/resources/views/transactions/show.blade.php
+++ b/resources/views/transactions/show.blade.php
@@ -20,7 +20,7 @@
</div>
<div class="col text-end">
<button class="btn btn-sm btn-secondary-outline dropdown-toggle" type="button" id="card_header_menu" data-bs-toggle="dropdown" aria-expanded="false">{{ __('firefly.actions') }} <span class="caret"></span></button>
- <ul class="dropdown-menu" aria-labelledby="card_header_menu">
+ <ul class="dropdown-menu journal-options" aria-labelledby="card_header_menu">
{{-- edit + delete --}}
<li><a class="dropdown-item" href="{{ route('transactions.edit', [$transactionGroup->id]) }}?_from={{ urlencode($FF3_FROM) }}"><span
class="bi bi-pencil"></span> {{ __('firefly.edit') }}</a></li>
@@ -54,9 +54,9 @@
{{-- clone --}}
@if($groupArray['transactions'][0]['type'] !== 'opening balance' && $groupArray['transactions'][0]['type'] !== 'reconciliation')
<li role="separator" class="divider"></li>
- <li><a class="dropdown-item" href="#" class="clone-transaction" data-id="{{ $transactionGroup->id }}"><span
+ <li><a class="dropdown-item clone-transaction" href="#" data-id="{{ $transactionGroup->id }}"><span
class="bi bi-copy"></span> {{ __('firefly.clone') }}</a></li>
- <li><a class="dropdown-item" href="#" class="clone-transaction-and-edit" data-id="{{ $transactionGroup->id }}"><span
+ <li><a class="dropdown-item clone-transaction-and-edit" href="#" data-id="{{ $transactionGroup->id }}"><span
class="bi bi-copy"></span> {{ __('firefly.clone_and_edit') }}</a></li>
@endif
@endif
@@ -223,7 +223,7 @@
</div>
<div class="col text-end">
<button class="btn btn-sm btn-secondary-outline dropdown-toggle" type="button" id="menu_journal_{{ $journal['transaction_journal_id'] }}" data-bs-toggle="dropdown" aria-expanded="false">{{ __('firefly.actions') }} <span class="caret"></span></button>
- <ul class="dropdown-menu" aria-labelledby="menu_journal_{{ $journal['transaction_journal_id'] }}">
+ <ul class="dropdown-menu journal-options" aria-labelledby="menu_journal_{{ $journal['transaction_journal_id'] }}">
{{-- edit + delete --}}
<li><a class="dropdown-item" href="{{ route('transactions.edit', [$transactionGroup->id]) }}?_from={{ urlencode($FF3_FROM) }}"><span
class="bi bi-pencil"></span> {{ __('firefly.edit') }}</a></li>
@@ -262,15 +262,12 @@
{{-- clone --}}
@if($groupArray['transactions'][0]['type'] !== 'opening balance' && $groupArray['transactions'][0]['type'] !== 'reconciliation')
<li role="separator" class="divider"></li>
- <li><a class="dropdown-item" href="#" data-id="{{ $transactionGroup->id }}" class="clone-transaction"><span
+ <li><a class="dropdown-item clone-transaction" href="#" data-id="{{ $transactionGroup->id }}"><span
class="bi bi-copy"></span> {{ __('firefly.clone') }}</a></li>
- <li><a class="dropdown-item" href="#" data-id="{{ $transactionGroup->id }}" class="clone-transaction-and-edit"><span
+ <li><a class="dropdown-item clone-transaction-and-edit" href="#" data-id="{{ $transactionGroup->id }}"><span
class="bi bi-copy"></span> {{ __('firefly.clone_and_edit') }}</a></li>
@endif
- <li><a class="dropdown-item link-modal" href="#"
- data-journal="{{ $journal['transaction_journal_id'] }}"><span
- class="bi bi-link"></span>{{ __('firefly.link_transaction') }}</a></li>
<li role="separator" class="divider"></li>
<li>
<a class="dropdown-item" href="{{ route('rules.create-from-journal', [$journal['transaction_journal_id']]) }}"><span
@@ -560,49 +557,17 @@
@endsection
@section('scripts')
- @vite(['js/pages/transactions/show.js'])
<script type="text/javascript" nonce="{{ $JS_NONCE }}">
var modalDialogURL = '{{ route('transactions.link.modal', ['%JOURNAL%']) }}';
var groupURL = '{{ route('transactions.show',['%GROUP%']) }}';
var cloneGroupUrl = '{{ route('transactions.clone') }}';
var cloneAndEditUrl = '{{ route('transactions.clone') }}?redirect=edit';
-
-
- $('.switch-link').on('click', switchLink);
- $('.reconcile-button').on('click', unreconcile);
var switchLinkUrl = '{{ route('transactions.link.switch') }}';
- function unreconcile(e) {
- e.preventDefault();
- var obj = $(e.currentTarget);
- $.post(obj.attr('href'), {
- _token: token
- }).done(function () {
- location.reload();
- }).fail(function () {
- console.error('I failed :(');
- });
-
- return false
- }
-
- function switchLink(e) {
- e.preventDefault();
- var obj = $(e.currentTarget);
- $.post(switchLinkUrl, {
- _token: token,
- id: obj.data('id')
- }).done(function () {
- location.reload();
- }).fail(function () {
- console.error('I failed :(');
- });
+ </script>
- //alert(obj.data('id'));
+ @vite(['js/pages/transactions/show.js'])
- return false
- }
- </script>
{{-- new auto complete --}}
<script type="text/javascript" src="v1/js/lib/bootstrap-simple-autocomplete.js?v={{ $FF_BUILD_TIME }}"
nonce="{{ $JS_NONCE }}"></script>