shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/brkcvn/akaunting into code-clean

Browse Source
This commit is contained in:
Burak Civan
2022-09-07 09:56:41 +03:00
parent ccc566ccc7 513f4516fe
commit f7694c24a8
76 changed files with 1024 additions and 705 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/views/banking/accounts/index.blade.php
View File

@@ -11,7 +11,7 @@
<x-slot name="buttons">
@can('create-banking-accounts')
<x-link href="{{ route('accounts.create') }}" kind="primary">
<x-link href="{{ route('accounts.create') }}" kind="primary" id="index-more-actions-new-account">
{{ trans('general.title.new', ['type' => trans_choice('general.accounts', 1)]) }}
</x-link>
@endcan

16
resources/views/banking/accounts/show.blade.php
View File

@@ -24,7 +24,7 @@
<x-slot name="buttons">
@stack('create_button_start')
<x-dropdown id="dropdown-new-actions">
<x-dropdown id="show-new-actions-account">
<x-slot name="trigger" class="flex items-center px-3 py-1.5 mb-3 sm:mb-0 bg-green hover:bg-green-700 rounded-xl text-white text-sm font-bold leading-6" override="class">
{{ trans('general.new_more') }}
<span class="material-icons ltr:ml-2 rtl:mr-2">expand_more</span>
@@ -33,7 +33,7 @@
@stack('income_button_start')
@can('create-banking-transactions')
<x-dropdown.link href="{{ route('accounts.create-income', $account->id) }}">
<x-dropdown.link href="{{ route('accounts.create-income', $account->id) }}" id="show-more-actions-new-income-account">
{{ trans_choice('general.incomes', 1) }}
</x-dropdown.link>
@endcan
@@ -41,7 +41,7 @@
@stack('expense_button_start')
@can('create-banking-transactions')
<x-dropdown.link href="{{ route('accounts.create-expense', $account->id) }}">
<x-dropdown.link href="{{ route('accounts.create-expense', $account->id) }}" id="show-more-actions-new-expense-account">
{{ trans_choice('general.expenses', 1) }}
</x-dropdown.link>
@endcan
@@ -49,7 +49,7 @@
@stack('transfer_button_start')
@can('create-banking-transfers')
<x-dropdown.link href="{{ route('accounts.create-transfer', $account->id) }}">
<x-dropdown.link href="{{ route('accounts.create-transfer', $account->id) }}" id="show-more-actions-new-transfer-account">
{{ trans_choice('general.transfers', 1) }}
</x-dropdown.link>
@endcan
@@ -60,7 +60,7 @@
@stack('edit_button_start')
@can('update-banking-accounts')
<x-link href="{{ route('accounts.edit', $account->id) }}">
<x-link href="{{ route('accounts.edit', $account->id) }}" id="show-more-actions-edit-account">
{{ trans('general.edit') }}
</x-link>
@endcan
@@ -71,7 +71,7 @@
<x-slot name="moreButtons">
@stack('more_button_start')
<x-dropdown id="dropdown-more-actions">
<x-dropdown id="show-more-actions-account">
<x-slot name="trigger">
<span class="material-icons">more_horiz</span>
</x-slot>
@@ -79,7 +79,7 @@
@stack('see_performance_button_start')
@can('read-banking-accounts')
<x-dropdown.link href="{{ route('accounts.see-performance', $account->id) }}">
<x-dropdown.link href="{{ route('accounts.see-performance', $account->id) }}" id="show-more-actions-performance-account">
{{ trans('accounts.see_performance') }}
</x-dropdown.link>
@endcan
@@ -89,7 +89,7 @@
@stack('duplicate_button_start')
@can('create-banking-accounts')
<x-dropdown.link href="{{ route('accounts.duplicate', $account->id) }}">
<x-dropdown.link href="{{ route('accounts.duplicate', $account->id) }}" id="show-more-actions-duplicate-account">
{{ trans('general.duplicate') }}
</x-dropdown.link>
@endcan

15
resources/views/banking/reconciliations/edit.blade.php
View File

@@ -81,13 +81,22 @@
@endif
<x-table.td kind="amount" class="none-truncate">
@php $type = $item->isIncome() ? 'income' : 'expense'; @endphp
@php
$type = $item->isIncome() ? 'income' : 'expense';
$name = $type . '_' . $item->id;
$checked = $item->reconciled;
if (! $reconciliation->reconciled && array_key_exists($name, $reconciliation->transactions)) {
$checked = (empty($reconciliation->transactions[$name]) || $reconciliation->transactions[$name] === 'false') ? 0 : 1;
}
@endphp
<x-form.input.checkbox name="{{ $type . '_' . $item->id }}"
label=""
id="transaction-{{ $item->id . '-'. $type }}"
:value="$item->amount_for_account"
:checked="$item->reconciled"
:checked="$checked"
data-field="transactions"
v-model="form.transactions.{{ $type . '_' . $item->id }}"
class="text-purple focus:outline-none focus:ring-purple focus:border-purple"
@@ -248,4 +257,4 @@
</x-slot>
<x-script folder="banking" file="reconciliations" />
</x-layouts.admin>
</x-layouts.admin>

2
resources/views/banking/reconciliations/index.blade.php
View File

@@ -9,7 +9,7 @@
<x-slot name="buttons">
@can('create-banking-reconciliations')
<x-link href="{{ route('reconciliations.create') }}" kind="primary">
<x-link href="{{ route('reconciliations.create') }}" kind="primary" id="index-more-actions-new-reconciliation">
{{ trans('general.title.new', ['type' => trans_choice('general.reconciliations', 1)]) }}
</x-link>
@endcan

4
resources/views/banking/recurring_transactions/index.blade.php
View File

@@ -11,11 +11,11 @@
<x-slot name="buttons">
@can('create-banking-transactions')
<x-link href="{{ route('recurring-transactions.create', ['type' => 'income-recurring']) }}" kind="primary">
<x-link href="{{ route('recurring-transactions.create', ['type' => 'income-recurring']) }}" kind="primary" id="index-more-actions-new-income-recurring-transaction">
{{ trans('general.title.new', ['type' => trans_choice('general.recurring_incomes', 1)]) }}
</x-link>
<x-link href="{{ route('recurring-transactions.create', ['type' => 'expense-recurring']) }}" kind="primary">
<x-link href="{{ route('recurring-transactions.create', ['type' => 'expense-recurring']) }}" kind="primary" id="index-more-actions-new-expense-recurring-transaction">
{{ trans('general.title.new', ['type' => trans_choice('general.recurring_expenses', 1)]) }}
</x-link>
@endcan

4
resources/views/banking/transactions/index.blade.php
View File

@@ -11,11 +11,11 @@
<x-slot name="buttons">
@can('create-banking-transactions')
<x-link href="{{ route('transactions.create', ['type' => 'income']) }}" kind="primary">
<x-link href="{{ route('transactions.create', ['type' => 'income']) }}" kind="primary" id="index-more-actions-new-income-transaction">
{{ trans('general.title.new', ['type' => trans_choice('general.incomes', 1)]) }}
</x-link>
<x-link href="{{ route('transactions.create', ['type' => 'expense']) }}" kind="primary">
<x-link href="{{ route('transactions.create', ['type' => 'expense']) }}" kind="primary" id="index-more-actions-new-expense-transaction">
{{ trans('general.title.new', ['type' => trans_choice('general.expenses', 1)]) }}
</x-link>
@endcan