diff --git a/public/css/custom.css b/public/css/custom.css index a14396579..596c09420 100644 --- a/public/css/custom.css +++ b/public/css/custom.css @@ -19,14 +19,6 @@ /*--------General Button Hover Finish--------*/ -/*--------Invoice, Bill Note--------*/ -.show-note -{ - width: 65% !important; -} -/*--------Invoice, Bill Note Finish--------*/ - - /*--------Dashboard Categories--------*/ .dashboard-categories { @@ -35,22 +27,13 @@ } /*--------Dashboard Categories Finish--------*/ -/*--------Recurring Form Element--------*/ -.recurring-hidden -{ - position: absolute; - overflow: hidden; - z-index: -1; -} -/*--------Recurring Form Element Finish--------*/ - -/*--------Attachment Cursor--------*/ -.form-attachment +/*--------Cursor Pointer--------*/ +.cursor-pointer { - cursor: pointer; + cursor: pointer !important; } -/*--------Attachment Cursor Finish--------*/ +/*--------Cursor Pointer Finish--------*/ /*--------Table Head Search--------*/ @@ -62,14 +45,6 @@ /*--------Table Head Search Finish--------*/ -/*--------Login Logo--------*/ -.login-logo -{ - width: 22% !important; -} -/*--------Login Logo Finish--------*/ - - /*--------Wizard Steps--------*/ .wizard-header { @@ -289,14 +264,6 @@ /*--------Index Page Tables Finish--------*/ -/*--------Categories Input--------*/ -.color-box -{ - min-width: 3rem; -} -/*--------Categories Input Finish--------*/ - - /*--------Left Menu Dropdown--------*/ .menu-dropdown { @@ -431,7 +398,7 @@ /*--------Company Name--------*/ .d-grid { - display: grid; + display: grid !important; } /*--------Company Name Finish--------*/ diff --git a/resources/views/expenses/bills/show.blade.php b/resources/views/expenses/bills/show.blade.php index 32c243dac..00a0079a8 100644 --- a/resources/views/expenses/bills/show.blade.php +++ b/resources/views/expenses/bills/show.blade.php @@ -50,14 +50,14 @@
@stack('timeline_body_create_bill_head_start') -

{{ trans('bills.create_bill') }}

+

{{ trans('bills.create_bill') }}

@stack('timeline_body_create_bill_head_end') @stack('timeline_body_create_bill_body_start') @stack('timeline_body_create_bill_body_message_start')
-

{{ trans_choice('general.statuses', 1) . ':' }}

- {{ trans('bills.messages.status.created', ['date' => Date::parse($bill->created_at)->format($date_format)]) }} +

{{ trans_choice('general.statuses', 1) . ':' }}

+ {{ trans('bills.messages.status.created', ['date' => Date::parse($bill->created_at)->format($date_format)]) }}
@stack('timeline_body_create_bill_body_message_end') @@ -80,15 +80,15 @@
@stack('timeline_body_receive_bill_head_start') -

{{ trans('bills.receive_bill') }}

+

{{ trans('bills.receive_bill') }}

@stack('timeline_body_receive_bill_head_end') @stack('timeline_body_receive_bill_body_start') @if ($bill->status->code == 'draft') @stack('timeline_body_receive_bill_body_message_start')
-

{{ trans_choice('general.statuses', 1) . ':' }}

- {{ trans('bills.messages.status.receive.draft') }} +

{{ trans_choice('general.statuses', 1) . ':' }}

+ {{ trans('bills.messages.status.receive.draft') }}
@stack('timeline_body_receive_bill_body_message_end') @@ -102,8 +102,8 @@ @else @stack('timeline_body_receive_bill_body_message_start')
-

{{ trans_choice('general.statuses', 1) . ':' }}

- {{ trans('bills.messages.status.receive.received', ['date' => Date::parse($bill->created_at)->format($date_format)]) }} +

{{ trans_choice('general.statuses', 1) . ':' }}

+ {{ trans('bills.messages.status.receive.received', ['date' => Date::parse($bill->created_at)->format($date_format)]) }}
@stack('timeline_body_receive_bill_body_message_end') @endif @@ -120,18 +120,20 @@
@stack('timeline_body_make_payment_head_start') -

{{ trans('bills.make_payment') }}

+

{{ trans('bills.make_payment') }}

@stack('timeline_body_make_payment_head_end') @stack('timeline_body_make_payment_body_start') @stack('timeline_body_get_paid_body_message_start') @if($bill->status->code != 'paid' && empty($bill->transactions->count()))
-

{{ trans_choice('general.statuses', 1) . ':' }}

{{ trans('bills.messages.status.paid.await') }} +

{{ trans_choice('general.statuses', 1) . ':' }}

+ {{ trans('bills.messages.status.paid.await') }}
@else
-

{{ trans_choice('general.statuses', 1) . ':' }}

{{ trans('general.partially_paid') }} +

{{ trans_choice('general.statuses', 1) . ':' }}

+ {{ trans('general.partially_paid') }}
@endif @stack('timeline_body_make_payment_body_message_end') @@ -342,7 +344,7 @@ @stack('name_td_end') @stack('quantity_td_start') - {{ $item->quantity }} + {{ $item->quantity }} @stack('quantity_td_end') @stack('price_td_start') @@ -372,7 +374,7 @@

{{ trans_choice('general.notes', 2) }}:

-

{{ $bill->notes }}

+

{{ $bill->notes }}

@endif @@ -537,7 +539,7 @@ @foreach($bill->transactions as $transaction) @date($item->paid_at) - @money($transaction->amount, $transaction->currency_code, true) + @money($transaction->amount, $transaction->currency_code, true) {{ $transaction->account->name }} @if ($transaction->reconciled) diff --git a/resources/views/incomes/invoices/print.blade.php b/resources/views/incomes/invoices/print.blade.php index f6942c2b3..1db3069b8 100644 --- a/resources/views/incomes/invoices/print.blade.php +++ b/resources/views/incomes/invoices/print.blade.php @@ -197,7 +197,7 @@
-
+
@stack('notes_input_start') @@ -207,7 +207,7 @@

{{ trans_choice('general.notes', 2) }}

-

{{ $invoice->notes }}

+

{{ $invoice->notes }}

diff --git a/resources/views/incomes/invoices/show.blade.php b/resources/views/incomes/invoices/show.blade.php index d2759a636..7dc16d1a1 100644 --- a/resources/views/incomes/invoices/show.blade.php +++ b/resources/views/incomes/invoices/show.blade.php @@ -50,14 +50,14 @@
@stack('timeline_body_create_invoice_head_start') -

{{ trans('invoices.create_invoice') }}

+

{{ trans('invoices.create_invoice') }}

@stack('timeline_body_create_invoice_head_end') @stack('timeline_body_create_invoice_body_start') @stack('timeline_body_create_invoice_body_message_start')
-

{{ trans_choice('general.statuses', 1) . ':' }}

- {{ trans('invoices.messages.status.created', ['date' => Date::parse($invoice->created_at)->format($date_format)]) }} +

{{ trans_choice('general.statuses', 1) . ':' }}

+ {{ trans('invoices.messages.status.created', ['date' => Date::parse($invoice->created_at)->format($date_format)]) }}
@stack('timeline_body_create_invoice_body_message_end') @@ -80,14 +80,15 @@
@stack('timeline_body_send_invoice_head_start') -

{{ trans('invoices.send_invoice') }}

+

{{ trans('invoices.send_invoice') }}

@stack('timeline_body_send_invoice_head_end') @stack('timeline_body_send_invoice_body_start') @if ($invoice->status->code != 'sent' && $invoice->status->code != 'partial' && $invoice->status->code != 'viewed') @stack('timeline_body_send_invoice_body_message_start')
-

{{ trans_choice('general.statuses', 1) . ':' }}

{{ trans('invoices.messages.status.send.draft') }} +

{{ trans_choice('general.statuses', 1) . ':' }}

+ {{ trans('invoices.messages.status.send.draft') }}
@stack('timeline_body_send_invoice_body_message_end') @@ -117,13 +118,15 @@ @elseif($invoice->status->code == 'viewed') @stack('timeline_body_viewed_invoice_body_message_start')
-

{{ trans_choice('general.statuses', 1) . ':' }}

{{ trans('invoices.messages.status.viewed') }} +

{{ trans_choice('general.statuses', 1) . ':' }}

+ {{ trans('invoices.messages.status.viewed') }}
@stack('timeline_body_viewed_invoice_body_message_end') @else @stack('timeline_body_send_invoice_body_message_start')
-

{{ trans_choice('general.statuses', 1) . ':' }}

{{ trans('invoices.messages.status.send.sent', ['date' => Date::parse($invoice->created_at)->format($date_format)]) }} +

{{ trans_choice('general.statuses', 1) . ':' }}

+ {{ trans('invoices.messages.status.send.sent', ['date' => Date::parse($invoice->created_at)->format($date_format)]) }}
@stack('timeline_body_send_invoice_body_message_end') @endif @@ -140,18 +143,20 @@
@stack('timeline_body_get_paid_head_start') -

{{ trans('invoices.get_paid') }}

+

{{ trans('invoices.get_paid') }}

@stack('timeline_body_get_paid_head_end') @stack('timeline_body_get_paid_body_start') @stack('timeline_body_get_paid_body_message_start') @if($invoice->status->code != 'paid' && empty($invoice->transactions->count()))
-

{{ trans_choice('general.statuses', 1) . ':' }}

{{ trans('invoices.messages.status.paid.await') }} +

{{ trans_choice('general.statuses', 1) . ':' }}

+ {{ trans('invoices.messages.status.paid.await') }}
@else
-

{{ trans_choice('general.statuses', 1) . ':' }}

{{ trans('general.partially_paid') }} +

{{ trans_choice('general.statuses', 1) . ':' }}

+ {{ trans('general.partially_paid') }}
@endif @stack('timeline_body_get_paid_body_message_end') @@ -364,7 +369,7 @@ @stack('name_td_end') @stack('quantity_td_start') - {{ $item->quantity }} + {{ $item->quantity }} @stack('quantity_td_end') @stack('price_td_start') @@ -394,7 +399,7 @@

{{ trans_choice('general.notes', 2) }}

-

{{ $invoice->notes }}

+

{{ $invoice->notes }}

@endif @@ -582,7 +587,7 @@ @foreach($invoice->transactions as $transaction) @date($transaction->paid_at) - @money($transaction->amount, $transaction->currency_code, true) + @money($transaction->amount, $transaction->currency_code, true) {{ $transaction->account->name }} @if ($transaction->reconciled) diff --git a/resources/views/layouts/auth.blade.php b/resources/views/layouts/auth.blade.php index a5178131c..3c9d85685 100644 --- a/resources/views/layouts/auth.blade.php +++ b/resources/views/layouts/auth.blade.php @@ -12,7 +12,7 @@
- + Akaunting
diff --git a/resources/views/layouts/install.blade.php b/resources/views/layouts/install.blade.php index 0df6433ba..ce09ba2eb 100644 --- a/resources/views/layouts/install.blade.php +++ b/resources/views/layouts/install.blade.php @@ -10,7 +10,7 @@
- + Akaunting
diff --git a/resources/views/partials/form/file_group.blade.php b/resources/views/partials/form/file_group.blade.php index fcb3c3423..6b34bb253 100644 --- a/resources/views/partials/form/file_group.blade.php +++ b/resources/views/partials/form/file_group.blade.php @@ -6,7 +6,7 @@
{!! Form::file($name, array_merge([ - 'class' => 'custom-file-input form-attachment cursor', + 'class' => 'custom-file-input cursor-pointer', '@input' => 'onHandleFileUpload("' . $name .'", $event)' ], $attributes)) !!} {!! Form::label($name, $text, ['class' => 'custom-file-label']) !!} diff --git a/resources/views/portal/invoices/show.blade.php b/resources/views/portal/invoices/show.blade.php index c03806eff..d7ee4b001 100644 --- a/resources/views/portal/invoices/show.blade.php +++ b/resources/views/portal/invoices/show.blade.php @@ -217,7 +217,7 @@ @if ($invoice->notes)

{{ trans_choice('general.notes', 2) }}

-

{{ $invoice->notes }}

+

{{ $invoice->notes }}

@endif diff --git a/resources/views/portal/invoices/signed.blade.php b/resources/views/portal/invoices/signed.blade.php index b376f8b28..9adff9c64 100644 --- a/resources/views/portal/invoices/signed.blade.php +++ b/resources/views/portal/invoices/signed.blade.php @@ -13,9 +13,9 @@
-
-
-
+
+
+
@@ -33,6 +33,7 @@
+
@@ -138,39 +139,48 @@ - -
-
-
- - - - - - - - @foreach($invoice->items as $item) +
+
+
{{ trans_choice('general.items', 1) }}{{ trans('invoices.quantity') }}{{ trans('invoices.price') }}{{ trans('invoices.total') }}
+ - - - - + + + + - @endforeach - -
{{ $item->name }}{{ $item->quantity }}@money($item->price, $invoice->currency_code, true)@money($item->total, $invoice->currency_code, true){{ trans_choice('general.items', 1) }}{{ trans('invoices.quantity') }}{{ trans('invoices.price') }}{{ trans('invoices.total') }}
-
-
- -
-
-
- @if ($invoice->notes) -

{{ trans_choice('general.notes', 2) }}

-

{{ $invoice->notes }}

- @endif + @foreach($invoice->items as $item) + + {{ $item->name }} + {{ $item->quantity }} + @money($item->price, $invoice->currency_code, true) + @money($item->total, $invoice->currency_code, true) + + @endforeach + +
+
+ +
+
+
+ + + + + + +
+ @if ($invoice->notes) +

{{ trans_choice('general.notes', 2) }}

+

{{ $invoice->notes }}

+ @endif +
+
+
+
@@ -219,6 +229,7 @@ @endif @endif +
  {{ trans('general.print') }}