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

Merge branch 'akaunting:master' into master

Browse Source
This commit is contained in:
Burak Civan
2022-06-07 09:19:46 +03:00
committed by GitHub
parent bd106645b7 55c6d3e1f4
commit f19e107f76
14 changed files with 188 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
resources/views/livewire/menu/neww.blade.php
View File

@ -1,15 +1,23 @@
<div wire:click.stop id="menu-neww">
<div wire:click.stop id="menu-neww" class="relative">
<input type="text" name="neww_keyword" wire:model.debounce.500ms="keyword" placeholder="{{ trans('general.search_placeholder') }}" class="border-t-0 border-l-0 border-r-0 border-b border-gray-300 bg-transparent text-gray-500 text-sm mb-3 focus:outline-none focus:ring-transparent focus:border-purple placeholder-light-gray js-search-action">
{!! menu('neww') !!}
</div>
@if ($keyword)
<button type="button" class="absolute ltr:right-2 rtl:left-2 top-2 clear" wire:click="resetKeyword">
<span class="material-icons text-sm">close</span>
</button>
@endif
@push('scripts_end')
<script type="text/javascript">
window.addEventListener('click', function() {
if (Livewire.components.getComponentsByName('menu.neww')[0].data.neww.length > 0) {
Livewire.emit('resetKeyword');
}
});
</script>
@endpush
@if ($neww)
{!! menu('neww') !!}
@else
<ul class="flex flex-col justify-center">
<li class="text-sm mb-5">
<div class="flex items-start">
<p class="text-black">
{{ trans('notifications.empty') }}
</p>
</div>
</li>
</ul>
@endif
</div>

14
resources/views/livewire/menu/notifications.blade.php
View File

