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

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

Browse Source 
# Conflicts:
#	resources/views/partials/form/radio_group.blade.php
This commit is contained in:
Cüneyt Şentürk 2020-02-01 18:52:08 +03:00
commit 3cc75fbcd0
6 changed files with 21 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
config/menu.php
View File

@ -4,22 +4,7 @@ return [
'styles' => [ 'styles' => [
// Boostrap 3
'bs3-navbar' => \Akaunting\Menu\Presenters\Bootstrap3\Navbar::class,
'bs3-navbar-right' => \Akaunting\Menu\Presenters\Bootstrap3\NavbarRight::class,
'bs3-nav-pills' => \Akaunting\Menu\Presenters\Bootstrap3\NavPills::class,
'bs3-nav-tab' => \Akaunting\Menu\Presenters\Bootstrap3\NavTab::class,
'bs3-sidebar' => \Akaunting\Menu\Presenters\Bootstrap3\Sidebar::class,
'bs3-navmenu' => \Akaunting\Menu\Presenters\Bootstrap3\Nav::class,
// Zurb
'zurb' => \Akaunting\Menu\Presenters\Foundation\Zurb::class,
// Admin
'adminlte' => \Akaunting\Menu\Presenters\Admin\Adminlte::class,
'argon' => \Akaunting\Menu\Presenters\Admin\Argon::class, 'argon' => \Akaunting\Menu\Presenters\Admin\Argon::class,
'metronic-horizontal' => \Akaunting\Menu\Presenters\Admin\MetronicHorizontal::class,
], ],
'ordering' => true, 'ordering' => true,

6
public/css/print.css vendored
View File

@ -146,6 +146,10 @@ th, td {
font-size: 16px; font-size: 16px;
} }
.text-nowrap {
white-space: nowrap;
}
.text-left { .text-left {
text-align: left; text-align: left;
} }
@ -244,7 +248,7 @@ th, td {
.invoice-classic-inline-frame .invoice-classic-inline-frame
{ {
margin: 0.3% 1% 0.3% 1%; margin: 0.3% 1% 0.3% 1%;
width: 95 !important%; width: 95 !important;
height: 59px; height: 59px;
border: 3px solid #3c3f72; border: 3px solid #3c3f72;
} }

18
resources/lang/en-GB/email_templates.php
View File

@ -4,47 +4,47 @@ return [
'invoice_new_customer' => [ 'invoice_new_customer' => [
'subject' => '{invoice_number} invoice created', 'subject' => '{invoice_number} invoice created',
'body' => 'Dear {customer_name},<br /><br />We have prepared the following invoice for you: <strong>{invoice_number}</strong>.<br /><br />You can see the invoice details and proceed with the payment from the following link: <a href="{invoice_guest_link}">{invoice_number}</a>.<br /><br />Feel free to contact us for any question.<br /><br />Best Regards,<br /><br />{company_name}', 'body' => 'Dear {customer_name},<br /><br />We have prepared the following invoice for you: <strong>{invoice_number}</strong>.<br /><br />You can see the invoice details and proceed with the payment from the following link: <a href="{invoice_guest_link}">{invoice_number}</a>.<br /><br />Feel free to contact us for any question.<br /><br />Best Regards,<br />{company_name}',
], ],
'invoice_remind_customer' => [ 'invoice_remind_customer' => [
'subject' => '{invoice_number} invoice overdue notice', 'subject' => '{invoice_number} invoice overdue notice',
'body' => 'Dear {customer_name},<br /><br />This is an overdue notice for <strong>{invoice_number}</strong> invoice.<br /><br />The invoice total is {invoice_total} and was due <strong>{invoice_due_date}</strong>.<br /><br />You can see the invoice details and proceed with the payment from the following link: <a href="{invoice_guest_link}">{invoice_number}</a>.<br /><br />Best Regards,<br /><br />{company_name}', 'body' => 'Dear {customer_name},<br /><br />This is an overdue notice for <strong>{invoice_number}</strong> invoice.<br /><br />The invoice total is {invoice_total} and was due <strong>{invoice_due_date}</strong>.<br /><br />You can see the invoice details and proceed with the payment from the following link: <a href="{invoice_guest_link}">{invoice_number}</a>.<br /><br />Best Regards,<br />{company_name}',
], ],
'invoice_remind_admin' => [ 'invoice_remind_admin' => [
'subject' => '{invoice_number} invoice overdue notice', 'subject' => '{invoice_number} invoice overdue notice',
'body' => 'Hello,<br /><br />{customer_name} has received an overdue notice for <strong>{invoice_number}</strong> invoice.<br /><br />The invoice total is {invoice_total} and was due <strong>{invoice_due_date}</strong>.<br /><br />You can see the invoice details from the following link: <a href="{invoice_admin_link}">{invoice_number}</a>.<br /><br />Best Regards,<br /><br />{company_name}', 'body' => 'Hello,<br /><br />{customer_name} has received an overdue notice for <strong>{invoice_number}</strong> invoice.<br /><br />The invoice total is {invoice_total} and was due <strong>{invoice_due_date}</strong>.<br /><br />You can see the invoice details from the following link: <a href="{invoice_admin_link}">{invoice_number}</a>.<br /><br />Best Regards,<br />{company_name}',
], ],
'invoice_recur_customer' => [ 'invoice_recur_customer' => [
'subject' => '{invoice_number} recurring invoice created', 'subject' => '{invoice_number} recurring invoice created',
'body' => 'Dear {customer_name},<br /><br />Based on your recurring circle, we have prepared the following invoice for you: <strong>{invoice_number}</strong>.<br /><br />You can see the invoice details and proceed with the payment from the following link: <a href="{invoice_guest_link}">{invoice_number}</a>.<br /><br />Feel free to contact us for any question.<br /><br />Best Regards,<br /><br />{company_name}', 'body' => 'Dear {customer_name},<br /><br />Based on your recurring circle, we have prepared the following invoice for you: <strong>{invoice_number}</strong>.<br /><br />You can see the invoice details and proceed with the payment from the following link: <a href="{invoice_guest_link}">{invoice_number}</a>.<br /><br />Feel free to contact us for any question.<br /><br />Best Regards,<br />{company_name}',
], ],
'invoice_recur_admin' => [ 'invoice_recur_admin' => [
'subject' => '{invoice_number} recurring invoice created', 'subject' => '{invoice_number} recurring invoice created',
'body' => 'Hello,<br /><br />Based on {customer_name} recurring circle, <strong>{invoice_number}</strong> invoice has been automatically created.<br /><br />You can see the invoice details from the following link: <a href="{invoice_admin_link}">{invoice_number}</a>.<br /><br />Best Regards,<br /><br />{company_name}', 'body' => 'Hello,<br /><br />Based on {customer_name} recurring circle, <strong>{invoice_number}</strong> invoice has been automatically created.<br /><br />You can see the invoice details from the following link: <a href="{invoice_admin_link}">{invoice_number}</a>.<br /><br />Best Regards,<br />{company_name}',
], ],
'invoice_payment_customer' => [ 'invoice_payment_customer' => [
'subject' => 'Payment received for {invoice_number} invoice', 'subject' => 'Payment received for {invoice_number} invoice',
'body' => 'Dear {customer_name},<br /><br />Thank you for the payment. Find the payment details below:<br /><br />-------------------------------------------------<br /><br />Amount: <strong>{transaction_total}<br /></strong>Date: <strong>{transaction_paid_date}</strong><br /><br />Invoice Number: <strong>{invoice_number}<br /><br /></strong>-------------------------------------------------<br />You can always see the invoice details from the following link: <a href="{invoice_guest_link}">{invoice_number}</a>.<br /><br />Feel free to contact us for any question.<br /><br />Best Regards,<br /><br />{company_name}', 'body' => 'Dear {customer_name},<br /><br />Thank you for the payment. Find the payment details below:<br /><br />-------------------------------------------------<br />Amount: <strong>{transaction_total}</strong><br />Date: <strong>{transaction_paid_date}</strong><br />Invoice Number: <strong>{invoice_number}</strong><br />-------------------------------------------------<br /><br />You can always see the invoice details from the following link: <a href="{invoice_guest_link}">{invoice_number}</a>.<br /><br />Feel free to contact us for any question.<br /><br />Best Regards,<br />{company_name}',
], ],
'invoice_payment_admin' => [ 'invoice_payment_admin' => [
'subject' => 'Payment received for {invoice_number} invoice', 'subject' => 'Payment received for {invoice_number} invoice',
'body' => 'Hello,<br /><br />{customer_name} recorded a payment for <strong>{invoice_number}</strong> invoice.<br /><br />You can see the invoice details from the following link: <a href="{invoice_admin_link}">{invoice_number}</a>.<br /><br />Best Regards,<br /><br />{company_name}', 'body' => 'Hello,<br /><br />{customer_name} recorded a payment for <strong>{invoice_number}</strong> invoice.<br /><br />You can see the invoice details from the following link: <a href="{invoice_admin_link}">{invoice_number}</a>.<br /><br />Best Regards,<br />{company_name}',
], ],
'bill_remind_admin' => [ 'bill_remind_admin' => [
'subject' => '{bill_number} bill reminding notice', 'subject' => '{bill_number} bill reminding notice',
'body' => 'Hello,<br /><br />This is a reminding notice for <strong>{bill_number}</strong> bill to {vendor_name}.<br /><br />The bill total is {bill_total} and is due <strong>{bill_due_date}</strong>.<br /><br />You can see the bill details from the following link: <a href="{bill_admin_link}">{bill_number}</a>.<br /><br />Best Regards,<br /><br />{company_name}', 'body' => 'Hello,<br /><br />This is a reminding notice for <strong>{bill_number}</strong> bill to {vendor_name}.<br /><br />The bill total is {bill_total} and is due <strong>{bill_due_date}</strong>.<br /><br />You can see the bill details from the following link: <a href="{bill_admin_link}">{bill_number}</a>.<br /><br />Best Regards,<br />{company_name}',
], ],
'bill_recur_admin' => [ 'bill_recur_admin' => [
'subject' => '{bill_number} recurring bill created', 'subject' => '{bill_number} recurring bill created',
'body' => 'Hello,<br /><br />Based on {vendor_name} recurring circle, <strong>{bill_number}</strong> invoice has been automatically created.<br /><br />You can see the bill details from the following link: <a href="{bill_admin_link}">{bill_number}</a>.<br /><br />Best Regards,<br /><br />{company_name}', 'body' => 'Hello,<br /><br />Based on {vendor_name} recurring circle, <strong>{bill_number}</strong> invoice has been automatically created.<br /><br />You can see the bill details from the following link: <a href="{bill_admin_link}">{bill_number}</a>.<br /><br />Best Regards,<br />{company_name}',
], ],
]; ];

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

