From 6f9ef5439cd2fd659a4c00739cbe25b2c384aa21 Mon Sep 17 00:00:00 2001 From: TheCOBAN Date: Sat, 1 Feb 2020 13:54:38 +0300 Subject: [PATCH 1/8] fix radio group disabled mode --- .../views/partials/form/radio_group.blade.php | 42 +++++++++---------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/resources/views/partials/form/radio_group.blade.php b/resources/views/partials/form/radio_group.blade.php index e24c3a323..d36d859b6 100644 --- a/resources/views/partials/form/radio_group.blade.php +++ b/resources/views/partials/form/radio_group.blade.php @@ -1,29 +1,27 @@ @stack($name . '_input_start') +
+ {!! Form::label($name, $text, ['class' => 'form-control-label']) !!} -
- {!! Form::label($name, $text, ['class' => 'form-control-label']) !!} +
+
+ -
-
- - - -
- -
- -
+
+
+
+
+
@stack($name . '_input_end') From 2ec8843bdf16c93b02858a7f16b0daa888f4e418 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Sat, 1 Feb 2020 14:15:31 +0300 Subject: [PATCH 2/8] styling --- resources/lang/en-GB/email_templates.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/resources/lang/en-GB/email_templates.php b/resources/lang/en-GB/email_templates.php index 408f3a3b4..bade1e6a5 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}', ], ]; From 7c579dd1b8494f851dc8f601d7273723945fca03 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Sat, 1 Feb 2020 14:37:29 +0300 Subject: [PATCH 3/8] more styling --- resources/lang/en-GB/email_templates.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/en-GB/email_templates.php b/resources/lang/en-GB/email_templates.php index bade1e6a5..59e874483 100644 --- a/resources/lang/en-GB/email_templates.php +++ b/resources/lang/en-GB/email_templates.php @@ -29,7 +29,7 @@ return [ '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' => [ From 7f3071798e742b5ac3693465e6c09d798ba6166b Mon Sep 17 00:00:00 2001 From: batuhanbas Date: Sat, 1 Feb 2020 15:23:48 +0300 Subject: [PATCH 4/8] payment list alignment updated --- resources/views/purchases/payments/index.blade.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/views/purchases/payments/index.blade.php b/resources/views/purchases/payments/index.blade.php index ba36239da..cc6c1f302 100644 --- a/resources/views/purchases/payments/index.blade.php +++ b/resources/views/purchases/payments/index.blade.php @@ -36,9 +36,9 @@ {{ 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 }} From 8e08f15f20bb9ad3c0a1324832e4ca0cea093493 Mon Sep 17 00:00:00 2001 From: batuhanbas Date: Sat, 1 Feb 2020 15:26:53 +0300 Subject: [PATCH 5/8] net profit print view updated --- public/css/print.css | 19 ++++++++++++++++++- .../profit_loss/content/footer.blade.php | 2 +- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/public/css/print.css b/public/css/print.css index 22d1fb26e..204fa41e1 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; } @@ -381,6 +385,19 @@ th, td { float: right; } +.report-column { + max-width: 100px; + width: 160px !important; +} + +.rp-value-left--48 { + padding-left:-48px; +} + +.rp-value-left-48 { + padding-left:48px; +} + /*! ========================================================= 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 From d8ebf472108a6567018003330b86b691d0ca0517 Mon Sep 17 00:00:00 2001 From: batuhanbas Date: Sat, 1 Feb 2020 15:28:55 +0300 Subject: [PATCH 6/8] useless classes deleted print --- public/css/print.css | 8 -------- 1 file changed, 8 deletions(-) diff --git a/public/css/print.css b/public/css/print.css index 204fa41e1..f38fd41ee 100644 --- a/public/css/print.css +++ b/public/css/print.css @@ -390,14 +390,6 @@ th, td { width: 160px !important; } -.rp-value-left--48 { - padding-left:-48px; -} - -.rp-value-left-48 { - padding-left:48px; -} - /*! ========================================================= From 62343119c2a3c987717cb09fc7257810275b883a Mon Sep 17 00:00:00 2001 From: batuhanbas Date: Sat, 1 Feb 2020 15:32:53 +0300 Subject: [PATCH 7/8] forgotten extra class deleted --- public/css/print.css | 5 ----- 1 file changed, 5 deletions(-) diff --git a/public/css/print.css b/public/css/print.css index f38fd41ee..4ccf74b59 100644 --- a/public/css/print.css +++ b/public/css/print.css @@ -385,11 +385,6 @@ th, td { float: right; } -.report-column { - max-width: 100px; - width: 160px !important; -} - /*! ========================================================= From ca9edb533b6c5d0ab3f4c52b664149cd811f1762 Mon Sep 17 00:00:00 2001 From: batuhanbas Date: Sat, 1 Feb 2020 15:50:09 +0300 Subject: [PATCH 8/8] unnecessary menu presenters deleted --- config/menu.php | 15 --------------- 1 file changed, 15 deletions(-) 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,
{{ trans('reports.net_profit') }}{{ trans('reports.net_profit') }}@money($profit, setting('default.currency'), true)