@ -1,6 +1,12 @@
<div wire:click.stop id="menu-notifications">
<div wire:click.stop id="menu-notifications" class="relative">
<input type="text" name="notification_keyword" wire:model.debounce.500ms="keyword" placeholder="{{ trans('general.search_placeholder') }}" class="border-t-0 border-l-0 border-r-0 border-b border-gray-300 bg-transparent text-gray-500 text-sm mb-3 focus:outline-none focus:ring-transparent focus:border-purple placeholder-light-gray js-search-action">
@if ($keyword)
<button type="button" class="absolute ltr:right-2 rtl:left-2 top-2 clear" wire:click="resetKeyword">
<span class="material-icons text-sm">close</span>
</button>
@endif
@if ($notifications)
<div class="flex justify-end mt-1">
<x-tooltip id="notification-all" placement="right" message="Mark as All Read">
@ -53,12 +59,6 @@
@push('scripts_end')
<script type="text/javascript">
window.addEventListener('click', function() {
if (Livewire.components.getComponentsByName('menu.notifications')[0].data.notifications.length > 0) {
Livewire.emit('resetKeyword');
}
});
window.addEventListener('mark-read', event => {
if (event.detail.type == 'notifications') {
$.notify(event.detail.message, {

32
resources/views/livewire/menu/settings.blade.php
View File

@ -1,7 +1,25 @@
<div wire:click.stop id="menu-settings">
<div wire:click.stop id="menu-settings" class="relative">
<input type="text" name="settings_keyword" wire:model.debounce.500ms="keyword" placeholder="{{ trans('general.search_placeholder') }}" class="border-t-0 border-l-0 border-r-0 border-b border-gray-300 bg-transparent text-gray-500 text-sm mb-3 focus:outline-none focus:ring-transparent focus:border-purple placeholder-light-gray js-search-action">
{!! menu('settings') !!}
@if ($keyword)
<button type="button" class="absolute ltr:right-2 rtl:left-2 top-2 clear" wire:click="resetKeyword">
<span class="material-icons text-sm">close</span>
</button>
@endif
@if ($settings)
{!! menu('settings') !!}
@else
<ul class="flex flex-col justify-center">
<li class="text-sm mb-5">
<div class="flex items-start">
<p class="text-black">
{{ trans('notifications.empty') }}
</p>
</div>
</li>
</ul>
@endif
</div>
@push('scripts_start')
@ -9,13 +27,3 @@
var is_settings_menu = {{ $active_menu }};
</script>
@endpush
@push('scripts_end')
<script type="text/javascript">
window.addEventListener('click', function() {
if (Livewire.components.getComponentsByName('menu.settings')[0].data.settings.length > 0) {
Livewire.emit('resetKeyword');
}
});
</script>
@endpush

75
resources/views/modals/documents/payment.blade.php
View File

@ -1,27 +1,70 @@
<x-form id="form-transaction" :route="$route" :model="!empty($transaction) ? $transaction : false">
<base-alert type="warning" v-if="typeof form.response !== 'undefined' && form.response.error" v-html="form.response.message"></base-alert>
<div class="rounded-xl px-5 py-3 mb-5 bg-red-100" v-if="typeof form.response !== 'undefined' && form.response.error">
<p class="text-sm mb-0 text-red-600" v-html="form.response.message"></p>
</div>
<div class="grid sm:grid-cols-6 gap-x-8 gap-y-6 my-3.5">
<x-form.group.date name="paid_at" label="{{ trans('general.date') }}" icon="calendar_today" value="{{ Date::now()->toDateString() }}" show-date-format="{{ company_date_format() }}" date-format="Y-m-d" autocomplete="off" />
<div x-data="{ active: 'general' }">
<div>
<div>
<ul class="grid grid-cols-6">
<li class="relative px-8 text-sm text-black text-center pb-2 cursor-pointer transition-all border-b tabs-link col-span-3"
id="tab-general"
data-id="tab-general"
data-tabs="general"
x-on:click="active = 'general'"
x-bind:class="active != 'general' ? '' : 'active-tabs text-purple border-purple transition-all after:absolute after:w-full after:h-0.5 after:left-0 after:right-0 after:bottom-0 after:bg-purple after:rounded-tl-md after:rounded-tr-md'"
>
{{ trans('general.general') }}
<x-form.group.money name="amount" label="{{ trans('general.amount') }}" value="{{ $document->grand_total }}" autofocus="autofocus" :currency="$currency" dynamicCurrency="currency" />
<span class="invalid-feedback block text-xs text-red whitespace-normal" v-if="form.errors.has('paid_at')||form.errors.has('amount')||form.errors.has('payment_method')||form.errors.has('account_id')">
{{ trans('general.validation_error') }}
</span>
</li>
<x-form.group.account change="onChangePaymentAccount" />
<li class="relative px-8 text-sm text-black text-center pb-2 cursor-pointer transition-all border-b tabs-link col-span-3"
id="tab-other"
data-id="tab-other"
data-tabs="other"
x-on:click="active = 'other'"
x-bind:class="active != 'other' ? '' : 'active-tabs text-purple border-purple transition-all after:absolute after:w-full after:h-0.5 after:left-0 after:right-0 after:bottom-0 after:bg-purple after:rounded-tl-md after:rounded-tr-md'"
>
{{ trans_choice('general.others', 1) }}
<x-form.group.text name="currency" label="{{ trans_choice('general.currencies', 1) }}" value="{{ $document->currency->name }}" not-required disabled />
<span class="invalid-feedback block text-xs text-red whitespace-normal" v-if="form.errors.has('number')||form.errors.has('description')||form.errors.has('recurring')">
{{ trans('general.validation_error') }}
</span>
</li>
</ul>
</div>
</div>
<x-form.group.textarea name="description" label="{{ trans('general.description') }}" rows="3" not-required />
<div id="tab-general" data-tabs-content="general" x-show="active === 'general'">
<div class="grid sm:grid-cols-6 gap-x-8 gap-y-6 my-3.5">
<x-form.group.date name="paid_at" label="{{ trans('general.date') }}" icon="calendar_today" value="{{ Date::now()->toDateString() }}" show-date-format="{{ company_date_format() }}" date-format="Y-m-d" autocomplete="off" form-group-class="col-span-6" />
<x-form.group.payment-method />
<x-form.group.money name="amount" label="{{ trans('general.amount') }}" value="{{ $document->grand_total }}" autofocus="autofocus" :currency="$currency" dynamicCurrency="currency" form-group-class="col-span-6" />
<x-form.group.text name="reference" label="{{ trans('general.reference') }}" not-required />
<x-form.group.payment-method form-group-class="col-span-6"/>
<x-form.input.hidden name="document_id" :value="$document->id" />
<x-form.input.hidden name="category_id" :value="$document->category->id" />
<x-form.input.hidden name="amount" :value="$document->grand_total" />
<x-form.input.hidden name="currency_code" :value="$document->currency_code" />
<x-form.input.hidden name="currency_rate" :value="$document->currency_rate" />
<x-form.input.hidden name="number" :value="$number" />
<x-form.input.hidden name="type" :value="config('type.document.' . $document->type . '.transaction_type')" />
<x-form.group.account change="onChangePaymentAccount" form-group-class="col-span-6" />
</div>
</div>
<div id="tab-other" data-tabs-content="other" x-show="active === 'other'">
<div class="grid sm:grid-cols-6 gap-x-8 gap-y-6 my-3.5">
<x-form.group.textarea name="description" label="{{ trans('general.description') }}" rows="3" not-required form-group-class="col-span-6" />
<x-form.group.text name="number" label="{{ trans_choice('general.numbers', 1) }}" value="{{ $number }}" form-group-class="col-span-6" />
<x-form.group.text name="reference" label="{{ trans('general.reference') }}" not-required form-group-class="col-span-6" />
<x-form.input.hidden name="document_id" :value="$document->id" />
<x-form.input.hidden name="category_id" :value="$document->category->id" />
<x-form.input.hidden name="amount" :value="$document->grand_total" />
<x-form.input.hidden name="currency_code" :value="$document->currency_code" />
<x-form.input.hidden name="currency_rate" :value="$document->currency_rate" />
<x-form.input.hidden name="type" :value="config('type.document.' . $document->type . '.transaction_type')" />
</div>
</div>
</div>
</x-form>