added export and improved import

resources/views/common/import/create.blade.php

@@ -9,7 +9,7 @@
         <div class="box-body">
             <div class="col-md-12">
                 <div class="alert alert-info alert-important">
-                    {!! trans('import.message', ['link' => url('public/files/import/' . $type . '.csv')]) !!}
+                    {!! trans('import.message', ['link' => url('public/files/import/' . $type . '.xlsx')]) !!}
                 </div>
             </div>
             <div class="form-group col-md-12 required {{ $errors->has('import') ? 'has-error' : '' }}" style="min-height: 59px">

resources/views/common/items/create.blade.php

@@ -5,7 +5,7 @@
 @section('content')
     <!-- Default box -->
     <div class="box box-success">
-        {!! Form::open(['url' => 'common/items', 'files' => true, 'role' => 'form']) !!}
+        {!! Form::open(['route' => 'items.store', 'files' => true, 'role' => 'form']) !!}
 
         <div class="box-body">
             {{ Form::textGroup('name', trans('general.name'), 'id-card-o') }}

resources/views/common/items/edit.blade.php

@@ -8,7 +8,7 @@
     {!! Form::model($item, [
         'method' => 'PATCH',
         'files' => true,
-        'url' => ['common/items', $item->id],
+        'route' => ['items.update', $item->id],
         'role' => 'form'
     ]) !!}
 

resources/views/common/items/index.blade.php

@@ -2,18 +2,19 @@
 
 @section('title', trans_choice('general.items', 2))
 
-@permission('create-common-items')
 @section('new_button')
-<span class="new-button"><a href="{{ url('common/items/create') }}" class="btn btn-success btn-sm"><span class="fa fa-plus"></span> &nbsp;{{ trans('general.add_new') }}</a></span>
-<span><a href="{{ url('common/import/common/items') }}" class="btn btn-success btn-sm"><span class="fa fa-download"></span> &nbsp;{{ trans('import.import') }}</a></span>
-@endsection
+@permission('create-common-items')
+<span class="new-button"><a href="{{ route('items.create') }}" class="btn btn-success btn-sm"><span class="fa fa-plus"></span> &nbsp;{{ trans('general.add_new') }}</a></span>
+<span><a href="{{ route('import.create', ['common', 'items']) }}" class="btn btn-default btn-sm"><span class="fa fa-download"></span> &nbsp;{{ trans('import.import') }}</a></span>
 @endpermission
+<span><a href="{{ route('items.export', request()->input()) }}" class="btn btn-default btn-sm"><span class="fa fa-upload"></span> &nbsp;{{ trans('general.export') }}</a></span>
+@endsection
 
 @section('content')
 <!-- Default box -->
 <div class="box box-success">
     <div class="box-header with-border">
-        {!! Form::open(['url' => 'common/items', 'role' => 'form', 'method' => 'GET']) !!}
+        {!! Form::open(['route' => 'items.index', 'role' => 'form', 'method' => 'GET']) !!}
         <div class="pull-left">
             <span class="title-filter hidden-xs">{{ trans('general.search') }}:</span>
             {!! Form::text('search', request('search'), ['class' => 'form-control input-filter input-sm', 'placeholder' => trans('general.search_placeholder')]) !!}
@@ -47,7 +48,7 @@
                 @foreach($items as $item)
                     <tr>
                         <td class="hidden-xs"><img src="{{ $item->picture ? Storage::url($item->picture->id) : asset('public/img/akaunting-logo-green.png') }}" class="img-thumbnail" width="50" alt="{{ $item->name }}"></td>
-                        <td><a href="{{ url('common/items/' . $item->id . '/edit') }}">{{ $item->name }}</a></td>
+                        <td><a href="{{ route('items.edit', $item->id) }}">{{ $item->name }}</a></td>
                         <td class="hidden-xs">{{ $item->category ? $item->category->name : trans('general.na') }}</td>
                         <td class="hidden-xs">{{ $item->quantity }}</td>
                         <td class="text-right amount-space">{{ money($item->sale_price, setting('general.default_currency'), true) }}</td>
