diff --git a/config/menu.php b/config/menu.php index 5d85ce9c5..fca9b0a61 100644 --- a/config/menu.php +++ b/config/menu.php @@ -4,22 +4,7 @@ return [ '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, - 'metronic-horizontal' => \Akaunting\Menu\Presenters\Admin\MetronicHorizontal::class, - ], 'ordering' => true, diff --git a/public/css/print.css b/public/css/print.css index 22d1fb26e..4ccf74b59 100644 --- a/public/css/print.css +++ b/public/css/print.css @@ -146,6 +146,10 @@ th, td { font-size: 16px; } +.text-nowrap { + white-space: nowrap; +} + .text-left { text-align: left; } @@ -244,7 +248,7 @@ th, td { .invoice-classic-inline-frame { margin: 0.3% 1% 0.3% 1%; - width: 95 !important%; + width: 95 !important; height: 59px; border: 3px solid #3c3f72; } diff --git a/resources/lang/en-GB/email_templates.php b/resources/lang/en-GB/email_templates.php index 408f3a3b4..59e874483 100644 --- a/resources/lang/en-GB/email_templates.php +++ b/resources/lang/en-GB/email_templates.php @@ -4,47 +4,47 @@ return [ 'invoice_new_customer' => [ 'subject' => '{invoice_number} invoice created', - 'body' => 'Dear {customer_name},

We have prepared the following invoice for you: {invoice_number}.

You can see the invoice details and proceed with the payment from the following link: {invoice_number}.

Feel free to contact us for any question.

Best Regards,

{company_name}', + 'body' => 'Dear {customer_name},

We have prepared the following invoice for you: {invoice_number}.

You can see the invoice details and proceed with the payment from the following link: {invoice_number}.

Feel free to contact us for any question.

Best Regards,
{company_name}', ], 'invoice_remind_customer' => [ 'subject' => '{invoice_number} invoice overdue notice', - 'body' => 'Dear {customer_name},

This is an overdue notice for {invoice_number} invoice.

The invoice total is {invoice_total} and was due {invoice_due_date}.

You can see the invoice details and proceed with the payment from the following link: {invoice_number}.

Best Regards,

{company_name}', + 'body' => 'Dear {customer_name},

This is an overdue notice for {invoice_number} invoice.

The invoice total is {invoice_total} and was due {invoice_due_date}.

You can see the invoice details and proceed with the payment from the following link: {invoice_number}.

Best Regards,
{company_name}', ], 'invoice_remind_admin' => [ 'subject' => '{invoice_number} invoice overdue notice', - 'body' => 'Hello,

{customer_name} has received an overdue notice for {invoice_number} invoice.

The invoice total is {invoice_total} and was due {invoice_due_date}.

You can see the invoice details from the following link: {invoice_number}.

Best Regards,

{company_name}', + 'body' => 'Hello,

{customer_name} has received an overdue notice for {invoice_number} invoice.

The invoice total is {invoice_total} and was due {invoice_due_date}.

You can see the invoice details from the following link: {invoice_number}.

Best Regards,
{company_name}', ], 'invoice_recur_customer' => [ 'subject' => '{invoice_number} recurring invoice created', - 'body' => 'Dear {customer_name},

Based on your recurring circle, we have prepared the following invoice for you: {invoice_number}.

You can see the invoice details and proceed with the payment from the following link: {invoice_number}.

Feel free to contact us for any question.

Best Regards,

{company_name}', + 'body' => 'Dear {customer_name},

Based on your recurring circle, we have prepared the following invoice for you: {invoice_number}.

You can see the invoice details and proceed with the payment from the following link: {invoice_number}.

Feel free to contact us for any question.

Best Regards,
{company_name}', ], 'invoice_recur_admin' => [ 'subject' => '{invoice_number} recurring invoice created', - 'body' => 'Hello,

Based on {customer_name} recurring circle, {invoice_number} invoice has been automatically created.

You can see the invoice details from the following link: {invoice_number}.

Best Regards,

{company_name}', + 'body' => 'Hello,

Based on {customer_name} recurring circle, {invoice_number} invoice has been automatically created.

You can see the invoice details from the following link: {invoice_number}.

Best Regards,
{company_name}', ], 'invoice_payment_customer' => [ 'subject' => 'Payment received for {invoice_number} invoice', - 'body' => 'Dear {customer_name},

Thank you for the payment. Find the payment details below:

-------------------------------------------------

Amount: {transaction_total}
Date: {transaction_paid_date}

Invoice Number: {invoice_number}

-------------------------------------------------
You can always see the invoice details from the following link: {invoice_number}.

Feel free to contact us for any question.

Best Regards,

{company_name}', + 'body' => 'Dear {customer_name},

Thank you for the payment. Find the payment details below:

-------------------------------------------------
Amount: {transaction_total}
Date: {transaction_paid_date}
Invoice Number: {invoice_number}
-------------------------------------------------

You can always see the invoice details from the following link: {invoice_number}.

Feel free to contact us for any question.

Best Regards,
{company_name}', ], 'invoice_payment_admin' => [ 'subject' => 'Payment received for {invoice_number} invoice', - 'body' => 'Hello,

{customer_name} recorded a payment for {invoice_number} invoice.

You can see the invoice details from the following link: {invoice_number}.

Best Regards,

{company_name}', + 'body' => 'Hello,

{customer_name} recorded a payment for {invoice_number} invoice.

You can see the invoice details from the following link: {invoice_number}.

Best Regards,
{company_name}', ], 'bill_remind_admin' => [ 'subject' => '{bill_number} bill reminding notice', - 'body' => 'Hello,

This is a reminding notice for {bill_number} bill to {vendor_name}.

The bill total is {bill_total} and is due {bill_due_date}.

You can see the bill details from the following link: {bill_number}.

Best Regards,

{company_name}', + 'body' => 'Hello,

This is a reminding notice for {bill_number} bill to {vendor_name}.

The bill total is {bill_total} and is due {bill_due_date}.

You can see the bill details from the following link: {bill_number}.

Best Regards,
{company_name}', ], 'bill_recur_admin' => [ 'subject' => '{bill_number} recurring bill created', - 'body' => 'Hello,

Based on {vendor_name} recurring circle, {bill_number} invoice has been automatically created.

You can see the bill details from the following link: {bill_number}.

Best Regards,

{company_name}', + 'body' => 'Hello,

Based on {vendor_name} recurring circle, {bill_number} invoice has been automatically created.

You can see the bill details from the following link: {bill_number}.

Best Regards,
{company_name}', ], ]; diff --git a/resources/views/partials/form/radio_group.blade.php b/resources/views/partials/form/radio_group.blade.php index ec62d9015..65a7674d9 100644 --- a/resources/views/partials/form/radio_group.blade.php +++ b/resources/views/partials/form/radio_group.blade.php @@ -20,7 +20,7 @@ - +
{{ Form::bulkActionAllGroup() }} - @sortablelink('paid_at', trans('general.date'), ['filter' => 'active, visible'], ['class' => 'col-aka', 'rel' => 'nofollow']) + @sortablelink('paid_at', trans('general.date'), ['filter' => 'active, visible'], ['class' => 'col-aka', 'rel' => 'nofollow']) @sortablelink('amount', trans('general.amount')) - @sortablelink('contact.name', trans_choice('general.vendors', 1)) + @sortablelink('contact.name', trans_choice('general.vendors', 1)) @sortablelink('category.name', trans_choice('general.categories', 1)) @sortablelink('account.name', trans_choice('general.accounts', 1)) {{ trans('general.actions') }} @@ -50,12 +50,12 @@ {{ Form::bulkActionGroup($item->id, $item->contact->name) }} @if ($item->reconciled) - @date($item->paid_at) + @date($item->paid_at) @else - @date($item->paid_at) + @date($item->paid_at) @endif @money($item->amount, $item->currency_code, true) - {{ $item->contact->name }} + {{ $item->contact->name }} {{ $item->category->name }} {{ $item->account->name }} diff --git a/resources/views/reports/profit_loss/content/footer.blade.php b/resources/views/reports/profit_loss/content/footer.blade.php index 8f96b92a7..713c2f314 100644 --- a/resources/views/reports/profit_loss/content/footer.blade.php +++ b/resources/views/reports/profit_loss/content/footer.blade.php @@ -2,7 +2,7 @@ - + @foreach($class->net_profit as $profit) @endforeach
{{ trans('reports.net_profit') }}{{ trans('reports.net_profit') }}@money($profit, setting('default.currency'), true)