shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

renamed income/expense

Browse Source
This commit is contained in:
denisdulici
2019-12-31 15:49:09 +03:00
parent e2189158b9
commit 2428feb73b
235 changed files with 815 additions and 2147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/assets/js/views/expenses/bills.js → resources/assets/js/views/purchases/bills.js vendored
View File

@ -76,7 +76,7 @@ const app = new Vue({
methods:{
onChangeContact(contact_id) {
axios.get(url + '/expenses/vendors/' + contact_id + '/currency')
axios.get(url + '/purchases/vendors/' + contact_id + '/currency')
.then(response => {
this.form.contact_name = response.data.name;
this.form.contact_email = response.data.email;

0
resources/assets/js/views/expenses/payments.js → resources/assets/js/views/purchases/payments.js vendored
View File

0
resources/assets/js/views/expenses/vendors.js → resources/assets/js/views/purchases/vendors.js vendored
View File

0
resources/assets/js/views/incomes/customers.js → resources/assets/js/views/sales/customers.js vendored
View File

0
resources/assets/js/views/incomes/invoices.js → resources/assets/js/views/sales/invoices.js vendored
View File

0
resources/assets/js/views/incomes/revenues.js → resources/assets/js/views/sales/revenues.js vendored
View File

2
resources/lang/en-GB/general.php
View File

@ -49,6 +49,8 @@ return [
'defaults' => 'Default|Defaults',
'widgets' => 'Widget|Widgets',
'templates' => 'Template|Templates',
'sales' => 'Sale|Sales',
'purchases' => 'Purchases|Purchases',
'dashboard' => 'Dashboard',
'welcome' => 'Welcome',

14
resources/views/partials/admin/navbar.blade.php
View File

@ -53,14 +53,14 @@
</a>
</li>
@permission(['create-incomes-invoices', 'create-incomes-revenues', 'create-incomes-customers', 'create-expenses-bills', 'create-expenses-payments', 'create-expenses-vendors'])
@permission(['create-sales-invoices', 'create-sales-revenues', 'create-sales-invoices', 'create-purchases-bills', 'create-purchases-payments', 'create-purchases-vendors'])
<li class="nav-item dropdown">
<a class="nav-link" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="fas fa-plus"></i>
</a>
<div class="dropdown-menu dropdown-menu-lg dropdown-menu-dark dropdown-menu-right">
<div class="row shortcuts px-4">
@permission('create-incomes-invoices')
@permission('create-sales-invoices')
<a href="{{ route('invoices.create') }}" class="col-4 shortcut-item">
<span class="shortcut-media avatar rounded-circle bg-gradient-info">
<i class="fa fa-money-bill"></i>
@ -69,7 +69,7 @@
</a>
@endpermission
@permission('create-incomes-revenues')
@permission('create-sales-revenues')
<a href="{{ route('revenues.create') }}" class="col-4 shortcut-item">
<span class="shortcut-media avatar rounded-circle bg-gradient-info">
<i class="fas fa-hand-holding-usd"></i>
@ -78,7 +78,7 @@
</a>
@endpermission
@permission('create-incomes-customers')
@permission('create-sales-customers')
<a href="{{ route('customers.create') }}" class="col-4 shortcut-item">
<span class="shortcut-media avatar rounded-circle bg-gradient-info">
<i class="fas fa-user"></i>
@ -87,7 +87,7 @@
</a>
@endpermission
@permission('create-expenses-bills')
@permission('create-purchases-bills')
<a href="{{ route('bills.create') }}" class="col-4 shortcut-item">
<span class="shortcut-media avatar rounded-circle bg-gradient-danger">
<i class="fa fa-shopping-cart"></i>
@ -96,7 +96,7 @@
</a>
@endpermission
@permission('create-expenses-payments')
@permission('create-purchases-payments')
<a href="{{ route('payments.create') }}" class="col-4 shortcut-item">
<span class="shortcut-media avatar rounded-circle bg-gradient-danger">
<i class="fas fa-hand-holding-usd"></i>
@ -105,7 +105,7 @@
</a>
@endpermission
@permission('create-expenses-vendors')
@permission('create-purchases-vendors')
<a href="{{ route('vendors.create') }}" class="col-4 shortcut-item">
<span class="shortcut-media avatar rounded-circle bg-gradient-danger">
<i class="fas fa-user"></i>

6
resources/views/expenses/bills/create.blade.php → resources/views/purchases/bills/create.blade.php
View File

@ -61,7 +61,7 @@
</tr>
</thead>
<tbody id="bill-item-rows">
@include('expenses.bills.item')
@include('purchases.bills.item')
@stack('add_item_td_start')
<tr class="row" id="addItem">
@ -179,7 +179,7 @@
<div class="card-footer">
<div class="row float-right">
{{ Form::saveButtons('expenses/bills') }}
{{ Form::saveButtons('purchases/bills') }}
</div>
</div>
{!! Form::close() !!}
@ -191,5 +191,5 @@
var bill_items = false;
</script>
<script src="{{ asset('public/js/expenses/bills.js?v=' . version('short')) }}"></script>
<script src="{{ asset('public/js/purchases/bills.js?v=' . version('short')) }}"></script>
@endpush

8
resources/views/expenses/bills/edit.blade.php → resources/views/purchases/bills/edit.blade.php
View File

@ -62,7 +62,7 @@
</tr>
</thead>
<tbody>
@include('expenses.bills.item')
@include('purchases.bills.item')
@stack('add_item_td_start')
<tr class="row" id="addItem">
@ -178,10 +178,10 @@
</div>
</div>
@permission('update-expenses-bills')
@permission('update-purchases-bills')
<div class="card-footer">
<div class="row float-right">
{{ Form::saveButtons('expenses/bills') }}
{{ Form::saveButtons('purchases/bills') }}
</div>
</div>
@endpermission
@ -194,5 +194,5 @@
var bill_items = {!! json_encode($bill->items()->select(['item_id', 'name', 'quantity', 'price', 'total', 'tax'])->get()) !!};
</script>
<script src="{{ asset('public/js/expenses/bills.js?v=' . version('short')) }}"></script>
<script src="{{ asset('public/js/purchases/bills.js?v=' . version('short')) }}"></script>
@endpush

18
resources/views/expenses/bills/index.blade.php → resources/views/purchases/bills/index.blade.php
View File

@ -3,9 +3,9 @@
@section('title', trans_choice('general.bills', 2))
@section('new_button')
@permission('create-expenses-bills')
@permission('create-purchases-bills')
<span><a href="{{ route('bills.create') }}" class="btn btn-success btn-sm header-button-top"><span class="fa fa-plus"></span> &nbsp;{{ trans('general.add_new') }}</a></span>
<span><a href="{{ url('common/import/expenses/bills') }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-upload"></span> &nbsp;{{ trans('import.import') }}</a></span>
<span><a href="{{ url('common/import/purchases/bills') }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-upload"></span> &nbsp;{{ trans('import.import') }}</a></span>
@endpermission
<span><a href="{{ route('bills.export', request()->input()) }}" class="btn btn-white btn-sm header-button-bottom"><span class="fa fa-download"></span> &nbsp;{{ trans('general.export') }}</a></span>
@endsection
@ -15,7 +15,7 @@
<div class="card">
<div class="card-header border-bottom-0" v-bind:class="[bulk_action.show ? 'bg-gradient-primary' : '']">
{!! Form::open([
'url' => 'expenses/bills',
'url' => 'purchases/bills',
'role' => 'form',
'method' => 'GET',
'class' => 'mb-0'
@ -27,7 +27,7 @@
</div>
</div>
{{ Form::bulkActionRowGroup('general.bills', $bulk_actions, 'expenses/bills') }}
{{ Form::bulkActionRowGroup('general.bills', $bulk_actions, 'purchases/bills') }}
{!! Form::close() !!}
</div>
@ -70,13 +70,13 @@
<a class="dropdown-item" href="{{ route('bills.edit', $item->id) }}">{{ trans('general.edit') }}</a>
@endif
<div class="dropdown-divider"></div>
@permission('create-expenses-bills')
@permission('create-purchases-bills')
<a class="dropdown-item" href="{{ route('bills.duplicate', $item->id) }}">{{ trans('general.duplicate') }}</a>
@endpermission
@permission('delete-expenses-bills')
@permission('delete-purchases-bills')
<div class="dropdown-divider"></div>
@if (!$item->reconciled)
{!! Form::deleteLink($item, 'expenses/bills') !!}
{!! Form::deleteLink($item, 'purchases/bills') !!}
@endif
@endpermission
</div>
@ -95,10 +95,10 @@
</div>
</div>
@else
@include('partials.admin.empty_page', ['page' => 'bills', 'docs_path' => 'expenses/bills'])
@include('partials.admin.empty_page', ['page' => 'bills', 'docs_path' => 'purchases/bills'])
@endif
@endsection
@push('scripts_start')
<script src="{{ asset('public/js/expenses/bills.js?v=' . version('short')) }}"></script>
<script src="{{ asset('public/js/purchases/bills.js?v=' . version('short')) }}"></script>
@endpush

0
resources/views/expenses/bills/item.blade.php → resources/views/purchases/bills/item.blade.php
View File

0
resources/views/expenses/bills/print.blade.php → resources/views/purchases/bills/print.blade.php
View File

14
resources/views/expenses/bills/show.blade.php → resources/views/purchases/bills/show.blade.php
View File

@ -61,7 +61,7 @@
<div class="mt-3">
@stack('timeline_body_create_bill_body_button_edit_start')
<a href="{{ url('expenses/bills/' . $bill->id . '/edit') }}" class="btn btn-info btn-sm btn-alone">
<a href="{{ url('purchases/bills/' . $bill->id . '/edit') }}" class="btn btn-info btn-sm btn-alone">
{{ trans('general.edit') }}
</a>
@stack('timeline_body_create_bill_body_button_edit_end')
@ -90,8 +90,8 @@
<div class="mt-3">
@stack('timeline_body_receive_bill_body_button_sent_start')
@permission('update-expenses-bills')
<a href="{{ url('expenses/bills/' . $bill->id . '/received') }}" class="btn btn-warning btn-sm btn-alone">{{ trans('bills.mark_received') }}</a>
@permission('update-purchases-bills')
<a href="{{ url('purchases/bills/' . $bill->id . '/received') }}" class="btn btn-warning btn-sm btn-alone">{{ trans('bills.mark_received') }}</a>
@endpermission
@stack('timeline_body_receive_bill_body_button_sent_end')
</div>
@ -434,7 +434,7 @@
@if(empty($bill->paid) || ($bill->paid != $bill->amount))
<a class="dropdown-item" href="#" id="button-payment">{{ trans('bills.add_payment') }}</a>
@endif
@permission('update-expenses-bills')
@permission('update-purchases-bills')
@if($bill->bill_status_code == 'draft')
<a class="dropdown-item" href="{{ route('bills.received', $bill->id) }}">{{ trans('bills.mark_received') }}</a></a>
@else
@ -450,9 +450,9 @@
@stack('button_pdf_end')
@stack('button_delete_start')
@permission('delete-expenses-bills')
@permission('delete-purchases-bills')
@if(!$bill->reconciled)
{!! Form::deleteLink($bill, 'expenses/bills') !!}
{!! Form::deleteLink($bill, 'purchases/bills') !!}
@endif
@endpermission
@stack('button_delete_end')
@ -603,5 +603,5 @@
@endpush
@push('scripts_start')
<script src="{{ asset('public/js/expenses/bills.js?v=' . version('short')) }}"></script>
<script src="{{ asset('public/js/purchases/bills.js?v=' . version('short')) }}"></script>
@endpush

4
resources/views/expenses/payments/create.blade.php → resources/views/purchases/payments/create.blade.php
View File

@ -46,7 +46,7 @@
<div class="card-footer">
<div class="row float-right">
{{ Form::saveButtons('expenses/payments') }}
{{ Form::saveButtons('purchases/payments') }}
</div>
</div>
@ -56,5 +56,5 @@
@endsection
@push('scripts_start')
<script src="{{ asset('public/js/expenses/payments.js?v=' . version('short')) }}"></script>
<script src="{{ asset('public/js/purchases/payments.js?v=' . version('short')) }}"></script>
@endpush

6
resources/views/expenses/payments/edit.blade.php → resources/views/purchases/payments/edit.blade.php
View File

@ -59,10 +59,10 @@
</div>
</div>
@permission('update-expenses-payments')
@permission('update-purchases-payments')
<div class="card-footer">
<div class="row float-right">
{{ Form::saveButtons('expenses/payments') }}
{{ Form::saveButtons('purchases/payments') }}
</div>
</div>
@endpermission
@ -72,5 +72,5 @@
@endsection
@push('scripts_start')
<script src="{{ asset('public/js/expenses/payments.js?v=' . version('short')) }}"></script>
<script src="{{ asset('public/js/purchases/payments.js?v=' . version('short')) }}"></script>
@endpush

18
resources/views/expenses/payments/index.blade.php → resources/views/purchases/payments/index.blade.php
View File

@ -3,9 +3,9 @@
@section('title', trans_choice('general.payments', 2))
@section('new_button')
@permission('create-expenses-payments')
@permission('create-purchases-payments')
<span><a href="{{ route('payments.create') }}" class="btn btn-success btn-sm header-button-top"><span class="fa fa-plus"></span> &nbsp;{{ trans('general.add_new') }}</a></span>
<span><a href="{{ url('common/import/expenses/payments') }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-upload"></span> &nbsp;{{ trans('import.import') }}</a></span>
<span><a href="{{ url('common/import/purchases/payments') }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-upload"></span> &nbsp;{{ trans('import.import') }}</a></span>
@endpermission
<span><a href="{{ route('payments.export', request()->input()) }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-download"></span> &nbsp;{{ trans('general.export') }}</a></span>
@endsection
@ -15,7 +15,7 @@
<div class="card">
<div class="card-header border-bottom-0" v-bind:class="[bulk_action.show ? 'bg-gradient-primary' : '']">
{!! Form::open([
'url' => 'expenses/payments',
'url' => 'purchases/payments',
'role' => 'form',
'method' => 'GET',
'class' => 'mb-0'
@ -27,7 +27,7 @@
</div>
</div>
{{ Form::bulkActionRowGroup('general.payments', $bulk_actions, 'expenses/payments') }}
{{ Form::bulkActionRowGroup('general.payments', $bulk_actions, 'purchases/payments') }}
{!! Form::close() !!}
</div>
@ -70,13 +70,13 @@
<a class="dropdown-item" href="{{ route('payments.edit', $item->id) }}">{{ trans('general.edit') }}</a>
<div class="dropdown-divider"></div>
@endif
@permission('create-expenses-payments')
@permission('create-purchases-payments')
<a class="dropdown-item" href="{{ route('payments.duplicate', $item->id) }}">{{ trans('general.duplicate') }}</a>
@endpermission
@permission('delete-expenses-payments')
@permission('delete-purchases-payments')
@if (!$item->reconciled)
<div class="dropdown-divider"></div>
{!! Form::deleteLink($item, 'expenses/payments') !!}
{!! Form::deleteLink($item, 'purchases/payments') !!}
@endif
@endpermission
</div>
@ -102,10 +102,10 @@
</div>
</div>
@else
@include('partials.admin.empty_page', ['page' => 'payments', 'docs_path' => 'expenses/payments'])
@include('partials.admin.empty_page', ['page' => 'payments', 'docs_path' => 'purchases/payments'])
@endif
@endsection
@push('scripts_start')
<script src="{{ asset('public/js/expenses/payments.js?v=' . version('short')) }}"></script>
<script src="{{ asset('public/js/purchases/payments.js?v=' . version('short')) }}"></script>
@endpush

4
resources/views/expenses/vendors/create.blade.php → resources/views/purchases/vendors/create.blade.php vendored
View File

@ -41,7 +41,7 @@
<div class="card-footer">
<div class="row float-right">
{{ Form::saveButtons('expenses/vendors') }}
{{ Form::saveButtons('purchases/vendors') }}
</div>
</div>
@ -51,5 +51,5 @@
@endsection
@push('scripts_start')
<script src="{{ asset('public/js/expenses/vendors.js?v=' . version('short')) }}"></script>
<script src="{{ asset('public/js/purchases/vendors.js?v=' . version('short')) }}"></script>
@endpush

6
resources/views/expenses/vendors/edit.blade.php → resources/views/purchases/vendors/edit.blade.php vendored
View File

@ -40,10 +40,10 @@
</div>
</div>
@permission('update-expenses-vendors')
@permission('update-purchases-vendors')
<div class="card-footer">
<div class="float-right">
{{ Form::saveButtons('expenses/vendors') }}
{{ Form::saveButtons('purchases/vendors') }}
</div>
</div>
@endpermission
@ -54,5 +54,5 @@
@endsection
@push('scripts_start')
<script src="{{ asset('public/js/expenses/vendors.js?v=' . version('short')) }}"></script>
<script src="{{ asset('public/js/purchases/vendors.js?v=' . version('short')) }}"></script>
@endpush

20
resources/views/expenses/vendors/index.blade.php → resources/views/purchases/vendors/index.blade.php vendored
View File

@ -3,9 +3,9 @@
@section('title', trans_choice('general.vendors', 2))
@section('new_button')
@permission('create-expenses-vendors')
@permission('create-purchases-vendors')
<span><a href="{{ route('vendors.create') }}" class="btn btn-success btn-sm header-button-top"><span class="fa fa-plus"></span> &nbsp;{{ trans('general.add_new') }}</a></span>
<span><a href="{{ url('common/import/expenses/vendors') }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-upload"></span> &nbsp;{{ trans('import.import') }}</a></span>
<span><a href="{{ url('common/import/purchases/vendors') }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-upload"></span> &nbsp;{{ trans('import.import') }}</a></span>
@endpermission
<span><a href="{{ route('vendors.export', request()->input()) }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-download"></span> &nbsp;{{ trans('general.export') }}</a></span>
@endsection
@ -15,7 +15,7 @@
<div class="card">
<div class="card-header border-bottom-0" v-bind:class="[bulk_action.show ? 'bg-gradient-primary' : '']">
{!! Form::open([
'url' => 'expenses/vendors',
'url' => 'purchases/vendors',
'role' => 'form',
'method' => 'GET',
'class' => 'mb-0'
@ -27,7 +27,7 @@
</div>
</div>
{{ Form::bulkActionRowGroup('general.vendors', $bulk_actions, 'expenses/vendors') }}
{{ Form::bulkActionRowGroup('general.vendors', $bulk_actions, 'purchases/vendors') }}
{!! Form::close() !!}
</div>
@ -64,7 +64,7 @@
@money($item->unpaid, setting('default.currency'), true)
</td>
<td class="col-xs-4 col-sm-2 col-md-2 col-lg-1 col-xl-1">
@if (user()->can('update-expenses-vendors'))
@if (user()->can('update-purchases-vendors'))
{{ Form::enabledGroup($item->id, $item->name, $item->enabled) }}
@else
@if ($item->enabled)
@ -82,13 +82,13 @@
<div class="dropdown-menu dropdown-menu-right dropdown-menu-arrow">
<a class="dropdown-item" href="{{ route('vendors.show', $item->id) }}">{{ trans('general.show') }}</a>
<a class="dropdown-item" href="{{ route('vendors.edit', $item->id) }}">{{ trans('general.edit') }}</a>
@permission('create-expenses-vendors')
@permission('create-purchases-vendors')
<div class="dropdown-divider"></div>
<a class="dropdown-item" href="{{ route('vendors.duplicate', $item->id) }}">{{ trans('general.duplicate') }}</a>
@endpermission
@permission('delete-expenses-vendors')
@permission('delete-purchases-vendors')
<div class="dropdown-divider"></div>
{!! Form::deleteLink($item, 'expenses/vendors') !!}
{!! Form::deleteLink($item, 'purchases/vendors') !!}
@endpermission
</div>
</div>
@ -106,10 +106,10 @@
</div>
</div>
@else
@include('partials.admin.empty_page', ['page' => 'vendors', 'docs_path' => 'expenses/vendors'])
@include('partials.admin.empty_page', ['page' => 'vendors', 'docs_path' => 'purchases/vendors'])
@endif
@endsection
@push('scripts_start')
<script src="{{ asset('public/js/expenses/vendors.js?v=' . version('short')) }}"></script>
<script src="{{ asset('public/js/purchases/vendors.js?v=' . version('short')) }}"></script>
@endpush

6
resources/views/expenses/vendors/show.blade.php → resources/views/purchases/vendors/show.blade.php vendored
View File

@ -47,7 +47,7 @@
</div>
</div>
<a href="{{ url('expenses/vendors/' . $vendor->id . '/edit') }}" class="btn btn-default btn-block edit-sv"><i class="fas fa-edit"></i><b>{{ trans('general.edit') }}</b></a>
<a href="{{ url('purchases/vendors/' . $vendor->id . '/edit') }}" class="btn btn-default btn-block edit-sv"><i class="fas fa-edit"></i><b>{{ trans('general.edit') }}</b></a>
</div>
<div class="col-xl-9">
@ -156,7 +156,7 @@
<tbody>
@foreach($bills as $item)
<tr class="row align-items-center border-top-1">
<td class="col-xs-4 col-sm-3"><a href="{{ url('expenses/bills/' . $item->id . ' ') }}">{{ $item->bill_number }}</a></td>
<td class="col-xs-4 col-sm-3"><a href="{{ url('purchases/bills/' . $item->id . ' ') }}">{{ $item->bill_number }}</a></td>
<td class="col-xs-4 col-sm-3">@money($item->amount, $item->currency_code, true)</td>
<td class="col-sm-2 d-none d-sm-none">@date($item->billed_at)</td>
<td class="col-sm-2 d-none d-sm-none">@date($item->due_at)</td>
@ -182,5 +182,5 @@
@endsection
@push('scripts_start')
<script src="{{ asset('public/js/expenses/vendors.js?v=' . version('short')) }}"></script>
<script src="{{ asset('public/js/purchases/vendors.js?v=' . version('short')) }}"></script>
@endpush

4
resources/views/incomes/customers/create.blade.php → resources/views/sales/customers/create.blade.php
View File

@ -63,7 +63,7 @@
<div class="card-footer">
<div class="row float-right">
{{ Form::saveButtons('incomes/customers') }}
{{ Form::saveButtons('sales/customers') }}
</div>
</div>
@ -81,5 +81,5 @@
};
</script>
<script src="{{ asset('public/js/incomes/customers.js?v=' . version('short')) }}"></script>
<script src="{{ asset('public/js/sales/customers.js?v=' . version('short')) }}"></script>
@endpush

6
resources/views/incomes/customers/edit.blade.php → resources/views/sales/customers/edit.blade.php
View File

@ -71,10 +71,10 @@
</div>
</div>
@permission('update-incomes-customers')
@permission('update-sales-customers')
<div class="card-footer">
<div class="float-right">
{{ Form::saveButtons('incomes/customers') }}
{{ Form::saveButtons('sales/customers') }}
</div>
</div>
@endpermission
@ -86,5 +86,5 @@
@endsection
@push('scripts_start')
<script src="{{ asset('public/js/incomes/customers.js?v=' . version('short')) }}"></script>
<script src="{{ asset('public/js/sales/customers.js?v=' . version('short')) }}"></script>
@endpush

22
resources/views/incomes/customers/index.blade.php → resources/views/sales/customers/index.blade.php
View File

@ -3,9 +3,9 @@
@section('title', trans_choice('general.customers', 2))
@section('new_button')
@permission('create-incomes-customers')
<span><a href="{{ url('incomes/customers/create') }}" class="btn btn-success btn-sm header-button-top"><span class="fa fa-plus"></span> &nbsp;{{ trans('general.add_new') }}</a></span>
<span><a href="{{ url('common/import/incomes/customers') }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-upload"></span> &nbsp;{{ trans('import.import') }}</a></span>
@permission('create-sales-customers')
<span><a href="{{ url('sales/customers/create') }}" class="btn btn-success btn-sm header-button-top"><span class="fa fa-plus"></span> &nbsp;{{ trans('general.add_new') }}</a></span>
<span><a href="{{ url('common/import/sales/customers') }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-upload"></span> &nbsp;{{ trans('import.import') }}</a></span>
@endpermission
<span><a href="{{ route('customers.export', request()->input()) }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-download"></span> &nbsp;{{ trans('general.export') }}</a></span>
@endsection
@ -15,7 +15,7 @@
<div class="card">
<div class="card-header border-bottom-0" v-bind:class="[bulk_action.show ? 'bg-gradient-primary' : '']">
{!! Form::open([
'url' => 'incomes/customers',
'url' => 'sales/customers',
'role' => 'form',
'method' => 'GET',
'class' => 'mb-0'
@ -27,7 +27,7 @@
</div>
</div>
{{ Form::bulkActionRowGroup('general.customers', $bulk_actions, 'incomes/customers') }}
{{ Form::bulkActionRowGroup('general.customers', $bulk_actions, 'sales/customers') }}
{!! Form::close() !!}
</div>
@ -64,7 +64,7 @@
@money($item->unpaid, setting('default.currency'), true)
</td>
<td class="col-xs-4 col-sm-2 col-md-2 col-lg-1 col-xl-1">
@if (user()->can('update-incomes-customers'))
@if (user()->can('update-sales-customers'))
{{ Form::enabledGroup($item->id, $item->name, $item->enabled) }}
@else
@if ($item->enabled)
@ -84,13 +84,13 @@
<a class="dropdown-item" href="{{ route('customers.edit', $item->id) }}">{{ trans('general.edit') }}</a>
<div class="dropdown-divider"></div>
@permission('create-incomes-customers')
@permission('create-sales-customers')
<a class="dropdown-item" href="{{ route('customers.duplicate', $item->id) }}">{{ trans('general.duplicate') }}</a>
<div class="dropdown-divider"></div>
@endpermission
@permission('delete-incomes-customers')
{!! Form::deleteLink($item, 'incomes/customers') !!}
@permission('delete-sales-customers')
{!! Form::deleteLink($item, 'sales/customers') !!}
@endpermission
</div>
</div>
@ -108,10 +108,10 @@
</div>
</div>
@else
@include('partials.admin.empty_page', ['page' => 'customers', 'docs_path' => 'incomes/customers'])
@include('partials.admin.empty_page', ['page' => 'customers', 'docs_path' => 'sales/customers'])
@endif
@endsection
@push('scripts_start')
<script src="{{ asset('public/js/incomes/customers.js?v=' . version('short')) }}"></script>
<script src="{{ asset('public/js/sales/customers.js?v=' . version('short')) }}"></script>
@endpush

6
resources/views/incomes/customers/show.blade.php → resources/views/sales/customers/show.blade.php
View File

@ -44,7 +44,7 @@
</div>
</div>
<a href="{{ url('incomes/customers/' . $customer->id . '/edit') }}" class="btn btn-default btn-block edit-sv"><i class="fas fa-edit"></i><b>{{ trans('general.edit') }}</b></a>
<a href="{{ route('customers.edit', $customer->id) }}" class="btn btn-default btn-block edit-sv"><i class="fas fa-edit"></i><b>{{ trans('general.edit') }}</b></a>
</div>
<div class="col-xl-9">
@ -151,7 +151,7 @@
<tbody>
@foreach($invoices as $item)
<tr class="row align-items-center border-top-1">
<td class="col-xs-4 col-sm-3"><a href="{{ url('incomes/invoices/' . $item->id . ' ') }}">{{ $item->invoice_number }}</a></td>
<td class="col-xs-4 col-sm-3"><a href="{{ url('sales/invoices/' . $item->id . ' ') }}">{{ $item->invoice_number }}</a></td>
<td class="col-xs-4 col-sm-3">@money($item->amount, $item->currency_code, true)</td>
<td class="col-sm-2 d-none d-sm-block">@date($item->invoiced_at)</td>
<td class="col-sm-2 d-none d-sm-block">@date($item->due_at)</td>
@ -176,5 +176,5 @@
@endsection
@push('scripts_start')
<script src="{{ asset('public/js/incomes/customers.js?v=' . version('short')) }}"></script>
<script src="{{ asset('public/js/sales/customers.js?v=' . version('short')) }}"></script>
@endpush

6
resources/views/incomes/invoices/create.blade.php → resources/views/sales/invoices/create.blade.php
View File

@ -61,7 +61,7 @@
</tr>
</thead>
<tbody id="invoice-item-rows">
@include('incomes.invoices.item')
@include('sales.invoices.item')
@stack('add_item_td_start')
<tr class="row" id="addItem">
@ -181,7 +181,7 @@
<div class="card-footer">
<div class="row float-right">
{{ Form::saveButtons('incomes/invoices') }}
{{ Form::saveButtons('sales/invoices') }}
</div>
</div>
{!! Form::close() !!}
@ -193,5 +193,5 @@
var invoice_items = false;
</script>
<script src="{{ asset('public/js/incomes/invoices.js?v=' . version('short')) }}"></script>
<script src="{{ asset('public/js/sales/invoices.js?v=' . version('short')) }}"></script>
@endpush

8
resources/views/incomes/invoices/edit.blade.php → resources/views/sales/invoices/edit.blade.php
View File

@ -62,7 +62,7 @@
</tr>
</thead>
<tbody id="invoice-item-rows">
@include('incomes.invoices.item')
@include('sales.invoices.item')
@stack('add_item_td_start')
<tr class="row" id="addItem">
@ -180,10 +180,10 @@
</div>
</div>
@permission('update-incomes-invoices')
@permission('update-sales-invoices')
<div class="card-footer">
<div class="row float-right">
{{ Form::saveButtons('incomes/invoices') }}
{{ Form::saveButtons('sales/invoices') }}
</div>
</div>
@endpermission
@ -196,5 +196,5 @@
var invoice_items = {!! json_encode($invoice->items()->select(['item_id', 'name', 'quantity', 'price', 'total', 'tax'])->get()) !!};
</script>
<script src="{{ asset('public/js/incomes/invoices.js?v=' . version('short')) }}"></script>
<script src="{{ asset('public/js/sales/invoices.js?v=' . version('short')) }}"></script>
@endpush

18
resources/views/incomes/invoices/index.blade.php → resources/views/sales/invoices/index.blade.php
View File

@ -3,9 +3,9 @@
@section('title', trans_choice('general.invoices', 2))
@section('new_button')
@permission('create-incomes-invoices')
@permission('create-sales-invoices')
<span><a href="{{ route('invoices.create') }}" class="btn btn-primary btn-sm btn-success header-button-top"><span class="fa fa-plus"></span> &nbsp;{{ trans('general.add_new') }}</a></span>
<span><a href="{{ url('common/import/incomes/invoices') }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-upload"></span> &nbsp;{{ trans('import.import') }}</a></span>
<span><a href="{{ url('common/import/sales/invoices') }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-upload"></span> &nbsp;{{ trans('import.import') }}</a></span>
@endpermission
<span><a href="{{ route('invoices.export', request()->input()) }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-download"></span> &nbsp;{{ trans('general.export') }}</a></span>
@endsection
@ -15,7 +15,7 @@
<div class="card">
<div class="card-header border-bottom-0" v-bind:class="[bulk_action.show ? 'bg-gradient-primary' : '']">
{!! Form::open([
'url' => 'incomes/invoices',
'url' => 'sales/invoices',
'role' => 'form',
'method' => 'GET',
'class' => 'mb-0'
@ -27,7 +27,7 @@
</div>
</div>
{{ Form::bulkActionRowGroup('general.invoices', $bulk_actions, 'incomes/invoices') }}
{{ Form::bulkActionRowGroup('general.invoices', $bulk_actions, 'sales/invoices') }}
{!! Form::close() !!}
</div>
@ -71,14 +71,14 @@
@endif
<div class="dropdown-divider"></div>
@permission('create-incomes-invoices')
@permission('create-sales-invoices')
<a class="dropdown-item" href="{{ route('invoices.duplicate', $item->id) }}">{{ trans('general.duplicate') }}</a>
<div class="dropdown-divider"></div>
@endpermission
@permission('delete-incomes-invoices')
@permission('delete-sales-invoices')
@if (!$item->reconciled)
{!! Form::deleteLink($item, 'incomes/invoices') !!}
{!! Form::deleteLink($item, 'sales/invoices') !!}
@endif
@endpermission
</div>
@ -97,10 +97,10 @@
</div>
</div>
@else
@include('partials.admin.empty_page', ['page' => 'invoices', 'docs_path' => 'incomes/invoices'])
@include('partials.admin.empty_page', ['page' => 'invoices', 'docs_path' => 'sales/invoices'])
@endif
@endsection
@push('scripts_start')
<script src="{{ asset('public/js/incomes/invoices.js?v=' . version('short')) }}"></script>
<script src="{{ asset('public/js/sales/invoices.js?v=' . version('short')) }}"></script>
@endpush

0
resources/views/incomes/invoices/item.blade.php → resources/views/sales/invoices/item.blade.php
View File

0
resources/views/incomes/invoices/print_classic.blade.php → resources/views/sales/invoices/print_classic.blade.php
View File

0
resources/views/incomes/invoices/print_default.blade.php → resources/views/sales/invoices/print_default.blade.php
View File

0
resources/views/incomes/invoices/print_modern.blade.php → resources/views/sales/invoices/print_modern.blade.php
View File

32
resources/views/incomes/invoices/show.blade.php → resources/views/sales/invoices/show.blade.php
View File

@ -61,7 +61,7 @@
<div class="mt-3">
@stack('timeline_body_create_invoice_body_button_edit_start')
<a href="{{ url('incomes/invoices/' . $invoice->id . '/edit') }}" class="btn btn-info btn-sm btn-alone">
<a href="{{ url('sales/invoices/' . $invoice->id . '/edit') }}" class="btn btn-info btn-sm btn-alone">
{{ trans('general.edit') }}
</a>
@stack('timeline_body_create_invoice_body_button_edit_end')
@ -90,9 +90,9 @@
<div class="mt-3">
@stack('timeline_body_send_invoice_body_button_sent_start')
@permission('update-incomes-invoices')
@permission('update-sales-invoices')
@if($invoice->invoice_status_code == 'draft')
<a href="{{ url('incomes/invoices/' . $invoice->id . '/sent') }}" class="btn btn-white btn-sm header-button-top">{{ trans('invoices.mark_sent') }}</a>
<a href="{{ url('sales/invoices/' . $invoice->id . '/sent') }}" class="btn btn-white btn-sm header-button-top">{{ trans('invoices.mark_sent') }}</a>
@else
<button type="button" class="btn btn-secondary btn-sm header-button-top" disabled="disabled">
<span class="text-disabled">{{ trans('invoices.mark_sent') }}</span>
@ -103,7 +103,7 @@
@stack('timeline_body_send_invoice_body_button_email_start')
@if($invoice->contact_email)
<a href="{{ url('incomes/invoices/' . $invoice->id . '/email') }}" class="btn btn-warning btn-sm header-button-bottom">{{ trans('invoices.send_mail') }}</a>
<a href="{{ url('sales/invoices/' . $invoice->id . '/email') }}" class="btn btn-warning btn-sm header-button-bottom">{{ trans('invoices.send_mail') }}</a>
@else
<button type="button" class="btn btn-white btn-sm header-button-bottom green-tooltip" disabled="disabled" data-toggle="tooltip" data-placement="right" title="{{ trans('invoices.messages.email_required') }}">
<span class="text-disabled">{{ trans('invoices.send_mail') }}</span>
@ -151,7 +151,7 @@
<div class="mt-3">
@stack('timeline_body_get_paid_body_button_pay_start')
@permission('update-incomes-invoices')
@permission('update-sales-invoices')
<a href="{{ route('invoices.paid', $invoice->id) }}" class="btn btn-white btn-sm header-button-top">{{ trans('invoices.mark_paid') }}</a>
@endpermission
@stack('timeline_body_get_paid_body_button_pay_end')
@ -436,14 +436,14 @@
<div class="float-right">
@stack('button_edit_start')
@if(!$invoice->reconciled)
<a href="{{ url('incomes/invoices/' . $invoice->id . '/edit') }}" class="btn btn-info header-button-top">
<a href="{{ url('sales/invoices/' . $invoice->id . '/edit') }}" class="btn btn-info header-button-top">
<i class="fas fa-edit"></i>&nbsp; {{ trans('general.edit') }}
</a>
@endif
@stack('button_edit_end')
@stack('button_print_start')
<a href="{{ url('incomes/invoices/' . $invoice->id . '/print') }}" target="_blank" class="btn btn-success header-button-top">
<a href="{{ url('sales/invoices/' . $invoice->id . '/print') }}" target="_blank" class="btn btn-success header-button-top">
<i class="fa fa-print"></i>&nbsp; {{ trans('general.print') }}
</a>
@stack('button_print_end')
@ -460,8 +460,8 @@
<div class="dropdown-menu" role="menu">
@stack('button_pay_start')
@if($invoice->status->code != 'paid')
@permission('update-incomes-invoices')
<a class="dropdown-item" href="{{ url('incomes/invoices/' . $invoice->id . '/pay') }}">{{ trans('invoices.mark_paid') }}</a>
@permission('update-sales-invoices')
<a class="dropdown-item" href="{{ url('sales/invoices/' . $invoice->id . '/pay') }}">{{ trans('invoices.mark_paid') }}</a>
@endpermission
@if(empty($invoice->paid) || ($invoice->paid != $invoice->amount))
@ -472,9 +472,9 @@
@stack('button_pay_end')
@stack('button_sent_start')
@permission('update-incomes-invoices')
@permission('update-sales-invoices')
@if($invoice->invoice_status_code == 'draft')
<a class="dropdown-item" href="{{ url('incomes/invoices/' . $invoice->id . '/sent') }}">{{ trans('invoices.mark_sent') }}</a>
<a class="dropdown-item" href="{{ url('sales/invoices/' . $invoice->id . '/sent') }}">{{ trans('invoices.mark_sent') }}</a>
@else
<button type="button" class="dropdown-item" disabled="disabled"><span class="text-disabled">{{ trans('invoices.mark_sent') }}</span></button>
@endif
@ -483,7 +483,7 @@
@stack('button_email_start')
@if($invoice->contact_email)
<a class="dropdown-item" href="{{ url('incomes/invoices/' . $invoice->id . '/email') }}">{{ trans('invoices.send_mail') }}</a>
<a class="dropdown-item" href="{{ url('sales/invoices/' . $invoice->id . '/email') }}">{{ trans('invoices.send_mail') }}</a>
@else
<button type="button" class="dropdown-item" disabled="disabled" data-toggle="tooltip" data-placement="right" title="{{ trans('invoices.messages.email_required') }}">
<span class="text-disabled">{{ trans('invoices.send_mail') }}</span>
@ -492,13 +492,13 @@
@stack('button_email_end')
@stack('button_pdf_start')
<a class="dropdown-item" href="{{ url('incomes/invoices/' . $invoice->id . '/pdf') }}">{{ trans('invoices.download_pdf') }}</a>
<a class="dropdown-item" href="{{ url('sales/invoices/' . $invoice->id . '/pdf') }}">{{ trans('invoices.download_pdf') }}</a>
@stack('button_pdf_end')
@stack('button_delete_start')
@permission('delete-incomes-invoices')
@permission('delete-sales-invoices')
@if(!$invoice->reconciled)
{!! Form::deleteLink($invoice, 'incomes/invoices') !!}
{!! Form::deleteLink($invoice, 'sales/invoices') !!}
@endif
@endpermission
@stack('button_delete_end')
@ -664,5 +664,5 @@
@endpush
@push('scripts_start')
<script src="{{ asset('public/js/incomes/invoices.js?v=' . version('short')) }}"></script>
<script src="{{ asset('public/js/sales/invoices.js?v=' . version('short')) }}"></script>
@endpush

4
resources/views/incomes/revenues/create.blade.php → resources/views/sales/revenues/create.blade.php
View File

@ -46,7 +46,7 @@
<div class="card-footer">
<div class="row float-right">
{{ Form::saveButtons('incomes/revenues') }}
{{ Form::saveButtons('sales/revenues') }}
</div>
</div>
@ -56,5 +56,5 @@
@endsection
@push('scripts_start')
<script src="{{ asset('public/js/incomes/revenues.js?v=' . version('short')) }}"></script>
<script src="{{ asset('public/js/sales/revenues.js?v=' . version('short')) }}"></script>
@endpush

6
resources/views/incomes/revenues/edit.blade.php → resources/views/sales/revenues/edit.blade.php
View File

@ -59,10 +59,10 @@
</div>
</div>
@permission('update-incomes-revenues')
@permission('update-sales-revenues')
<div class="card-footer">
<div class="row float-right">
{{ Form::saveButtons('incomes/revenues') }}
{{ Form::saveButtons('sales/revenues') }}
</div>
</div>
@endpermission
@ -73,5 +73,5 @@
@endsection
@push('scripts_start')
<script src="{{ asset('public/js/incomes/revenues.js?v=' . version('short')) }}"></script>
<script src="{{ asset('public/js/sales/revenues.js?v=' . version('short')) }}"></script>
@endpush

18
resources/views/incomes/revenues/index.blade.php → resources/views/sales/revenues/index.blade.php
View File

@ -3,9 +3,9 @@
@section('title', trans_choice('general.revenues', 2))
@section('new_button')
@permission('create-incomes-revenues')
@permission('create-sales-revenues')
<span><a href="{{ route('revenues.create') }}" class="btn btn-primary btn-sm btn-success header-button-top"><span class="fa fa-plus"></span> &nbsp;{{ trans('general.add_new') }}</a></span>
<span><a href="{{ url('common/import/incomes/revenues') }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-upload"></span> &nbsp;{{ trans('import.import') }}</a></span>
<span><a href="{{ url('common/import/sales/revenues') }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-upload"></span> &nbsp;{{ trans('import.import') }}</a></span>
@endpermission
<span><a href="{{ route('revenues.export', request()->input()) }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-download"></span> &nbsp;{{ trans('general.export') }}</a></span>
@endsection
@ -15,7 +15,7 @@
<div class="card">
<div class="card-header border-bottom-0" v-bind:class="[bulk_action.show ? 'bg-gradient-primary' : '']">
{!! Form::open([
'url' => 'incomes/revenues',
'url' => 'sales/revenues',
'role' => 'form',
'method' => 'GET',
'class' => 'mb-0'
@ -27,7 +27,7 @@
</div>
</div>
{{ Form::bulkActionRowGroup('general.revenues', $bulk_actions, 'incomes/revenues') }}
{{ Form::bulkActionRowGroup('general.revenues', $bulk_actions, 'sales/revenues') }}
{!! Form::close() !!}
</div>
@ -70,14 +70,14 @@
<a class="dropdown-item" href="{{ route('revenues.edit', $item->id) }}">{{ trans('general.edit') }}</a>
<div class="dropdown-divider"></div>
@endif
@permission('create-incomes-revenues')
@permission('create-sales-revenues')
<a class="dropdown-item" href="{{ route('revenues.duplicate', $item->id) }}">{{ trans('general.duplicate') }}</a>
@endpermission
@permission('delete-incomes-revenues')
@permission('delete-sales-revenues')
@if (!$item->reconciled)
<div class="dropdown-divider"></div>
{!! Form::deleteLink($item, 'incomes/revenues') !!}
{!! Form::deleteLink($item, 'sales/revenues') !!}
@endif
@endpermission
</div>
@ -103,12 +103,12 @@
</div>
</div>
@else
@include('partials.admin.empty_page', ['page' => 'revenues', 'docs_path' => 'incomes/revenues'])
@include('partials.admin.empty_page', ['page' => 'revenues', 'docs_path' => 'sales/revenues'])
@endif
@endsection
@push('scripts_start')
<script src="{{ asset('public/js/incomes/revenues.js?v=' . version('short')) }}"></script>
<script src="{{ asset('public/js/sales/revenues.js?v=' . version('short')) }}"></script>
@endpush