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

Merge branch 'master' of github.com:akaunting/akaunting into 2.1-dev

Browse Source
This commit is contained in:
Cüneyt Şentürk
2020-09-08 11:11:36 +03:00
parent a3b5cc7ddd 496b28f971
commit f62374b0d4
48 changed files with 1230 additions and 279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/assets/js/components/AkauntingCarousel.vue
View File

@@ -65,7 +65,7 @@ export default {
},
initial_index: {
type: Number,
default: 1,
default: 0,
description: "index of the initially active slide (starting from 0)"
},
trigger: {

8
resources/assets/js/components/AkauntingSelect.vue
View File

@@ -980,6 +980,10 @@ export default {
}
this.$emit('interface', this.real_model);
setTimeout(function() {
this.change();
}.bind(this), 800);
},
methods: {
@@ -1218,6 +1222,8 @@ export default {
} else {
this.real_model = value.toString();
}
this.change();
},
model: function (value) {
@@ -1226,6 +1232,8 @@ export default {
} else {
this.real_model = value.toString();
}
this.change();
}
},
}

4
resources/assets/js/components/AkauntingSelectRemote.vue
View File

@@ -616,6 +616,10 @@ export default {
}
this.$emit('interface', this.real_model);
setTimeout(function() {
this.change();
}.bind(this), 800);
},
methods: {

4
resources/assets/js/views/modules/apps.js vendored
View File

@@ -32,6 +32,10 @@ const app = new Vue({
methods: {
onChangeCategory(category) {
if (!category.length) {
return;
}
let path = document.getElementById('category_page').value;
if (category != '*') {

4
resources/assets/js/views/modules/item.js vendored
View File

@@ -61,6 +61,10 @@ const app = new Vue({
methods: {
onChangeCategory(category) {
if (!category.length) {
return;
}
let path = document.getElementById('category_page').value;
if (category != '*') {

14
resources/assets/js/views/purchases/bills.js vendored
View File

@@ -46,6 +46,7 @@ const app = new Vue({
edit: {
status: false,
currency: false,
items: false,
},
}
},
@@ -54,6 +55,7 @@ const app = new Vue({
if ((document.getElementById('items') != null) && (document.getElementById('items').rows)) {
this.colspan = document.getElementById("items").rows[0].cells.length - 1;
}
this.form.items = [];
if (this.form.method) {
@@ -92,6 +94,10 @@ const app = new Vue({
methods: {
onChangeContact(contact_id) {
if (!contact_id) {
return;
}
if (this.edit.status && !this.edit.currency) {
this.edit.currency = true;
@@ -226,7 +232,7 @@ const app = new Vue({
// set global total variable.
this.totals.sub = sub_total;
this.totals.tax = tax_total;
this.totals.tax = Math.abs(tax_total);
this.totals.item_discount = line_item_discount_total;
// Apply discount to total
@@ -285,6 +291,12 @@ const app = new Vue({
},
onSelectItem(item, index) {
if (this.edit.status && !this.edit.items) {
this.edit.items = true;
return;
}
let tax_id = (item.tax_id) ? [item.tax_id.toString()] : '';
this.form.items[index].item_id = item.id;

11
resources/assets/js/views/sales/invoices.js vendored
View File

@@ -46,6 +46,7 @@ const app = new Vue({
edit: {
status: false,
currency: false,
items: false,
},
}
},
@@ -93,6 +94,10 @@ const app = new Vue({
methods: {
onChangeContact(contact_id) {
if (!contact_id) {
return;
}
if (this.edit.status && !this.edit.currency) {
this.edit.currency = true;
@@ -286,6 +291,12 @@ const app = new Vue({
},
onSelectItem(item, index) {
if (this.edit.status && !this.edit.items) {
this.edit.items = true;
return;
}
let tax_id = (item.tax_id) ? [item.tax_id.toString()] : '';
this.form.items[index].item_id = item.id;

2
resources/lang/da-DK/bills.php
View File

@@ -52,7 +52,7 @@ return [
'marked_received' => 'Regning markeret som modtaget',
'marked_paid' => 'Regning markeret som betalt',
'marked_cancelled' => 'Regning markeret som annulleret',
'draft' => 'Dette er et <b>UDKAST</b> til faktura og vil blive afspejlet i diagrammer, når den bliver modtaget.',
'draft' => 'Dette er et <b>UDKAST</b> til faktura og vil først blive vist i oversigten, når den er afsendt.',
'status' => [
'created' => 'Oprettet den :date',

4
resources/lang/da-DK/general.php
View File

@@ -7,7 +7,7 @@ return [
'incomes' => 'Indkomst|Indkomster',
'invoices' => 'Faktura|Fakturaer',
'revenues' => 'Indtægt|Indtægter',
'customers' => 'Kunde|Kunder',
'customers' => 'Medlem|Medlemmer',
'expenses' => 'Udgift|Udgifter',
'bills' => 'Regning|Regninger',
'payments' => 'Betaling|Betalinger',
@@ -195,7 +195,7 @@ return [
'invoices' => 'Faktura kan være engang eller gentagne. Du kan sende dem til kunder og begynde at modtage onlinebetaling.',
'revenues' => 'Omsætning er en betalt indtægts-transaktion. Det kan være en uafhængig post (ei. deponering) eller tilføjet til en faktura.',
'customers' => 'Kunder er obligatorisk hvis du vil oprette en faktura. De kan også logge ind i klientportalen og se deres balance.',
'bills' => 'Regninger kan være engang eller gentagne. De indikerer at du skylder leverandører for produkter eller services du har købt.',
'bills' => 'Regninger kan være en-gangs eller gentagne. De indikerer at du skylder leverandører for produkter eller services du har købt.',
'payments' => 'Betaling er en betalt udgiftstransaktion. Det kan være en uafhængig post (ie. kassebon) eller tilføjet til en regning.',
'vendors' => 'Leverandører er obligatorisk hvis du vil oprette en regning. Du kan se balancen og filtrere reporten efter leverandør.',
'transfers' => 'Overførsel tillader dig at flytte penge fra en konto til en anden, uanset om du bruger samme valuta eller ej.',

2
resources/lang/da-DK/invoices.php
View File

@@ -59,7 +59,7 @@ return [
'marked_viewed' => 'Faktura markeret som set!',
'marked_cancelled' => 'Faktura markeret som annulleret!',
'email_required' => 'Ingen E-mail-adresse for kunden!',
'draft' => 'Dette er et <b>UDKAST</b> til faktura og vil blive vist som diagrammer, når det bliver sendt.',
'draft' => 'Dette er et <b>UDKAST</b> til faktura og vil først blive vist i oversigten, når den er sendt.',
'status' => [
'created' => 'Oprettet den :date',

1
resources/lang/da-DK/reconciliations.php
View File

@@ -3,6 +3,7 @@
return [
'reconcile' => 'Afstemme',
'unreconcile' => 'Uafsem',
'reconciled' => 'Afstemt',
'opening_balance' => 'Åbningsbalance',
'closing_balance' => 'Primo saldo',

2
resources/lang/da-DK/settings.php
View File

@@ -67,7 +67,7 @@ return [
'default' => [
'description' => 'Standard konto, valuta og sprog',
'list_limit' => 'Poster pr side',
'use_gravatar' => 'Brug Gravatar',
'use_gravatar' => 'Brug standard-ikoner (Gravatar)',
],
'email' => [

2
resources/lang/de-DE/bulk_actions.php
View File

@@ -16,6 +16,8 @@ return [
'sent' => 'Sind Sie sicher das Sie die ausgewählte Rechnung als <b>versendet</b> markieren möchten?|Sind Sie sicher das Sie die ausgewählten Rechnungen als <b>versendet</b> markieren möchten?',
'received' => 'Sind Sie sicher das Sie die ausgewählte Rechnung als <b>empfangen</b> markieren möchten?|Sind Sie sicher das Sie die ausgewählten Rechnungen als <b>empfangen</b> markieren möchten?',
'cancelled' => 'Sind Sie sicher das Sie die ausgewählte Rechnung <b>stornieren</b> möchten?|Sind Sie sicher das Sie die ausgewählten Rechnungen <b>stornieren</b> möchten?',
'reconcile' => 'Sind Sie sicher das Sie den ausgewählten Datensatz <b>abgleichen</b> möchten?|Sind Sie sicher das Sie die ausgewählten Datensätze <b>abgleichen</b> möchten?',
'unreconcile' => 'Sind Sie sicher das Sie den ausgewählten Datensatz <b>nicht abgleichen</b> möchten?|Sind Sie sicher das Sie die ausgewählten Datensätze <b>nicht abgleichen</b> möchten?',
],
];

2
resources/lang/de-DE/reconciliations.php
View File

@@ -3,7 +3,9 @@
return [
'reconcile' => 'Abstimmen',
'unreconcile' => 'Nicht abgeglichen',
'reconciled' => 'Abgeglichen',
'opening_balance' => 'Eröffnungssaldo',
'closing_balance' => 'Endsaldo',
'unreconciled' => 'Nicht abgeglichen',
'transactions' => 'Transaktionen',

4
resources/lang/fr-FR/general.php
View File

@@ -3,7 +3,7 @@
return [
'dashboards' => 'Tableau de bord|Tableaux de bord',
'items' => 'Marchandise|Marchandises',
'items' => 'Article|Articles',
'incomes' => 'Revenu|Revenus',
'invoices' => 'Facture|Factures',
'revenues' => 'Recettes|Chiffre d’affaires',
@@ -40,7 +40,7 @@ return [
'statuses' => 'Statut | Statuts',
'others' => 'Autre|Autres',
'contacts' => 'Contact|Contacts',
'reconciliations' => 'Conciliation|Conciliations',
'reconciliations' => 'Réconciliation|Réconciliations',
'developers' => 'Développeur|Développeurs',
'schedules' => 'Planification|Planifications',
'groups' => 'Groupe|Groupes',

2
resources/lang/hi-IN/reconciliations.php
View File

@@ -3,7 +3,9 @@
return [
'reconcile' => 'मेल-मिलाप',
'unreconcile' => 'असंतुष्ट',
'reconciled' => 'मेल मिलाप',
'opening_balance' => 'प्रारंभिक बैलेंस',
'closing_balance' => 'समाप्ति के समय बैलेंस',
'unreconciled' => 'असंतुष्ट',
'transactions' => 'लेन-देन',

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

@@ -33,7 +33,7 @@
{!! Form::close() !!}
</div>
<div class="card">
<div id="reconciliations-table" class="card">
<div class="card-header border-0">
<h3 class="mb-0">{{ trans_choice('general.transactions', 2) }}</h3>
</div>

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

@@ -3,7 +3,7 @@
@section('title', trans('general.title.edit', ['type' => trans_choice('general.reconciliations', 1)]))
@section('content')
<div class="card">
<div id="reconciliations-table" class="card">
{!! Form::model($reconciliation, [
'id' => 'reconciliation',
'method' => 'PATCH',

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

@@ -34,31 +34,27 @@
<thead class="thead-light">
<tr class="row table-head-line">
<th class="col-sm-2 col-md-2 d-none d-sm-block">@sortablelink('paid_at', trans('general.date'))</th>
<th class="col-xs-4 col-sm-3 col-md-2">@sortablelink('account.name', trans_choice('general.accounts', 1))</th>
<th class="col-xs-4 col-sm-2 col-md-2 text-right">@sortablelink('amount', trans('general.amount'))</th>
<th class="col-xs-4 col-sm-3 col-md-2">@sortablelink('type', trans_choice('general.types', 1))</th>
<th class="col-sm-2 col-md-2 d-none d-sm-block">@sortablelink('category.name', trans_choice('general.categories', 1))</th>
<th class="col-xs-4 col-sm-3 col-md-2">@sortablelink('account.name', trans_choice('general.accounts', 1))</th>
<th class="col-md-2 d-none d-md-block">@sortablelink('description', trans('general.description'))</th>
<th class="col-xs-4 col-sm-2 col-md-2 text-right">@sortablelink('amount', trans('general.amount'))</th>
</tr>
</thead>
<tbody>
@foreach($transactions as $item)
<tr class="row align-items-center border-top-1 tr-py">
<td class="col-sm-2 col-md-2 d-none d-sm-block">@date($item->paid_at)</td>
<td class="col-xs-4 col-sm-3 col-md-2">{{ $item->account->name }}</td>
<td class="col-xs-4 col-sm-3 col-md-2">{{ $item->type_title }}</td>
<td class="col-sm-2 col-md-2 d-none d-sm-block">{{ $item->category->name }}</td>
<td class="col-md-2 d-none d-md-block long-texts">{{ $item->description }}</td>
<td class="col-xs-4 col-sm-2 col-md-2 text-right">
@php
$id = !empty($item->document_id) ? $item->document_id : $item->id;
$route = ($item->type == 'income') ? (!empty($item->document_id) ? 'invoices.show' : 'revenues.edit') : (!empty($item->document_id) ? 'bills.show' : 'payments.edit');
@endphp
<a href="{{ route($route, $id) }}">
@money($item->amount, $item->currency_code, true)
<td class="col-sm-2 col-md-2 d-none d-sm-block">
<a href="{{ route($item->route_name, $item->route_id) }}">
@date($item->paid_at)
</a>
</td>
<td class="col-xs-4 col-sm-2 col-md-2 text-right">@money($item->amount, $item->currency_code, true)</td>
<td class="col-xs-4 col-sm-3 col-md-2">{{ $item->type_title }}</td>
<td class="col-sm-2 col-md-2 d-none d-sm-block">{{ $item->category->name }}</td>
<td class="col-xs-4 col-sm-3 col-md-2">{{ $item->account->name }}</td>
<td class="col-md-2 d-none d-md-block long-texts">{{ $item->description }}</td>
</tr>
@endforeach
</tbody>

2
resources/views/partials/form/enabled_group.blade.php
View File

@@ -1,6 +1,6 @@
@stack($name . '_input_start')
<label class="custom-toggle">
<label class="custom-toggle d-inline-block">
<input type="checkbox"
name="status[{{ $id }}]"
@input="onStatus({{ $id }}, $event)"

2
resources/views/partials/media/file.blade.php
View File

@@ -37,7 +37,7 @@
@endif
@endpermission
<a href="{{ rotue('uploads.download', $file->id) }}" type="button" class="btn btn-sm btn-info text-white header-button-top">
<a href="{{ route('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>

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

@@ -36,11 +36,11 @@
<thead class="thead-light">
<tr class="row table-head-line">
<th class="col-sm-2 col-md-2 col-lg-1 col-xl-1 d-none d-sm-block">{{ Form::bulkActionAllGroup() }}</th>
<th class="col-xs-4 col-sm-4 col-md-3 col-lg-2 col-xl-1">@sortablelink('paid_at', trans('general.date'), ['filter' => 'active, visible'], ['class' => 'col-aka', 'rel' => 'nofollow'])</th>
<th class="col-xs-4 col-sm-4 col-md-3 col-lg-1 col-xl-1">@sortablelink('paid_at', trans('general.date'), ['filter' => 'active, visible'], ['class' => 'col-aka', 'rel' => 'nofollow'])</th>
<th class="col-xs-4 col-sm-4 col-md-3 col-lg-2 col-xl-2 text-right">@sortablelink('amount', trans('general.amount'))</th>
<th class="col-md-2 col-lg-2 col-xl-4 d-none d-md-block text-left">@sortablelink('contact.name', trans_choice('general.vendors', 1))</th>
<th class="col-md-2 col-lg-3 col-xl-3 d-none d-md-block text-left">@sortablelink('contact.name', trans_choice('general.vendors', 1))</th>
<th class="col-lg-2 col-xl-2 d-none d-lg-block text-left">@sortablelink('category.name', trans_choice('general.categories', 1))</th>
<th class="col-lg-2 col-xl-1 d-none d-lg-block text-left">@sortablelink('account.name', trans_choice('general.accounts', 1))</th>
<th class="col-lg-2 col-xl-2 d-none d-lg-block text-left">@sortablelink('account.name', trans_choice('general.accounts', 1))</th>
<th class="col-xs-4 col-sm-2 col-md-2 col-lg-1 col-xl-1 text-center"><a>{{ trans('general.actions') }}</a></th>
</tr>
</thead>
@@ -50,12 +50,12 @@
<tr class="row align-items-center border-top-1">
<td class="col-sm-2 col-md-2 col-lg-1 col-xl-1 d-none d-sm-block">{{ Form::bulkActionGroup($item->id, $item->contact->name) }}</td>
@if ($item->reconciled)
<td class="col-xs-4 col-sm-4 col-md-3 col-lg-2 col-xl-1"><a class="col-aka" href="#">@date($item->paid_at)</a></td>
<td class="col-xs-4 col-sm-4 col-md-3 col-lg-1 col-xl-1"><a class="col-aka" href="#">@date($item->paid_at)</a></td>
@else
<td class="col-xs-4 col-sm-4 col-md-3 col-lg-2 col-xl-1"><a class="col-aka" href="{{ route('payments.edit', $item->id) }}">@date($item->paid_at)</a></td>
<td class="col-xs-4 col-sm-4 col-md-3 col-lg-1 col-xl-1"><a class="col-aka" href="{{ route('payments.edit', $item->id) }}">@date($item->paid_at)</a></td>
@endif
<td class="col-xs-4 col-sm-4 col-md-3 col-lg-2 col-xl-2 text-right">@money($item->amount, $item->currency_code, true)</td>
<td class="col-md-2 col-lg-2 col-xl-4 d-none d-md-block text-left">
<td class="col-md-2 col-lg-3 col-xl-3 d-none d-md-block text-left">
{{ $item->contact->name }}
@if($item->bill)
@@ -81,7 +81,7 @@
@endif
</td>
<td class="col-lg-2 col-xl-2 d-none d-lg-block text-left">{{ $item->category->name }}</td>
<td class="col-lg-2 col-xl-1 d-none d-lg-block text-left">{{ $item->account->name }}</td>
<td class="col-lg-2 col-xl-2 d-none d-lg-block text-left">{{ $item->account->name }}</td>
<td class="col-xs-4 col-sm-2 col-md-2 col-lg-1 col-xl-1 text-center">
<div class="dropdown">
<a class="btn btn-neutral btn-sm text-light items-align-center py-2" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">

30
resources/views/purchases/vendors/index.blade.php vendored
View File

@@ -36,11 +36,10 @@
<thead class="thead-light">
<tr class="row table-head-line">
<th class="col-sm-2 col-md-1 col-lg-1 col-xl-1 d-none d-sm-block">{{ Form::bulkActionAllGroup() }}</th>
<th class="col-xs-4 col-sm-3 col-md-3 col-lg-3 col-xl-2">@sortablelink('name', trans('general.name'), ['filter' => 'active, visible'], ['class' => 'col-aka', 'rel' => 'nofollow'])</th>
<th class="col-md-2 col-lg-2 col-xl-3 d-none d-md-block">@sortablelink('email', trans('general.email'))</th>
<th class="col-sm-3 col-md-2 col-lg-2 col-xl-2 d-none d-sm-block">@sortablelink('phone', trans('general.phone'))</th>
<th class="col-lg-2 col-xl-2 text-right d-none d-lg-block">@sortablelink('unpaid', trans('general.unpaid'))</th>
<th class="col-xs-4 col-sm-2 col-md-2 col-lg-1 col-xl-1 text-center">@sortablelink('enabled', trans('general.enabled'))</th>
<th class="col-xs-4 col-sm-3 col-md-4 col-lg-3 col-xl-3">@sortablelink('name', trans('general.name'), ['filter' => 'active, visible'], ['class' => 'col-aka', 'rel' => 'nofollow'])</th>
<th class="col-md-3 col-lg-3 col-xl-3 d-none d-md-block">@sortablelink('email', trans('general.email'))</th>
<th class="col-lg-2 col-xl-2 d-none d-lg-block text-right">@sortablelink('unpaid', trans('general.unpaid'))</th>
<th class="col-xs-4 col-sm-2 col-md-2 col-lg-2 col-xl-2 text-center">@sortablelink('enabled', trans('general.enabled'))</th>
<th class="col-xs-4 col-sm-2 col-md-2 col-lg-1 col-xl-1 text-center">{{ trans('general.actions') }}</th>
</tr>
</thead>
@@ -51,26 +50,27 @@
<td class="col-sm-2 col-md-1 col-lg-1 col-xl-1 d-none d-sm-block">
{{ Form::bulkActionGroup($item->id, $item->name) }}
</td>
<td class="col-xs-4 col-sm-3 col-md-3 col-lg-3 col-xl-2">
<td class="col-xs-4 col-sm-3 col-md-4 col-lg-3 col-xl-3">
<a class="col-aka" href="{{ route('vendors.show', $item->id) }}">{{ $item->name }}</a>
</td>
<td class="col-md-2 col-lg-2 col-xl-3 d-none d-md-block long-texts">
{{ !empty($item->email) ? $item->email : trans('general.na') }}
<td class="col-md-3 col-lg-3 col-xl-3 d-none d-md-block long-texts">
<el-tooltip content="{{ !empty($item->phone) ? $item->phone : trans('general.na') }}"
effect="dark"
placement="top">
<span>{{ !empty($item->email) ? $item->email : trans('general.na') }}</span>
</el-tooltip>
</td>
<td class="col-sm-3 col-md-2 col-lg-2 col-xl-2 d-none d-sm-block long-texts">
{{ $item->phone }}
</td>
<td class="col-lg-2 col-xl-2 text-right d-none d-lg-block long-texts">
<td class="col-lg-2 col-xl-2 d-none d-lg-block text-right long-texts">
@money($item->unpaid, setting('default.currency'), true)
</td>
<td class="col-xs-4 col-sm-2 col-md-2 col-lg-1 col-xl-1 text-center">
<td class="col-xs-4 col-sm-2 col-md-2 col-lg-2 col-xl-2 text-center">
@if (user()->can('update-purchases-vendors'))
{{ Form::enabledGroup($item->id, $item->name, $item->enabled) }}
@else
@if ($item->enabled)
<badge rounded type="success" class="mw-60">{{ trans('general.yes') }}</badge>
<badge rounded type="success" class="mw-60 d-inline-block">{{ trans('general.yes') }}</badge>
@else
<badge rounded type="danger" class="mw-60">{{ trans('general.no') }}</badge>
<badge rounded type="danger" class="mw-60 d-inline-block">{{ trans('general.no') }}</badge>
@endif
@endif
</td>

28
resources/views/sales/customers/index.blade.php
View File

@@ -36,11 +36,10 @@
<thead class="thead-light">
<tr class="row table-head-line">
<th class="col-sm-2 col-md-1 col-lg-1 col-xl-1 d-none d-sm-block">{{ Form::bulkActionAllGroup() }}</th>
<th class="col-xs-4 col-sm-3 col-md-3 col-lg-3 col-xl-2">@sortablelink('name', trans('general.name'), ['filter' => 'active, visible'], ['class' => 'col-aka', 'rel' => 'nofollow'])</th>
<th class="col-md-2 col-lg-2 col-xl-3 d-none d-md-block text-left">@sortablelink('email', trans('general.email'))</th>
<th class="col-sm-3 col-md-2 col-lg-2 col-xl-2 d-none d-sm-block text-left">@sortablelink('phone', trans('general.phone'))</th>
<th class="col-xs-4 col-sm-3 col-md-4 col-lg-3 col-xl-3">@sortablelink('name', trans('general.name'), ['filter' => 'active, visible'], ['class' => 'col-aka', 'rel' => 'nofollow'])</th>
<th class="col-md-3 col-lg-3 col-xl-3 d-none d-md-block">@sortablelink('email', trans('general.email'))</th>
<th class="col-lg-2 col-xl-2 d-none d-lg-block text-right">@sortablelink('unpaid', trans('general.unpaid'))</th>
<th class="col-xs-4 col-sm-2 col-md-2 col-lg-1 col-xl-1 text-center">@sortablelink('enabled', trans('general.enabled'))</th>
<th class="col-xs-4 col-sm-2 col-md-2 col-lg-2 col-xl-2 text-center">@sortablelink('enabled', trans('general.enabled'))</th>
<th class="col-xs-4 col-sm-2 col-md-2 col-lg-1 col-xl-1 text-center">{{ trans('general.actions') }}</th>
</tr>
</thead>
@@ -51,26 +50,27 @@
<td class="col-sm-2 col-md-1 col-lg-1 col-xl-1 d-none d-sm-block">
{{ Form::bulkActionGroup($item->id, $item->name) }}
</td>
<td class="col-xs-4 col-sm-3 col-md-3 col-lg-3 col-xl-2">
<td class="col-xs-4 col-sm-3 col-md-4 col-lg-3 col-xl-3">
<a class="col-aka" href="{{ route('customers.show', $item->id) }}">{{ $item->name }}</a>
</td>
<td class="col-md-2 col-lg-2 col-xl-3 d-none d-md-block long-texts text-left">
{{ !empty($item->email) ? $item->email : trans('general.na') }}
<td class="col-md-3 col-lg-3 col-xl-3 d-none d-md-block long-texts">
<el-tooltip content="{{ !empty($item->phone) ? $item->phone : trans('general.na') }}"
effect="dark"
placement="top">
<span>{{ !empty($item->email) ? $item->email : trans('general.na') }}</span>
</el-tooltip>
</td>
<td class="col-sm-3 col-md-2 col-lg-2 col-xl-2 d-none d-sm-block long-texts text-left">
{{ $item->phone }}
</td>
<td class="col-lg-2 col-xl-2 d-none d-lg-block long-texts text-right">
<td class="col-lg-2 col-xl-2 d-none d-lg-block text-right long-texts">
@money($item->unpaid, setting('default.currency'), true)
</td>
<td class="col-xs-4 col-sm-2 col-md-2 col-lg-1 col-xl-1 text-center">
<td class="col-xs-4 col-sm-2 col-md-2 col-lg-2 col-xl-2 text-center">
@if (user()->can('update-sales-customers'))
{{ Form::enabledGroup($item->id, $item->name, $item->enabled) }}
@else
@if ($item->enabled)
<badge rounded type="success" class="mw-60">{{ trans('general.yes') }}</badge>
<badge rounded type="success" class="mw-60 d-inline-block">{{ trans('general.yes') }}</badge>
@else
<badge rounded type="danger" class="mw-60">{{ trans('general.no') }}</badge>
<badge rounded type="danger" class="mw-60 d-inline-block">{{ trans('general.no') }}</badge>
@endif
@endif
</td>

12
resources/views/sales/invoices/index.blade.php
View File

@@ -36,9 +36,9 @@
<thead class="thead-light">
<tr class="row table-head-line">
<th class="col-sm-2 col-md-1 col-lg-1 col-xl-1 d-none d-sm-block">{{ Form::bulkActionAllGroup() }}</th>
<th class="col-md-2 col-lg-2 col-xl-1 d-none d-md-block">@sortablelink('invoice_number', trans_choice('general.numbers', 1), ['filter' => 'active, visible'], ['class' => 'col-aka', 'rel' => 'nofollow'])</th>
<th class="col-xs-4 col-sm-4 col-md-4 col-lg-2 col-xl-3 text-left">@sortablelink('contact_name', trans_choice('general.customers', 1))</th>
<th class="col-xs-4 col-sm-4 col-md-3 col-lg-1 col-xl-1 text-right">@sortablelink('amount', trans('general.amount'))</th>
<th class="col-md-2 col-lg-1 col-xl-1 d-none d-md-block">@sortablelink('invoice_number', trans_choice('general.numbers', 1), ['filter' => 'active, visible'], ['class' => 'col-aka', 'rel' => 'nofollow'])</th>
<th class="col-xs-4 col-sm-4 col-md-4 col-lg-2 col-xl-2 text-left">@sortablelink('contact_name', trans_choice('general.customers', 1))</th>
<th class="col-xs-4 col-sm-4 col-md-3 col-lg-2 col-xl-2 text-right">@sortablelink('amount', trans('general.amount'))</th>
<th class="col-lg-2 col-xl-2 d-none d-lg-block text-left">@sortablelink('invoiced_at', trans('invoices.invoice_date'))</th>
<th class="col-lg-2 col-xl-2 d-none d-lg-block text-left">@sortablelink('due_at', trans('invoices.due_date'))</th>
<th class="col-lg-1 col-xl-1 d-none d-lg-block text-center">@sortablelink('status', trans_choice('general.statuses', 1))</th>
@@ -51,9 +51,9 @@
@php $paid = $item->paid; @endphp
<tr class="row align-items-center border-top-1">
<td class="col-sm-2 col-md-1 col-lg-1 col-xl-1 d-none d-sm-block">{{ Form::bulkActionGroup($item->id, $item->invoice_number) }}</td>
<td class="col-md-2 col-lg-2 col-xl-1 d-none d-md-block"><a class="col-aka" href="{{ route('invoices.show' , $item->id) }}">{{ $item->invoice_number }}</a></td>
<td class="col-xs-4 col-sm-4 col-md-4 col-lg-2 col-xl-3 text-left">{{ $item->contact_name }}</td>
<td class="col-xs-4 col-sm-4 col-md-3 col-lg-1 col-xl-1 text-right">@money($item->amount, $item->currency_code, true)</td>
<td class="col-md-2 col-lg-1 col-xl-1 d-none d-md-block"><a class="col-aka" href="{{ route('invoices.show' , $item->id) }}">{{ $item->invoice_number }}</a></td>
<td class="col-xs-4 col-sm-4 col-md-4 col-lg-2 col-xl-2 text-left">{{ $item->contact_name }}</td>
<td class="col-xs-4 col-sm-4 col-md-3 col-lg-2 col-xl-2 text-right">@money($item->amount, $item->currency_code, true)</td>
<td class="col-lg-2 col-xl-2 d-none d-lg-block text-left">@date($item->invoiced_at)</td>
<td class="col-lg-2 col-xl-2 d-none d-lg-block text-left">@date($item->due_at)</td>
<td class="col-lg-1 col-xl-1 d-none d-lg-block text-center">

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

@@ -36,11 +36,11 @@
<thead class="thead-light">
<tr class="row table-head-line">
<th class="col-sm-2 col-md-2 col-lg-1 col-xl-1 d-none d-sm-block">{{ Form::bulkActionAllGroup() }}</th>
<th class="col-xs-4 col-sm-4 col-md-3 col-lg-2 col-xl-1">@sortablelink('paid_at', trans('general.date'), ['filter' => 'active, visible'], ['class' => 'col-aka', 'rel' => 'nofollow'])</th>
<th class="col-xs-4 col-sm-4 col-md-3 col-lg-1 col-xl-1">@sortablelink('paid_at', trans('general.date'), ['filter' => 'active, visible'], ['class' => 'col-aka', 'rel' => 'nofollow'])</th>
<th class="col-xs-4 col-sm-4 col-md-3 col-lg-2 col-xl-2 text-right">@sortablelink('amount', trans('general.amount'))</th>
<th class="col-md-2 col-lg-2 col-xl-4 d-none d-md-block text-left">@sortablelink('contact.name', trans_choice('general.customers', 1))</th>
<th class="col-md-2 col-lg-3 col-xl-3 d-none d-md-block text-left">@sortablelink('contact.name', trans_choice('general.customers', 1))</th>
<th class="col-lg-2 col-xl-2 d-none d-lg-block text-left">@sortablelink('category.name', trans_choice('general.categories', 1))</th>
<th class="col-lg-2 col-xl-1 d-none d-lg-block text-left">@sortablelink('account.name', trans_choice('general.accounts', 1))</th>
<th class="col-lg-2 col-xl-2 d-none d-lg-block text-left">@sortablelink('account.name', trans_choice('general.accounts', 1))</th>
<th class="col-xs-4 col-sm-2 col-md-2 col-lg-1 col-xl-1 text-center"><a>{{ trans('general.actions') }}</a></th>
</tr>
</thead>
@@ -55,7 +55,7 @@
<td class="col-xs-4 col-sm-4 col-md-3 col-lg-2 col-xl-1"><a class="col-aka" href="{{ route('revenues.edit', $item->id) }}">@date($item->paid_at)</a></td>
@endif
<td class="col-xs-4 col-sm-4 col-md-3 col-lg-2 col-xl-2 text-right">@money($item->amount, $item->currency_code, true)</td>
<td class="col-md-2 col-lg-2 col-xl-4 d-none d-md-block text-left">
<td class="col-md-2 col-lg-3 col-xl-3 d-none d-md-block text-left">
{{ $item->contact->name }}
@if($item->invoice)
@@ -81,7 +81,7 @@
@endif
</td>
<td class="col-lg-2 col-xl-2 d-none d-lg-block text-left">{{ $item->category->name }}</td>
<td class="col-lg-2 col-xl-1 d-none d-lg-block text-left">{{ $item->account->name }}</td>
<td class="col-lg-2 col-xl-2 d-none d-lg-block text-left">{{ $item->account->name }}</td>
<td class="col-xs-4 col-sm-2 col-md-2 col-lg-1 col-xl-1 text-center">
<div class="dropdown">
<a class="btn btn-neutral btn-sm text-light items-align-center py-2" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">

2
resources/views/settings/currencies/create.blade.php
View File

@@ -23,7 +23,7 @@
{{ Form::textGroup('rate', trans('currencies.rate'), 'sliders-h', ['@input' => 'onChangeRate', 'required' => 'required']) }}
{{ Form::selectGroup('precision', trans('currencies.precision'), 'dot-circle', $precisions) }}
{{ Form::selectGroup('precision', trans('currencies.precision'), 'dot-circle', $precisions, null, ['model' => 'form.precision']) }}
{{ Form::textGroup('symbol', trans('currencies.symbol.symbol'), 'font') }}

2
resources/views/settings/currencies/edit.blade.php
View File

@@ -24,7 +24,7 @@
{{ Form::textGroup('rate', trans('currencies.rate'), 'sliders-h', ['@input' => 'onChangeRate', 'required' => 'required']) }}
{{ Form::selectGroup('precision', trans('currencies.precision'), 'dot-circle', $precisions, $currency->precision) }}
{{ Form::selectGroup('precision', trans('currencies.precision'), 'dot-circle', $precisions, $currency->precision, ['model' => 'form.precision']) }}
{{ Form::textGroup('symbol', trans('currencies.symbol.symbol'), 'font') }}