Final code for 5.3.3

2024-12-25 08:21:08 -06:00 · 2021-04-03 18:48:21 +02:00 · 2021-04-03 18:48:21 +02:00 · a3091f7509
commit a3091f7509
parent 70a6ac0038
21 changed files with 61 additions and 37 deletions
--- a/.env.example
+++ b/.env.example
@ -320,6 +320,7 @@ BROADCAST_DRIVER=log
 QUEUE_DRIVER=sync
 CACHE_PREFIX=firefly
 PUSHER_KEY=
+IPINFO_TOKEN=
 PUSHER_SECRET=
 PUSHER_ID=
 DEMO_USERNAME=
--- a/app/Jobs/MailError.php
+++ b/app/Jobs/MailError.php
@ -76,7 +76,8 @@ class MailError extends Job implements ShouldQueue
        $args             = $this->exception;
        $args['loggedIn'] = $this->userData['id'] > 0;
        $args['user']     = $this->userData;
-        $args['ipAddress'] = $this->ipAddress;
+        $args['ip']       = $this->ipAddress;
+        $args['token']    = config('firefly.ipinfo_token');
        if ($this->attempts() < 3) {
            try {
                Mail::send(
--- a/config/firefly.php
+++ b/config/firefly.php
@ -123,6 +123,7 @@ return [
    'authentication_guard'         => envNonEmpty('AUTHENTICATION_GUARD', 'web'),
    'custom_logout_uri'            => envNonEmpty('CUSTOM_LOGOUT_URI', ''),
    'cer_provider'                 => envNonEmpty('CER_PROVIDER', 'fixer'),
+    'ipinfo_token'                 => env('IPINFO_TOKEN',''),
    'update_endpoint'              => 'https://version.firefly-iii.org/index.json',
    'send_telemetry'               => env('SEND_TELEMETRY', false),
    'allow_webhooks'               => env('ALLOW_WEBHOOKS', false),
--- a/frontend/src/components/dashboard/MainAccountList.vue
+++ b/frontend/src/components/dashboard/MainAccountList.vue
@ -100,7 +100,7 @@ export default {
                  ]),
    'datesReady': function () {
      return null !== this.start && null !== this.end && this.ready;
-    }
+    },
  },
  watch: {
    datesReady: function (value) {
@ -137,7 +137,8 @@ export default {
                               id: accountIds[key],
                               title: '',
                               url: '',
-                               current_balance: '',
+                               include: false,
+                               current_balance: '0',
                               currency_code: 'EUR',
                               transactions: []
                             });
@ -148,13 +149,16 @@ export default {
    loadSingleAccount(key, accountId) {
      axios.get('./api/v1/accounts/' + accountId)
          .then(response => {
-                  this.accounts[key].title = response.data.data.attributes.name;
-                  this.accounts[key].url = './accounts/show/' + response.data.data.id;
-                  this.accounts[key].current_balance = response.data.data.attributes.current_balance;
-                  this.accounts[key].currency_code = response.data.data.attributes.currency_code;
-
+                  let account = response.data.data;
+                  if ('asset' === account.attributes.type || 'liabilities' === account.attributes.type) {
+                    this.accounts[key].title = account.attributes.name;
+                    this.accounts[key].url = './accounts/show/' + account.id;
+                    this.accounts[key].current_balance = account.attributes.current_balance;
+                    this.accounts[key].currency_code = account.attributes.currency_code;
+                    this.accounts[key].include = true;
                    this.loadTransactions(key, accountId);
                  }
+                }
          );
    },
    loadTransactions(key, accountId) {
--- a/frontend/src/components/transactions/SplitForm.vue
+++ b/frontend/src/components/transactions/SplitForm.vue
@ -56,6 +56,7 @@
                    :errors="transaction.errors.source"
                    :index="index"
                    :source-allowed-types="sourceAllowedTypes"
+                    :transaction-type="transactionType"
                    direction="source"
                />
              </div>
@ -79,6 +80,7 @@
                    :destination-allowed-types="destinationAllowedTypes"
                    :errors="transaction.errors.destination"
                    :index="index"
+                    :transaction-type="transactionType"
                    :source-allowed-types="sourceAllowedTypes"
                    direction="destination"
                />
--- a/frontend/src/components/transactions/TransactionAccount.vue
+++ b/frontend/src/components/transactions/TransactionAccount.vue
@ -96,6 +96,10 @@ export default {
      type: Object,
      default: () => ({})
    },
+    transactionType: {
+      type: String,
+      default: 'any'
+    },
  },
  data() {
    return {
@ -234,10 +238,6 @@ export default {
    }
  },
  computed: {
-    // 'transactionType',
-    // 'sourceAllowedTypes',
-    // 'destinationAllowedTypes',
-    // 'allowedOpposingTypes'
    accountKey: {
      get() {
        return 'source' === this.direction ? 'source_account' : 'destination_account';
@ -249,11 +249,13 @@ export default {
        if (0 === this.index) {
          return true;
        }
+        // console.log('Direction of account ' + this.index + ' is ' + this.direction + '(' + this.transactionType + ')');
+        // console.log(this.transactionType);
        if ('source' === this.direction) {
-          return 'any' === this.transactionType || 'Deposit' === this.transactionType
+            return 'any' === this.transactionType || 'Deposit' === this.transactionType || typeof this.transactionType === 'undefined';
        }
        if ('destination' === this.direction) {
-          return 'any' === this.transactionType || 'Withdrawal' === this.transactionType;
+          return 'any' === this.transactionType || 'Withdrawal' === this.transactionType || typeof this.transactionType === 'undefined';
        }
        return false;
      }
--- a/frontend/src/components/transactions/TransactionDate.vue
+++ b/frontend/src/components/transactions/TransactionDate.vue
@ -66,7 +66,8 @@ export default {
    return {
      localDate: this.date,
      localTime: this.time,
-      timeZone: ''
+      timeZone: '',
+      timeString: '',
    }
  },
  methods: {},
@ -98,6 +99,7 @@ export default {
          // console.log('Time is: ' + localStr);
          return localStr;
        }
+        // console.log('Return empty string!');
        return '';
      },
      set(value) {
@ -115,9 +117,20 @@ export default {
        let parts = value.split(':');
        // console.log('Parts are:');
        // console.log(parts);
-        current.setHours(parseInt(parts[0] ?? 0));
-        current.setMinutes(parseInt(parts[1] ?? 0));
-        current.setSeconds(parseInt(parts[2] ?? 0));
+
+        let hrs = parts[0] ?? '0';
+        let min = parts[1] ?? '0';
+        let sec = parts[2] ?? '0';
+        hrs = 3 === hrs.length ? hrs.substr(1, 2) : hrs;
+        min = 3 === min.length ? min.substr(1, 2) : min;
+        sec = 3 === sec.length ? sec.substr(1, 2) : sec;
+        // console.log('Hrs: ' + hrs);
+        // console.log('Min: ' + min);
+        // console.log('Sec: ' + sec);
+
+        current.setHours(parseInt(hrs));
+        current.setMinutes(parseInt(min));
+        current.setSeconds(parseInt(sec));
        this.localTime = current;
        this.$emit('set-time', {time: this.localTime});
      }
--- a/frontend/src/locales/it.json
+++ b/frontend/src/locales/it.json
@ -58,7 +58,7 @@
        "spent": "Speso",
        "Default asset account": "Conto attivit\u00e0 predefinito",
        "search_results": "Risultati ricerca",
-        "include": "Include?",
+        "include": "Includere?",
        "transaction": "Transazione",
        "account_role_defaultAsset": "Conto attivit\u00e0 predefinito",
        "account_role_savingAsset": "Conto risparmio",
--- a/frontend/src/locales/pt-br.json
+++ b/frontend/src/locales/pt-br.json
@ -58,7 +58,7 @@
        "spent": "Gasto",
        "Default asset account": "Conta padr\u00e3o",
        "search_results": "Resultados da pesquisa",
-        "include": "Include?",
+        "include": "Incluir?",
        "transaction": "Transa\u00e7\u00e3o",
        "account_role_defaultAsset": "Conta padr\u00e3o",
        "account_role_savingAsset": "Conta poupan\u00e7a",
--- a/public/v2/js/accounts/index.js
+++ b/public/v2/js/accounts/index.js
--- a/public/v2/js/accounts/show.js
+++ b/public/v2/js/accounts/show.js
--- a/public/v2/js/dashboard.js
+++ b/public/v2/js/dashboard.js
--- a/public/v2/js/dashboard.js.map
+++ b/public/v2/js/dashboard.js.map
--- a/public/v2/js/transactions/create.js
+++ b/public/v2/js/transactions/create.js
--- a/public/v2/js/transactions/create.js.map
+++ b/public/v2/js/transactions/create.js.map
--- a/public/v2/js/transactions/edit.js
+++ b/public/v2/js/transactions/edit.js
--- a/public/v2/js/transactions/edit.js.map
+++ b/public/v2/js/transactions/edit.js.map
--- a/public/v2/js/transactions/index.js
+++ b/public/v2/js/transactions/index.js
--- a/resources/lang/it_IT/firefly.php
+++ b/resources/lang/it_IT/firefly.php
@ -423,7 +423,7 @@ return [
    'apply_rule_selection'                                => 'Applica la regola ":title" a una selezione delle tue transazioni',
    'apply_rule_selection_intro'                          => 'Regole come ":title" sono normalmente applicate solo a transazioni nuove o aggiornate, ma puoi dire a Firefly III di eseguirle su una selezione delle tue transazioni esistenti. Questo può essere utile quando hai aggiornato una regola e hai bisogno che le modifiche vengano applicate a tutte le altre transazioni.',
    'include_transactions_from_accounts'                  => 'Includi transazioni da questi conti',
-    'include'                                             => 'Include?',
+    'include'                                             => 'Includere?',
    'applied_rule_selection'                              => '{0} Nessuna transazione della selezione è stata cambiata dalla regola ":title".|[1] Una transazione della selezione è stata modificata dalla regola ":title".|[2,*] :count transazioni della selezione sono state modificate dalla regola ":title".',
    'execute'                                             => 'Eseguire',
    'apply_rule_group_selection'                          => 'Applica il gruppo di regole ":title" a una selezione delle tue transazioni',
--- a/resources/lang/pt_BR/firefly.php
+++ b/resources/lang/pt_BR/firefly.php
@ -423,7 +423,7 @@ return [
    'apply_rule_selection'                                => 'Aplicar a regra ":title" para uma seleção de suas transações',
    'apply_rule_selection_intro'                          => 'As regras como ":title" normalmente são aplicadas apenas a transações novas ou atualizadas, mas você pode informar o Firefly III para executá-lo em uma seleção de suas transações existentes. Isso pode ser útil quando você atualizou uma regra e você precisa das alterações a serem aplicadas a todas as suas outras transações.',
    'include_transactions_from_accounts'                  => 'Incluir as transações destas contas',
-    'include'                                             => 'Include?',
+    'include'                                             => 'Incluir?',
    'applied_rule_selection'                              => '{0} Nenhuma transação em sua seleção foi alterada pela regra ":title".|[1] Uma transação em sua seleção foi alterada pela regra ":title".|[2,*] :count transações em sua seleção foram alteradas pela regra ":title".',
    'execute'                                             => 'Executar',
    'apply_rule_group_selection'                          => 'Aplicar grupo de regras ":title" para uma seleção de suas transações',
--- a/resources/views/emails/error-html.twig
+++ b/resources/views/emails/error-html.twig
@ -25,7 +25,7 @@
 </p>

 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    {{ trans('email.error_ip', { ip: ip }) }}<br />
+    {{ trans('email.error_ip', { ip: ip }) }} (<a href="https://ipinfo.io/{{ ip }}/json?token={{ token }}">info</a>)<br />
    {{ trans('email.error_url', {url :url }) }}<br />
    {{ trans('email.error_user_agent', {userAgent: userAgent }) }}
 </p>