diff --git a/composer.json b/composer.json index a6853969e..dd0be8017 100755 --- a/composer.json +++ b/composer.json @@ -108,7 +108,8 @@ "Webkul\\Marketplace\\": "packages/Webkul/Marketplace/src", "Sarga\\Shop\\": "packages/Sarga/Shop/src", "Sarga\\API\\": "packages/Sarga/API", - "Sarga\\Admin\\": "packages/Sarga/Admin/src" + "Sarga\\Admin\\": "packages/Sarga/Admin/src", + "Sarga\\Brand\\": "packages/Sarga/Brand/src" } }, "autoload-dev": { diff --git a/config/app.php b/config/app.php index 26327274c..f04844d09 100755 --- a/config/app.php +++ b/config/app.php @@ -286,7 +286,8 @@ return [ Sarga\Shop\Providers\ShopServiceProvider::class, Sarga\API\Providers\APIServiceProvider::class, - Sarga\Admin\Providers\AdminServiceProvider::class + Sarga\Admin\Providers\AdminServiceProvider::class, + Sarga\Brand\Providers\BrandServiceProvider::class, ], /* diff --git a/packages/Sarga/API/Http/Controllers/Vendors.php b/packages/Sarga/API/Http/Controllers/Vendors.php index cdaccf9c5..4ee091195 100644 --- a/packages/Sarga/API/Http/Controllers/Vendors.php +++ b/packages/Sarga/API/Http/Controllers/Vendors.php @@ -46,15 +46,15 @@ class Vendors extends Controller }]) ->orderBy('position','asc') ->get(); - if($vendor->main_categories->count()){ - foreach($vendor->main_categories as $category){ - $category->filters = app(ProductFlatRepository::class)->getProductsRelatedFilterableAttributes($category); - } - } +// if($vendor->main_categories->count()){ +// foreach($vendor->main_categories as $category){ +// $category->filters = app(ProductFlatRepository::class)->getProductsRelatedFilterableAttributes($category); +// } +// } } } - return $vendors; +// return $vendors; return Vendor::collection($vendors); } diff --git a/packages/Sarga/Brand/composer.json b/packages/Sarga/Brand/composer.json new file mode 100644 index 000000000..429c3cf54 --- /dev/null +++ b/packages/Sarga/Brand/composer.json @@ -0,0 +1,27 @@ +{ + "name": "sarga/bagisto-brand", + "license": "MIT", + "authors": [ + { + "name": "Merdan Singh", + "email": "merdan.m@gmail.com" + } + ], + "require": { + "bagisto/laravel-core": "dev-master" + }, + "autoload": { + "psr-4": { + "Sarga\\Admin\\": "src/" + } + }, + "extra": { + "laravel": { + "providers": [ + "Sarga\\Brand\\Providers\\BrandServiceProvider" + ], + "aliases": {} + } + }, + "minimum-stability": "dev" +} \ No newline at end of file diff --git a/packages/Sarga/Brand/src/Cotnracts/Brand.php b/packages/Sarga/Brand/src/Cotnracts/Brand.php new file mode 100644 index 000000000..1e9505e34 --- /dev/null +++ b/packages/Sarga/Brand/src/Cotnracts/Brand.php @@ -0,0 +1,6 @@ +increments('id'); + $table->string('code')->unique(); + $table->string('name'); + $table->integer('position')->default(0); + $table->string('image')->nullable(); + $table->boolean('status')->default(0); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('brands'); + } +} diff --git a/packages/Sarga/Brand/src/Http/Controllers/BrandController.php b/packages/Sarga/Brand/src/Http/Controllers/BrandController.php new file mode 100644 index 000000000..029ab4dc0 --- /dev/null +++ b/packages/Sarga/Brand/src/Http/Controllers/BrandController.php @@ -0,0 +1,34 @@ + ['web', 'admin', 'admin_locale'], 'prefix' => config('app.admin_url')], function () { + Route::prefix('catalog')->group(function () { + /** + * Categories routes. + */ + Route::get('/brands', [BrandController::class, 'index'])->defaults('_config', [ + 'view' => 'admin::catalog.categories.index', + ])->name('admin.catalog.categories.index'); + + Route::get('/brands/create', [BrandController::class, 'create'])->defaults('_config', [ + 'view' => 'admin::catalog.categories.create', + ])->name('admin.catalog.categories.create'); + + Route::post('/brands/create', [BrandController::class, 'store'])->defaults('_config', [ + 'redirect' => 'admin.catalog.categories.index', + ])->name('admin.catalog.categories.store'); + + Route::get('/brands/edit/{id}', [BrandController::class, 'edit'])->defaults('_config', [ + 'view' => 'admin::catalog.categories.edit', + ])->name('admin.catalog.categories.edit'); + + Route::put('/brands/edit/{id}', [BrandController::class, 'update'])->defaults('_config', [ + 'redirect' => 'admin.catalog.categories.index', + ])->name('admin.catalog.categories.update'); + + Route::post('/brands/delete/{id}', [BrandController::class, 'destroy'])->name('admin.catalog.categories.delete'); + + Route::post('brands/massdelete', [BrandController::class, 'massDestroy'])->defaults('_config', [ + 'redirect' => 'admin.catalog.categories.index', + ])->name('admin.catalog.categories.massdelete'); + + Route::post('/brands/product/count', [BrandController::class, 'productCount'])->name('admin.catalog.categories.product.count'); + }); +}); + diff --git a/packages/Sarga/Brand/src/Http/Routes/shop-routes.php b/packages/Sarga/Brand/src/Http/Routes/shop-routes.php new file mode 100644 index 000000000..b3d9bbc7f --- /dev/null +++ b/packages/Sarga/Brand/src/Http/Routes/shop-routes.php @@ -0,0 +1 @@ +image) { + return; + } + + return Storage::url($this->image); + } + + /** + * Get image url for the category image. + */ + public function getImageUrlAttribute() + { + return $this->image_url(); + } +} \ No newline at end of file diff --git a/packages/Sarga/Brand/src/Providers/BrandServiceProvider.php b/packages/Sarga/Brand/src/Providers/BrandServiceProvider.php new file mode 100644 index 000000000..2cf3e5b4a --- /dev/null +++ b/packages/Sarga/Brand/src/Providers/BrandServiceProvider.php @@ -0,0 +1,17 @@ +loadMigrationsFrom(__DIR__ . '/../Database/Migrations'); + +// CategoryProxy::observe(CategoryObserver::class); + } +} \ No newline at end of file diff --git a/packages/Sarga/Brand/src/Providers/ModuleServiceProvider.php b/packages/Sarga/Brand/src/Providers/ModuleServiceProvider.php new file mode 100644 index 000000000..a37c4529b --- /dev/null +++ b/packages/Sarga/Brand/src/Providers/ModuleServiceProvider.php @@ -0,0 +1,12 @@ + +
+
+ +@stop \ No newline at end of file diff --git a/packages/Sarga/Brand/src/Resources/views/admin/edit.blade.php b/packages/Sarga/Brand/src/Resources/views/admin/edit.blade.php new file mode 100644 index 000000000..b3d9bbc7f --- /dev/null +++ b/packages/Sarga/Brand/src/Resources/views/admin/edit.blade.php @@ -0,0 +1 @@ +