diff --git a/app/Http/Controllers/Sales/Customers.php b/app/Http/Controllers/Sales/Customers.php index f6976d68f..39882ff62 100644 --- a/app/Http/Controllers/Sales/Customers.php +++ b/app/Http/Controllers/Sales/Customers.php @@ -327,4 +327,11 @@ class Customers extends Controller return redirect()->route('invoices.create')->withInput($data); } + + public function createRevenue(Contact $customer) + { + $data['contact'] = $customer; + + return redirect()->route('revenues.create')->withInput($data); + } } diff --git a/resources/lang/en-GB/revenues.php b/resources/lang/en-GB/revenues.php index f30baace3..550d65b45 100644 --- a/resources/lang/en-GB/revenues.php +++ b/resources/lang/en-GB/revenues.php @@ -5,5 +5,6 @@ return [ 'revenue_received' => 'Revenue Received', 'paid_by' => 'Paid By', 'related_invoice' => 'Releated Invoice', + 'create_revenue' => 'Create Revenue', ]; diff --git a/resources/views/sales/customers/index.blade.php b/resources/views/sales/customers/index.blade.php index 8049a5b17..6f2a92808 100644 --- a/resources/views/sales/customers/index.blade.php +++ b/resources/views/sales/customers/index.blade.php @@ -47,9 +47,11 @@ {{ Form::bulkActionGroup($item->id, $item->name) }} + {{ $item->name }} + {{ !empty($item->email) ? $item->email : trans('general.na') }} + @money($item->unpaid, setting('default.currency'), true) + @if (user()->can('update-sales-customers')) {{ Form::enabledGroup($item->id, $item->name, $item->enabled) }} @@ -71,21 +75,34 @@ @endif @endif +
+
- {{ trans('general.show') }} - {{ trans('general.edit') }} + + {{ trans('general.show') }} + + + @can('create-sales-customers') + + {{ trans('general.edit') }} + + @endcan
+ @can('create-sales-customers') - {{ trans('general.duplicate') }} + + {{ trans('general.duplicate') }} +
@endcan + @can('delete-sales-customers') {!! Form::deleteLink($item, 'customers.destroy') !!} @endcan diff --git a/resources/views/sales/customers/show.blade.php b/resources/views/sales/customers/show.blade.php index ba3ffb964..8bf89d2b1 100644 --- a/resources/views/sales/customers/show.blade.php +++ b/resources/views/sales/customers/show.blade.php @@ -2,6 +2,62 @@ @section('title', $customer->name) +@section('new_button') +
+ + + +
+ + @stack('edit_button_start') + @can('update-sales-customers') + + {{ trans('general.edit') }} + + @endcan + @stack('edit_button_end') +@endsection + @section('content')
@@ -68,12 +124,7 @@ @stack('customer_edit_button_start') - {{ trans('general.edit') }} @stack('customer_edit_button_end') - - @stack('customer_create_invoice_button_start') - {{ trans('invoices.create_invoice') }} - @stack('customer_create_invoice_button_end')
@@ -131,55 +182,28 @@
-
-
- @stack('customer_transactions_content_start') -
-
- - - - - - - - - - - @foreach($transactions as $item) - - - - - - - @endforeach - -
{{ trans('general.date') }}{{ trans('general.amount') }}{{ trans_choice('general.categories', 1) }}{{ trans_choice('general.accounts', 1) }}
@date($item->paid_at)@money($item->amount, $item->currency_code, true){{ $item->category->name }}{{ $item->account->name }}
-
-
-
- @include('partials.admin.pagination', ['items' => $transactions, 'type' => 'transactions']) -
-
-
- @stack('customer_transactions_content_end') +
+
@stack('customer_invoices_content_start') -
+
@@ -191,6 +215,7 @@ + @foreach($invoices as $item) @@ -204,6 +229,7 @@
{{ trans_choice('general.statuses', 1) }}
+
@include('partials.admin.pagination', ['items' => $invoices, 'type' => 'invoices']) @@ -211,6 +237,40 @@
@stack('customer_invoices_content_end') + + @stack('customer_transactions_content_start') +
+
+ + + + + + + + + + + + @foreach($transactions as $item) + + + + + + + @endforeach + +
{{ trans('general.date') }}{{ trans('general.amount') }}{{ trans_choice('general.categories', 1) }}{{ trans_choice('general.accounts', 1) }}
@date($item->paid_at)@money($item->amount, $item->currency_code, true){{ $item->category->name }}{{ $item->account->name }}
+
+ +
+
+ @include('partials.admin.pagination', ['items' => $transactions, 'type' => 'transactions']) +
+
+
+ @stack('customer_transactions_content_end')
diff --git a/resources/views/sales/revenues/create.blade.php b/resources/views/sales/revenues/create.blade.php index 5c3cbe51e..5d943090e 100644 --- a/resources/views/sales/revenues/create.blade.php +++ b/resources/views/sales/revenues/create.blade.php @@ -26,7 +26,7 @@ {{ Form::selectAddNewGroup('account_id', trans_choice('general.accounts', 1), 'university', $accounts, setting('default.account'), ['required' => 'required', 'path' => route('modals.accounts.create'), 'change' => 'onChangeAccount']) }} - {{ Form::selectRemoteAddNewGroup('contact_id', trans_choice('general.customers', 1), 'user', $customers, null, ['path' => route('modals.customers.create'), 'remote_action' => route('customers.index')]) }} + {{ Form::selectRemoteAddNewGroup('contact_id', trans_choice('general.customers', 1), 'user', $customers, old('contact.id', old('contact_id', null)), ['path' => route('modals.customers.create'), 'remote_action' => route('customers.index')]) }} {{ Form::textareaGroup('description', trans('general.description')) }} diff --git a/routes/admin.php b/routes/admin.php index 448916395..287bef815 100644 --- a/routes/admin.php +++ b/routes/admin.php @@ -97,6 +97,7 @@ Route::group(['prefix' => 'sales'], function () { Route::get('customers/{customer}/disable', 'Sales\Customers@disable')->name('customers.disable'); Route::get('customers/{customer}/currency', 'Sales\Customers@currency')->name('customers.currency'); Route::get('customers/{customer}/create-invoice', 'Sales\Customers@createInvoice')->name('customers.create-invoice'); + Route::get('customers/{customer}/create-revenue', 'Sales\Customers@createRevenue')->name('customers.create-revenue'); Route::resource('customers', 'Sales\Customers'); }); @@ -128,6 +129,7 @@ Route::group(['prefix' => 'purchases'], function () { Route::get('vendors/{vendor}/currency', 'Purchases\Vendors@currency')->name('vendors.currency'); Route::get('vendors/{vendor}/disable', 'Purchases\Vendors@disable')->name('vendors.disable'); Route::get('vendors/{vendor}/create-bill', 'Purchases\Vendors@createBill')->name('vendors.create-bill'); + Route::get('vendors/{vendor}/create-payment', 'Purchases\Vendors@createPayment')->name('vendors.create-payment'); Route::resource('vendors', 'Purchases\Vendors', ['middleware' => ['dropzone']]); });