@@ -65,10 +66,10 @@
                                     <i class="fa fa-ellipsis-h"></i>
                                 </button>
                                 <ul class="dropdown-menu dropdown-menu-right">
-                                    <li><a href="{{ url('common/items/' . $item->id . '/edit') }}">{{ trans('general.edit') }}</a></li>
+                                    <li><a href="{{ route('items.edit', $item->id) }}">{{ trans('general.edit') }}</a></li>
                                     <li class="divider"></li>
                                     @permission('create-common-items')
-                                    <li><a href="{{ url('common/items/' . $item->id . '/duplicate') }}">{{ trans('general.duplicate') }}</a></li>
+                                    <li><a href="{{ route('items.duplicate', $item->id) }}">{{ trans('general.duplicate') }}</a></li>
                                     <li class="divider"></li>
                                     @endpermission
                                     @permission('delete-common-items')

resources/views/expenses/bills/index.blade.php

@@ -2,12 +2,13 @@
 
 @section('title', trans_choice('general.bills', 2))
 
-@permission('create-expenses-bills')
 @section('new_button')
+@permission('create-expenses-bills')
 <span class="new-button"><a href="{{ url('expenses/bills/create') }}" class="btn btn-success btn-sm"><span class="fa fa-plus"></span> &nbsp;{{ trans('general.add_new') }}</a></span>
-<span><a href="{{ url('common/import/expenses/bills') }}" class="btn btn-success btn-sm"><span class="fa fa-download"></span> &nbsp;{{ trans('import.import') }}</a></span>
-@endsection
+<span><a href="{{ url('common/import/expenses/bills') }}" class="btn btn-default btn-sm"><span class="fa fa-download"></span> &nbsp;{{ trans('import.import') }}</a></span>
 @endpermission
+<span><a href="{{ route('bills.export', request()->input()) }}" class="btn btn-default btn-sm"><span class="fa fa-upload"></span> &nbsp;{{ trans('general.export') }}</a></span>
+@endsection
 
 @section('content')
 <!-- Default box -->

resources/views/expenses/payments/index.blade.php

@@ -2,12 +2,13 @@
 
 @section('title', trans_choice('general.payments', 2))
 
-@permission('create-expenses-payments')
 @section('new_button')
+@permission('create-expenses-payments')
 <span class="new-button"><a href="{{ url('expenses/payments/create') }}" class="btn btn-success btn-sm"><span class="fa fa-plus"></span> &nbsp;{{ trans('general.add_new') }}</a></span>
-<span><a href="{{ url('common/import/expenses/payments') }}" class="btn btn-success btn-sm"><span class="fa fa-download"></span> &nbsp;{{ trans('import.import') }}</a></span>
-@endsection
+<span><a href="{{ url('common/import/expenses/payments') }}" class="btn btn-default btn-sm"><span class="fa fa-download"></span> &nbsp;{{ trans('import.import') }}</a></span>
 @endpermission
+<span><a href="{{ route('payments.export', request()->input()) }}" class="btn btn-default btn-sm"><span class="fa fa-upload"></span> &nbsp;{{ trans('general.export') }}</a></span>
+@endsection
 
 @section('content')
 <!-- Default box -->

resources/views/expenses/vendors/index.blade.php

@@ -2,12 +2,13 @@
 
 @section('title', trans_choice('general.vendors', 2))
 
-@permission('create-expenses-vendors')
 @section('new_button')
+@permission('create-expenses-vendors')
 <span class="new-button"><a href="{{ url('expenses/vendors/create') }}" class="btn btn-success btn-sm"><span class="fa fa-plus"></span> &nbsp;{{ trans('general.add_new') }}</a></span>
-<span><a href="{{ url('common/import/expenses/vendors') }}" class="btn btn-success btn-sm"><span class="fa fa-download"></span> &nbsp;{{ trans('import.import') }}</a></span>
-@endsection
+<span><a href="{{ url('common/import/expenses/vendors') }}" class="btn btn-default btn-sm"><span class="fa fa-download"></span> &nbsp;{{ trans('import.import') }}</a></span>
 @endpermission
