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

Merge branch 'master' of github.com:akaunting/akaunting

Browse Source 
# Conflicts:
#	resources/views/banking/reconciliations/create.blade.php
This commit is contained in:
Cüneyt Şentürk
2020-06-08 23:13:38 +03:00
parent d4923b4414 5e51b494d2
commit 41e7aee498
391 changed files with 6324 additions and 2309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
resources/views/auth/users/index.blade.php
View File

@ -54,11 +54,11 @@
<td class="col-xs-4 col-sm-3 col-md-2 col-lg-3">
<a class="col-aka" href="{{ route('users.edit', $item->id) }}">
@if (setting('default.use_gravatar', '0') == '1')
<img src="{{ $item->picture }}" alt="{{ $item->name }}" title="{{ $item->name }}">
<img src="{{ $item->picture }}" alt="{{ $item->name }}" class="rounded-circle user-img p-1 mr-3 hidden-md" title="{{ $item->name }}">
@elseif ($item->picture)
<img src="{{ Storage::url($item->picture->id) }}" class="rounded-circle user-img p-1 mr-3 hidden-md" alt="{{ $item->name }}" title="{{ $item->name }}">
@else
@if ($item->picture)
<img src="{{ Storage::url($item->picture->id) }}" alt="{{ $item->name }}" title="{{ $item->name }}">
@endif
<img src="{{ asset('public/img/user.svg') }}" class="user-img p-1 mr-3 hidden-md" alt="{{ $item->name }}"/>
@endif
{{ $item->name }}
</a>
@ -87,10 +87,12 @@
</a>
<div class="dropdown-menu dropdown-menu-right dropdown-menu-arrow">
<a class="dropdown-item" href="{{ route('users.edit', $item->id) }}">{{ trans('general.edit') }}</a>
@permission('delete-auth-users')
<div class="dropdown-divider"></div>
{!! Form::deleteLink($item, 'users.destroy') !!}
@endpermission
@if (user()->id != $item->id)
@permission('delete-auth-users')
<div class="dropdown-divider"></div>
{!! Form::deleteLink($item, 'users.destroy') !!}
@endpermission
@endif
</div>
</div>
</td>

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

@ -23,7 +23,7 @@
{{ Form::selectAddNewGroup('currency_code', trans_choice('general.currencies', 1), 'exchange-alt', $currencies, setting('default.currency'), ['required' => 'required', 'path' => route('modals.currencies.create'), 'field' => ['key' => 'code', 'value' => 'name'], 'change' => 'onChangeCurrency']) }}
{{ Form::moneyGroup('opening_balance', trans('accounts.opening_balance'), 'balance-scale', ['required' => 'required', 'currency' => $currency], 0) }}
{{ Form::moneyGroup('opening_balance', trans('accounts.opening_balance'), 'balance-scale', ['required' => 'required', 'currency' => $currency, 'dynamic-currency' => 'currency'], 0) }}
{{ Form::textGroup('bank_name', trans('accounts.bank_name'), 'university', []) }}

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

@ -24,7 +24,7 @@
{{ Form::selectAddNewGroup('currency_code', trans_choice('general.currencies', 1), 'exchange-alt', $currencies, $account->currency_code, ['required' => 'required', 'path' => route('modals.currencies.create'), 'field' => ['key' => 'code', 'value' => 'name'], 'change' => 'onChangeCurrency']) }}
{{ Form::moneyGroup('opening_balance', trans('accounts.opening_balance'), 'balance-scale', ['required' => 'required', 'currency' => $currency], $account->opening_balance) }}
{{ Form::moneyGroup('opening_balance', trans('accounts.opening_balance'), 'balance-scale', ['required' => 'required', 'currency' => $currency, 'dynamic-currency' => 'currency'], $account->opening_balance) }}
{{ Form::textGroup('bank_name', trans('accounts.bank_name'), 'university', []) }}

10
resources/views/banking/reconciliations/create.blade.php
View File

