- {!! Form::button(trans('reconciliations.transactions'), ['type' => 'button', '@click' => 'onReconcilition', 'class' => 'btn btn-success header-button-top']) !!}
+ {!! Form::button(' ' . trans('reconciliations.transactions'), ['type' => 'button', '@click' => 'onReconcilition', 'class' => 'btn btn-success header-button-top']) !!}
@@ -140,15 +140,15 @@
@if ($transactions->count())
-
+
{!! Form::button(
- '
' . trans('reconciliations.reconcile') . '',
- [':disabled' => 'reconcile || form.loading', '@click' => 'onReconcileSubmit', 'type' => 'button', 'class' => 'btn btn-icon btn-info header-button-top']) !!}
+ '
' . '
' . trans('reconciliations.reconcile') . '',
+ [':disabled' => 'reconcile || form.loading', '@click' => 'onReconcileSubmit', 'type' => 'button', 'class' => 'btn btn-icon btn-info header-button-top', 'data-loading-text' => trans('general.loading')]) !!}
{!! Form::button(
- '
' . trans('general.save') . '',
- [':disabled' => 'form.loading', 'type' => 'submit', 'class' => 'btn btn-icon btn-success header-button-top']) !!}
+ '
' . '
' . trans('general.save') . '',
+ [':disabled' => 'form.loading', 'type' => 'submit', 'class' => 'btn btn-icon btn-success header-button-top', 'data-loading-text' => trans('general.loading')]) !!}
@else
diff --git a/resources/views/banking/reconciliations/edit.blade.php b/resources/views/banking/reconciliations/edit.blade.php
index b04c9c782..5e1caf745 100644
--- a/resources/views/banking/reconciliations/edit.blade.php
+++ b/resources/views/banking/reconciliations/edit.blade.php
@@ -113,15 +113,15 @@
@if ($transactions->count())
-
+
{!! Form::button(
- '
' . trans('reconciliations.reconcile') . '',
+ '
' . '
' . trans('reconciliations.reconcile') . '',
[':disabled' => 'reconcile || form.loading', '@click' => 'onReconcileSubmit', 'type' => 'button', 'class' => 'btn btn-icon btn-info header-button-top', 'data-loading-text' => trans('general.loading')]) !!}
{!! Form::button(
- '
' . trans('general.save') . '',
- [':disabled' => 'form.loading', 'type' => 'submit', 'class' => 'btn btn-icon btn-success header-button-top']) !!}
+ '
' . '
' . trans('general.save') . '',
+ [':disabled' => 'form.loading', 'type' => 'submit', 'class' => 'btn btn-icon btn-success header-button-top', 'data-loading-text' => trans('general.loading')]) !!}
@else
diff --git a/resources/views/banking/reconciliations/index.blade.php b/resources/views/banking/reconciliations/index.blade.php
index 2c0a9b255..4ff221f0c 100644
--- a/resources/views/banking/reconciliations/index.blade.php
+++ b/resources/views/banking/reconciliations/index.blade.php
@@ -4,7 +4,7 @@
@section('new_button')
@can('create-banking-reconciliations')
-
{{ trans('general.add_new') }}
+
{{ trans('general.add_new') }}
@endcan
@endsection
diff --git a/resources/views/banking/transactions/index.blade.php b/resources/views/banking/transactions/index.blade.php
index 58d9a3a95..65adc3986 100644
--- a/resources/views/banking/transactions/index.blade.php
+++ b/resources/views/banking/transactions/index.blade.php
@@ -3,14 +3,14 @@
@section('title', trans_choice('general.transactions', 2))
@section('new_button')
- @can('create-sales-revenues')
-
{{ trans('general.add_income') }}
- @endcan
- @can('create-purchases-payments')
-
{{ trans('general.add_expense') }}
- @endcan
-
{{ trans('import.import') }}
-
{{ trans('general.export') }}
+ @permission('create-sales-revenues')
+
+ @endpermission
+ @permission('create-purchases-payments')
+
+ @endpermission
+
+
@endsection
@section('content')
diff --git a/resources/views/banking/transfers/index.blade.php b/resources/views/banking/transfers/index.blade.php
index 58440ec56..cdfe5ab14 100644
--- a/resources/views/banking/transfers/index.blade.php
+++ b/resources/views/banking/transfers/index.blade.php
@@ -3,10 +3,10 @@
@section('title', trans_choice('general.transfers', 2))
@section('new_button')
- @can('create-banking-transfers')
-
- @endcan
-
+ @permission('create-banking-transfers')
+
+ @endpermission
+
@endsection
@@ -59,10 +59,10 @@
diff --git a/resources/views/common/companies/index.blade.php b/resources/views/common/companies/index.blade.php
index b4de518d9..4ee8a1d8f 100644
--- a/resources/views/common/companies/index.blade.php
+++ b/resources/views/common/companies/index.blade.php
@@ -4,7 +4,7 @@
@can('create-common-companies')
@section('new_button')
-
{{ trans('general.add_new') }}
+
{{ trans('general.add_new') }}
@endsection
@endcan
diff --git a/resources/views/common/dashboards/index.blade.php b/resources/views/common/dashboards/index.blade.php
index 06cc6964a..4044031bb 100644
--- a/resources/views/common/dashboards/index.blade.php
+++ b/resources/views/common/dashboards/index.blade.php
@@ -4,7 +4,7 @@
@can('create-common-dashboards')
@section('new_button')
-
{{ trans('general.add_new') }}
+
{{ trans('general.add_new') }}
@endsection
@endcan
diff --git a/resources/views/common/import/create.blade.php b/resources/views/common/import/create.blade.php
index aab88ecb6..50a032dd6 100644
--- a/resources/views/common/import/create.blade.php
+++ b/resources/views/common/import/create.blade.php
@@ -41,8 +41,8 @@
diff --git a/resources/views/common/items/index.blade.php b/resources/views/common/items/index.blade.php
index 6a7170a7f..945a1acd3 100644
--- a/resources/views/common/items/index.blade.php
+++ b/resources/views/common/items/index.blade.php
@@ -3,11 +3,11 @@
@section('title', trans_choice('general.items', 2))
@section('new_button')
- @can('create-common-items')
-
{{ trans('general.add_new') }}
-
{{ trans('import.import') }}
- @endcan
-
{{ trans('general.export') }}
+ @permission('create-common-items')
+
+
+ @endpermission
+
@endsection
@section('content')
@@ -82,14 +82,14 @@
diff --git a/resources/views/common/reports/index.blade.php b/resources/views/common/reports/index.blade.php
index 07d96c218..a1df6af5d 100644
--- a/resources/views/common/reports/index.blade.php
+++ b/resources/views/common/reports/index.blade.php
@@ -3,10 +3,10 @@
@section('title', trans_choice('general.reports', 2))
@section('new_button')
- @can('create-common-reports')
-
{{ trans('general.add_new') }}
- @endcan
-
{{ trans('general.clear_cache') }}
+ @permission('create-common-reports')
+
+ @endpermission
+
@endsection
@section('content')
@@ -26,14 +26,14 @@
diff --git a/resources/views/errors/403.blade.php b/resources/views/errors/403.blade.php
index f351f8df7..3c9eee2ac 100644
--- a/resources/views/errors/403.blade.php
+++ b/resources/views/errors/403.blade.php
@@ -5,9 +5,7 @@
@section('content')
@endsection
diff --git a/resources/views/errors/404.blade.php b/resources/views/errors/404.blade.php
index 3cf4cdeca..7ca8aefea 100644
--- a/resources/views/errors/404.blade.php
+++ b/resources/views/errors/404.blade.php
@@ -5,9 +5,7 @@
@section('content')
@endsection
diff --git a/resources/views/errors/500.blade.php b/resources/views/errors/500.blade.php
index 301fef4cb..d2e9df81b 100644
--- a/resources/views/errors/500.blade.php
+++ b/resources/views/errors/500.blade.php
@@ -5,9 +5,7 @@
@section('content')
@endsection
diff --git a/resources/views/install/updates/edit.blade.php b/resources/views/install/updates/edit.blade.php
index 747f4e6cd..b37f2ec92 100644
--- a/resources/views/install/updates/edit.blade.php
+++ b/resources/views/install/updates/edit.blade.php
@@ -3,7 +3,7 @@
@section('title', trans_choice('general.updates', 2))
@section('new_button')
-
{{ trans('updates.check') }}
+
@endsection
@section('content')
diff --git a/resources/views/install/updates/index.blade.php b/resources/views/install/updates/index.blade.php
index ba282219d..01a433f82 100644
--- a/resources/views/install/updates/index.blade.php
+++ b/resources/views/install/updates/index.blade.php
@@ -3,7 +3,7 @@
@section('title', trans_choice('general.updates', 2))
@section('new_button')
-
+
@endsection
@section('content')
@@ -25,11 +25,11 @@
@endif
@@ -62,7 +62,7 @@
{{ $module->latest }} |
- {{ trans_choice('general.updates', 1) }}
+ {{ trans_choice('general.updates', 1) }}
|
diff --git a/resources/views/layouts/install.blade.php b/resources/views/layouts/install.blade.php
index e3fc92f79..50ca3ff80 100644
--- a/resources/views/layouts/install.blade.php
+++ b/resources/views/layouts/install.blade.php
@@ -40,16 +40,18 @@
{!! Form::close() !!}
diff --git a/resources/views/partials/reports/header.blade.php b/resources/views/partials/reports/header.blade.php
index aca2eff7f..bb791ea6a 100644
--- a/resources/views/partials/reports/header.blade.php
+++ b/resources/views/partials/reports/header.blade.php
@@ -1,10 +1,14 @@
@section('title', $class->model->name)
@section('new_button')
-
- {{ trans('general.print') }}
-
-
+
+
+
+
+
+
@endsection
diff --git a/resources/views/partials/reports/table/rows.blade.php b/resources/views/partials/reports/table/rows.blade.php
index 85f4a91b6..2901beb30 100644
--- a/resources/views/partials/reports/table/rows.blade.php
+++ b/resources/views/partials/reports/table/rows.blade.php
@@ -1,6 +1,6 @@
@if ($row_total = array_sum($rows))
- | {{ $class->row_names[$table][$id] }} |
+ {{ $class->row_names[$table][$id] }} |
@foreach($rows as $row)
@money($row, setting('default.currency'), true) |
@endforeach
diff --git a/resources/views/portal/invoices/show.blade.php b/resources/views/portal/invoices/show.blade.php
index 11cd0f9e1..1d065acbb 100644
--- a/resources/views/portal/invoices/show.blade.php
+++ b/resources/views/portal/invoices/show.blade.php
@@ -291,13 +291,13 @@
@stack('button_print_start')
@stack('button_print_end')
@stack('button_pdf_start')
@stack('button_pdf_end')
diff --git a/resources/views/portal/invoices/signed.blade.php b/resources/views/portal/invoices/signed.blade.php
index e046313bc..5ae8d85b2 100644
--- a/resources/views/portal/invoices/signed.blade.php
+++ b/resources/views/portal/invoices/signed.blade.php
@@ -3,7 +3,7 @@
@section('title', trans_choice('general.invoices', 1) . ': ' . $invoice->invoice_number)
@section('new_button')
- {{ trans('invoices.all_invoices') }}
+ {{ trans('invoices.all_invoices') }}
@endsection
@section('content')
@@ -235,11 +235,11 @@
diff --git a/resources/views/purchases/bills/index.blade.php b/resources/views/purchases/bills/index.blade.php
index 97f715f75..fc7273dbb 100644
--- a/resources/views/purchases/bills/index.blade.php
+++ b/resources/views/purchases/bills/index.blade.php
@@ -3,11 +3,11 @@
@section('title', trans_choice('general.bills', 2))
@section('new_button')
- @can('create-purchases-bills')
- {{ trans('general.add_new') }}
- {{ trans('import.import') }}
- @endcan
- {{ trans('general.export') }}
+ @permission('create-purchases-bills')
+
+
+ @endpermission
+
@endsection
@section('content')
@@ -73,21 +73,21 @@
@if ($item->status != 'cancelled')
- @can('create-purchases-bills')
+ @permission('create-purchases-bills')
{{ trans('general.duplicate') }}
- @endcan
+ @endpermission
- @can('update-purchases-bills')
+ @permission('update-purchases-bills')
{{ trans('general.cancel') }}
- @endcan
+ @endpermission
@endif
- @can('delete-purchases-bills')
+ @permission('delete-purchases-bills')
@if (!$item->reconciled)
{!! Form::deleteLink($item, 'bills.destroy') !!}
@endif
- @endcan
+ @endpermission
diff --git a/resources/views/purchases/bills/show.blade.php b/resources/views/purchases/bills/show.blade.php
index bb837123c..160205a79 100644
--- a/resources/views/purchases/bills/show.blade.php
+++ b/resources/views/purchases/bills/show.blade.php
@@ -448,14 +448,14 @@
@stack('button_edit_start')
@if(!$bill->reconciled)
@endif
@stack('button_edit_end')
@stack('button_print_start')
@stack('button_print_end')
@@ -611,7 +611,7 @@
]);
@endphp
- {!! Form::button(trans('general.delete'), array(
+ {!! Form::button(' ' . trans('general.delete'), array(
'type' => 'button',
'class' => 'btn btn-danger btn-sm',
'title' => trans('general.delete'),
diff --git a/resources/views/purchases/payments/index.blade.php b/resources/views/purchases/payments/index.blade.php
index 3c24e4cb6..c46ac2311 100644
--- a/resources/views/purchases/payments/index.blade.php
+++ b/resources/views/purchases/payments/index.blade.php
@@ -3,11 +3,11 @@
@section('title', trans_choice('general.payments', 2))
@section('new_button')
- @can('create-purchases-payments')
- {{ trans('general.add_new') }}
- {{ trans('import.import') }}
- @endcan
- {{ trans('general.export') }}
+ @permission('create-purchases-payments')
+
+
+ @endpermission
+
@endsection
@section('content')
@@ -93,15 +93,15 @@
@endif
@if (empty($item->document_id))
- @can('create-purchases-payments')
+ @permission('create-purchases-payments')
{{ trans('general.duplicate') }}
- @endcan
+ @endpermission
@endif
@if (!$item->reconciled)
- @can('delete-purchases-payments')
+ @permission('delete-purchases-payments')
{!! Form::deleteLink($item, 'payments.destroy') !!}
- @endcan
+ @endpermission
@endif
diff --git a/resources/views/purchases/vendors/index.blade.php b/resources/views/purchases/vendors/index.blade.php
index 8d2f4501a..5c44fef9d 100644
--- a/resources/views/purchases/vendors/index.blade.php
+++ b/resources/views/purchases/vendors/index.blade.php
@@ -3,11 +3,11 @@
@section('title', trans_choice('general.vendors', 2))
@section('new_button')
- @can('create-purchases-vendors')
- {{ trans('general.add_new') }}
- {{ trans('import.import') }}
- @endcan
- {{ trans('general.export') }}
+ @permission('create-purchases-vendors')
+
+
+ @endpermission
+
@endsection
@section('content')
@@ -82,14 +82,14 @@
diff --git a/resources/views/purchases/vendors/show.blade.php b/resources/views/purchases/vendors/show.blade.php
index e2360a465..d05518b59 100644
--- a/resources/views/purchases/vendors/show.blade.php
+++ b/resources/views/purchases/vendors/show.blade.php
@@ -68,7 +68,7 @@
@stack('vendor_edit_button_start')
- {{ trans('general.edit') }}
+ {{ trans('general.edit') }}
@stack('vendor_edit_button_end')
diff --git a/resources/views/sales/customers/index.blade.php b/resources/views/sales/customers/index.blade.php
index 9c4dc6d55..45fe846d8 100644
--- a/resources/views/sales/customers/index.blade.php
+++ b/resources/views/sales/customers/index.blade.php
@@ -3,11 +3,11 @@
@section('title', trans_choice('general.customers', 2))
@section('new_button')
- @can('create-sales-customers')
- {{ trans('general.add_new') }}
- {{ trans('import.import') }}
- @endcan
-
+ @permission('create-sales-customers')
+
+
+ @endpermission
+
@endsection
@section('content')
@@ -84,14 +84,14 @@
{{ trans('general.edit') }}
- @can('create-sales-customers')
+ @permission('create-sales-customers')
{{ trans('general.duplicate') }}
- @endcan
- @can('delete-sales-customers')
+ @endpermission
+ @permission('delete-sales-customers')
{!! Form::deleteLink($item, 'customers.destroy') !!}
- @endcan
+ @endpermission
diff --git a/resources/views/sales/customers/show.blade.php b/resources/views/sales/customers/show.blade.php
index ee90d0b08..1d1568e23 100644
--- a/resources/views/sales/customers/show.blade.php
+++ b/resources/views/sales/customers/show.blade.php
@@ -68,7 +68,7 @@
@stack('customer_edit_button_start')
- {{ trans('general.edit') }}
+ {{ trans('general.edit') }}
@stack('customer_edit_button_end')
diff --git a/resources/views/sales/invoices/index.blade.php b/resources/views/sales/invoices/index.blade.php
index 6918bfdb0..301240c1d 100644
--- a/resources/views/sales/invoices/index.blade.php
+++ b/resources/views/sales/invoices/index.blade.php
@@ -3,11 +3,11 @@
@section('title', trans_choice('general.invoices', 2))
@section('new_button')
- @can('create-sales-invoices')
-
-
- @endcan
-
+ @permission('create-sales-invoices')
+
+
+ @endpermission
+
@endsection
@section('content')
@@ -72,21 +72,21 @@
@if ($item->status != 'cancelled')
- @can('create-sales-invoices')
+ @permission('create-sales-invoices')
{{ trans('general.duplicate') }}
- @endcan
+ @endpermission
- @can('update-sales-invoices')
+ @permission('update-sales-invoices')
{{ trans('general.cancel') }}
- @endcan
+ @endpermission
@endif
- @can('delete-sales-invoices')
+ @permission('delete-sales-invoices')
@if (!$item->reconciled)
{!! Form::deleteLink($item, 'invoices.destroy') !!}
@endif
- @endcan
+ @endpermission
diff --git a/resources/views/sales/invoices/show.blade.php b/resources/views/sales/invoices/show.blade.php
index 1def2453b..553c25214 100644
--- a/resources/views/sales/invoices/show.blade.php
+++ b/resources/views/sales/invoices/show.blade.php
@@ -463,21 +463,21 @@
@stack('button_edit_start')
@if(!$invoice->reconciled)
@endif
@stack('button_edit_end')
@stack('button_print_start')
@stack('button_print_end')
@if ($invoice->status != 'cancelled')
@stack('button_share_start')
@stack('button_share_end')
@endif
@@ -643,7 +643,7 @@
]);
@endphp
- {!! Form::button(trans('general.delete'), array(
+ {!! Form::button(' ' . trans('general.delete'), array(
'type' => 'button',
'class' => 'btn btn-danger btn-sm',
'title' => trans('general.delete'),
diff --git a/resources/views/sales/revenues/index.blade.php b/resources/views/sales/revenues/index.blade.php
index 75930749e..41b39f4bc 100644
--- a/resources/views/sales/revenues/index.blade.php
+++ b/resources/views/sales/revenues/index.blade.php
@@ -4,10 +4,10 @@
@section('new_button')
@can('create-sales-revenues')
- {{ trans('general.add_new') }}
- {{ trans('import.import') }}
+
+
@endcan
- {{ trans('general.export') }}
+
@endsection
@section('content')
diff --git a/resources/views/settings/categories/index.blade.php b/resources/views/settings/categories/index.blade.php
index 50d1a1ade..0fa4f26c5 100644
--- a/resources/views/settings/categories/index.blade.php
+++ b/resources/views/settings/categories/index.blade.php
@@ -4,7 +4,7 @@
@can('create-settings-categories')
@section('new_button')
- {{ trans('general.add_new') }}
+ {{ trans('general.add_new') }}
@endsection
@endcan
diff --git a/resources/views/settings/currencies/index.blade.php b/resources/views/settings/currencies/index.blade.php
index 3a22a21ba..67f4bc5b2 100644
--- a/resources/views/settings/currencies/index.blade.php
+++ b/resources/views/settings/currencies/index.blade.php
@@ -4,7 +4,7 @@
@can('create-settings-currencies')
@section('new_button')
- {{ trans('general.add_new') }}
+
@endsection
@endcan
diff --git a/resources/views/settings/invoice/edit.blade.php b/resources/views/settings/invoice/edit.blade.php
index 447fb3c7f..b9682d4c9 100644
--- a/resources/views/settings/invoice/edit.blade.php
+++ b/resources/views/settings/invoice/edit.blade.php
@@ -45,7 +45,7 @@
diff --git a/resources/views/settings/taxes/index.blade.php b/resources/views/settings/taxes/index.blade.php
index fd22cde08..b23830061 100644
--- a/resources/views/settings/taxes/index.blade.php
+++ b/resources/views/settings/taxes/index.blade.php
@@ -4,7 +4,7 @@
@can('create-settings-taxes')
@section('new_button')
- {{ trans('general.add_new') }}
+ {{ trans('general.add_new') }}
@endsection
@endcan