+<span><a href="{{ route('vendors.export', request()->input()) }}" class="btn btn-default btn-sm"><span class="fa fa-upload"></span> &nbsp;{{ trans('general.export') }}</a></span>
+@endsection
 
 @section('content')
 <!-- Default box -->

resources/views/incomes/customers/index.blade.php

@@ -2,12 +2,13 @@
 
 @section('title', trans_choice('general.customers', 2))
 
-@permission('create-incomes-customers')
 @section('new_button')
+@permission('create-incomes-customers')
 <span class="new-button"><a href="{{ url('incomes/customers/create') }}" class="btn btn-success btn-sm"><span class="fa fa-plus"></span> &nbsp;{{ trans('general.add_new') }}</a></span>
-<span><a href="{{ url('common/import/incomes/customers') }}" class="btn btn-success btn-sm"><span class="fa fa-download"></span> &nbsp;{{ trans('import.import') }}</a></span>
-@endsection
+<span><a href="{{ url('common/import/incomes/customers') }}" class="btn btn-default btn-sm"><span class="fa fa-download"></span> &nbsp;{{ trans('import.import') }}</a></span>
 @endpermission
+<span><a href="{{ route('customers.export', request()->input()) }}" class="btn btn-default btn-sm"><span class="fa fa-upload"></span> &nbsp;{{ trans('general.export') }}</a></span>
+@endsection
 
 @section('content')
 <!-- Default box -->

resources/views/incomes/invoices/index.blade.php

@@ -2,12 +2,13 @@
 
 @section('title', trans_choice('general.invoices', 2))
 
-@permission('create-incomes-invoices')
 @section('new_button')
+@permission('create-incomes-invoices')
 <span class="new-button"><a href="{{ url('incomes/invoices/create') }}" class="btn btn-success btn-sm"><span class="fa fa-plus"></span> &nbsp;{{ trans('general.add_new') }}</a></span>
-<span><a href="{{ url('common/import/incomes/invoices') }}" class="btn btn-success btn-sm"><span class="fa fa-download"></span> &nbsp;{{ trans('import.import') }}</a></span>
-@endsection
+<span><a href="{{ url('common/import/incomes/invoices') }}" class="btn btn-default btn-sm"><span class="fa fa-download"></span> &nbsp;{{ trans('import.import') }}</a></span>
 @endpermission
+<span><a href="{{ route('invoices.export', request()->input()) }}" class="btn btn-default btn-sm"><span class="fa fa-upload"></span> &nbsp;{{ trans('general.export') }}</a></span>
+@endsection
 
 @section('content')
 <!-- Default box -->

resources/views/incomes/revenues/index.blade.php

@@ -2,12 +2,13 @@
 
 @section('title', trans_choice('general.revenues', 2))
 
-@permission('create-incomes-revenues')
 @section('new_button')
+@permission('create-incomes-revenues')
 <span class="new-button"><a href="{{ url('incomes/revenues/create') }}" class="btn btn-success btn-sm"><span class="fa fa-plus"></span> &nbsp;{{ trans('general.add_new') }}</a></span>
-<span><a href="{{ url('common/import/incomes/revenues') }}" class="btn btn-success btn-sm"><span class="fa fa-download"></span> &nbsp;{{ trans('import.import') }}</a></span>
-@endsection
+<span><a href="{{ url('common/import/incomes/revenues') }}" class="btn btn-default btn-sm"><span class="fa fa-download"></span> &nbsp;{{ trans('import.import') }}</a></span>
 @endpermission
+<span><a href="{{ route('revenues.export', request()->input()) }}" class="btn btn-default btn-sm"><span class="fa fa-upload"></span> &nbsp;{{ trans('general.export') }}</a></span>
+@endsection
 
 @section('content')
 <!-- Default box -->