@@ -83,12 +83,12 @@ |
||
83 | 83 | $q->orWhereNull('startdate'); |
84 | 84 | } |
85 | 85 | ) |
86 | - ->where( |
|
87 | - function (EloquentBuilder $q) use ($date) { |
|
88 | - $q->where('targetdate', '>=', $date->format('Y-m-d 00:00:00')); |
|
89 | - $q->orWhereNull('targetdate'); |
|
90 | - } |
|
91 | - ); |
|
86 | + ->where( |
|
87 | + function (EloquentBuilder $q) use ($date) { |
|
88 | + $q->where('targetdate', '>=', $date->format('Y-m-d 00:00:00')); |
|
89 | + $q->orWhereNull('targetdate'); |
|
90 | + } |
|
91 | + ); |
|
92 | 92 | } |
93 | 93 | |
94 | 94 | /** |
@@ -71,8 +71,8 @@ |
||
71 | 71 | if (auth()->check()) { |
72 | 72 | $piggyBankId = (int)$value; |
73 | 73 | $piggyBank = self::where('piggy_banks.id', $piggyBankId) |
74 | - ->leftJoin('accounts', 'accounts.id', '=', 'piggy_banks.account_id') |
|
75 | - ->where('accounts.user_id', auth()->user()->id)->first(['piggy_banks.*']); |
|
74 | + ->leftJoin('accounts', 'accounts.id', '=', 'piggy_banks.account_id') |
|
75 | + ->where('accounts.user_id', auth()->user()->id)->first(['piggy_banks.*']); |
|
76 | 76 | if (null !== $piggyBank) { |
77 | 77 | return $piggyBank; |
78 | 78 | } |
@@ -55,9 +55,9 @@ |
||
55 | 55 | if (auth()->check()) { |
56 | 56 | $budgetLimitId = (int)$value; |
57 | 57 | $budgetLimit = self::where('budget_limits.id', $budgetLimitId) |
58 | - ->leftJoin('budgets', 'budgets.id', '=', 'budget_limits.budget_id') |
|
59 | - ->where('budgets.user_id', auth()->user()->id) |
|
60 | - ->first(['budget_limits.*']); |
|
58 | + ->leftJoin('budgets', 'budgets.id', '=', 'budget_limits.budget_id') |
|
59 | + ->where('budgets.user_id', auth()->user()->id) |
|
60 | + ->first(['budget_limits.*']); |
|
61 | 61 | if (null !== $budgetLimit) { |
62 | 62 | return $budgetLimit; |
63 | 63 | } |
@@ -49,11 +49,11 @@ |
||
49 | 49 | if (auth()->check()) { |
50 | 50 | $linkId = (int)$value; |
51 | 51 | $link = self::where('journal_links.id', $linkId) |
52 | - ->leftJoin('transaction_journals as t_a', 't_a.id', '=', 'source_id') |
|
53 | - ->leftJoin('transaction_journals as t_b', 't_b.id', '=', 'destination_id') |
|
54 | - ->where('t_a.user_id', auth()->user()->id) |
|
55 | - ->where('t_b.user_id', auth()->user()->id) |
|
56 | - ->first(['journal_links.*']); |
|
52 | + ->leftJoin('transaction_journals as t_a', 't_a.id', '=', 'source_id') |
|
53 | + ->leftJoin('transaction_journals as t_b', 't_b.id', '=', 'destination_id') |
|
54 | + ->where('t_a.user_id', auth()->user()->id) |
|
55 | + ->where('t_b.user_id', auth()->user()->id) |
|
56 | + ->first(['journal_links.*']); |
|
57 | 57 | if (null !== $link) { |
58 | 58 | return $link; |
59 | 59 | } |
@@ -49,8 +49,8 @@ |
||
49 | 49 | $ruleIds = $bill->user->rules()->get(['id'])->pluck('id')->toArray(); |
50 | 50 | /** @var Collection $set */ |
51 | 51 | $set = RuleAction::whereIn('rule_id', $ruleIds) |
52 | - ->where('action_type', 'link_to_bill') |
|
53 | - ->where('action_value', $oldName)->get(); |
|
52 | + ->where('action_type', 'link_to_bill') |
|
53 | + ->where('action_value', $oldName)->get(); |
|
54 | 54 | |
55 | 55 | /** @var RuleAction $ruleAction */ |
56 | 56 | foreach ($set as $ruleAction) { |
@@ -93,8 +93,8 @@ |
||
93 | 93 | if ('file' === $importJob->provider) { |
94 | 94 | $json['download_config'] = true; |
95 | 95 | $json['download_config_text'] |
96 | - = trans('import.should_download_config', ['route' => route('import.job.download', [$importJob->key])]) . ' ' |
|
97 | - . trans('import.share_config_file'); |
|
96 | + = trans('import.should_download_config', ['route' => route('import.job.download', [$importJob->key])]) . ' ' |
|
97 | + . trans('import.share_config_file'); |
|
98 | 98 | } |
99 | 99 | |
100 | 100 | // if count is zero: |
@@ -149,8 +149,8 @@ |
||
149 | 149 | |
150 | 150 | return view( |
151 | 151 | 'admin.users.show', compact( |
152 | - 'title', 'mainTitleIcon', 'subTitle', 'subTitleIcon', 'information', 'user' |
|
153 | - ) |
|
152 | + 'title', 'mainTitleIcon', 'subTitle', 'subTitleIcon', 'information', 'user' |
|
153 | + ) |
|
154 | 154 | ); |
155 | 155 | } |
156 | 156 |
@@ -107,7 +107,7 @@ |
||
107 | 107 | |
108 | 108 | // set default optional fields: |
109 | 109 | $visibleFields = ['interest_date' => true, 'book_date' => false, 'process_date' => false, 'due_date' => false, 'payment_date' => false, |
110 | - 'invoice_date' => false, 'internal_reference' => false, 'notes' => true, 'attachments' => true,]; |
|
110 | + 'invoice_date' => false, 'internal_reference' => false, 'notes' => true, 'attachments' => true,]; |
|
111 | 111 | app('preferences')->set('transaction_journal_optional_fields', $visibleFields); |
112 | 112 | |
113 | 113 | session()->flash('success', (string)trans('firefly.stored_new_accounts_new_user')); |
@@ -227,11 +227,11 @@ |
||
227 | 227 | $result = [ |
228 | 228 | 'daily' => ['label' => (string)trans('firefly.recurring_daily'), 'selected' => 0 === strpos($preSelected, 'daily')], |
229 | 229 | $weekly => ['label' => (string)trans('firefly.recurring_weekly', ['weekday' => $dayOfWeek]), |
230 | - 'selected' => 0 === strpos($preSelected, 'weekly')], |
|
230 | + 'selected' => 0 === strpos($preSelected, 'weekly')], |
|
231 | 231 | $monthly => ['label' => (string)trans('firefly.recurring_monthly', ['dayOfMonth' => $date->day]), |
232 | - 'selected' => 0 === strpos($preSelected, 'monthly')], |
|
232 | + 'selected' => 0 === strpos($preSelected, 'monthly')], |
|
233 | 233 | $ndom => ['label' => (string)trans('firefly.recurring_ndom', ['weekday' => $dayOfWeek, 'dayOfMonth' => $date->weekOfMonth]), |
234 | - 'selected' => 0 === strpos($preSelected, 'ndom')], |
|
234 | + 'selected' => 0 === strpos($preSelected, 'ndom')], |
|
235 | 235 | $yearly => ['label' => (string)trans('firefly.recurring_yearly', ['date' => $yearlyDate]), 'selected' => 0 === strpos($preSelected, 'yearly')], |
236 | 236 | ]; |
237 | 237 | } |