Merge branch 'develop' into trunk
This commit is contained in:
commit
ec325a27f3
3 changed files with 8 additions and 5 deletions
|
|
@ -1,4 +1,7 @@
|
|||
{
|
||||
"/js/app.js": "/js/app.js",
|
||||
"/css/app.css": "/css/app.css"
|
||||
"/js/gauloisir-2021-min.js": "/js/gauloisir-2021-min.js",
|
||||
"/css/gauloisir-2021.css": "/css/gauloisir-2021.css",
|
||||
"/css/app.css": "/css/app.css",
|
||||
"/js/ldcweb-cn.min.js": "/js/ldcweb-cn.min.js"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -85,8 +85,8 @@
|
|||
</div>
|
||||
</li>
|
||||
<a class="nav-link" href="{{route('bo.instant-win')}}">Instant gagnants</a>
|
||||
<a class="nav-link" href="{{route('bo.codes-ean')}}">Code EAN</a>
|
||||
@endsuperadmin
|
||||
<a class="nav-link" href="{{route('bo.codes-ean')}}">Code EAN</a>
|
||||
<a class="nav-link" href="{{route('bo.products.index')}}">Produits porteurs</a>
|
||||
@superadmin
|
||||
<a class="nav-link" href="#_">Social share</a>
|
||||
|
|
|
|||
|
|
@ -70,9 +70,9 @@ Route::namespace('bo')
|
|||
Route::get('/instant-win', 'InstantWinController@index')->name('instant-win');
|
||||
Route::get('/ajax/instant-win-generate', 'InstantWinController@instantWinGenerate');
|
||||
// Codes EAN
|
||||
Route::get('/codes-ean', 'CodesEANController@index')->name('codes-ean');
|
||||
Route::post('/ajax/delete-codes-ean', 'CodesEANController@destroy');
|
||||
Route::post('/ajax/save-codes-ean', 'CodesEANController@saveDatas');
|
||||
Route::get('/codes-ean', 'CodesEANController@index')->name('codes-ean')->withoutMiddleware('is-super-admin');;
|
||||
Route::post('/ajax/delete-codes-ean', 'CodesEANController@destroy')->withoutMiddleware('is-super-admin');;
|
||||
Route::post('/ajax/save-codes-ean', 'CodesEANController@saveDatas')->withoutMiddleware('is-super-admin');;
|
||||
// IP Bannies
|
||||
Route::get('/banned-ip', 'BannedIPController@index')->name('banned-ip');
|
||||
Route::post('/ajax/delete-banned-ip', 'BannedIPController@destroy');
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue