Merge branch 'master' of github.com:akaunting/akaunting into 2.1-dev
# Conflicts: # app/Http/Controllers/Common/Items.php # resources/views/modules/item/documentation.blade.php # resources/views/modules/item/show.blade.php # resources/views/partials/admin/header.blade.php # resources/views/purchases/bills/show.blade.php # resources/views/purchases/vendors/show.blade.php # resources/views/sales/customers/show.blade.php # resources/views/sales/invoices/show.blade.php # resources/views/wizard/companies/edit.blade.php # resources/views/wizard/currencies/index.blade.php # resources/views/wizard/finish/index.blade.php # resources/views/wizard/taxes/index.blade.php
This commit is contained in:
Cüneyt Şentürk
@ -7,7 +7,8 @@
|
||||
@stack('content_content_end')
|
||||
<notifications></notifications>
|
||||
|
||||
<form id="form-create" method="POST" action="#"/>
|
||||
<form id="form-dynamic-component" method="POST" action="#"></form>
|
||||
|
||||
<component v-bind:is="component"></component>
|
||||
</div>
|
||||
@stack('content_end')
|
||||
|
||||
@ -34,6 +34,7 @@
|
||||
<script type="text/javascript"><!--
|
||||
var url = '{{ url("/") }}';
|
||||
var app_url = '{{ config("app.url") }}';
|
||||
var aka_currency = {!! !empty($currency) ? $currency : 'false' !!};
|
||||
//--></script>
|
||||
|
||||
@stack('js')
|
||||
|
||||
@ -1,30 +1,26 @@
|
||||
@stack('header_start')
|
||||
<div id="header" class="header pb-6">
|
||||
<div class="container-fluid content-layout">
|
||||
<div class="header-body">
|
||||
<div class="row py-4 align-items-center">
|
||||
<div class="col-xs-12 col-sm-4 col-md-5 align-items-center">
|
||||
<h2 class="d-inline-flex mb-0 long-texts">@yield('title')</h2>
|
||||
@yield('dashboard_action')
|
||||
</div>
|
||||
|
||||
<div class="col-xs-12 col-sm-8 col-md-7">
|
||||
<div class="text-right">
|
||||
@yield('new_button')
|
||||
<div id="header" class="header pb-6">
|
||||
<div class="container-fluid content-layout">
|
||||
<div class="header-body">
|
||||
<div class="row py-4 align-items-center">
|
||||
<div class="col-xs-12 col-sm-4 col-md-5 align-items-center">
|
||||
<h2 class="d-inline-flex mb-0 long-texts">@yield('title')</h2>
|
||||
@yield('dashboard_action')
|
||||
</div>
|
||||
|
||||
@permission('read-modules-home')
|
||||
@if (!empty($suggestion_modules))
|
||||
@foreach($suggestion_modules as $s_module)
|
||||
<a href="{{ url($s_module->action_url) . '?' . http_build_query((array) $s_module->action_parameters) }}" class="btn btn-white btn-sm" target="{{ $s_module->action_target }}">{{ $s_module->name }}</a>
|
||||
@endforeach
|
||||
@endif
|
||||
@endpermission
|
||||
<div class="col-xs-12 col-sm-8 col-md-7">
|
||||
<div class="text-right">
|
||||
@stack('header_button_start')
|
||||
|
||||
@stack('header_button')
|
||||
</div>
|
||||
@yield('new_button')
|
||||
|
||||
@stack('header_button_end')
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@stack('header_end')
|
||||
|
||||
@ -39,8 +39,24 @@
|
||||
@endpermission
|
||||
|
||||
<ul class="navbar-nav align-items-center ml-md-auto">
|
||||
<li class="nav-item d-xl-none">
|
||||
<div class="pr-3 sidenav-toggler sidenav-toggler-dark" data-action="sidenav-pin" data-target="#sidenav-main">
|
||||
<div class="sidenav-toggler-inner">
|
||||
<i class="sidenav-toggler-line"></i>
|
||||
<i class="sidenav-toggler-line"></i>
|
||||
<i class="sidenav-toggler-line"></i>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
|
||||
@stack('navbar_create')
|
||||
|
||||
<li class="nav-item d-sm-none">
|
||||
<a class="nav-link" href="#" data-action="search-show" data-target="#navbar-search-main">
|
||||
<i class="fa fa-search"></i>
|
||||
</a>
|
||||
</li>
|
||||
|
||||
@permission(['create-sales-invoices', 'create-sales-revenues', 'create-sales-invoices', 'create-purchases-bills', 'create-purchases-payments', 'create-purchases-vendors'])
|
||||
<li class="nav-item dropdown">
|
||||
<a class="nav-link" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
|
||||
@ -211,14 +227,16 @@
|
||||
<li class="nav-item dropdown">
|
||||
<a class="nav-link pr-0" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
|
||||
<div class="media align-items-center">
|
||||
<img src="{{ asset('public/img/user.svg') }}" height="36" width="36" alt="User"/>
|
||||
<div class="media-body ml-2 d-none d-lg-block">
|
||||
<span class="mb-0 text-sm font-weight-bold">
|
||||
@if (!empty($user->name))
|
||||
{{ $user->name }}
|
||||
@endif
|
||||
</span>
|
||||
</div>
|
||||
@if (is_object($user->picture))
|
||||
<img src="{{ Storage::url($user->picture->id) }}" class="rounded-circle image-style user-img" alt="{{ $user->name }}"/>
|
||||
@else
|
||||
<img src="{{ asset('public/img/user.svg') }}" class="user-img" alt="{{ $user->name }}"/>
|
||||
@endif
|
||||
@if (!empty($user->name))
|
||||
<div class="media-body ml-2 d-none d-lg-block">
|
||||
<span class="mb-0 text-sm font-weight-bold">{{ $user->name }}</span>
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
</a>
|
||||
|
||||
@ -231,7 +249,7 @@
|
||||
|
||||
@stack('navbar_profile_edit')
|
||||
|
||||
@permission('update-auth-users')
|
||||
@permission(['read-auth-users', 'read-auth-profile'])
|
||||
<a href="{{ route('users.edit', $user->id) }}" class="dropdown-item">
|
||||
<i class="fas fa-user"></i>
|
||||
<span>{{ trans('auth.profile') }}</span>
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
<div class="col-xs-12 col-sm-7 pagination-xs">
|
||||
<nav class="float-right">
|
||||
{!! $items->withPath(request()->url())->appends(request()->except('page'))->links() !!}
|
||||
{!! $items->withPath(request()->url())->withQueryString()->links() !!}
|
||||
</nav>
|
||||
</div>
|
||||
@else
|
||||
|
||||
6
resources/views/partials/admin/suggestions.blade.php
Normal file
6
resources/views/partials/admin/suggestions.blade.php
Normal file
@ -0,0 +1,6 @@
|
||||
|
||||
@foreach($modules as $module)
|
||||
<span>
|
||||
<a href="{{ url($module->action_url) . '?' . http_build_query((array) $module->action_parameters) }}" class="btn btn-white btn-sm" target="{{ $module->action_target }}">{{ $module->name }}</a>
|
||||
</span>
|
||||
@endforeach
|
||||
@ -29,6 +29,7 @@
|
||||
<script type="text/javascript"><!--
|
||||
var url = '{{ url("/") }}';
|
||||
var app_url = '{{ config("app.url") }}';
|
||||
var aka_currency = {!! !empty($currency) ? $currency : 'false' !!};
|
||||
//--></script>
|
||||
|
||||
@stack('js')
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
@foreach($items as $item)
|
||||
<div class="col-md-3">
|
||||
<div class="custom-control custom-checkbox">
|
||||
{{ Form::checkbox($name, $item->$id, null, [
|
||||
{{ Form::checkbox($name, $item->$id, (is_array($selected) && count($selected) ? (in_array($item->$id, $selected) ? true : false) : null), [
|
||||
'id' => 'checkbox-' . $name . '-' . $item->$id,
|
||||
'class' => 'custom-control-input',
|
||||
'v-model' => !empty($attributes['v-model']) ? $attributes['v-model'] : (!empty($attributes['data-field']) ? 'form.' . $attributes['data-field'] . '.'. $name : 'form.' . $name),
|
||||
|
||||
@ -9,6 +9,8 @@
|
||||
:form-classes="[{'has-error': form.errors.get('{{ $name }}') }]"
|
||||
@endif
|
||||
|
||||
:group_class="'{{ $group_class }}'"
|
||||
|
||||
icon="fa fa-{{ $icon }}"
|
||||
title="{{ $text }}"
|
||||
placeholder="{{ trans('general.form.select.field', ['field' => $text]) }}"
|
||||
@ -40,11 +42,15 @@
|
||||
}"
|
||||
|
||||
@if (!empty($attributes['v-model']))
|
||||
@interface="{{ $attributes['v-model'] . ' = $event' }}"
|
||||
@interface="form.errors.clear('{{ $attributes['v-model'] }}'); {{ $attributes['v-model'] . ' = $event' }}"
|
||||
@elseif (!empty($attributes['data-field']))
|
||||
@interface="{{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}"
|
||||
@interface="form.errors.clear('{{ 'form.' . $attributes['data-field'] . '.' . $name }}'); {{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}"
|
||||
@else
|
||||
@interface="form.{{ $name }} = $event"
|
||||
@interface="form.errors.clear('{{ $name }}'); form.{{ $name }} = $event"
|
||||
@endif
|
||||
|
||||
@if (isset($attributes['required']))
|
||||
:required="{{ ($attributes['required']) ? 'true' : 'false' }}"
|
||||
@endif
|
||||
|
||||
@if (isset($attributes['readonly']))
|
||||
|
||||
@ -45,11 +45,11 @@
|
||||
}"
|
||||
|
||||
@if (!empty($attributes['v-model']))
|
||||
@interface="{{ $attributes['v-model'] . ' = $event' }}"
|
||||
@interface="form.errors.clear('{{ $attributes['v-model'] }}'); {{ $attributes['v-model'] . ' = $event' }}"
|
||||
@elseif (!empty($attributes['data-field']))
|
||||
@interface="{{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}"
|
||||
@interface="form.errors.clear('{{ 'form.' . $attributes['data-field'] . '.' . $name }}'); {{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}"
|
||||
@else
|
||||
@interface="form.{{ $name }} = $event"
|
||||
@interface="form.errors.clear('{{ $name }}'); form.{{ $name }} = $event"
|
||||
@endif
|
||||
|
||||
@if (isset($attributes['readonly']))
|
||||
|
||||
@ -1,31 +1,87 @@
|
||||
@stack($name . '_input_start')
|
||||
<div class="{{ $col }} input-group-invoice-text">
|
||||
<akaunting-select
|
||||
class="float-left{{ isset($attributes['required']) ? ' required' : '' }}{{ isset($attributes['disabled']) ? ' disabled' : '' }}"
|
||||
|
||||
<div
|
||||
class="form-group {{ $col }}{{ isset($attributes['required']) ? ' required' : '' }}{{ isset($attributes['readonly']) ? ' readonly' : '' }}{{ isset($attributes['disabled']) ? ' disabled' : '' }}"
|
||||
:class="[{'has-error': form.errors.get('{{ $name }}')}]">
|
||||
@if (!empty($text))
|
||||
{!! Form::label($name, $text, ['class' => 'form-control-label'])!!}
|
||||
@endif
|
||||
@if (!empty($attributes['v-error']))
|
||||
:form-classes="[{'has-error': {{ $attributes['v-error'] }} }, form.{{ $name }} == 'custom' ? 'col-md-6' : 'col-md-12']"
|
||||
@else
|
||||
:form-classes="[{'has-error': form.errors.has('{{ $name }}') }, form.{{ $name }} == 'custom' ? 'col-md-6' : 'col-md-12']"
|
||||
@endif
|
||||
|
||||
<div class="input-group input-group-merge {{ $group_class }}">
|
||||
<div class="input-group-prepend">
|
||||
<span class="input-group-text">
|
||||
<i class="fa fa-{{ $icon }}"></i>
|
||||
</span>
|
||||
icon="{{ $icon }}"
|
||||
title="{{ $text }}"
|
||||
placeholder="{{ trans('general.form.select.field', ['field' => $text]) }}"
|
||||
name="{{ $name }}"
|
||||
:options="{{ json_encode($values) }}"
|
||||
|
||||
@if (isset($selected) || old($name))
|
||||
value="{{ old($name, $selected) }}"
|
||||
@endif
|
||||
|
||||
@if (!empty($attributes['model']))
|
||||
:model="{{ $attributes['model'] }}"
|
||||
@endif
|
||||
|
||||
@if (!empty($attributes['v-model']))
|
||||
@interface="form.errors.clear('{{ $attributes['v-model'] }}'); {{ $attributes['v-model'] . ' = $event' }}"
|
||||
@elseif (!empty($attributes['data-field']))
|
||||
@interface="form.errors.clear('{{ 'form.' . $attributes['data-field'] . '.' . $name }}'); {{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}"
|
||||
@else
|
||||
@interface="form.errors.clear('{{ $name }}'); form.{{ $name }} = $event;"
|
||||
@endif
|
||||
|
||||
@if (!empty($attributes['change']))
|
||||
@change="{{ $attributes['change'] }}($event)"
|
||||
@endif
|
||||
|
||||
@if (isset($attributes['readonly']))
|
||||
:readonly="{{ $attributes['readonly'] }}"
|
||||
@endif
|
||||
|
||||
@if (isset($attributes['disabled']))
|
||||
:disabled="{{ $attributes['disabled'] }}"
|
||||
@endif
|
||||
|
||||
@if (isset($attributes['show']))
|
||||
v-if="{{ $attributes['show'] }}"
|
||||
@endif
|
||||
|
||||
@if (isset($attributes['v-error-message']))
|
||||
:form-error="{{ $attributes['v-error-message'] }}"
|
||||
@else
|
||||
:form-error="form.errors.get('{{ $name }}')"
|
||||
@endif
|
||||
|
||||
no-data-text="{{ trans('general.no_data') }}"
|
||||
no-matching-data-text="{{ trans('general.no_matching_data') }}"
|
||||
></akaunting-select>
|
||||
|
||||
<div
|
||||
class="form-group float-left{{ isset($attributes['required']) ? ' required' : '' }}{{ isset($attributes['readonly']) ? ' readonly' : '' }}{{ isset($attributes['disabled']) ? ' disabled' : '' }}"
|
||||
:class="[{'has-error': form.errors.get('{{ $input_name }}')}, form.{{ $name }} == 'custom' ? 'col-md-6' : 'd-none']">
|
||||
{!! Form::label($input_name, trans('settings.invoice.custom'), ['class' => 'form-control-label'])!!}
|
||||
|
||||
<div class="input-group input-group-merge {{ $group_class }}">
|
||||
<div class="input-group-prepend">
|
||||
<span class="input-group-text">
|
||||
<i class="fa fa-{{ $icon }}"></i>
|
||||
</span>
|
||||
</div>
|
||||
|
||||
{!! Form::text($input_name, $input_value, [
|
||||
'class' => 'form-control',
|
||||
'data-name' => $input_name,
|
||||
'data-value' => $input_value,
|
||||
'placeholder' => trans('general.form.enter', ['field' => $text]),
|
||||
'v-model' => !empty($attributes['v-model']) ? $attributes['v-model'] : (!empty($attributes['data-field']) ? 'form.' . $attributes['data-field'] . '.'. $input_name : 'form.' . $input_name),
|
||||
]) !!}
|
||||
</div>
|
||||
|
||||
{!! Form::text($input_name, $input_value, [
|
||||
'class' => 'form-control',
|
||||
'data-name' => $input_name,
|
||||
'data-value' => $input_value,
|
||||
'placeholder' => trans('general.form.enter', ['field' => $text]),
|
||||
'v-model' => !empty($attributes['v-model']) ? $attributes['v-model'] : (!empty($attributes['data-field']) ? 'form.' . $attributes['data-field'] . '.'. $name : 'form.' . $name),
|
||||
]) !!}
|
||||
</div>
|
||||
|
||||
<div class="invalid-feedback d-block"
|
||||
v-if="form.errors.has('{{ $input_name }}')"
|
||||
v-html="form.errors.get('{{ $input_name }}')">
|
||||
<div class="invalid-feedback d-block"
|
||||
v-if="form.errors.has('{{ $input_name }}')"
|
||||
v-html="form.errors.get('{{ $input_name }}')">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@ -49,12 +49,16 @@
|
||||
@change="{{ $attributes['change'] }}($event)"
|
||||
@endif
|
||||
|
||||
@if (!empty($attributes['input']))
|
||||
@input="{{ $attributes['input'] }}"
|
||||
@endif
|
||||
|
||||
@if (!empty($attributes['v-model']))
|
||||
@interface="{{ $attributes['v-model'] . ' = $event' }}"
|
||||
@interface="form.errors.clear('{{ $attributes['v-model'] }}'); {{ $attributes['v-model'] . ' = $event' }}"
|
||||
@elseif (!empty($attributes['data-field']))
|
||||
@interface="{{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}"
|
||||
@interface="form.errors.clear('{{ 'form.' . $attributes['data-field'] . '.' . $name }}'); {{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}"
|
||||
@else
|
||||
@interface="form.{{ $name }} = $event"
|
||||
@interface="form.errors.clear('{{ $name }}'); form.{{ $name }} = $event"
|
||||
@endif
|
||||
|
||||
@if (isset($attributes['v-error-message']))
|
||||
|
||||
@ -52,11 +52,11 @@
|
||||
@endif
|
||||
|
||||
@if (!empty($attributes['v-model']))
|
||||
@interface="{{ $attributes['v-model'] . ' = $event' }}"
|
||||
@interface="form.errors.clear('{{ $attributes['v-model'] }}'); {{ $attributes['v-model'] . ' = $event' }}"
|
||||
@elseif (!empty($attributes['data-field']))
|
||||
@interface="{{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}"
|
||||
@interface="form.errors.clear('{{ 'form.' . $attributes['data-field'] . '.' . $name }}'); {{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}"
|
||||
@else
|
||||
@interface="form.{{ $name }} = $event"
|
||||
@interface="form.errors.clear('{{ $name }}'); form.{{ $name }} = $event"
|
||||
@endif
|
||||
|
||||
@if (!empty($attributes['change']))
|
||||
|
||||
@ -30,11 +30,11 @@
|
||||
@endif
|
||||
|
||||
@if (!empty($attributes['v-model']))
|
||||
@interface="{{ $attributes['v-model'] . ' = $event' }}"
|
||||
@interface="form.errors.clear('{{ $attributes['v-model'] }}'); {{ $attributes['v-model'] . ' = $event' }}"
|
||||
@elseif (!empty($attributes['data-field']))
|
||||
@interface="{{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}"
|
||||
@interface="form.errors.clear('{{ 'form.' . $attributes['data-field'] . '.' . $name }}'); {{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}"
|
||||
@else
|
||||
@interface="form.{{ $name }} = $event"
|
||||
@interface="form.errors.clear('{{ $name }}'); form.{{ $name }} = $event"
|
||||
@endif
|
||||
|
||||
@if (!empty($attributes['change']))
|
||||
|
||||
@ -0,0 +1,76 @@
|
||||
@stack($name . '_input_start')
|
||||
|
||||
<akaunting-select-remote
|
||||
class="{{ $col }}{{ isset($attributes['required']) ? ' required' : '' }}{{ isset($attributes['disabled']) ? ' disabled' : '' }}"
|
||||
|
||||
id="form-select-{{ $name }}"
|
||||
|
||||
@if (!empty($attributes['v-error']))
|
||||
:form-classes="[{'has-error': {{ $attributes['v-error'] }} }]"
|
||||
@else
|
||||
:form-classes="[{'has-error': form.errors.get('{{ $name }}') }]"
|
||||
@endif
|
||||
|
||||
icon="{{ $icon }}"
|
||||
title="{{ $text }}"
|
||||
placeholder="{{ trans('general.form.select.field', ['field' => $text]) }}"
|
||||
name="{{ $name }}"
|
||||
:options="{{ json_encode($values) }}"
|
||||
|
||||
@if (!empty($selected) || old($name))
|
||||
:value="{{ json_encode(old($name, $selected)) }}"
|
||||
@endif
|
||||
|
||||
@if (!empty($attributes['model']))
|
||||
:model="{{ $attributes['model'] }}"
|
||||
@endif
|
||||
|
||||
:multiple="true"
|
||||
|
||||
@if (!empty($attributes['collapse']))
|
||||
:collapse="true"
|
||||
@endif
|
||||
|
||||
@if (!empty($attributes['v-model']))
|
||||
@interface="form.errors.clear('{{ $attributes['v-model'] }}'); {{ $attributes['v-model'] . ' = $event' }}"
|
||||
@elseif (!empty($attributes['data-field']))
|
||||
@interface="form.errors.clear('{{ 'form.' . $attributes['data-field'] . '.' . $name }}'); {{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}"
|
||||
@else
|
||||
@interface="form.errors.clear('{{ $name }}'); form.{{ $name }} = $event"
|
||||
@endif
|
||||
|
||||
@if (!empty($attributes['change']))
|
||||
@change="{{ $attributes['change'] }}($event)"
|
||||
@endif
|
||||
|
||||
@if (isset($attributes['readonly']))
|
||||
:readonly="{{ $attributes['readonly'] }}"
|
||||
@endif
|
||||
|
||||
@if (isset($attributes['disabled']))
|
||||
:disabled="{{ $attributes['disabled'] }}"
|
||||
@endif
|
||||
|
||||
@if (isset($attributes['show']))
|
||||
v-if="{{ $attributes['show'] }}"
|
||||
@endif
|
||||
|
||||
@if (isset($attributes['v-error-message']))
|
||||
:form-error="{{ $attributes['v-error-message'] }}"
|
||||
@else
|
||||
:form-error="form.errors.get('{{ $name }}')"
|
||||
@endif
|
||||
|
||||
remote-action="{{ $attributes['remote_action'] }}"
|
||||
remote-type="{{ $attributes['remote_type'] }}"
|
||||
|
||||
@if (!empty($attributes['currecny_code']))
|
||||
currency-code="{{ $attributes['currecny_code'] }}"
|
||||
@endif
|
||||
|
||||
loading-text="{{ trans('general.loading') }}"
|
||||
no-data-text="{{ trans('general.no_data') }}"
|
||||
no-matching-data-text="{{ trans('general.no_matching_data') }}"
|
||||
></akaunting-select-remote>
|
||||
|
||||
@stack($name . '_input_end')
|
||||
@ -46,9 +46,9 @@
|
||||
])}}"
|
||||
|
||||
@if (!empty($attributes['v-model']))
|
||||
@interface="{{ $attributes['v-model'] . ' = $event' }}"
|
||||
@interface="form.errors.clear('{{ $attributes['v-model'] }}'); {{ $attributes['v-model'] . ' = $event' }}"
|
||||
@elseif (!empty($attributes['data-field']))
|
||||
@interface="{{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}"
|
||||
@interface="form.errors.clear('{{ 'form.' . $attributes['data-field'] . '.' . $name }}'); {{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}"
|
||||
@else
|
||||
@interface="form.{{ $name }} = $event; form.errors.clear('{{ $name }}');"
|
||||
@endif
|
||||
|
||||
@ -24,9 +24,9 @@
|
||||
@endif
|
||||
|
||||
@if (!empty($attributes['v-model']))
|
||||
@interface="{{ $attributes['v-model'] . ' = $event' }}"
|
||||
@interface="form.errors.clear('{{ $attributes['v-model'] }}'); {{ $attributes['v-model'] . ' = $event' }}"
|
||||
@elseif (!empty($attributes['data-field']))
|
||||
@interface="{{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}"
|
||||
@interface="form.errors.clear('{{ 'form.' . $attributes['data-field'] . '.' . $name }}'); {{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}"
|
||||
@else
|
||||
@interface="form.errors.clear('{{ $name }}'); form.{{ $name }} = $event;"
|
||||
@endif
|
||||
|
||||
@ -48,11 +48,11 @@
|
||||
:group="true"
|
||||
|
||||
@if (!empty($attributes['v-model']))
|
||||
@interface="{{ $attributes['v-model'] . ' = $event' }}"
|
||||
@interface="form.errors.clear('{{ $attributes['v-model'] }}'); {{ $attributes['v-model'] . ' = $event' }}"
|
||||
@elseif (!empty($attributes['data-field']))
|
||||
@interface="{{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}"
|
||||
@interface="form.errors.clear('{{ 'form.' . $attributes['data-field'] . '.' . $name }}'); {{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}"
|
||||
@else
|
||||
@interface="form.{{ $name }} = $event; form.errors.clear('{{ $name }}');"
|
||||
@interface="form.errors.clear('{{ $name }}'); form.{{ $name }} = $event; form.errors.clear('{{ $name }}');"
|
||||
@endif
|
||||
|
||||
@if (!empty($attributes['change']))
|
||||
|
||||
@ -26,11 +26,11 @@
|
||||
:group="true"
|
||||
|
||||
@if (!empty($attributes['v-model']))
|
||||
@interface="{{ $attributes['v-model'] . ' = $event' }}"
|
||||
@interface="form.errors.clear('{{ $attributes['v-model'] }}'); {{ $attributes['v-model'] . ' = $event' }}"
|
||||
@elseif (!empty($attributes['data-field']))
|
||||
@interface="{{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}"
|
||||
@interface="form.errors.clear('{{ 'form.' . $attributes['data-field'] . '.' . $name }}'); {{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}"
|
||||
@else
|
||||
@interface="form.{{ $name }} = $event"
|
||||
@interface="form.errors.clear('{{ $name }}'); form.{{ $name }} = $event"
|
||||
@endif
|
||||
|
||||
@if (!empty($attributes['change']))
|
||||
|
||||
@ -24,11 +24,11 @@
|
||||
@endif
|
||||
|
||||
@if (!empty($attributes['v-model']))
|
||||
@interface="{{ $attributes['v-model'] . ' = $event' }}"
|
||||
@interface="form.errors.clear('{{ $attributes['v-model'] }}'); {{ $attributes['v-model'] . ' = $event' }}"
|
||||
@elseif (!empty($attributes['data-field']))
|
||||
@interface="{{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}"
|
||||
@interface="form.errors.clear('{{ 'form.' . $attributes['data-field'] . '.' . $name }}'); {{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}"
|
||||
@else
|
||||
@interface="form.{{ $name }} = $event"
|
||||
@interface="form.errors.clear('{{ $name }}'); form.{{ $name }} = $event"
|
||||
@endif
|
||||
|
||||
@if (!empty($attributes['change']))
|
||||
|
||||
@ -10,12 +10,10 @@
|
||||
<akaunting-html-editor
|
||||
name="{{ $name }}"
|
||||
|
||||
@if (!empty($attributes['v-model']))
|
||||
:value="{{ $attributes['v-model'] . ' = ' . `$value` }}"
|
||||
@elseif (!empty($attributes['data-field']))
|
||||
:value="{{ 'form.' . $attributes['data-field'] . '.' . $name . ' = '. `$value` }}"
|
||||
@if (!empty($value))
|
||||
:value="`{{ $value }}`"
|
||||
@else
|
||||
:value="form.{{ $name }} = `{{ $value }}`"
|
||||
:value="''"
|
||||
@endif
|
||||
|
||||
@if (!empty($attributes['v-model']))
|
||||
|
||||
@ -33,11 +33,11 @@
|
||||
}"
|
||||
|
||||
@if (!empty($attributes['v-model']))
|
||||
@interface="{{ $attributes['v-model'] . ' = $event' }}"
|
||||
@interface="form.errors.clear('{{ $attributes['v-model'] }}'); {{ $attributes['v-model'] . ' = $event' }}"
|
||||
@elseif (!empty($attributes['data-field']))
|
||||
@interface="{{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}"
|
||||
@interface="form.errors.clear('{{ 'form.' . $attributes['data-field'] . '.' . $name }}'); {{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}"
|
||||
@else
|
||||
@interface="form.{{ $name }} = $event"
|
||||
@interface="form.errors.clear('{{ $name }}'); form.{{ $name }} = $event"
|
||||
@endif
|
||||
|
||||
@if (isset($attributes['readonly']))
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
<i class="fas fa-file-image display-3"></i>
|
||||
@else
|
||||
<a href="#" class="avatar">
|
||||
<img src="{{ url('uploads/' . $file->id) }}" alt="{{ $file->basename }}">
|
||||
<img src="{{ route('uploads.get', $file->id) }}" alt="{{ $file->basename }}">
|
||||
</a>
|
||||
@endif
|
||||
</div>
|
||||
@ -26,26 +26,18 @@
|
||||
|
||||
<div class="col-auto">
|
||||
@permission('delete-common-uploads')
|
||||
{!! Form::open([
|
||||
'id' => $column_name. '-' . $file->id,
|
||||
'method' => 'DELETE',
|
||||
'url' => [url('uploads/' . $file->id)],
|
||||
'class' => 'd-inline'
|
||||
]) !!}
|
||||
<a href="javascript:void();" id="remove-{{ $column_name }}" @click="onDeleteFile('{{ $file->id }}', '{{ route('uploads.destroy', $file->id) }}', '{{ trans('general.title.delete', ['type' => $column_name]) }}', '{{ trans('general.delete_confirm', ['name' => $file->basename, 'type' => $column_name]) }} ', '{{ trans('general.cancel') }}', '{{ trans('general.delete') }}')" type="button" class="btn btn-sm btn-danger text-white header-button-top">
|
||||
<i class="fas fa-times"></i>
|
||||
</a>
|
||||
|
||||
<a href="javascript:void();" id="remove-{{ $column_name }}" type="button" class="btn btn-sm btn-danger text-white header-button-top">
|
||||
<i class="fas fa-times"></i>
|
||||
</a>
|
||||
|
||||
@if ($options)
|
||||
<input type="hidden" name="page" value="{{ $options['page'] }}" />
|
||||
<input type="hidden" name="key" value="{{ $options['key'] }}" />
|
||||
<input type="hidden" name="value" value="{{ $file->id }}" />
|
||||
@endif
|
||||
{!! Form::close() !!}
|
||||
@if ($options)
|
||||
<input type="hidden" name="page_{{ $file->id}}" id="file-page-{{ $file->id}}" value="{{ $options['page'] }}" />
|
||||
<input type="hidden" name="key_{{ $file->id}}" id="file-key-{{ $file->id}}" value="{{ $options['key'] }}" />
|
||||
<input type="hidden" name="value_{{ $file->id}}" id="file-value-{{ $file->id}}" value="{{ $file->id }}" />
|
||||
@endif
|
||||
@endpermission
|
||||
|
||||
<a href="{{ url('uploads/' . $file->id . '/download') }}" type="button" class="btn btn-sm btn-info text-white header-button-top">
|
||||
<a href="{{ rotue('uploads.download', $file->id) }}" type="button" class="btn btn-sm btn-info text-white header-button-top">
|
||||
<i class="fas fa-file-download"></i>
|
||||
</a>
|
||||
</div>
|
||||
|
||||
@ -32,6 +32,7 @@
|
||||
var url = '{{ url("/") }}';
|
||||
var app_home = '{{ route("apps.home.index") }}';
|
||||
var app_url = '{{ config("app.url") }}';
|
||||
var aka_currency = {!! !empty($currency) ? $currency : 'false' !!};
|
||||
//--></script>
|
||||
|
||||
@stack('js')
|
||||
|
||||
@ -1,22 +1,25 @@
|
||||
<div class="col-md-3">
|
||||
<div class="card">
|
||||
<div class="card-header py-2">
|
||||
<div class="float-left ml--3">
|
||||
<h4 class="mb-0"><a href="{{ route('apps.app.show', $module->slug) }}">{{ $module->name }}</a></h4>
|
||||
</div>
|
||||
<div class="float-right mr--3">
|
||||
<span class="badge badge-pill badge-danger">{{ trans('modules.badge.pre_sale') }}</span>
|
||||
</div>
|
||||
<h4 class="ml--3 mb-0 float-left">
|
||||
<a href="{{ route('apps.app.show', $module->slug) }}">{{ $module->name }}</a>
|
||||
</h4>
|
||||
|
||||
<span class="mr--3 float-right">
|
||||
<span class="badge bg-danger text-white">{{ trans('modules.badge.pre_sale') }}</span>
|
||||
</span>
|
||||
</div>
|
||||
<a href="{{ route('apps.app.show', [module->slug) }}">
|
||||
|
||||
<a href="{{ route('apps.app.show', $module->slug) }}">
|
||||
@foreach ($module->files as $file)
|
||||
@if (($file->media_type == 'image') && ($file->pivot->zone == 'thumbnail'))
|
||||
<img src="{{ $file->path_string }}" alt="{{ $module->name }}" class="card-img-top card-border">
|
||||
<img src="{{ $file->path_string }}" alt="{{ $module->name }}" class="card-img-top border-radius-none">
|
||||
@endif
|
||||
@endforeach
|
||||
</a>
|
||||
|
||||
<div class="card-footer py-2">
|
||||
<div class="float-left ml--3 mt-1">
|
||||
<div class="float-left ml--3 mt--1">
|
||||
<small class="text-sm">
|
||||
{{ trans('modules.pre_sale') }}
|
||||
</small>
|
||||
|
||||
@ -6,5 +6,9 @@
|
||||
|
||||
@stack('content_content_end')
|
||||
<notifications></notifications>
|
||||
|
||||
<form id="form-dynamic-component" method="POST" action="#"></form>
|
||||
|
||||
<component v-bind:is="component"></component>
|
||||
</div>
|
||||
@stack('content_end')
|
||||
|
||||
@ -31,6 +31,7 @@
|
||||
<script type="text/javascript"><!--
|
||||
var url = '{{ url("/") }}';
|
||||
var app_url = '{{ config("app.url") }}';
|
||||
var aka_currency = {!! !empty($currency) ? $currency : 'false' !!};
|
||||
//--></script>
|
||||
|
||||
@stack('js')
|
||||
|
||||
@ -91,14 +91,16 @@
|
||||
<li class="nav-item dropdown">
|
||||
<a class="nav-link pr-0" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
|
||||
<div class="media align-items-center">
|
||||
<img src="{{ asset('public/img/user.svg') }}" height="36" width="36" alt="User"/>
|
||||
<div class="media-body ml-2">
|
||||
<span class="mb-0 text-sm font-weight-bold">
|
||||
@if (!empty($user->name))
|
||||
{{ $user->name }}
|
||||
@endif
|
||||
</span>
|
||||
</div>
|
||||
@if (is_object($user->picture))
|
||||
<img src="{{ Storage::url($user->picture->id) }}" class="rounded-circle image-style user-img" alt="{{ $user->name }}"/>
|
||||
@else
|
||||
<img src="{{ asset('public/img/user.svg') }}" class="user-img" alt="{{ $user->name }}"/>
|
||||
@endif
|
||||
@if (!empty($user->name))
|
||||
<div class="media-body ml-2">
|
||||
<span class="mb-0 text-sm font-weight-bold">{{ $user->name }}</span>
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
</a>
|
||||
<div class="dropdown-menu dropdown-menu-right">
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
<div class="col-6">
|
||||
<nav class="float-right">
|
||||
{!! $items->withPath(request()->url())->appends(request()->except('page'))->links() !!}
|
||||
{!! $items->withPath(request()->url())->withQueryString()->links() !!}
|
||||
</nav>
|
||||
</div>
|
||||
@else
|
||||
|
||||
@ -20,7 +20,6 @@
|
||||
}
|
||||
</style>
|
||||
|
||||
|
||||
@stack('css')
|
||||
|
||||
@stack('stylesheet')
|
||||
|
||||
@ -9,6 +9,12 @@
|
||||
) }}
|
||||
@elseif ($type == 'textareaGroup')
|
||||
{{ Form::$type($field['name'], $field['title']) }}
|
||||
@elseif ($type == 'dateGroup')
|
||||
{{ Form::$type($field['name'], $field['title'], $field['icon'], array_merge([
|
||||
'model' => 'form.settings'.'.'.$field['name']
|
||||
],
|
||||
$field['attributes'])
|
||||
) }}
|
||||
@elseif ($type == 'selectGroup')
|
||||
{{ Form::$type($field['name'], $field['title'], $field['icon'], $field['values'], $field['selected'], array_merge([
|
||||
'data-field' => 'settings'
|
||||
@ -16,13 +22,13 @@
|
||||
$field['attributes'])
|
||||
) }}
|
||||
@elseif ($type == 'radioGroup')
|
||||
{{ Form::$type($field['name'], $field['title'], 1, $field['enable'], $field['disable'], array_merge([
|
||||
{{ Form::$type($field['name'], $field['title'], $field['selected'] ?? true, $field['enable'], $field['disable'], array_merge([
|
||||
'data-field' => 'settings'
|
||||
],
|
||||
$field['attributes'])
|
||||
) }}
|
||||
@elseif ($type == 'checkboxGroup')
|
||||
{{ Form::$type($field['name'], $field['title'], $field['items'], $field['value'], $field['id'], array_merge([
|
||||
{{ Form::$type($field['name'], $field['title'], $field['items'], $field['value'], $field['id'], $field['selected'], array_merge([
|
||||
'data-field' => 'settings'
|
||||
],
|
||||
$field['attributes'])
|
||||
|
||||
@ -1,12 +1,13 @@
|
||||
@extends('layouts.print')
|
||||
|
||||
@section('content')
|
||||
@section('title', $class->model->name)
|
||||
|
||||
@section('content')
|
||||
<h2>{{ $class->model->name }}</h2>
|
||||
|
||||
{{ setting('company.name') }}
|
||||
|
||||
@if(!empty($class->model->settings->chart))
|
||||
@if (!empty($class->model->settings->chart))
|
||||
@include($class->views['chart'])
|
||||
@endif
|
||||
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
@else
|
||||
<tr>
|
||||
<td colspan="{{ count($class->dates) + 2 }}">
|
||||
<h5 class="text-center pl-0">{{ trans('general.no_records') }}</h5>
|
||||
<div class="text-muted pl-0">{{ trans('general.no_records') }}</div>
|
||||
</td>
|
||||
</tr>
|
||||
@endif
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
@php $grand_total = array_sum($class->footer_totals[$table]); @endphp
|
||||
|
||||
<tfoot>
|
||||
<tr class="row rp-border-top-1 font-size-unset px-3">
|
||||
<th class="{{ $class->column_name_width }} text-uppercase">{{ trans_choice('general.totals', 1) }}</th>
|
||||
@php $grand_total = 0; @endphp
|
||||
<th class="{{ $class->column_name_width }} text-uppercase text-left">{{ trans_choice('general.totals', 1) }}</th>
|
||||
@foreach($class->footer_totals[$table] as $total)
|
||||
@php $grand_total += $total; @endphp
|
||||
<th class="{{ $class->column_value_width }} text-right px-0">@money($total, setting('default.currency'), true)</th>
|
||||
@endforeach
|
||||
<th class="{{ $class->column_name_width }} text-right pl-0 pr-4">@money($grand_total, setting('default.currency'), true)</th>
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
@php $row_total = 0; @endphp
|
||||
<tr class="row rp-border-top-1 font-size-unset">
|
||||
<td class="{{ $class->column_name_width }} long-texts pr-0">{{ $class->row_names[$table][$id] }}</td>
|
||||
@foreach($rows as $row)
|
||||
@php $row_total += $row; @endphp
|
||||
<td class="{{ $class->column_value_width }} text-right px-0">@money($row, setting('default.currency'), true)</td>
|
||||
@endforeach
|
||||
<td class="{{ $class->column_name_width }} text-right pl-0 pr-4">@money($row_total, setting('default.currency'), true)</td>
|
||||
</tr>
|
||||
@if ($row_total = array_sum($rows))
|
||||
<tr class="row rp-border-top-1 font-size-unset">
|
||||
<td class="{{ $class->column_name_width }} long-texts pr-0" title="{{ $class->row_names[$table][$id] }}">{{ $class->row_names[$table][$id] }}</td>
|
||||
@foreach($rows as $row)
|
||||
<td class="{{ $class->column_value_width }} text-right px-0">@money($row, setting('default.currency'), true)</td>
|
||||
@endforeach
|
||||
<td class="{{ $class->column_name_width }} text-right pl-0 pr-4">@money($row_total, setting('default.currency'), true)</td>
|
||||
</tr>
|
||||
@endif
|
||||
|
||||
@ -31,6 +31,7 @@
|
||||
<script type="text/javascript"><!--
|
||||
var url = '{{ url("/") }}';
|
||||
var app_url = '{{ config("app.url") }}';
|
||||
var aka_currency = {!! !empty($currency) ? $currency : 'false' !!};
|
||||
//--></script>
|
||||
|
||||
@stack('js')
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
<div class="row align-items-center">
|
||||
|
||||
<div class="col-10 text-nowrap">
|
||||
<h4 class="mb-0 long-texts">{{ $class->model->name }}</h4>
|
||||
<h4 class="mb-0 long-texts" title="{{ $class->model->name }}">{{ $class->model->name }}</h4>
|
||||
</div>
|
||||
|
||||
<div class="col-2 hidden-sm">
|
||||
|
||||
@ -31,6 +31,7 @@
|
||||
<script type="text/javascript"><!--
|
||||
var url = '{{ url("/") }}';
|
||||
var app_url = '{{ config("app.url") }}';
|
||||
var aka_currency = {!! !empty($currency) ? $currency : 'false' !!};
|
||||
//--></script>
|
||||
|
||||
@stack('js')
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
<small>{{ trans('pagination.showing', ['first' => $items->firstItem(), 'last' => $items->lastItem(), 'total' => $items->total(), 'type' => strtolower(trans_choice('general.' . $type, 2))]) }}</small>
|
||||
</div>
|
||||
<div class="pull-right">
|
||||
{!! $items->withPath(request()->url())->appends(request()->except('page'))->links() !!}
|
||||
{!! $items->withPath(request()->url())->withQueryString()->links() !!}
|
||||
</div>
|
||||
@else
|
||||
<div class="pull-left">
|
||||
|
||||
Reference in New Issue
Block a user