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

Merge branch 'master' of https://github.com/brkcvn/akaunting into button-loading

Browse Source
This commit is contained in:
Burak Civan
2022-06-13 09:41:40 +03:00
parent 9dffcf849d 21162cadd2
commit ec257b07f7
43 changed files with 766 additions and 378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,7 +15,7 @@
ref="dropdownMenu"
@click="openPalette"
:class="`bg-${color}`"
:style="{ backgroundColor: color }"
:style="this.color.includes('#') ? `backgroundColor: ${color}` : `backgroundColor: #${color}`"
></div>
<transition name="fade">
@ -115,8 +115,6 @@ export default {
return {
isOpen: false,
color: 'green-500',
hexCode: null,
colors: [
'gray',
'red',
@ -174,13 +172,11 @@ export default {
setColor(event) {
this.isOpen = false;
this.color = event.target.getAttribute('colorid');
this.hexCode = null;
this.$refs.dropdownMenu.style = '';
},
addColor() {
let code = this.color;
this.hexCode = code.includes('#') ? code : '#' + code;
},
closeIfClickedOutside(event) {

27
resources/assets/sass/app.css vendored
View File

@ -309,7 +309,7 @@
border-bottom-right-radius: 4px;
cursor: pointer !important;
margin-top: 8px;
margin-bottom: 0 !important;
margin-bottom: -8px !important;
}
.el-select__footer:hover {
@ -330,11 +330,7 @@
}
.el-select-dropdown__list {
padding: 8px 0 0 0;
}
.el-select-dropdown__item:last-child {
margin-bottom: 8px;
padding: 8px 0 8px 0;
}
.el-select .el-select__tags {
@ -456,6 +452,25 @@ html[dir='rtl'] .el-input__suffix {
}
/* element-ui */
/* apex-chart */
.apexcharts-donut-custom span.apexcharts-legend-text {
display: -webkit-box !important;
-webkit-line-clamp: 1 !important;
-webkit-box-orient: vertical !important;
overflow: hidden !important;
height: 1rem !important;
}
.apexcharts-donut-custom .apexcharts-legend-series {
display: flex !important;
align-items: center !important;
}
.apexcharts-donut-custom .apexcharts-legend {
padding: 0 !important;
}
/* apex-chart */
/* collapse */
.active-collapse {
@apply opacity-100;

84
resources/lang/ca-ES/general.php
View File

@ -6,15 +6,20 @@ return [
'items' => 'Article|Articles',
'incomes' => 'Ingrés|Ingressos',
'invoices' => 'Factura|Factures',
'revenues' => 'Cobrament|Cobraments',
'recurring_invoices' => 'Factura recurrent|Factures recurrents',
'customers' => 'Client|Clients',
'incomes' => 'Ingrés|Ingressos',
'recurring_incomes' => 'Ingrés recurrent|Ingressos recurrents',
'expenses' => 'Despesa|Despeses',
'recurring_expenses' => 'Despesa recurrent|Despeses recurrents',
'bills' => 'Factura|Factures',
'payments' => 'Pagament|Pagaments',
'recurring_bills' => 'Factura recurrent|Factures recurrents',
'vendors' => 'Proveïdor|Proveïdors',
'accounts' => 'Compte|Comptes',
'transfers' => 'Transferència|Transferències',
'transactions' => 'Transacció|Transaccions',
'payments' => 'Pagament|Pagaments',
'recurring_transactions'=> 'Transacció recurrent|Transaccions recurrents',
'reports' => 'Informe|Informes',
'settings' => 'Configuració|Configuració',
'categories' => 'Categoria|Categories',
@ -40,6 +45,7 @@ return [
'statuses' => 'Estat|Estats',
'others' => 'Altre|Altres',
'contacts' => 'Contacte|Contactes',
'documents' => 'Document|Documents',
'reconciliations' => 'Conciliació|Conciliacions',
'developers' => 'Desenvolupador|Desenvolupadors',
'schedules' => 'Agenda|Agendes',
@ -54,6 +60,16 @@ return [
'notifications' => 'Notificació|Notificacions',
'countries' => 'País|Països',
'cities' => 'Població/Ciutat|Poblacions/Ciutats',
'email_services' => 'Servei de correu|Serveis de correu',
'email_templates' => 'Plantilla de correu|Plantilles de correu',
'bank_transactions' => 'Transacció bancària|Transaccions bancàries',
'recurring_templates' => 'Plantilla recurrent|Plantilles recurrents',
'receipts' => 'Rebut|Rebuts',
'products' => 'Producte|Productes',
'services' => 'Servei|Serveis',
'invitations' => 'Invitació|Invitacions',
'attachments' => 'Adjunt|Adjunts',
'histories' => 'Història|Històries',
'welcome' => 'Benvingut/da',
'banking' => 'Bancs',
@ -63,6 +79,7 @@ return [
'amount' => 'Quantitat',
'enabled' => 'Activat',
'disabled' => 'Desactivat',
'disabled_type' => 'Aquest :type s\'ha desactivat',
'yes' => 'Sí',
'no' => 'No',
'na' => 'N/A',
@ -77,11 +94,17 @@ return [
'add_expense' => 'Afegeix despesa',
'add_transfer' => 'Afegeix transferència',
'show' => 'Mostra',
'create' => 'Crea',
'edit' => 'Edita',
'delete' => 'Esborra',
'send' => 'Envia',
'send_to' => 'Envia a',
'receive' => 'Rep',
'share' => 'Comparteix',
'share_link' => 'Comparteix l\'enllaç',
'copy_link' => 'Copia l\'enllaç',
'download' => 'Descarrega',
'restore' => 'Restaura',
'delete_confirm' => 'Confimes que vols esborrar :name :type?',
'name' => 'Nom',
'email' => 'Correu electrònic',
@ -107,6 +130,8 @@ return [
'loading' => 'Es carrega...',
'from' => 'Des de',
'to' => 'A',
'subject' => 'Assumpte',
'body' => 'Cos',
'print' => 'Imprimeix',
'download_pdf' => 'Descarrega PDF',
'customize' => 'Personalitza',
@ -162,12 +187,44 @@ return [
'is' => 'és',
'isnot' => 'no és',
'recurring_and_more' => 'Recurrent i més...',
'due_on' => 'Límit el',
'due' => 'Venciment',
'due_on' => 'Venç el',
'amount_due' => 'Quantitat',
'financial_year' => 'Any fiscal',
'created' => 'Creat/da',
'state' => 'Província/Estat',
'zip_code' => 'Codi postal',
'parent' => 'Pare/Mare',
'split' => 'Divideix',
'email_send_me' => 'Envia\'m una còpia a mi mateix a :email',
'connect' => 'Connecta',
'assign' => 'Assigna',
'your_notifications' => 'La teva notificació|Les teves notificacions',
'new' => 'Nou',
'new_more' => 'Nou...',
'number' => 'Número',
'client_portal' => 'Portal del client',
'issue_date' => 'Data d\'emissió',
'due_date' => 'Data de venciment',
'open' => 'Obre',
'invite' => 'Convida',
'common' => 'Comuna',
'api' => 'API',
'admin_panel' => 'Tauler d\'administració',
'special' => 'Especial',
'distribution' => 'Distribució',
'timeline' => 'Línia de temps',
'incoming' => 'Entrant',
'outgoing' => 'Sortint',
'none' => 'Cap',
'preferences' => 'Preferències',
'resend' => 'Reenvia',
'last_sent' => 'Últim enviament :date',
'preview_in_window' => 'Previsualitza en una altra finestra',
'copied' => 'S\'ha copiat',
'preview_mode' => 'Mode de previsualització',
'go_back' => 'Torna a :type',
'validation_error' => 'Error de validació',
'card' => [
'cards' => 'Tarjeta|Tarjetes',
@ -179,6 +236,7 @@ return [
],
'title' => [
'show' => 'Mostra :type',
'new' => 'Nou :type',
'edit' => 'Edita :type',
'delete' => 'Esborra :type',
@ -187,6 +245,8 @@ return [
'get' => 'Utilitza :type',
'add' => 'Afegeix :type',
'manage' => 'Gestiona :type',
'invite' => 'Convida :type',
'closed' => 'Tancat :type',
],
'form' => [
@ -215,11 +275,12 @@ return [
],
'date_range' => [
'today' => 'Avui',
'yesterday' => 'Ahir',
'last_days' => 'Últims :day dies',
'this_month' => 'Aquest mes',
'last_month' => 'Últim mes',
'today' => 'Avui',
'yesterday' => 'Ahir',
'week_ago' => 'Fa una setmana',
'last_days' => 'Últims :day dies',
'this_month' => 'Aquest mes',
'last_month' => 'Últim mes',
],
'empty' => [
@ -232,8 +293,15 @@ return [
'payments' => 'Una despesa és una transacció de pagament. Pot ser un registre independent (per exemple un rebut) o anar lligat a una factura de proveïdor.',
'vendors' => 'És necessari crear proveïdors per tal de poder crear factures a proveïdors. Pots veure el balanç del que deus i generar informes per proveïdor.',
'transfers' => 'Les transferències permeten moure els diners d\'un compte a un altre, ja sigui en la mateixa moneda o una altra de diferent.',
'transactions' => 'Les transaccions permeten crear registres dels ingressos o despeses. Els pagaments de factures/factures també es mostren aquí.',
'taxes' => 'Els impostos s\'apliquen sobre l\'import de les factures. La teva comptabilitat dependrà de la legislació vigent per a cada impost.',
'reconciliations' => 'La conciliació de moviments bancaris és un procés que permet assegurar que les dades entre la comptabilitat i els registres bancaris coincideixen.',
'recurring_templates' => 'Plantilla recurrent pot ser ingrés o despesa',
'actions' => [
'new' => 'Entra els detalls i crea el teu primer :type',
'import' => 'Importa els/les :type existents amb un simple click',
],
],
];

1
resources/lang/en-GB/general.php
View File

@ -4,7 +4,6 @@ return [
'dashboards' => 'Dashboard|Dashboards',
'items' => 'Item|Items',
'incomes' => 'Income|Incomes',
'invoices' => 'Invoice|Invoices',
'recurring_invoices' => 'Recurring Invoice|Recurring Invoices',
'customers' => 'Customer|Customers',

165
resources/views/components/documents/template/classic.blade.php
View File

@ -12,7 +12,7 @@
<div class="col-58">
<div class="text">
@stack('company_logo_start')
@if (!$hideCompanyLogo)
@if (! $hideCompanyLogo)
@if (!empty($document->contact->logo) && !empty($document->contact->logo->id))
<img class="c-logo w-image" src="{{ $logo }}" alt="{{ $document->contact_name }}"/>
@else
@ -31,19 +31,20 @@
{{ $textDocumentSubheading }}
</p>
@endif
@if (!$hideCompanyDetails)
@if (!$hideCompanyName)
@if (! $hideCompanyDetails)
@if (! $hideCompanyName)
<p>{{ setting('company.name') }}</p>
@endif
@if (!$hideCompanyAddress)
@if (! $hideCompanyAddress)
<p>
{!! nl2br(setting('company.address')) !!}
{!! $document->company->location !!}
</p>
@endif
@if (!$hideCompanyTaxNumber)
@if (! $hideCompanyTaxNumber)
@if (setting('company.tax_number'))
<p>
<span class="text-medium text-default">
@ -54,7 +55,7 @@
@endif
@endif
@if (!$hideCompanyPhone)
@if (! $hideCompanyPhone)
@if (setting('company.phone'))
<p>
{{ setting('company.phone') }}
@ -62,8 +63,10 @@
@endif
@endif
@if (!$hideCompanyEmail)
<p class="small-text">{{ setting('company.email') }}</p>
@if (! $hideCompanyEmail)
<p class="small-text">
{{ setting('company.email') }}
</p>
@endif
@endif
@stack('company_details_end')
@ -81,9 +84,14 @@
<div class="invoice-classic-frame ml-1 mt-1" style="border: 1px solid {{ $backgroundColor }}">
<div class="invoice-classic-inline-frame text-center" style="border: 1px solid {{ $backgroundColor }}">
@stack('invoice_number_input_start')
@if (!$hideDocumentNumber)
@if (! $hideDocumentNumber)
<div class="text small-text text-semibold mt-classic">
<span>{{ trans($textDocumentNumber) }}:</span><br>
<span>
{{ trans($textDocumentNumber) }}:
</span>
<br>
{{ $document->document_number }}
</div>
@endif
@ -102,17 +110,21 @@
<div class="col-60">
<div class="text p-index-left">
@if (! $hideContactInfo)
<p class="text-semibold mb-0">{{ trans($textContactInfo) }}</p>
<p class="text-semibold mb-0">
{{ trans($textContactInfo) }}
</p>
@endif
@stack('name_input_start')
@if (!$hideContactName)
<p>{{ $document->contact_name }}</p>
@if (! $hideContactName)
<p>
{{ $document->contact_name }}
</p>
@endif
@stack('name_input_end')
@stack('address_input_start')
@if (!$hideContactAddress)
@if (! $hideContactAddress)
<p>
{!! nl2br($document->contact_address) !!}
<br>
@ -122,7 +134,7 @@
@stack('address_input_end')
@stack('tax_number_input_start')
@if (!$hideContactTaxNumber)
@if (! $hideContactTaxNumber)
@if ($document->contact_tax_number)
<p>
<span class="text-medium text-default">
@ -135,7 +147,7 @@
@stack('tax_number_input_end')
@stack('phone_input_start')
@if (!$hideContactPhone)
@if (! $hideContactPhone)
@if ($document->contact_phone)
<p>
{{ $document->contact_phone }}
@ -145,8 +157,10 @@
@stack('phone_input_end')
@stack('email_start')
@if (!$hideContactEmail)
<p class="small-text">{{ $document->contact_email }}</p>
@if (! $hideContactEmail)
<p class="small-text">
{{ $document->contact_email }}
</p>
@endif
@stack('email_input_end')
</div>
@ -155,30 +169,45 @@
<div class="col-40">
<div class="text p-index-right">
@stack('order_number_input_start')
@if (!$hideOrderNumber)
@if (! $hideOrderNumber)
@if ($document->order_number)
<p class="mb-0">
<span class="text-semibold spacing">{{ trans($textOrderNumber) }}:</span>
<span class="float-right spacing">{{ $document->order_number }}</span>
<span class="text-semibold spacing">
{{ trans($textOrderNumber) }}:
</span>
<span class="float-right spacing">
{{ $document->order_number }}
</span>
</p>
@endif
@endif
@stack('order_number_input_end')
@stack('issued_at_input_start')
@if (!$hideIssuedAt)
@if (! $hideIssuedAt)
<p class="mb-0">
<span class="text-semibold spacing">{{ trans($textIssuedAt) }}:</span>
<span class="float-right spacing">@date($document->issued_at)</span>
<span class="text-semibold spacing">
{{ trans($textIssuedAt) }}:
</span>
<span class="float-right spacing">
@date($document->issued_at)
</span>
</p>
@endif
@stack('issued_at_input_end')
@stack('due_at_input_start')
@if (!$hideDueAt)
@if (! $hideDueAt)
<p class="mb-0">
<span class="text-semibold spacing">{{ trans($textDueAt) }}:</span>
<span class="float-right spacing">@date($document->due_at)</span>
<span class="text-semibold spacing">
{{ trans($textDueAt) }}:
</span>
<span class="float-right spacing">
@date($document->due_at)
</span>
</p>
@endif
@stack('due_at_input_end')
@ -186,8 +215,13 @@
@foreach ($document->totals_sorted as $total)
@if ($total->code == 'total')
<p class="mb-0">
<span class="text-semibold spacing">{{ trans($total->name) }}:</span>
<span class="float-right spacing">@money($total->amount - $document->paid, $document->currency_code, true)</span>
<span class="text-semibold spacing">
{{ trans($total->name) }}:
</span>
<span class="float-right spacing">
@money($total->amount - $document->paid, $document->currency_code, true)
</span>
</p>
@endif
@endforeach
@ -195,7 +229,7 @@
</div>
</div>
@if (!$hideItems)
@if (! $hideItems)
<div class="row">
<div class="col-100">
<div class="text extra-spacing">
@ -203,34 +237,44 @@
<thead>
<tr>
@stack('name_th_start')
@if (!$hideItems || (!$hideName && !$hideDescription))
<th class="item text text-semibold text-alignment-left text-left">{{ (trans_choice($textItems, 2) != $textItems) ? trans_choice($textItems, 2) : trans($textItems) }}</th>
@if (! $hideItems || (! $hideName && ! $hideDescription))
<th class="item text text-semibold text-alignment-left text-left">
{{ (trans_choice($textItems, 2) != $textItems) ? trans_choice($textItems, 2) : trans($textItems) }}
</th>
@endif
@stack('name_th_end')
@stack('quantity_th_start')
@if (!$hideQuantity)
<th class="quantity text text-semibold text-alignment-right text-right">{{ trans($textQuantity) }}</th>
@if (! $hideQuantity)
<th class="quantity text text-semibold text-alignment-right text-right">
{{ trans($textQuantity) }}
</th>
@endif
@stack('quantity_th_end')
@stack('price_th_start')
@if (!$hidePrice)
<th class="price text text-semibold text-alignment-right text-right">{{ trans($textPrice) }}</th>
@if (! $hidePrice)
<th class="price text text-semibold text-alignment-right text-right">
{{ trans($textPrice) }}
</th>
@endif
@stack('price_th_end')
@if (!$hideDiscount)
@if (! $hideDiscount)
@if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both']))
@stack('discount_td_start')
<th class="discount text text-semibold text-alignment-right text-right">{{ trans('invoices.discount') }}</th>
<th class="discount text text-semibold text-alignment-right text-right">
{{ trans('invoices.discount') }}
</th>
@stack('discount_td_end')
@endif
@endif
@stack('total_th_start')
@if (!$hideAmount)
<th class="total text text-semibold text-alignment-right text-right">{{ trans($textAmount) }}</th>
@if (! $hideAmount)
<th class="total text text-semibold text-alignment-right text-right">
{{ trans($textAmount) }}
</th>
@endif
@stack('total_th_end')
</tr>
@ -270,9 +314,12 @@
<div class="col-60">
<div class="text p-index-right">
@stack('notes_input_start')
@if($hideNote)
@if ($hideNote)
@if ($document->notes)
<strong>{{ trans_choice('general.notes', 2) }}</strong>
<strong>
{{ trans_choice('general.notes', 2) }}
</strong>
{!! nl2br($document->notes) !!}
@endif
@endif
@ -285,23 +332,39 @@
@if ($total->code != 'total')
@stack($total->code . '_total_tr_start')
<div class="text border-bottom-dashed py-1">
<strong class="float-left text-semibold">{{ trans($total->title) }}:</strong>
<span>@money($total->amount, $document->currency_code, true)</span>
<strong class="float-left text-semibold">
{{ trans($total->title) }}:
</strong>
<span>
@money($total->amount, $document->currency_code, true)
</span>
</div>
@stack($total->code . '_total_tr_end')
@else
@if ($document->paid)
@stack('paid_total_tr_start')
<div class="text border-bottom-dashed py-1">
<span class="float-left text-semibold">{{ trans('invoices.paid') }}:</span>
<span>- @money($document->paid, $document->currency_code, true)</span>
<span class="float-left text-semibold">
{{ trans('invoices.paid') }}:
</span>
<span>
- @money($document->paid, $document->currency_code, true)
</span>
</div>
@stack('paid_total_tr_end')
@endif
@stack('grand_total_tr_start')
<div class="text border-bottom-dashed py-1">
<span class="float-left text-semibold">{{ trans($total->name) }}:</span>
<span>@money($document->amount_due, $document->currency_code, true)</span>
<span class="float-left text-semibold">
{{ trans($total->name) }}:
</span>
<span>
@money($document->amount_due, $document->currency_code, true)
</span>
</div>
@stack('grand_total_tr_end')
@endif
@ -309,12 +372,14 @@
</div>
</div>
@if (!$hideFooter)
@if (! $hideFooter)
@if ($document->footer)
<div class="row mt-1">
<div class="col-100">
<div class="text company">
<strong>{!! nl2br($document->footer) !!}</strong>
<strong>
{!! nl2br($document->footer) !!}
</strong>
</div>
</div>
</div>

130
resources/views/components/documents/template/default.blade.php
View File

@ -12,8 +12,8 @@
<div class="col-58">
<div class="text">
@stack('company_logo_start')
@if (!$hideCompanyLogo)
@if (!empty($document->contact->logo) && !empty($document->contact->logo->id))
@if (! $hideCompanyLogo)
@if (! empty($document->contact->logo) && ! empty($document->contact->logo->id))
<img class="d-logo w-image" src="{{ $logo }}" alt="{{ $document->contact_name }}"/>
@else
<img class="d-logo w-image" src="{{ $logo }}" alt="{{ setting('company.name') }}"/>
@ -31,19 +31,20 @@
{{ $textDocumentSubheading }}
</p>
@endif
@if (!$hideCompanyDetails)
@if (!$hideCompanyName)
@if (! $hideCompanyDetails)
@if (! $hideCompanyName)
<p>{{ setting('company.name') }}</p>
@endif
@if (!$hideCompanyAddress)
@if (! $hideCompanyAddress)
<p>
{!! nl2br(setting('company.address')) !!}
{!! $document->company->location !!}
</p>
@endif
@if (!$hideCompanyTaxNumber)
@if (! $hideCompanyTaxNumber)
@if (setting('company.tax_number'))
<p>
@ -53,17 +54,15 @@
@endif
@if (!$hideCompanyPhone)
@if (! $hideCompanyPhone)
@if (setting('company.phone'))
<p>
{{ setting('company.phone') }}
</p>
@endif
@endif
@if (!$hideCompanyEmail)
@if (! $hideCompanyEmail)
<p class="small-text">{{ setting('company.email') }}</p>
@endif
@endif
@ -80,13 +79,13 @@
@endif
@stack('name_input_start')
@if (!$hideContactName)
@if (! $hideContactName)
<p>{{ $document->contact_name }}</p>
@endif
@stack('name_input_end')
@stack('address_input_start')
@if (!$hideContactAddress)
@if (! $hideContactAddress)
<p>
{!! nl2br($document->contact_address) !!}
<br>
@ -96,7 +95,7 @@
@stack('address_input_end')
@stack('tax_number_input_start')
@if (!$hideContactTaxNumber)
@if (! $hideContactTaxNumber)
@if ($document->contact_tax_number)
<p>
<span class="text-medium text-default">
@ -109,7 +108,7 @@
@stack('tax_number_input_end')
@stack('phone_input_start')
@if (!$hideContactPhone)
@if (! $hideContactPhone)
@if ($document->contact_phone)
<p>
{{ $document->contact_phone }}
@ -119,7 +118,7 @@
@stack('phone_input_end')
@stack('email_start')
@if (!$hideContactEmail)
@if (! $hideContactEmail)
<p class="small-text">
{{ $document->contact_email }}
</p>
@ -131,48 +130,59 @@
<div class="col-40">
<div class="text p-index-right">
@stack('document_number_input_start')
@if (!$hideDocumentNumber)
@if (! $hideDocumentNumber)
<p class="mb-0">
<span class="font-semibold spacing w-numbers">
{{ trans($textDocumentNumber) }}:
</span>
<span class="float-right spacing">{{ $document->document_number }}</span>
<span class="float-right spacing">
{{ $document->document_number }}
</span>
</p>
@endif
@stack('document_number_input_end')
@stack('order_number_input_start')
@if (!$hideOrderNumber)
@if (! $hideOrderNumber)
@if ($document->order_number)
<p class="mb-0">
<span class="font-semibold spacing w-numbers">
{{ trans($textOrderNumber) }}:
</span>
<span class="float-right spacing">{{ $document->order_number }}</span>
<span class="float-right spacing">
{{ $document->order_number }}
</span>
</p>
@endif
@endif
@stack('order_number_input_end')
@stack('issued_at_input_start')
@if (!$hideIssuedAt)
@if (! $hideIssuedAt)
<p class="mb-0">
<span class="font-semibold spacing w-numbers">
{{ trans($textIssuedAt) }}:
</span>
<span class="float-right spacing">@date($document->issued_at)</span>
<span class="float-right spacing">
@date($document->issued_at)
</span>
</p>
@endif
@stack('issued_at_input_end')
@stack('due_at_input_start')
@if (!$hideDueAt)
@if (! $hideDueAt)
<p class="mb-0">
<span class="font-semibold spacing w-numbers">
{{ trans($textDueAt) }}:
</span>
<span class="float-right spacing">@date($document->due_at)</span>
<span class="float-right spacing">
@date($document->due_at)
</span>
</p>
@endif
@stack('due_at_input_end')
@ -180,7 +190,7 @@
</div>
</div>
@if (!$hideItems)
@if (! $hideItems)
<div class="row">
<div class="col-100">
<div class="text extra-spacing">
@ -188,38 +198,49 @@
<thead class="bg-{{ $backgroundColor }}" style="background-color:{{ $backgroundColor }} !important; -webkit-print-color-adjust: exact;">
<tr>
@stack('name_th_start')
@if (!$hideItems || (!$hideName && !$hideDescription))
<th class="item text text-semibold text-alignment-left text-left text-white border-radius-first">{{ (trans_choice($textItems, 2) != $textItems) ? trans_choice($textItems, 2) : trans($textItems) }}</th>
@if (! $hideItems || (! $hideName && ! $hideDescription))
<th class="item text text-semibold text-alignment-left text-left text-white border-radius-first">
{{ (trans_choice($textItems, 2) != $textItems) ? trans_choice($textItems, 2) : trans($textItems) }}
</th>
@endif
@stack('name_th_end')
@stack('quantity_th_start')
@if (!$hideQuantity)
<th class="quantity text text-semibold text-alignment-right text-right text-white">{{ trans($textQuantity) }}</th>
@if (! $hideQuantity)
<th class="quantity text text-semibold text-alignment-right text-right text-white">
{{ trans($textQuantity) }}
</th>
@endif
@stack('quantity_th_end')
@stack('price_th_start')
@if (!$hidePrice)
<th class="price text text-semibold text-alignment-right text-right text-white">{{ trans($textPrice) }}</th>
@if (! $hidePrice)
<th class="price text text-semibold text-alignment-right text-right text-white">
{{ trans($textPrice) }}
</th>
@endif
@stack('price_th_end')
@if (!$hideDiscount)
@if (! $hideDiscount)
@if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both']))
@stack('discount_td_start')
<th class="discount text text-semibold text-alignment-right text-right text-white">{{ trans('invoices.discount') }}</th>
<th class="discount text text-semibold text-alignment-right text-right text-white">
{{ trans('invoices.discount') }}
</th>
@stack('discount_td_end')
@endif
@endif
@stack('total_th_start')
@if (!$hideAmount)
<th class="total text text-semibold text-white text-alignment-right text-right border-radius-last">{{ trans($textAmount) }}</th>
@if (! $hideAmount)
<th class="total text text-semibold text-white text-alignment-right text-right border-radius-last">
{{ trans($textAmount) }}
</th>
@endif
@stack('total_th_end')
</tr>
</thead>
<tbody>
@if ($document->items->count())
@foreach($document->items as $item)
@ -255,7 +276,10 @@
<div class="text p-index-left">
@stack('notes_input_start')
@if ($document->notes)
<p class="text-semibold">{{ trans_choice('general.notes', 2) }}</p>
<p class="text-semibold">
{{ trans_choice('general.notes', 2) }}
</p>
{!! nl2br($document->notes) !!}
@endif
@stack('notes_input_end')
@ -267,23 +291,39 @@
@if ($total->code != 'total')
@stack($total->code . '_total_tr_start')
<div class="text border-bottom-1 py-1">
<span class="float-left text-semibold">{{ trans($total->title) }}:</span>
<span>@money($total->amount, $document->currency_code, true)</span>
<span class="float-left text-semibold">
{{ trans($total->title) }}:
</span>
<span>
@money($total->amount, $document->currency_code, true)
</span>
</div>
@stack($total->code . '_total_tr_end')
@else
@if ($document->paid)
@stack('paid_total_tr_start')
<div class="text border-bottom-1 py-1">
<span class="float-left text-semibold">{{ trans('invoices.paid') }}:</span>
<span>- @money($document->paid, $document->currency_code, true)</span>
<span class="float-left text-semibold">
{{ trans('invoices.paid') }}:
</span>
<span>
- @money($document->paid, $document->currency_code, true)
</span>
</div>
@stack('paid_total_tr_end')
@endif
@stack('grand_total_tr_start')
<div class="text border-bottom-1 py-1">
<span class="float-left text-semibold">{{ trans($total->name) }}:</span>
<span>@money($document->amount_due, $document->currency_code, true)</span>
<span class="float-left text-semibold">
{{ trans($total->name) }}:
</span>
<span>
@money($document->amount_due, $document->currency_code, true)
</span>
</div>
@stack('grand_total_tr_end')
@endif
@ -291,12 +331,14 @@
</div>
</div>
@if (!$hideFooter)
@if (! $hideFooter)
@if ($document->footer)
<div class="row mt-4">
<div class="col-100 text-left">
<div class="text">
<strong>{!! nl2br($document->footer) !!}</strong>
<strong>
{!! nl2br($document->footer) !!}
</strong>
</div>
</div>
</div>

187
resources/views/components/documents/template/modern.blade.php
View File

@ -12,8 +12,8 @@
<div class="col-58">
<div class="text p-modern">
@stack('company_logo_start')
@if (!$hideCompanyLogo)
@if (!empty($document->contact->logo) && !empty($document->contact->logo->id))
@if (! $hideCompanyLogo)
@if (! empty($document->contact->logo) && ! empty($document->contact->logo->id))
<img class="w-image radius-circle" src="{{ $logo }}" alt="{{ $document->contact_name }}"/>
@else
<img class="w-image radius-circle" src="{{ $logo }}" alt="{{ setting('company.name') }}" />
@ -31,24 +31,29 @@
{{ $textDocumentSubheading }}
</p>
@endif
@if (!$hideCompanyName)
<p class="text-white">{{ setting('company.name') }}</p>
@if (! $hideCompanyName)
<p class="text-white">
{{ setting('company.name') }}
</p>
@endif
@if (!$hideCompanyDetails)
@if (!$hideCompanyAddress)
@if (! $hideCompanyDetails)
@if (! $hideCompanyAddress)
<p class="text-white">
{!! nl2br(setting('company.address')) !!}
{!! $document->company->location !!}
</p>
@endif
@if (!$hideCompanyTaxNumber)
@if (! $hideCompanyTaxNumber)
<p class="text-white">
@if (setting('company.tax_number'))
<span class="text-medium text-default">
{{ trans('general.tax_number') }}:
</span>
{{ setting('company.tax_number') }}
<span class="text-medium text-default">
{{ trans('general.tax_number') }}:
</span>
{{ setting('company.tax_number') }}
@endif
</p>
@endif
@ -62,7 +67,9 @@
@endif
@if (!$hideCompanyEmail)
<p class="small-text text-white">{{ setting('company.email') }}</p>
<p class="small-text text-white">
{{ setting('company.email') }}
</p>
@endif
@endif
@stack('company_details_end')
@ -74,31 +81,37 @@
<div class="col-50">
<div class="text p-modern">
@if (! $hideContactInfo)
<p class="text-semibold mb-0">{{ trans($textContactInfo) }}</p>
<p class="text-semibold mb-0">
{{ trans($textContactInfo) }}
</p>
@endif
@stack('name_input_start')
@if (!$hideContactName)
<p>{{ $document->contact_name }}</p>
@if (! $hideContactName)
<p>
{{ $document->contact_name }}
</p>
@endif
@stack('name_input_end')
@stack('address_input_start')
@if (!$hideContactAddress)
@if (! $hideContactAddress)
<p>
{!! nl2br($document->contact_address) !!} <br/>
{!! nl2br($document->contact_address) !!}
<br/>
{!! $document->contact_location !!}
</p>
@endif
@stack('address_input_end')
@stack('tax_number_input_start')
@if (!$hideContactTaxNumber)
@if (! $hideContactTaxNumber)
@if ($document->contact_tax_number)
<p>
<span class="text-medium text-default">
{{ trans('general.tax_number') }}:
</span>
{{ $document->contact_tax_number }}
</p>
@endif
@ -106,7 +119,7 @@
@stack('tax_number_input_end')
@stack('phone_input_start')
@if (!$hideContactPhone)
@if (! $hideContactPhone)
@if ($document->contact_phone)
<p>
{{ $document->contact_phone }}
@ -116,9 +129,9 @@
@stack('phone_input_end')
@stack('email_start')
@if (!$hideContactEmail)
@if (! $hideContactEmail)
<p>
{{ $document->contact_email }}
{{ $document->contact_email }}
</p>
@endif
@stack('email_input_end')
@ -128,47 +141,67 @@
<div class="col-50">
<div class="text p-modern">
@stack('order_number_input_start')
@if (!$hideOrderNumber)
@if (! $hideOrderNumber)
@if ($document->order_number)
<p class="mb-0">
<span class="text-semibold spacing">{{ trans($textOrderNumber) }}:</span>
<span class="float-right spacing">{{ $document->order_number }}</span>
</p>
<p class="mb-0">
<span class="text-semibold spacing">
{{ trans($textOrderNumber) }}:
</span>
<span class="float-right spacing">
{{ $document->order_number }}
</span>
</p>
@endif
@endif
@stack('order_number_input_end')
@stack('invoice_number_input_start')
@if (!$hideDocumentNumber)
<p class="mb-0">
<span class="text-semibold spacing">{{ trans($textDocumentNumber) }}:</span>
<span class="float-right spacing">{{ $document->document_number }}</span>
</p>
@if (! $hideDocumentNumber)
<p class="mb-0">
<span class="text-semibold spacing">
{{ trans($textDocumentNumber) }}:
</span>
<span class="float-right spacing">
{{ $document->document_number }}
</span>
</p>
@endif
@stack('invoice_number_input_end')
@stack('issued_at_input_start')
@if (!$hideIssuedAt)
<p class="mb-0">
<span class="text-semibold spacing">{{ trans($textIssuedAt) }}:</span>
<span class="float-right spacing">@date($document->issued_at)</span>
</p>
@if (! $hideIssuedAt)
<p class="mb-0">
<span class="text-semibold spacing">
{{ trans($textIssuedAt) }}:
</span>
<span class="float-right spacing">
@date($document->issued_at)
</span>
</p>
@endif
@stack('issued_at_input_end')
@stack('due_at_input_start')
@if (!$hideDueAt)
<p class="mb-0">
<span class="text-semibold spacing">{{ trans($textDueAt) }}:</span>
<span class="float-right spacing">@date($document->due_at)</span>
</p>
@if (! $hideDueAt)
<p class="mb-0">
<span class="text-semibold spacing">
{{ trans($textDueAt) }}:
</span>
<span class="float-right spacing">
@date($document->due_at)
</span>
</p>
@endif
@stack('due_at_input_end')
</div>
</div>
</div>
@if (!$hideItems)
@if (! $hideItems)
<div class="row">
<div class="col-100">
<div class="text extra-spacing">
@ -176,38 +209,49 @@
<thead class="bg-{{ $backgroundColor }}" style="background-color:{{ $backgroundColor }} !important; -webkit-print-color-adjust: exact;">
<tr>
@stack('name_th_start')
@if (!$hideItems || (!$hideName && !$hideDescription))
<th class="item text text-semibold text-alignment-left text-left text-white border-radius-first">{{ (trans_choice($textItems, 2) != $textItems) ? trans_choice($textItems, 2) : trans($textItems) }}</th>
@if (! $hideItems || (! $hideName && ! $hideDescription))
<th class="item text text-semibold text-alignment-left text-left text-white border-radius-first">
{{ (trans_choice($textItems, 2) != $textItems) ? trans_choice($textItems, 2) : trans($textItems) }}
</th>
@endif
@stack('name_th_end')
@stack('quantity_th_start')
@if (!$hideQuantity)
<th class="quantity text text-semibold text-white text-alignment-right text-right">{{ trans($textQuantity) }}</th>
@if (! $hideQuantity)
<th class="quantity text text-semibold text-white text-alignment-right text-right">
{{ trans($textQuantity) }}
</th>
@endif
@stack('quantity_th_end')
@stack('price_th_start')
@if (!$hidePrice)
<th class="price text text-semibold text-white text-alignment-right text-right">{{ trans($textPrice) }}</th>
@if (! $hidePrice)
<th class="price text text-semibold text-white text-alignment-right text-right">
{{ trans($textPrice) }}
</th>
@endif
@stack('price_th_end')
@if (!$hideDiscount)
@if (! $hideDiscount)
@if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both']))
@stack('discount_td_start')
<th class="discount text text-semibold text-white text-alignment-right text-right">{{ trans('invoices.discount') }}</th>
<th class="discount text text-semibold text-white text-alignment-right text-right">
{{ trans('invoices.discount') }}
</th>
@stack('discount_td_end')
@endif
@endif
@stack('total_th_start')
@if (!$hideAmount)
<th class="total text text-semibold text-white text-alignment-right text-right border-radius-last">{{ trans($textAmount) }}</th>
@if (! $hideAmount)
<th class="total text text-semibold text-white text-alignment-right text-right border-radius-last">
{{ trans($textAmount) }}
</th>
@endif
@stack('total_th_end')
</tr>
</thead>
<tbody>
@if ($document->items->count())
@foreach($document->items as $item)
@ -243,7 +287,10 @@
<div class="text p-index-right p-modern">
@stack('notes_input_start')
@if ($document->notes)
<p class="text-semibold">{{ trans_choice('general.notes', 2) }}</p>
<p class="text-semibold">
{{ trans_choice('general.notes', 2) }}
</p>
{!! nl2br($document->notes) !!}
@endif
@stack('notes_input_end')
@ -255,23 +302,39 @@
@if ($total->code != 'total')
@stack($total->code . '_total_tr_start')
<div class="text">
<span class="float-left text-semibold">{{ trans($total->title) }}:</span>
<span>@money($total->amount, $document->currency_code, true)</span>
<span class="float-left text-semibold">
{{ trans($total->title) }}:
</span>
<span>
@money($total->amount, $document->currency_code, true)
</span>
</div>
@stack($total->code . '_total_tr_end')
@else
@if ($document->paid)
@stack('paid_total_tr_start')
<div class="text">
<span class="float-left text-semibold">{{ trans('invoices.paid') }}:</span>
<span>- @money($document->paid, $document->currency_code, true)</span>
<span class="float-left text-semibold">
{{ trans('invoices.paid') }}:
</span>
<span>
- @money($document->paid, $document->currency_code, true)
</span>
</div>
@stack('paid_total_tr_end')
@endif
@stack('grand_total_tr_start')
<div class="text">
<span class="float-left text-semibold">{{ trans($total->name) }}:</span>
<span>@money($document->amount_due, $document->currency_code, true)</span>
<span class="float-left text-semibold">
{{ trans($total->name) }}:
</span>
<span>
@money($document->amount_due, $document->currency_code, true)
</span>
</div>
@stack('grand_total_tr_end')
@endif
@ -279,12 +342,14 @@
</div>
</div>
@if (!$hideFooter)
@if (! $hideFooter)
@if ($document->footer)
<div class="row mt-7">
<div class="col-100 py-top p-modern bg-{{ $backgroundColor }}" style="background-color:{{ $backgroundColor }} !important; -webkit-print-color-adjust: exact;">
<div class="text pl-2">
<strong class="text-white">{!! nl2br($document->footer) !!}</strong>
<strong class="text-white">
{!! nl2br($document->footer) !!}
</strong>
</div>
</div>
</div>

6
resources/views/components/form/group/select.blade.php
View File

@ -33,11 +33,7 @@
title="{!! $label !!}"
@if (isset($attributes['placeholder']))
placeholder="{{ $attributes['placeholder'] }}"
@else
placeholder="{{ trans('general.form.select.field', ['field' => $label]) }}"
@endif
placeholder="{{ $placeholder }}"
name="{{ $name }}"

6
resources/views/components/form/input/select.blade.php
View File

@ -33,11 +33,7 @@
title="{{ $label }}"
@endif
@if (isset($attributes['placeholder']))
placeholder="{{ $attributes['placeholder'] }}"
@else
placeholder="{{ trans('general.form.select.field', ['field' => $label]) }}"
@endif
placeholder="{{ $placeholder }}"
name="{{ $name }}"

15
resources/views/components/layouts/admin/menu.blade.php
View File

@ -63,15 +63,16 @@
'flex items-center menu-button justify-center w-8 h-8 mb-2.5 relative cursor-pointer js-menu-toggles',
'animate-vibrate' => $notification_count,
])
data-menu="notifications-menu">
data-menu="notifications-menu"
>
<span id="menu-notification-icon" name="notifications" class="material-icons-outlined text-purple text-2xl">notifications</span>
@if ($notification_count)
<span data-notification-count class="w-2 h-2 absolute top-2 right-2 inline-flex items-center justify-center p-2.5 text-xs text-white font-bold leading-none transform translate-x-1/2 -translate-y-1/2 bg-orange rounded-full">
{{ $notification_count }}
</span>
@endif
</button>
@if ($notification_count)
<span data-notification-count class="w-2 h-2 absolute top-2 right-2 inline-flex items-center justify-center p-2.5 text-xs text-white font-bold leading-none transform translate-x-1/2 -translate-y-1/2 bg-orange rounded-full">
{{ $notification_count }}
</span>
@endif
</x-tooltip>
@endcan

3
resources/views/components/layouts/maintenance/body.blade.php
View File

@ -1,9 +1,10 @@
<body>
<div class="max-w-7xl m-auto h-screen flex flex-col sm:flex-row items-center justify-center sm:justify-between">
<div class="flex flex-col items-start gap-y-4 mb-10 sm:mb-0 sm:-mt-24">
<span class="text-lg">
{{ trans('maintenance.message') }}
</span>
</div>
<img src="{{ asset('public/img/empty_pages/transactions.png') }}" alt="{{ trans('maintenance.message') }}" />
</div>
</body>

6
resources/views/components/layouts/maintenance/head.blade.php
View File

@ -11,9 +11,9 @@
<base href="{{ config('app.url') . '/' }}">
<link rel="stylesheet" href="{{ asset('public/css/fonts/material-icons/style.css') }}" type="text/css">
<link rel="stylesheet" href="{{ asset('public/vendor/quicksand/css/quicksand.css') }}" type="text/css">
<link rel="stylesheet" href="{{ asset('public/css/apps.css') }}" type="text/css">
<link rel="stylesheet" href="{{ asset('public/css/fonts/material-icons/style.css?v=' . version('short')) }}" type="text/css">
<link rel="stylesheet" href="{{ asset('public/vendor/quicksand/css/quicksand.css?v=' . version('short')) }}" type="text/css">
<link rel="stylesheet" href="{{ asset('public/css/app.css') }}" type="text/css">
@stack('css')

2
resources/views/components/reports/summary/chart.blade.php
View File

@ -18,7 +18,7 @@
{!! $charts['bar']->container() !!}
</div>
<div x-show="toggle === 'bar'">
<div class="apexcharts-donut-custom apexcharts-donut-custom-report" x-show="toggle === 'bar'">
{!! $charts['donut']->container() !!}
</div>
</div>

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

@ -8,8 +8,8 @@
@endif
@if ($notifications)
<div class="flex justify-end mt-1">
<x-tooltip id="notification-all" placement="right" message="Mark as All Read">
<div class="flex justify-end mt-1 mb-3">
<x-tooltip id="notification-all" placement="top" message="Mark as All Read">
<button type="button" wire:click="markReadAll()">
<span id="menu-notification-read-all" class="material-icons text-lg text-purple">done_all</span>
</button>
@ -30,9 +30,11 @@
</div>
@if ($notification->type != 'updates')
<button type="button" wire:click="markRead('{{ $notification->id }}')">
<span id="menu-notification-mark-read" class="material-icons text-lg text-purple">check_circle_outline</span>
</button>
<x-tooltip id="notification-{{ $notification->id }}" placement="top" message="Clear Notification">
<button type="button" wire:click="markRead('{{ $notification->type }}', '{{ $notification->id }}')">
<span id="menu-notification-mark-read" class="material-icons text-lg text-purple">check_circle_outline</span>
</button>
</x-tooltip>
@endif
</div>

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

@ -7,7 +7,7 @@
<x-form.group.editor name="body" label="{{ trans('settings.email.templates.body') }}" :value="$notification->getBody()" rows="5" data-toggle="quill" form-group-class="sm:col-span-6 mb-0" />
<x-form.group.checkbox name="user_email" :options="['1' => trans('general.email_send_me', ['email' => user()->email])]" />
<x-form.group.checkbox name="user_email" :options="['1' => trans('general.email_send_me', ['email' => user()->email])]" checkbox-class="col-span-6" />
<x-form.input.hidden name="document_id" :value="$invoice->id" />
</x-slot>

2
resources/views/settings/categories/index.blade.php
View File

@ -99,7 +99,7 @@
</x-table.td>
<x-table.td class="w-2/12 relative">
<span class="material-icons" class="text-3xl" style="color:{{ $category->color }};">circle</span>
<span class="material-icons text-{{ $category->color }}" class="text-3xl" style="color:{{ $category->color }};">circle</span>
</x-table.td>
<x-table.td kind="action">

2
resources/views/settings/categories/sub_category.blade.php
View File

@ -39,7 +39,7 @@
</x-table.td>
<x-table.td class="ltr:pr-6 rtl:pl-6 py-4 ltr:text-left rtl:text-right whitespace-nowrap text-sm font-normal text-black cursor-pointer w-2/12 relative">
<span class="material-icons" class="text-3xl" style="color:{{ $sub_category->color }};">circle</span>
<span class="material-icons text-3xl text-{{ $category->color }}" style="color:{{ $sub_category->color }};">circle</span>
</x-table.td>
<x-table.td kind="action">

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

@ -1,4 +1,4 @@
<div id="widget-{{ $class->model->id }}" class="{{ $class->model->settings->width }} my-8">
<div id="widget-{{ $class->model->id }}" class="apexcharts-donut-custom {{ $class->model->settings->width }} my-8">
@include($class->views['header'], ['header_class' => ''])
<div class="flex flex-col lg:flex-row mt-3" id="widget-donut-{{ $class->model->id }}">