@ -20,7 +20,7 @@
</label> </label>
</div> </div>
<input type="hidden" name="{{ $name }}" value="{{ ($value) ? true : false }}" /> <input type="hidden" name="{{ $name }}" value="{{ ($value) ? 1 : 0 }}" />
</div> </div>
<div class="invalid-feedback d-block" <div class="invalid-feedback d-block"

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

@ -36,9 +36,9 @@
<thead class="thead-light"> <thead class="thead-light">
<tr class="row table-head-line"> <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-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-2">@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-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-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-3 d-none d-md-block text-left">@sortablelink('contact.name', trans_choice('general.vendors', 1))</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-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-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-1 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> <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>
@ -50,12 +50,12 @@
<tr class="row align-items-center border-top-1"> <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> <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) @if ($item->reconciled)
<td class="col-xs-4 col-sm-4 col-md-3 col-lg-2 col-xl-2">@date($item->paid_at)</td> <td class="col-xs-4 col-sm-4 col-md-3 col-lg-2 col-xl-1">@date($item->paid_at)</td>
@else @else
<td class="col-xs-4 col-sm-4 col-md-3 col-lg-2 col-xl-2"><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-2 col-xl-1"><a class="col-aka" href="{{ route('payments.edit', $item->id) }}">@date($item->paid_at)</a></td>
@endif @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-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-3 d-none d-md-block text-left">{{ $item->contact->name }}</td> <td class="col-md-2 col-lg-2 col-xl-4 d-none d-md-block text-left">{{ $item->contact->name }}</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-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-1 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"> <td class="col-xs-4 col-sm-2 col-md-2 col-lg-1 col-xl-1 text-center">

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"> <table class="table table-hover align-items-center rp-border-collapse">
<tfoot class="border-top-style"> <tfoot class="border-top-style">
<tr class="rp-border-top-1"> <tr class="rp-border-top-1">
<th class="report-column text-uppercase">{{ trans('reports.net_profit') }}</th> <th class="report-column text-uppercase text-left text-nowrap">{{ trans('reports.net_profit') }}</th>
@foreach($class->net_profit as $profit) @foreach($class->net_profit as $profit)
<th class="report-column text-right px-0">@money($profit, setting('default.currency'), true)</th> <th class="report-column text-right px-0">@money($profit, setting('default.currency'), true)</th>
@endforeach @endforeach