diff --git a/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php b/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php index 14287c7c9..1bd679e15 100644 --- a/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php @@ -103,9 +103,9 @@ class SliderDataGrid 'label' => 'ID' ], [ 'column' => 's.title', - 'alias' => 'SliderTitle', + 'alias' => 'sliderTitle', 'type' => 'string', - 'label' => 'Slider Title' + 'label' => 'title' ], ], diff --git a/packages/Webkul/Admin/src/DataGrids/TaxCategoryDataGrid.php b/packages/Webkul/Admin/src/DataGrids/TaxCategoryDataGrid.php index d84f10bfe..de19cc205 100644 --- a/packages/Webkul/Admin/src/DataGrids/TaxCategoryDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/TaxCategoryDataGrid.php @@ -103,18 +103,18 @@ class TaxCategoryDataGrid ], //don't use aliasing in case of filters 'filterable' => [ - [ - 'column' => 'tr.name', - 'alias' => 'Name', - 'type' => 'number', - 'label' => 'Name' - ], [ 'column' => 'tr.id', 'alias' => 'ID', 'type' => 'number', 'label' => 'ID' ], + [ + 'column' => 'tr.name', + 'alias' => 'Name', + 'type' => 'string', + 'label' => 'Name' + ], [ 'column' => 'tr.code', 'alias' => 'code', diff --git a/packages/Webkul/Admin/src/Http/routes.php b/packages/Webkul/Admin/src/Http/routes.php index e05da2cf2..337d8a8fd 100644 --- a/packages/Webkul/Admin/src/Http/routes.php +++ b/packages/Webkul/Admin/src/Http/routes.php @@ -174,10 +174,8 @@ Route::group(['middleware' => ['web']], function () { // Catalog Routes Route::prefix('catalog')->group(function () { - Route::get('/sync', 'Webkul\Product\Http\Controllers\ProductController@sync'); - // Catalog Product Routes Route::get('/products', 'Webkul\Product\Http\Controllers\ProductController@index')->defaults('_config', [ 'view' => 'admin::catalog.products.index' diff --git a/packages/Webkul/Admin/src/Listeners/Product.php b/packages/Webkul/Admin/src/Listeners/Product.php index 5968e76d9..eb40c580c 100644 --- a/packages/Webkul/Admin/src/Listeners/Product.php +++ b/packages/Webkul/Admin/src/Listeners/Product.php @@ -243,11 +243,17 @@ class Product { $qty = 0; } - $this->productGrid->create($gridObject); + + $oldGridObject = $this->productGrid->findOneByField('product_id', $product->id); + + if($oldGridObject) { + $oldGridObject->update($gridObject); + } else { + $this->productGrid->create($gridObject); + } $gridObject = []; } - return true; } } \ No newline at end of file diff --git a/packages/Webkul/Product/src/Database/Migrations/2018_11_27_113535_remove_cost_column_from_datagrid.php b/packages/Webkul/Product/src/Database/Migrations/2018_11_27_113535_remove_cost_column_from_datagrid.php index 53d287c51..95986d240 100644 --- a/packages/Webkul/Product/src/Database/Migrations/2018_11_27_113535_remove_cost_column_from_datagrid.php +++ b/packages/Webkul/Product/src/Database/Migrations/2018_11_27_113535_remove_cost_column_from_datagrid.php @@ -13,11 +13,10 @@ class RemoveCostColumnFromDatagrid extends Migration */ public function up() { - if (Schema::hasTable('product_grid')) { - Schema::table('products_grid', function (Blueprint $table) { - $table->dropColumn('cost'); - }); - } + Schema::table('products_grid', function (Blueprint $table) { + $table->dropColumn('cost'); + $table->dropColumn('attribute_family_name'); + }); } /** @@ -27,10 +26,9 @@ class RemoveCostColumnFromDatagrid extends Migration */ public function down() { - if (Schema::hasTable('product_grid')) { - Schema::table('products_grid', function (Blueprint $table) { - $table->string('cost'); - }); - } + Schema::table('products_grid', function (Blueprint $table) { + $table->string('cost'); + $table->string('attribute_family_name')->nullable(); + }); } } diff --git a/packages/Webkul/Product/src/Http/Controllers/ProductController.php b/packages/Webkul/Product/src/Http/Controllers/ProductController.php index af08a8716..7930044e6 100644 --- a/packages/Webkul/Product/src/Http/Controllers/ProductController.php +++ b/packages/Webkul/Product/src/Http/Controllers/ProductController.php @@ -78,6 +78,8 @@ class ProductController extends Controller Product $product, ProductGrid $productGrid) { + $this->middleware('admin'); + $this->attributeFamily = $attributeFamily; $this->category = $category; @@ -216,6 +218,8 @@ class ProductController extends Controller * To be manually invoked when data is seeded into products */ public function sync() { - Event::fire('products.datagrid.create', true); + Event::fire('products.datagrid.sync', true); + + return redirect()->route('admin.catalog.products.index'); } } \ No newline at end of file diff --git a/packages/Webkul/Product/src/Providers/ProductServiceProvider.php b/packages/Webkul/Product/src/Providers/ProductServiceProvider.php index 73c99bb38..35c7d62ad 100644 --- a/packages/Webkul/Product/src/Providers/ProductServiceProvider.php +++ b/packages/Webkul/Product/src/Providers/ProductServiceProvider.php @@ -19,7 +19,7 @@ class ProductServiceProvider extends ServiceProvider { $this->loadMigrationsFrom(__DIR__ . '/../Database/Migrations'); - Event::listen('products.datagrid.create', 'Webkul\Admin\Listeners\Product@sync'); + Event::listen('products.datagrid.sync', 'Webkul\Admin\Listeners\Product@sync'); Event::listen('product.save.after', 'Webkul\Admin\Listeners\Product@afterProductCreated'); diff --git a/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php b/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php index a86c9fd3c..859f0a988 100644 --- a/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php @@ -187,14 +187,6 @@ Designer sarees --}} - - @auth('customer') - @if(auth()->guard('customer')->user()->is_verified == 0) -