diff --git a/packages/Webkul/BookingProduct/src/Http/admin-routes.php b/packages/Webkul/BookingProduct/src/Http/admin-routes.php index 0778866a7..a7255efc9 100644 --- a/packages/Webkul/BookingProduct/src/Http/admin-routes.php +++ b/packages/Webkul/BookingProduct/src/Http/admin-routes.php @@ -3,7 +3,7 @@ /** * Sales routes. */ -Route::group(['middleware' => ['web', 'admin', 'admin_locale'], 'prefix' => config('app.admin_url')], function () { +Route::group(['middleware' => ['web', 'admin'], 'prefix' => config('app.admin_url')], function () { Route::prefix('sales')->group(function () { /** * Booking routes. @@ -14,4 +14,4 @@ Route::group(['middleware' => ['web', 'admin', 'admin_locale'], 'prefix' => conf Route::get('/bookings/get', [Webkul\BookingProduct\Http\Controllers\Admin\BookingController::class, 'get'])->name('admin.sales.bookings.get'); }); -}); \ No newline at end of file +}); diff --git a/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php b/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php index 2c59d5dc1..d89132f38 100644 --- a/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php +++ b/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php @@ -260,14 +260,14 @@ - +
{{ $results['records']->total() }} {{ __('admin::app.admin.system.records-found') }}
- - + +
@include('ui::datagrid.partials.mass-action-header') @@ -276,7 +276,7 @@ @include('ui::datagrid.body', ['records' => $results['records'], 'actions' => $results['actions'], 'index' => $results['index'], 'columns' => $results['columns'],'enableMassActions' => $results['enableMassActions'], 'enableActions' => $results['enableActions'], 'norecords' => $results['norecords']])
-
+ @@ -810,7 +810,7 @@ break; } - if (obj.column !== undefined && obj.column !== 'admin_locale' && obj.val !== undefined) { + if (obj.column !== undefined && obj.val !== undefined) { this.filters.push(obj); } diff --git a/packages/Webkul/Velocity/src/Routes/admin-routes.php b/packages/Webkul/Velocity/src/Routes/admin-routes.php index a5c44a941..6fc0fc384 100644 --- a/packages/Webkul/Velocity/src/Routes/admin-routes.php +++ b/packages/Webkul/Velocity/src/Routes/admin-routes.php @@ -4,47 +4,47 @@ use Illuminate\Support\Facades\Route; use Webkul\Velocity\Http\Controllers\Admin\ConfigurationController; use Webkul\Velocity\Http\Controllers\Admin\ContentController; -Route::group(['middleware' => ['web', 'admin_locale']], function () { +Route::group(['middleware' => ['web']], function () { Route::prefix(config('app.admin_url') . '/velocity')->group(function () { Route::group(['middleware' => ['admin']], function () { Route::get('/content', [ContentController::class, 'index'])->defaults('_config', [ - 'view' => 'velocity::admin.content.index' + 'view' => 'velocity::admin.content.index', ])->name('velocity.admin.content.index'); Route::get('/content/search', [ContentController::class, 'search'])->name('velocity.admin.content.search'); Route::get('/content/create', [ContentController::class, 'create'])->defaults('_config', [ - 'view' => 'velocity::admin.content.create' + 'view' => 'velocity::admin.content.create', ])->name('velocity.admin.content.create'); Route::post('/content/create', [ContentController::class, 'store'])->defaults('_config', [ - 'redirect' => 'velocity.admin.content.index' + 'redirect' => 'velocity.admin.content.index', ])->name('velocity.admin.content.store'); Route::get('/content/edit/{id}', [ContentController::class, 'edit'])->defaults('_config', [ - 'view' => 'velocity::admin.content.edit' + 'view' => 'velocity::admin.content.edit', ])->name('velocity.admin.content.edit'); Route::put('/content/edit/{id}', [ContentController::class, 'update'])->defaults('_config', [ - 'redirect' => 'velocity.admin.content.index' + 'redirect' => 'velocity.admin.content.index', ])->name('velocity.admin.content.update'); Route::post('/content/delete/{id}', [ContentController::class, 'destroy'])->name('velocity.admin.content.delete'); Route::post('/content/masssdelete', [ContentController::class, 'massDestroy'])->defaults('_config', [ - 'redirect' => 'velocity.admin.content.index' + 'redirect' => 'velocity.admin.content.index', ])->name('velocity.admin.content.mass-delete'); Route::post('/content/masss-update', [ContentController::class, 'massUpdate'])->defaults('_config', [ - 'redirect' => 'velocity.admin.content.index' + 'redirect' => 'velocity.admin.content.index', ])->name('velocity.admin.content.mass-update'); Route::get('/meta-data', [ConfigurationController::class, 'renderMetaData'])->defaults('_config', [ - 'view' => 'velocity::admin.meta-info.meta-data' + 'view' => 'velocity::admin.meta-info.meta-data', ])->name('velocity.admin.meta-data'); Route::post('/meta-data/{id}', [ConfigurationController::class, 'storeMetaData'])->defaults('_config', [ - 'redirect' => 'velocity.admin.meta-data' + 'redirect' => 'velocity.admin.meta-data', ])->name('velocity.admin.store.meta-data'); }); });