Improve routes overrides
This commit is contained in:
parent
de14ec8221
commit
c8f0b46a3c
4 changed files with 5 additions and 49 deletions
|
@ -68,7 +68,7 @@ class CrmController extends BaseCrmController {
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($fail || $validator->fails()) {
|
if ($fail || $validator->fails()) {
|
||||||
return redirect()->route('mmfrestrictedcustomers.create_customer')
|
return redirect()->route('crm.create_customer')
|
||||||
->withErrors($validator)
|
->withErrors($validator)
|
||||||
->withInput();
|
->withInput();
|
||||||
}
|
}
|
||||||
|
|
|
@ -14,10 +14,8 @@ Route::group(['middleware' => 'web', 'prefix' => \Helper::getSubdirectory(), 'na
|
||||||
Route::post('/customers/ajax', ['uses' => CustomersController::class . '@ajax', 'laroute' => true])->name('customers.ajax');
|
Route::post('/customers/ajax', ['uses' => CustomersController::class . '@ajax', 'laroute' => true])->name('customers.ajax');
|
||||||
// Crm module
|
// Crm module
|
||||||
Route::group([ 'roles' => ['user', 'admin'] ], function() {
|
Route::group([ 'roles' => ['user', 'admin'] ], function() {
|
||||||
Route::get('/customers/new', CrmController::class . '@createCustomer')->name('mmfrestrictedcustomers.create_customer');
|
Route::get('/customers/new', CrmController::class . '@createCustomer')->name('crm.create_customer');
|
||||||
Route::post('/customers/new', CrmController::class . '@createCustomerSave');
|
Route::post('/customers/new', CrmController::class . '@createCustomerSave');
|
||||||
Route::get('/crm/ajax-html/{action}/{param?}', ['uses' => CrmController::class . '@ajaxHtml'])->name('crm.ajax_html');
|
|
||||||
Route::get('/customers/fields/ajax-search', ['uses' => CrmController::class . '@ajaxSearch', 'laroute' => true])->name('crm.ajax_search');
|
|
||||||
Route::post('/crm/ajax', ['uses' => CrmController::class . '@ajax', 'laroute' => true])->name('crm.ajax');
|
Route::post('/crm/ajax', ['uses' => CrmController::class . '@ajax', 'laroute' => true])->name('crm.ajax');
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
46
README.md
46
README.md
|
@ -53,8 +53,8 @@ git clone https://port.numenaute.org/MMF/freescout-restricted-customers.git Modu
|
||||||
|
|
||||||
### Edit the application routes
|
### Edit the application routes
|
||||||
|
|
||||||
Routes set in other modules or in Freescout itself can not be automatically overridden.
|
Routes set in Freescout itself can not be automatically overridden.
|
||||||
Overriding them has to be done manually, in the three following files.
|
Overriding them has to be done manually, in the following file:
|
||||||
|
|
||||||
#### routes/web.php
|
#### routes/web.php
|
||||||
|
|
||||||
|
@ -80,48 +80,6 @@ Route::get('/customers/ajax-search', ['uses' => '\Modules\MMFRestrictedCustomers
|
||||||
Route::post('/customers/ajax', ['uses' => '\Modules\MMFRestrictedCustomers\Http\Controllers\CustomersController@ajax', 'laroute' => true])->name('customers.ajax');
|
Route::post('/customers/ajax', ['uses' => '\Modules\MMFRestrictedCustomers\Http\Controllers\CustomersController@ajax', 'laroute' => true])->name('customers.ajax');
|
||||||
```
|
```
|
||||||
|
|
||||||
#### Modules/Crm/Http/routes.php
|
|
||||||
|
|
||||||
The following list of routes:
|
|
||||||
|
|
||||||
```php
|
|
||||||
Route::group(['middleware' => ['web', 'auth', 'roles'], 'roles' => ['user', 'admin'], 'prefix' => \Helper::getSubdirectory(), 'namespace' => 'Modules\Crm\Http\Controllers'], function()
|
|
||||||
{
|
|
||||||
Route::get('/customers/new', 'CrmController@createCustomer')->name('crm.create_customer');
|
|
||||||
Route::post('/customers/new', 'CrmController@createCustomerSave');
|
|
||||||
Route::get('/crm/ajax-html/{action}/{param?}', ['uses' => 'CrmController@ajaxHtml'])->name('crm.ajax_html');
|
|
||||||
Route::get('/customers/fields/ajax-search', ['uses' => 'CrmController@ajaxSearch', 'laroute' => true])->name('crm.ajax_search');
|
|
||||||
Route::post('/crm/ajax', ['uses' => 'CrmController@ajax', 'laroute' => true])->name('crm.ajax');
|
|
||||||
});
|
|
||||||
```
|
|
||||||
|
|
||||||
should be replaced with:
|
|
||||||
|
|
||||||
```php
|
|
||||||
Route::group(['middleware' => ['web', 'auth', 'roles'], 'roles' => ['user', 'admin'], 'prefix' => \Helper::getSubdirectory(), 'namespace' => 'Modules\MMFRestrictedCustomers\Http\Controllers'], function()
|
|
||||||
{
|
|
||||||
Route::get('/customers/new', 'CrmController@createCustomer')->name('mmfrestrictedcustomers.create_customer');
|
|
||||||
Route::post('/customers/new', 'CrmController@createCustomerSave');
|
|
||||||
Route::get('/crm/ajax-html/{action}/{param?}', ['uses' => '\Modules\Crm\Http\Controllers\CrmController@ajaxHtml'])->name('crm.ajax_html');
|
|
||||||
Route::get('/customers/fields/ajax-search', ['uses' => 'CrmController@ajaxSearch', 'laroute' => true])->name('crm.ajax_search');
|
|
||||||
Route::post('/crm/ajax', ['uses' => 'CrmController@ajax', 'laroute' => true])->name('crm.ajax');
|
|
||||||
});
|
|
||||||
```
|
|
||||||
|
|
||||||
#### Modules/Crm/Providers/CrmServiceProvider.php
|
|
||||||
|
|
||||||
At line 173, this route call:
|
|
||||||
|
|
||||||
```php
|
|
||||||
$html = __('Customers').' <a href="#" data-trigger="modal" data-modal-title="'.__('Add Customer').'" data-modal-size="lg" data-modal-no-footer="true" data-modal-body=\'<iframe src="'.route('crm.create_customer', ['x_embed' => 1]).'" frameborder="0" class="modal-iframe"></iframe>\' class="btn btn-bordered btn-xs" style="position:relative;top:-1px;margin-left:4px;"><i class="glyphicon glyphicon-plus" title="'.__('Add Customer').'" data-toggle="tooltip"></i></a>';
|
|
||||||
```
|
|
||||||
|
|
||||||
should be replaced with:
|
|
||||||
|
|
||||||
```php
|
|
||||||
$html = __('Customers').' <a href="#" data-trigger="modal" data-modal-title="'.__('Add Customer').'" data-modal-size="lg" data-modal-no-footer="true" data-modal-body=\'<iframe src="'.route('mmfrestrictedcustomers.create_customer', ['x_embed' => 1]).'" frameborder="0" class="modal-iframe"></iframe>\' class="btn btn-bordered btn-xs" style="position:relative;top:-1px;margin-left:4px;"><i class="glyphicon glyphicon-plus" title="'.__('Add Customer').'" data-toggle="tooltip"></i></a>';
|
|
||||||
```
|
|
||||||
|
|
||||||
### Edit the artisan commands
|
### Edit the artisan commands
|
||||||
|
|
||||||
Console commands set in other modules or in Freescout itself can not be automatically overridden.
|
Console commands set in other modules or in Freescout itself can not be automatically overridden.
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
"license": "AGPL-3.0-only",
|
"license": "AGPL-3.0-only",
|
||||||
"keywords": [],
|
"keywords": [],
|
||||||
"active": 0,
|
"active": 0,
|
||||||
"order": 0,
|
"order": 1,
|
||||||
"providers": [
|
"providers": [
|
||||||
"Modules\\MMFRestrictedCustomers\\Providers\\MMFRestrictedCustomersServiceProvider"
|
"Modules\\MMFRestrictedCustomers\\Providers\\MMFRestrictedCustomersServiceProvider"
|
||||||
],
|
],
|
||||||
|
|
Loading…
Reference in a new issue