@ -20,7 +20,7 @@
{{ Form::dateGroup('ended_at', trans('reconciliations.end_date'), 'calendar', ['id' => 'ended_at', 'class' => 'form-control datepicker', 'required' => 'required', 'date-format' => 'Y-m-d', 'autocomplete' => 'off'], request('ended_at', Date::now()->endOfMonth()->toDateString()), 'col-xl-3') }}
{{ Form::moneyGroup('closing_balance', trans('reconciliations.closing_balance'), 'balance-scale', ['required' => 'required', 'autofocus' => 'autofocus', 'currency' => $currency, 'dynamic-currency' => 'currency', 'input' => 'onCalculate'], request('closing_balance', 0.00), 'col-xl-2') }}
{{ Form::moneyGroup('closing_balance', trans('reconciliations.closing_balance'), 'balance-scale', ['required' => 'required', 'autofocus' => 'autofocus', 'currency' => $currency, 'dynamic-currency' => 'currency'], request('closing_balance', 0.00), 'col-xl-2') }}
{{ Form::selectAddNewGroup('account_id', trans_choice('general.accounts', 1), 'university', $accounts, request('account_id', setting('default.account')), ['required' => 'required', 'path' => route('modals.accounts.create'), 'change' => 'onChangeAccount'], 'col-xl-2') }}
@ -83,7 +83,7 @@
@endif
<td class="col-md-1 text-right d-none d-md-block">
<div class="custom-control custom-checkbox">
{{ Form::checkbox($item->type . '_' . $item->id, $item->price, $item->reconciled, [
{{ Form::checkbox($item->type . '_' . $item->id, $item->amount, $item->reconciled, [
'data-field' => 'transactions',
'v-model' => 'form.transactions.' . $item->type . '_' . $item->id,
'id' => 'transaction-' . $item->id . '-'. $item->type,
@ -100,12 +100,6 @@
@if ($transactions->count())
<table class="table">
<tbody>
<tr class="row">
<th class="col-md-9 col-lg-11 text-right d-none d-md-block">{{ trans('reconciliations.opening_balance') }}:</th>
<td id="closing-balance" class="col-md-3 col-lg-1 text-right d-none d-md-block">
<span>@money($opening_balance, $account->currency_code, true)</span>
</td>
</tr>
<tr class="row">
<th class="col-md-9 col-lg-11 text-right d-none d-md-block">{{ trans('reconciliations.closing_balance') }}:</th>
<td id="closing-balance" class="col-md-3 col-lg-1 text-right d-none d-md-block">

2
resources/views/banking/transfers/create.blade.php
View File

@ -21,7 +21,7 @@
{{ Form::selectGroup('to_account_id', trans('transfers.to_account'), 'university', $accounts) }}
{{ Form::moneyGroup('amount', trans('general.amount'), 'money-bill-alt', ['required' => 'required', 'currency' => $currency], 0) }}
{{ Form::moneyGroup('amount', trans('general.amount'), 'money-bill-alt', ['required' => 'required', 'currency' => $currency, 'dynamic-currency' => 'currency'], 0) }}
{{ Form::dateGroup('transferred_at', trans('general.date'), 'calendar', ['id' => 'transferred_at', 'class' => 'form-control datepicker', 'required' => 'required', 'date-format' => 'Y-m-d', 'autocomplete' => 'off'], Date::now()->toDateString()) }}

2
resources/views/banking/transfers/edit.blade.php
View File

@ -22,7 +22,7 @@
{{ Form::selectGroup('to_account_id', trans('transfers.to_account'), 'university', $accounts, $transfer->to_account_id) }}
{{ Form::moneyGroup('amount', trans('general.amount'), 'money-bill-alt', ['required' => 'required', 'currency' => $currency], $transfer->amount) }}
{{ Form::moneyGroup('amount', trans('general.amount'), 'money-bill-alt', ['required' => 'required', 'currency' => $currency, 'dynamic-currency' => 'currency'], $transfer->amount) }}
{{ Form::dateGroup('transferred_at', trans('general.date'), 'calendar', ['id' => 'transferred_at', 'class' => 'form-control datepicker', 'required' => 'required', 'date-format' => 'Y-m-d', 'autocomplete' => 'off'], Date::parse($transfer->transferred_at)->toDateString()) }}

2
resources/views/install/updates/edit.blade.php
View File

@ -16,7 +16,7 @@
<p>
<el-progress :text-inside="true" :stroke-width="24" :percentage="update.total" :status="update.status"></el-progress>
<div id="progress-text" v-html="update.html"></div>
<div id="progress-text" class="mt-3" v-html="update.html"></div>
{{ Form::hidden('page', 'update', ['id' => 'page']) }}
{{ Form::hidden('name', $name, ['id' => 'name']) }}

2
resources/views/layouts/print.blade.php
View File

@ -1,5 +1,4 @@
<html lang="{{ app()->getLocale() }}">
@include('partials.print.head')
<body onload="window.print();">
@ -9,5 +8,4 @@
@stack('body_end')
</body>
</html>

2
resources/views/modals/accounts/create.blade.php
View File

@ -14,7 +14,7 @@
{{ Form::selectGroup('currency_code', trans_choice('general.currencies', 1), 'exchange-alt', $currencies, setting('default.currency'), ['required' => 'required', 'change' => 'onChangeCurrency']) }}
{{ Form::moneyGroup('opening_balance', trans('accounts.opening_balance'), 'balance-scale', ['required' => 'required', 'currency' => $currency], 0.00) }}
{{ Form::moneyGroup('opening_balance', trans('accounts.opening_balance'), 'balance-scale', ['required' => 'required', 'currency' => $currency, 'dynamic-currency' => 'currency'], 0.00) }}
{!! Form::hidden('enabled', '1', []) !!}
</div>

2
resources/views/modals/bills/payment.blade.php
View File

@ -14,7 +14,7 @@
{{ Form::dateGroup('paid_at', trans('general.date'), 'calendar', ['id' => 'paid_at', 'required' => 'required', 'date-format' => 'Y-m-d', 'autocomplete' => 'off', 'v-model' => 'transaction_form.paid_at', 'v-error' => 'payment.errors.get("paid_at")', 'v-error-message' => 'payment.errors.get("paid_at")'], Date::now()->toDateString()) }}
{{ Form::moneyGroup('amount', trans('general.amount'), 'money-bill-alt', ['required' => 'required', 'autofocus' => 'autofocus', 'v-model' => 'transaction_form.amount', 'v-error' => 'payment.errors.get("amount")', 'v-error-message' => 'payment.errors.get("amount")', 'currency' => $currency], $bill->grand_total) }}
{{ Form::moneyGroup('amount', trans('general.amount'), 'money-bill-alt', ['required' => 'required', 'autofocus' => 'autofocus', 'v-model' => 'transaction_form.amount', 'v-error' => 'payment.errors.get("amount")', 'v-error-message' => 'payment.errors.get("amount")', 'currency' => $currency, 'dynamic-currency' => 'currency'], $bill->grand_total) }}
{{ Form::selectGroup('account_id', trans_choice('general.accounts', 1), 'university', $accounts, setting('default.account'), ['required' => 'required', 'v-model' => 'transaction_form.account_id', 'v-error' => 'payment.errors.get("account_id")', 'v-error-message' => 'payment.errors.get("account_id")', 'change' => 'onChangePaymentAccount']) }}

2
resources/views/modals/invoices/payment.blade.php
View File

@ -14,7 +14,7 @@
{{ Form::dateGroup('paid_at', trans('general.date'), 'calendar', ['id' => 'paid_at', 'required' => 'required', 'date-format' => 'Y-m-d', 'autocomplete' => 'off', 'v-model' => 'transaction_form.paid_at', 'v-error' => 'payment.errors.get("paid_at")', 'v-error-message' => 'payment.errors.get("paid_at")'], Date::now()->toDateString()) }}
{{ Form::moneyGroup('amount', trans('general.amount'), 'money-bill-alt', ['required' => 'required', 'autofocus' => 'autofocus', 'v-model' => 'transaction_form.amount', 'v-error' => 'payment.errors.get("amount")', 'v-error-message' => 'payment.errors.get("amount")', 'currency' => $currency], $invoice->grand_total) }}
{{ Form::moneyGroup('amount', trans('general.amount'), 'money-bill-alt', ['required' => 'required', 'autofocus' => 'autofocus', 'v-model' => 'transaction_form.amount', 'v-error' => 'payment.errors.get("amount")', 'v-error-message' => 'payment.errors.get("amount")', 'currency' => $currency, 'dynamic-currency' => 'currency'], $invoice->grand_total) }}
{{ Form::selectGroup('account_id', trans_choice('general.accounts', 1), 'university', $accounts, setting('default.account'), ['required' => 'required', 'v-model' => 'transaction_form.account_id', 'v-error' => 'payment.errors.get("account_id")', 'v-error-message' => 'payment.errors.get("account_id")', 'change' => 'onChangePaymentAccount']) }}

9
resources/views/modules/item/pre_sale.blade.php
View File

@ -87,10 +87,9 @@
@endif
@endpermission
@if ($module->purchase_faq)
<br>
<div class="text-center">
<a href="#" @click="onShowFaq" id="button-purchase-faq">{{ trans('modules.tab.faq')}}</a>
@if (!empty($module->purchase_desc))
<div class="text-center mt-3">
{!! $module->purchase_desc !!}
</div>
@endif
</div>
@ -138,7 +137,7 @@
</div>
@if ($module->purchase_faq)
<akaunting-modal :show="faq.show">
<akaunting-modal :show="faq" modal-dialog-class="modal-md">
<template #modal-content>
{!! $module->purchase_faq !!}
</template>

85
resources/views/modules/item/show.blade.php
View File

@ -108,17 +108,72 @@
@endif
<div class="tab-pane fade" id="review">
<div id="reviews" class="clearfix" v-html="reviews">
@if(!$module->reviews)
<div class="text-center">
<strong>
{{ trans('modules.reviews.na') }}
</strong>
</div>
@endif
@php
$reviews = $module->app_reviews;
@endphp
<div id="reviews" class="clearfix" v-if="reviews.status" v-html="reviews.html"></div>
<div id="reviews" class="clearfix" v-else>
@include('partials.modules.reviews')
</div>
<div class="card-footer mx--4 mt-4 mb--4">
@php
$review_first_item = count($reviews->data) > 0 ? ($reviews->current_page - 1) * $reviews->per_page + 1 : null;
$review_last_item = count($reviews->data) > 0 ? $review_first_item + count($reviews->data) - 1 : null;
@endphp
@if (!empty($review_first_item))
@stack('pagination_start')
<div class="row mt-4">
<div class="col-md-6">
<span class="table-text d-lg-block">
{{ trans('pagination.showing', ['first' => $review_first_item, 'last' => $review_last_item, 'total' => $reviews->total, 'type' => strtolower(trans('modules.tab.reviews'))]) }}
</span>
</div>
<div class="col-md-6">
<ul class="pagination float-right">
{{-- Previous Page Link --}}
<li class="page-item disabled" v-if="reviews.pagination.current_page == 1">
<span class="page-link">&laquo;</span>
</li>
<li class="page-item" v-else>
<button type="button" class="page-link" @click="onReviews(reviews.pagination.current_page - 1)" rel="prev">&laquo;</button>
</li>
{{-- Pagination Elements --}}
@for ($page = 1; $page <= $reviews->last_page; $page++)
<li class="page-item" :class="[{'active': reviews.pagination.current_page == {{ $page }}}]" v-if="reviews.pagination.current_page == {{ $page }}">
<span class="page-link">{{ $page }}</span>
</li>
<li class="page-item" v-else>
<button type="button" class="page-link" @click="onReviews({{ $page }})" data-page="{{ $page }}">{{ $page }}</button>
</li>
@endfor
{{-- Next Page Link --}}
<li class="page-item" v-if="reviews.pagination.last_page != reviews.pagination.current_page">
<button type="button" class="page-link" @click="onReviews(reviews.pagination.current_page + 1)" rel="next">&raquo;</button>
</li>
<li class="page-item disabled" v-else>
<span class="page-link">&raquo;</span>
</li>
</ul>
</div>
</div>
@stack('pagination_end')
@else
<div class="row">
<div class="col-md-12">
<small>{{ trans('general.no_records') }}</small>
</div>
</div>
@endif
<div class="card-footer mx--4 mb--4">
<div class="row">
<div class="col-md-12 text-right">
@if (!empty($module->review_action))
@ -188,10 +243,10 @@
@endpermission
@endif
@if ($module->purchase_faq)
<div class="text-center mt-3">
<a href="#" @click="onShowFaq" id="button-purchase-faq">{{ trans('modules.tab.faq')}}</a>
</div>
@if (!empty($module->purchase_desc))
<div class="text-center mt-3">
{!! $module->purchase_desc !!}
</div>
@endif
</div>
</div>
@ -248,7 +303,7 @@
</div>
@if ($module->purchase_faq)
<akaunting-modal :show="faq">
<akaunting-modal :show="faq" modal-dialog-class="modal-md">
<template #modal-content>
{!! $module->purchase_faq !!}
</template>
@ -263,7 +318,7 @@
<div class="modal-body">
<el-progress :text-inside="true" :stroke-width="24" :percentage="installation.total" :status="installation.status"></el-progress>
<div id="progress-text" v-html="installation.html"></div>
<div id="progress-text" class="mt-3" v-html="installation.html"></div>
</div>
</template>
<template #card-footer>

2
resources/views/partials/admin/head.blade.php
View File

@ -33,7 +33,7 @@
<script type="text/javascript"><!--
var url = '{{ url("/") }}';
var app_url = '{{ env("APP_URL") }}';
var app_url = '{{ config("app.url") }}';
//--></script>
@stack('js')

96
resources/views/partials/admin/navbar.blade.php
View File

@ -2,6 +2,8 @@
<nav class="navbar navbar-top navbar-expand navbar-dark border-bottom">
<div class="container-fluid">
<div class="collapse navbar-collapse" id="navbarSupportedContent">
@stack('navbar_search')
@permission('read-common-search')
<form class="navbar-search navbar-search-light form-inline mb-0" id="navbar-search-main" autocomplete="off">
<div id="global-search" class="form-group mb-0 mr-sm-3">
@ -47,6 +49,8 @@
</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>
@ -60,6 +64,8 @@
</a>
<div class="dropdown-menu dropdown-menu-lg dropdown-menu-dark dropdown-menu-right">
<div class="row shortcuts px-4">
@stack('navbar_create_invoice')
@permission('create-sales-invoices')
<a href="{{ route('invoices.create') }}" class="col-4 shortcut-item">
<span class="shortcut-media avatar rounded-circle bg-gradient-info">
@ -69,6 +75,8 @@
</a>
@endpermission
@stack('navbar_create_revenue')
@permission('create-sales-revenues')
<a href="{{ route('revenues.create') }}" class="col-4 shortcut-item">
<span class="shortcut-media avatar rounded-circle bg-gradient-info">
@ -78,6 +86,8 @@
</a>
@endpermission
@stack('navbar_create_customer')
@permission('create-sales-customers')
<a href="{{ route('customers.create') }}" class="col-4 shortcut-item">
<span class="shortcut-media avatar rounded-circle bg-gradient-info">
@ -87,6 +97,8 @@
</a>
@endpermission
@stack('navbar_create_bill')
@permission('create-purchases-bills')
<a href="{{ route('bills.create') }}" class="col-4 shortcut-item">
<span class="shortcut-media avatar rounded-circle bg-gradient-danger">
@ -96,6 +108,8 @@
</a>
@endpermission
@stack('navbar_create_payment')
@permission('create-purchases-payments')
<a href="{{ route('payments.create') }}" class="col-4 shortcut-item">
<span class="shortcut-media avatar rounded-circle bg-gradient-danger">
@ -105,6 +119,8 @@
</a>
@endpermission
@stack('navbar_create_vendor_start')
@permission('create-purchases-vendors')
<a href="{{ route('vendors.create') }}" class="col-4 shortcut-item">
<span class="shortcut-media avatar rounded-circle bg-gradient-danger">
@ -113,10 +129,14 @@
<small class="text-danger">{{ trans_choice('general.vendors', 1) }}</small>
</a>
@endpermission
@stack('navbar_create_vendor_end')
</div>
</div>
</li>
@endif
@endpermission
@stack('navbar_notifications')
<li class="nav-item dropdown">
<a class="nav-link" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@ -175,6 +195,8 @@
</div>
</li>
@stack('navbar_updates')
@permission('read-install-updates')
<li class="nav-item">
<a class="nav-link" href="{{ route('updates.index') }}" title="{{ $updates }} Updates Available" role="button" aria-haspopup="true" aria-expanded="false">
@ -188,18 +210,28 @@
</li>
@endpermission
@stack('navbar_help_start')
<li class="nav-item d-none d-md-block">
<a class="nav-link" href="{{ url(trans('header.support_link')) }}" target="_blank" title="{{ trans('general.help') }}" role="button" aria-haspopup="true" aria-expanded="false">
<i class="far fa-life-ring"></i>
</a>
</li>
@stack('navbar_help_end')
</ul>
@stack('navbar_profile')
<ul class="navbar-nav align-items-center ml-auto ml-md-0">
<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"/>
@if ($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
<div class="media-body ml-2 d-none d-lg-block">
<span class="mb-0 text-sm font-weight-bold">
@if (!empty($user->name))
@ -209,40 +241,66 @@
</div>
</div>
</a>
<div class="dropdown-menu dropdown-menu-right">
@stack('navbar_profile_welcome')
<div class="dropdown-header noti-title">
<h6 class="text-overflow m-0">{{ trans('general.welcome') }}</h6>
</div>
@stack('navbar_profile_edit')
@permission('update-auth-users')
<a href="{{ route('users.edit', $user->id) }}" class="dropdown-item">
<i class="fas fa-user"></i>
<span>{{ trans('auth.profile') }}</span>
</a>
@endpermission
@permission('read-auth-users')
@permission(['read-auth-users', 'read-auth-roles', 'read-auth-permissions'])
<div class="dropdown-divider"></div>
<a href="{{ route('users.index') }}" class="dropdown-item">
<i class="fas fa-users"></i>
<span>{{ trans_choice('general.users', 2) }}</span>
</a>
@endpermission
@permission('read-auth-roles')
<a href="{{ route('roles.index') }}" class="dropdown-item">
<i class="fas fa-list"></i>
<span>{{ trans_choice('general.roles', 2) }}</span>
</a>
@endpermission
@permission('read-auth-permissions')
<a href="{{ route('permissions.index') }}" class="dropdown-item">
<i class="fas fa-key"></i>
<span>{{ trans_choice('general.permissions', 2) }}</span>
</a>
@stack('navbar_profile_users')
@permission('read-auth-users')
<a href="{{ route('users.index') }}" class="dropdown-item">
<i class="fas fa-users"></i>
<span>{{ trans_choice('general.users', 2) }}</span>
</a>
@endpermission
@stack('navbar_profile_roles')
@permission('read-auth-roles')
<a href="{{ route('roles.index') }}" class="dropdown-item">
<i class="fas fa-list"></i>
<span>{{ trans_choice('general.roles', 2) }}</span>
</a>
@endpermission
@stack('navbar_profile_permissions_start')
@permission('read-auth-permissions')
<a href="{{ route('permissions.index') }}" class="dropdown-item">
<i class="fas fa-key"></i>
<span>{{ trans_choice('general.permissions', 2) }}</span>
</a>
@endpermission
@stack('navbar_profile_permissions_end')
@endpermission
<div class="dropdown-divider"></div>
@stack('navbar_profile_logout_start')
<a href="{{ route('logout') }}" class="dropdown-item">
<i class="fas fa-power-off"></i>
<span>{{ trans('auth.logout') }}</span>
</a>
@stack('navbar_profile_logout_end')
</div>
</li>
</ul>

2
resources/views/partials/auth/head.blade.php
View File

@ -28,7 +28,7 @@
<script type="text/javascript"><!--
var url = '{{ url("/") }}';
var app_url = '{{ env("APP_URL") }}';
var app_url = '{{ config("app.url") }}';
//--></script>
@stack('js')

22
resources/views/partials/documents/item/print.blade.php Normal file
View File

@ -0,0 +1,22 @@
<tr>
@stack('name_td_start')
<td class="item">
{{ $item->name }}
@if (!empty($item->item->description))
<br><small>{!! \Illuminate\Support\Str::limit($item->item->description, 500) !!}</small>
@endif
</td>
@stack('name_td_end')
@stack('quantity_td_start')
<td class="quantity">{{ $item->quantity }}</td>
@stack('quantity_td_end')
@stack('price_td_start')
<td class="price">@money($item->price, $document->currency_code, true)</td>
@stack('price_td_end')
@stack('total_td_start')
<td class="total">@money($item->total, $document->currency_code, true)</td>
@stack('total_td_end')
</tr>

28
resources/views/partials/documents/item/show.blade.php Normal file
View File

@ -0,0 +1,28 @@
<tr class="d-flex flex-nowrap">
@stack('name_td_start')
<td class="col-xs-4 col-sm-5 pl-5">
{{ $item->name }}
@if (!empty($item->item->description))
<br><small class="text-pre-nowrap">{!! \Illuminate\Support\Str::limit($item->item->description, 500) !!}<small>
@endif
</td>
@stack('name_td_end')
@stack('quantity_td_start')
<td class="col-xs-4 col-sm-1 text-center">{{ $item->quantity }}</td>
@stack('quantity_td_end')
@stack('price_td_start')
<td class="col-sm-3 text-right d-none d-sm-block">@money($item->price, $document->currency_code, true)</td>
@stack('price_td_end')
@if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both']))
@stack('discount_td_start')
<td class="col-sm-1 text-center d-none d-sm-block">{{ $item->discount }}</td>
@stack('discount_td_end')
@endif
@stack('total_td_start')
<td class="col-xs-4 col-sm-3 text-right pr-5">@money($item->total, $document->currency_code, true)</td>
@stack('total_td_end')
</tr>

6
resources/views/partials/form/date_group.blade.php
View File

@ -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]) }}"
@ -47,6 +49,10 @@
@interface="form.{{ $name }} = $event"
@endif
@if (isset($attributes['required']))
:required="{{ ($attributes['required']) ? 'true' : 'false' }}"
@endif
@if (isset($attributes['readonly']))
:readonly="{{ $attributes['readonly'] }}"
@endif

6
resources/views/partials/form/money_group.blade.php
View File

@ -54,11 +54,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'] }}"); {{ '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']))

4
resources/views/partials/form/select_group.blade.php
View File

@ -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'] }}"); {{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}"
@else
@interface="form.errors.clear('{{ $name }}'); form.{{ $name }} = $event;"
@endif

2
resources/views/partials/modules/bar.blade.php
View File

@ -21,7 +21,7 @@
</div>
<div class="col-xs-12 col-sm-3 text-right">
{!! Form::open(['route' => 'apps.search', 'role' => 'form', 'method' => 'GET', 'class' => 'm-0']) !!}
<input name="keyword" value="{{ isset($keyword) ? $keyword : '' }}" type="text" class="form-control form-control-sm d-inline-block w-auto" placeholder="Search Apps">
<input name="keyword" value="{{ isset($keyword) ? $keyword : '' }}" type="text" class="form-control form-control-sm d-inline-block w-auto" placeholder="{{ trans('general.search_placeholder') }}">
<span class="glyphicon glyphicon-search form-control-feedback"></span>
{!! Form::close() !!}
</div>

4
resources/views/partials/modules/head.blade.php
View File

@ -30,8 +30,8 @@
<script type="text/javascript"><!--
var url = '{{ url("/") }}';
var app_home = '{{ url("apps/categories") }}';
var app_url = '{{ env("APP_URL") }}';
var app_home = '{{ route("apps.home.index") }}';
var app_url = '{{ config("app.url") }}';
//--></script>
@stack('js')

2
resources/views/partials/modules/item.blade.php
View File

@ -8,7 +8,7 @@
@php $color = 'bg-green'; @endphp
@if (!$installed[$module->slug])
@php $color = 'bg-yellow'; @endphp
@php $color = 'bg-warning'; @endphp
@endif
<span class="mr--3 float-right">
<span class="badge {{ $color }} text-white">{{ trans('modules.badge.installed') }}</span>

87
resources/views/partials/modules/reviews.blade.php
View File

@ -5,77 +5,38 @@
<div class="media-body">
<div class="media-comment-text">
<div class="d-flex">
<h5 class="mt-0">{{ $review->author }}</h5>
<h5 class="text-right ml-auto">@date($review->created_at)</h5>
<h5 class="mb-0">{{ $review->author }}</h5>
</div>
<p class="text-sm lh-160">{!! nl2br($review->text) !!}</p>
<div class="icon-actions">
<a href="#" class="like active">
<span class="text-yellow">
<div class="d-flex">
<p class="h6 text-muted mb-0">@date($review->created_at)</p>
</div>
<div class="d-flex">
<span class="text-yellow position-absolute top-3 right-3">
@if ($review->rating)
@for($i = 1; $i <= $review->rating; $i++)
<i class="fa fa-star"></i>
@endfor
@for($i = $review->rating; $i < 5; $i++)
<i class="fa fa-star-o"></i>
@if ($review->rating < 5)
@for($i = 1; $i <= 5 - $review->rating; $i++)
<i class="far fa-star"></i>
@endfor
@endif
@else
@for($i = 1; $i <= 5; $i++)
<i class="far fa-star"></i>
@endfor
</span>
</a>
@endif
</span>
</div>
<div class="d-flex">
<p class="mt-2 mb-0 text-sm lh-160">{!! nl2br($review->text) !!}</p>
</div>
</div>
</div>
</div>
@endforeach
@php
$review_first_item = count($reviews->data) > 0 ? ($reviews->current_page - 1) * $reviews->per_page + 1 : null;
$review_last_item = count($reviews->data) > 0 ? $review_first_item + count($reviews->data) - 1 : null;
@endphp
@endif
@if (!empty($review_first_item))
@stack('pagination_start')
<div class="row d-none">
<div class="col-md-6">
<span class="table-text d-none d-lg-block">
{{ trans('pagination.showing', ['first' => $review_first_item, 'last' => $review_last_item, 'total' => $reviews->total, 'type' => strtolower(trans('modules.tab.reviews'))]) }}
</span>
</div>
<div class="col-md-6">
<ul class="pagination float-right">
{{-- Previous Page Link --}}
@if ($reviews->current_page <= 1)
<li class="page-item disabled"><span class="page-link">&laquo;</span></li>
@else
<li><a class="page-link" href="{{ url(request()->path()) }}?page={{ $reviews->current_page - 1 }}" rel="prev">&laquo;</a></li>
@endif
{{-- Pagination Elements --}}
@for ($page = 1; $page <= $reviews->last_page; $page++)
@if ($page == $reviews->current_page)
<li class="page-item active"><span class="page-link">{{ $page }}</span></li>
@else
<li class="page-item"><a class="page-link" href="{{ url(request()->path()) }}?page={{ $page }}" data-page="{{ $page }}">{{ $page }}</a></li>
@endif
@endfor
{{-- Next Page Link --}}
@if ($reviews->current_page != 1)
<li class="page-item"><a class="page-link" href="{{ url(request()->path()) }}?page={{ $reviews->current_page + 1 }}" rel="next">&raquo;</a></li>
@else
<li class="page-item disabled"><span class="page-link">&raquo;</span></li>
@endif
</ul>
</div>
</div>
@stack('pagination_end')
@else
<div class="row">
<div class="col-md-12">
<small>{{ trans('general.no_records') }}</small>
</div>
</div>
@endif
</div>
</div>

3
resources/views/partials/portal/content.blade.php
View File

@ -6,5 +6,8 @@
@stack('content_content_end')
<notifications></notifications>
<form id="form-create" method="POST" action="#"/>
<component v-bind:is="component"></component>
</div>
@stack('content_end')

2
resources/views/partials/portal/head.blade.php
View File

@ -30,7 +30,7 @@
<script type="text/javascript"><!--
var url = '{{ url("/") }}';
var app_url = '{{ env("APP_URL") }}';
var app_url = '{{ config("app.url") }}';
//--></script>
@stack('js')

1
resources/views/partials/print/head.blade.php
View File

@ -20,7 +20,6 @@
}
</style>
@stack('css')
@stack('stylesheet')

5
resources/views/partials/reports/print.blade.php
View File

@ -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

2
resources/views/partials/reports/table.blade.php
View File

@ -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

6
resources/views/partials/reports/table/footer.blade.php
View File

@ -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>

18
resources/views/partials/reports/table/rows.blade.php
View File

@ -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">{{ $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

2
resources/views/partials/signed/head.blade.php
View File

@ -30,7 +30,7 @@
<script type="text/javascript"><!--
var url = '{{ url("/") }}';
var app_url = '{{ env("APP_URL") }}';
var app_url = '{{ config("app.url") }}';
//--></script>
@stack('js')

6
resources/views/partials/widgets/standard_header.blade.php
View File

@ -2,11 +2,11 @@
<div class="card-header{{ !empty($header_class) ? ' ' . $header_class : '' }}">
<div class="row align-items-center">
<div class="col-6 text-nowrap">
<h4 class="mb-0">{{ $class->model->name }}</h4>
<div class="col-10 text-nowrap">
<h4 class="mb-0 long-texts">{{ $class->model->name }}</h4>
</div>
<div class="col-6 hidden-sm">
<div class="col-2 hidden-sm">
<span class="float-right">
<div class="dropdown">
<a class="btn btn-sm items-align-center py-2 mr-0 shadow-none--hover" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">

2
resources/views/partials/wizard/head.blade.php
View File

@ -30,7 +30,7 @@
<script type="text/javascript"><!--
var url = '{{ url("/") }}';
var app_url = '{{ env("APP_URL") }}';
var app_url = '{{ config("app.url") }}';
//--></script>
@stack('js')

25
resources/views/purchases/bills/print.blade.php
View File

@ -128,29 +128,8 @@
</thead>
<tbody>
@foreach($bill->items as $bill_item)
<tr>
@stack('name_td_start')
<td class="item">
{{ $bill_item->name }}
@if (!empty($bill_item->item->description))
<br><small>{!! \Illuminate\Support\Str::limit($bill_item->item->description, 500) !!}<small>
@endif
</td>
@stack('name_td_end')
@stack('quantity_td_start')
<td class="quantity">{{ $bill_item->quantity }}</td>
@stack('quantity_td_end')
@stack('price_td_start')
<td class="price">@money($bill_item->price, $bill->currency_code, true)</td>
@stack('price_td_end')
@stack('total_td_start')
<td class="total">@money($bill_item->total, $bill->currency_code, true)</td>
@stack('total_td_end')
</tr>
@foreach($bill->items as $item)
@include('partials.documents.item.print', ['document' => $bill])
@endforeach
</tbody>
</table>

31
resources/views/purchases/bills/show.blade.php
View File

@ -349,35 +349,8 @@
<th class="col-xs-4 col-sm-3 text-right pr-5">{{ trans('bills.total') }}</th>
@stack('total_th_end')
</tr>
@foreach($bill->items as $bill_item)
<tr class="d-flex flex-nowrap">
@stack('name_td_start')
<td class="col-xs-4 col-sm-5 pl-5">
{{ $bill_item->name }}
@if (!empty($bill_item->item->description))
<br><small class="text-pre-nowrap">{!! \Illuminate\Support\Str::limit($bill_item->item->description, 500) !!}<small>
@endif
</td>
@stack('name_td_end')
@stack('quantity_td_start')
<td class="col-xs-4 col-sm-1 text-center">{{ $bill_item->quantity }}</td>
@stack('quantity_td_end')
@stack('price_td_start')
<td class="col-sm-3 text-right d-none d-sm-block">@money($bill_item->price, $bill->currency_code, true)</td>
@stack('price_td_end')
@if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both']))
@stack('discount_td_start')
<td class="col-sm-1 text-center d-none d-sm-block">{{ $bill_item->discount }}</td>
@stack('discount_td_end')
@endif
@stack('total_td_start')
<td class="col-xs-4 col-sm-3 text-right pr-5">@money($bill_item->total, $bill->currency_code, true)</td>
@stack('total_td_end')
</tr>
@foreach($bill->items as $item)
@include('partials.documents.item.show', ['document' => $bill])
@endforeach
</tbody>
</table>

2
resources/views/purchases/payments/create.blade.php
View File

@ -22,7 +22,7 @@
{!! Form::hidden('currency_code', $account_currency_code, ['id' => 'currency_code', 'class' => 'form-control', 'required' => 'required']) !!}
{!! Form::hidden('currency_rate', '1', ['id' => 'currency_rate']) !!}
{{ Form::moneyGroup('amount', trans('general.amount'), 'money-bill-alt', ['required' => 'required', 'currency' => $currency], 0.00) }}
{{ Form::moneyGroup('amount', trans('general.amount'), 'money-bill-alt', ['required' => 'required', 'currency' => $currency, 'dynamic-currency' => 'currency'], 0.00) }}
{{ Form::selectAddNewGroup('account_id', trans_choice('general.accounts', 1), 'university', $accounts, setting('default.account'), ['required' => 'required', 'path' => route('modals.accounts.create'), 'change' => 'onChangeAccount']) }}

2
resources/views/purchases/payments/edit.blade.php
View File

@ -41,7 +41,7 @@
{!! Form::hidden('currency_code', $payment->currency_code, ['id' => 'currency_code', 'class' => 'form-control', 'required' => 'required']) !!}
{!! Form::hidden('currency_rate', null, ['id' => 'currency_rate']) !!}
{{ Form::moneyGroup('amount', trans('general.amount'), 'money-bill-alt', ['required' => 'required', 'autofocus' => 'autofocus', 'currency' => $currency], $payment->amount) }}
{{ Form::moneyGroup('amount', trans('general.amount'), 'money-bill-alt', ['required' => 'required', 'autofocus' => 'autofocus', 'currency' => $currency, 'dynamic-currency' => 'currency'], $payment->amount) }}
{{ Form::selectAddNewGroup('account_id', trans_choice('general.accounts', 1), 'university', $accounts, $payment->account_id, ['required' => 'required', 'path' => route('modals.accounts.create'), 'change' => 'onChangeAccount']) }}

10
resources/views/purchases/payments/index.blade.php
View File

@ -92,15 +92,17 @@
<a class="dropdown-item" href="{{ route('payments.edit', $item->id) }}">{{ trans('general.edit') }}</a>
<div class="dropdown-divider"></div>
@endif
@if (empty($item->document_id))
@permission('create-purchases-payments')
<a class="dropdown-item" href="{{ route('payments.duplicate', $item->id) }}">{{ trans('general.duplicate') }}</a>
<div class="dropdown-divider"></div>
@endpermission
@endif
@if (!$item->reconciled)
@permission('delete-purchases-payments')
@if (!$item->reconciled)
<div class="dropdown-divider"></div>
{!! Form::deleteLink($item, 'payments.destroy') !!}
@endif
{!! Form::deleteLink($item, 'payments.destroy') !!}
@endpermission
@endif
</div>
</div>
</td>

2
resources/views/reports/profit_loss/content/footer.blade.php
View File

@ -2,7 +2,7 @@
<table class="table table-hover align-items-center rp-border-collapse">
<tfoot class="border-top-style">
<tr class="row rp-border-top-1 font-size-unset px-3">
<th class="{{ $class->column_name_width }} text-uppercase text-nowrap border-top-0">{{ trans('reports.net_profit') }}</th>
<th class="{{ $class->column_name_width }} text-uppercase text-left border-top-0">{{ trans('reports.net_profit') }}</th>
@foreach($class->net_profit as $profit)
<th class="{{ $class->column_value_width }} text-right px-0 border-top-0">@money($profit, setting('default.currency'), true)</th>
@endforeach

8
resources/views/reports/profit_loss/table/footer.blade.php
View File

@ -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 mb-3">
<th class="{{ $class->column_name_width }} text-uppercase">{{ trans_choice('general.totals', 1) }}</th>
@php $grand_total = 0; @endphp
@foreach($class->footer_totals[$table] as $date => $total)
@php $grand_total += $total; @endphp
<th class="{{ $class->column_name_width }} text-uppercase text-left">{{ trans_choice('general.totals', 1) }}</th>
@foreach($class->footer_totals[$table] as $total)
<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>

6
resources/views/reports/tax_summary/content/header.blade.php
View File

@ -1,10 +1,10 @@
<div class="table-responsive">
<div class="table-responsive mt-4">
<table class="table table-hover align-items-center rp-border-collapse">
<thead class="border-top-style">
<tr class="row rp-border-bottom-1 font-size-unset px-3">
<th class="{{ $class->column_name_width }} text-right border-top-0 rp-border-bottom-1"></th>
<th class="{{ $class->column_name_width }} text-right px-0 border-top-0"></th>
@foreach($class->dates as $date)
<th class="{{ $class->column_value_width }} text-right px-0 border-top-0 rp-border-bottom-1">{{ $date }}</th>
<th class="{{ $class->column_value_width }} text-right px-0 border-top-0">{{ $date }}</th>
@endforeach
<th class="{{ $class->column_name_width }} text-right pl-0 pr-4 border-top-0 rp-border-bottom-1">{{ trans_choice('general.totals', 1) }}</th>
</tr>

8
resources/views/reports/tax_summary/table/footer.blade.php
View File

@ -1,9 +1,9 @@
@php $grand_total = array_sum($class->footer_totals[$table]); @endphp
<tfoot>
<tr class="row rp-border-bottom-1 font-size-unset px-3">
<th class="{{ $class->column_name_width }} text-left">{{ trans('reports.net') }}</th>
@php $grand_total = 0; @endphp
<tr class="row rp-border-top-1 font-size-unset px-3 mb-3">
<th class="{{ $class->column_name_width }} text-uppercase text-left">{{ trans('reports.net') }}</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>

2
resources/views/reports/tax_summary/table/header.blade.php
View File

@ -1,4 +1,4 @@
<thead class="border-top-style mt-4">
<thead class="border-top-style">
<tr>
<th class="rp-float-left" colspan="{{ count($class->dates) + 2 }}">
<h4>{{ $table }}</h4>

25
resources/views/sales/invoices/print_classic.blade.php
View File

@ -145,29 +145,8 @@
</tr>
</thead>
<tbody>
@foreach($invoice->items as $invoice_item)
<tr>
@stack('name_td_start')
<td class="item">
{{ $invoice_item->name }}
@if (!empty($invoice_item->item->description))
<br><small>{!! \Illuminate\Support\Str::limit($invoice_item->item->description, 500) !!}</small>
@endif
</td>
@stack('name_td_end')
@stack('quantity_td_start')
<td class="quantity">{{ $invoice_item->quantity }}</td>
@stack('quantity_td_end')
@stack('price_td_start')
<td class="price">@money($invoice_item->price, $invoice->currency_code, true)</td>
@stack('price_td_end')
@stack('total_td_start')
<td class="total">@money($invoice_item->total, $invoice->currency_code, true)</td>
@stack('total_td_end')
</tr>
@foreach($invoice->items as $item)
@include('partials.documents.item.print', ['document' => $invoice])
@endforeach
</tbody>
</table>

25
resources/views/sales/invoices/print_default.blade.php
View File

@ -132,29 +132,8 @@
</tr>
</thead>
<tbody>
@foreach($invoice->items as $invoice_item)
<tr>
@stack('name_td_start')
<td class="item">
{{ $invoice_item->name }}
@if (!empty($invoice_item->item->description))
<br><small>{!! \Illuminate\Support\Str::limit($invoice_item->item->description, 500) !!}</small>
@endif
</td>
@stack('name_td_end')
@stack('quantity_td_start')
<td class="quantity">{{ $invoice_item->quantity }}</td>
@stack('quantity_td_end')
@stack('price_td_start')
<td class="price">@money($invoice_item->price, $invoice->currency_code, true)</td>
@stack('price_td_end')
@stack('total_td_start')
<td class="total">@money($invoice_item->total, $invoice->currency_code, true)</td>
@stack('total_td_end')
</tr>
@foreach($invoice->items as $item)
@include('partials.documents.item.print', ['document' => $invoice])
@endforeach
</tbody>
</table>

25
resources/views/sales/invoices/print_modern.blade.php
View File

@ -114,29 +114,8 @@
</tr>
</thead>
<tbody>
@foreach($invoice->items as $invoice_item)
<tr>
@stack('name_td_start')
<td class="item">
{{ $invoice_item->name }}
@if (!empty($invoice_item->item->description))
<br><small>{!! \Illuminate\Support\Str::limit($invoice_item->item->description, 500) !!}</small>
@endif
</td>
@stack('name_td_end')
@stack('quantity_td_start')
<td class="quantity">{{ $invoice_item->quantity }}</td>
@stack('quantity_td_end')
@stack('price_td_start')
<td class="price">@money($invoice_item->price, $invoice->currency_code, true)</td>
@stack('price_td_end')
@stack('total_td_start')
<td class="total">@money($invoice_item->total, $invoice->currency_code, true)</td>
@stack('total_td_end')
</tr>
@foreach($invoice->items as $item)
@include('partials.documents.item.print', ['document' => $invoice])
@endforeach
</tbody>
</table>

31
resources/views/sales/invoices/show.blade.php
View File

@ -366,35 +366,8 @@
<th class="col-xs-4 col-sm-3 text-right pr-5">{{ trans('invoices.total') }}</th>
@stack('total_th_end')
</tr>
@foreach($invoice->items as $invoice_item)
<tr class="d-flex flex-nowrap">
@stack('name_td_start')
<td class="col-xs-4 col-sm-5 pl-5">
{{ $invoice_item->name }}
@if (!empty($invoice_item->item->description))
<br><small class="text-pre-nowrap">{!! \Illuminate\Support\Str::limit($invoice_item->item->description, 500) !!}<small>
@endif
</td>
@stack('name_td_end')
@stack('quantity_td_start')
<td class="col-xs-4 col-sm-1 text-center">{{ $invoice_item->quantity }}</td>
@stack('quantity_td_end')
@stack('price_td_start')
<td class="col-sm-3 text-right d-none d-sm-block">@money($invoice_item->price, $invoice->currency_code, true)</td>
@stack('price_td_end')
@if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both']))
@stack('discount_td_start')
<td class="col-sm-1 text-center d-none d-sm-block">{{ $invoice_item->discount }}</td>
@stack('discount_td_end')
@endif
@stack('total_td_start')
<td class="col-xs-4 col-sm-3 text-right pr-5">@money($invoice_item->total, $invoice->currency_code, true)</td>
@stack('total_td_end')
</tr>
@foreach($invoice->items as $item)
@include('partials.documents.item.show', ['document' => $invoice])
@endforeach
</tbody>
</table>

2
resources/views/sales/revenues/create.blade.php
View File

@ -22,7 +22,7 @@
{!! Form::hidden('currency_code', $account_currency_code, ['id' => 'currency_code', 'class' => 'form-control', 'required' => 'required']) !!}
{!! Form::hidden('currency_rate', '1', ['id' => 'currency_rate']) !!}
{{ Form::moneyGroup('amount', trans('general.amount'), 'money-bill-alt', ['required' => 'required', 'autofocus' => 'autofocus', 'currency' => $currency], 0) }}
{{ Form::moneyGroup('amount', trans('general.amount'), 'money-bill-alt', ['required' => 'required', 'autofocus' => 'autofocus', 'currency' => $currency, 'dynamic-currency' => 'currency'], 0) }}
{{ Form::selectAddNewGroup('account_id', trans_choice('general.accounts', 1), 'university', $accounts, setting('default.account'), ['required' => 'required', 'path' => route('modals.accounts.create'), 'change' => 'onChangeAccount']) }}

2
resources/views/sales/revenues/edit.blade.php
View File

@ -41,7 +41,7 @@
{!! Form::hidden('currency_code', $revenue->currency_code, ['id' => 'currency_code', 'class' => 'form-control', 'required' => 'required']) !!}
{!! Form::hidden('currency_rate', null, ['id' => 'currency_rate']) !!}
{{ Form::moneyGroup('amount', trans('general.amount'), 'money-bill-alt', ['required' => 'required', 'autofocus' => 'autofocus', 'currency' => $currency], $revenue->amount) }}
{{ Form::moneyGroup('amount', trans('general.amount'), 'money-bill-alt', ['required' => 'required', 'autofocus' => 'autofocus', 'currency' => $currency, 'dynamic-currency' => 'currency'], $revenue->amount) }}
{{ Form::selectAddNewGroup('account_id', trans_choice('general.accounts', 1), 'university', $accounts, $revenue->account_id, ['required' => 'required', 'path' => route('modals.accounts.create'), 'change' => 'onChangeAccount']) }}

10
resources/views/sales/revenues/index.blade.php
View File

@ -92,15 +92,17 @@
<a class="dropdown-item" href="{{ route('revenues.edit', $item->id) }}">{{ trans('general.edit') }}</a>
<div class="dropdown-divider"></div>
@endif
@if (empty($item->document_id))
@permission('create-sales-revenues')
<a class="dropdown-item" href="{{ route('revenues.duplicate', $item->id) }}">{{ trans('general.duplicate') }}</a>
<div class="dropdown-divider"></div>
@endpermission
@endif
@if (!$item->reconciled)
@permission('delete-sales-revenues')
@if (!$item->reconciled)
<div class="dropdown-divider"></div>
{!! Form::deleteLink($item, 'revenues.destroy') !!}
@endif
{!! Form::deleteLink($item, 'revenues.destroy') !!}
@endpermission
@endif
</div>
</div>
</td>

2
resources/views/widgets/account_balance.blade.php
View File

@ -13,7 +13,7 @@
<tbody class="thead-light">
@foreach($accounts as $item)
<tr class="row border-top-1 tr-py">
<td class="col-xs-6 col-md-6 text-left">{{ $item->name }}</td>
<td class="col-xs-6 col-md-6 text-left long-texts">{{ $item->name }}</td>
<td class="col-xs-6 col-md-6 text-right">@money($item->balance, $item->currency_code, true)</td>
</tr>
@endforeach

2
resources/views/widgets/latest_expenses.blade.php
View File

@ -17,7 +17,7 @@
@foreach($transactions as $item)
<tr class="row border-top-1 tr-py">
<td class="col-xs-4 col-md-4 text-left">@date($item->paid_at)</td>
<td class="col-xs-4 col-md-4 text-left">{{ $item->category->name }}</td>
<td class="col-xs-4 col-md-4 text-left long-texts">{{ $item->category->name }}</td>
<td class="col-xs-4 col-md-4 text-right">@money($item->amount, $item->currency_code, true)</td>
</tr>
@endforeach

2
resources/views/widgets/latest_income.blade.php
View File

@ -17,7 +17,7 @@
@foreach($transactions as $item)
<tr class="row border-top-1 tr-py">
<td class="col-xs-4 col-md-4 text-left">@date($item->paid_at)</td>
<td class="col-xs-4 col-md-4 text-left">{{ $item->category->name }}</td>
<td class="col-xs-4 col-md-4 text-left long-texts">{{ $item->category->name }}</td>
<td class="col-xs-4 col-md-4 text-right">@money($item->amount, $item->currency_code, true)</td>
</tr>
@endforeach