diff --git a/packages/Sarga/Admin/src/Database/Migrations/2022_11_18_212834_create_vendor_categories_table.php b/packages/Sarga/Admin/src/Database/Migrations/2022_11_18_212834_create_vendor_categories_table.php new file mode 100644 index 000000000..2568b1e9a --- /dev/null +++ b/packages/Sarga/Admin/src/Database/Migrations/2022_11_18_212834_create_vendor_categories_table.php @@ -0,0 +1,33 @@ +integer('vendor_id')->unsigned(); + $table->integer('category_id')->unsigned(); + $table->foreign('vendor_id')->references('id')->on('marketplace_sellers')->onDelete('cascade'); + $table->foreign('category_id')->references('id')->on('categories')->onDelete('cascade'); + }); + + } + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('vendor_categories'); + } +} diff --git a/packages/Sarga/Admin/src/Resources/lang/en/app.php b/packages/Sarga/Admin/src/Resources/lang/en/app.php index aa4ef0434..8bffe0304 100644 --- a/packages/Sarga/Admin/src/Resources/lang/en/app.php +++ b/packages/Sarga/Admin/src/Resources/lang/en/app.php @@ -208,7 +208,7 @@ return [ 'scrap' => [ 'title' => 'Scrap', 'trendyol' => 'Trendyol', - ] + ], ], 'notification' => [ 'notification-title' => 'Notification', diff --git a/packages/Sarga/Admin/src/Resources/views/catalog/categories/create.blade.php b/packages/Sarga/Admin/src/Resources/views/catalog/categories/create.blade.php index 18917057a..13f984b93 100644 --- a/packages/Sarga/Admin/src/Resources/views/catalog/categories/create.blade.php +++ b/packages/Sarga/Admin/src/Resources/views/catalog/categories/create.blade.php @@ -31,7 +31,6 @@
- {!! view_render_event('bagisto.admin.catalog.category.create_form_accordian.general.controls.before') !!}
@@ -62,7 +61,6 @@ @{{ errors.first('position') }}
- {!! view_render_event('bagisto.admin.catalog.category.create_form_accordian.general.controls.after') !!}
@@ -71,7 +69,6 @@
- {!! view_render_event('bagisto.admin.catalog.category.create_form_accordian.description_images.controls.before') !!}
@@ -106,7 +103,6 @@
- {!! view_render_event('bagisto.admin.catalog.category.create_form_accordian.description_images.controls.after') !!}
diff --git a/packages/Sarga/Admin/src/Resources/views/catalog/categories/scrap/create.blade.php b/packages/Sarga/Admin/src/Resources/views/catalog/categories/scrap/create.blade.php index e62e81aa5..6e0186d73 100644 --- a/packages/Sarga/Admin/src/Resources/views/catalog/categories/scrap/create.blade.php +++ b/packages/Sarga/Admin/src/Resources/views/catalog/categories/scrap/create.blade.php @@ -25,5 +25,21 @@ @{{ errors.first('product_limit') }} + +
+ + + + + + @{{ errors.first('vendors[]') }} + +
\ No newline at end of file diff --git a/packages/Sarga/Admin/src/Resources/views/catalog/categories/scrap/edit.blade.php b/packages/Sarga/Admin/src/Resources/views/catalog/categories/scrap/edit.blade.php index 3ac746c8e..fb3bc68d2 100644 --- a/packages/Sarga/Admin/src/Resources/views/catalog/categories/scrap/edit.blade.php +++ b/packages/Sarga/Admin/src/Resources/views/catalog/categories/scrap/edit.blade.php @@ -27,6 +27,20 @@ value="{{ old('product_limit',$category->product_limit)}}" data-vv-as=""Products limit""/> @{{ errors.first('product_limit') }} +
+ + vendors->pluck('id')->toArray() ?> + + + @{{ errors.first('vendors[]') }} + +
\ No newline at end of file diff --git a/packages/Sarga/Shop/src/Models/Category.php b/packages/Sarga/Shop/src/Models/Category.php index 232a685b3..8049920cf 100644 --- a/packages/Sarga/Shop/src/Models/Category.php +++ b/packages/Sarga/Shop/src/Models/Category.php @@ -54,4 +54,8 @@ class Category extends WCategory public function brands() :BelongsToMany{ return $this->belongsToMany(BrandProxy::modelClass(),'category_brands'); } + + public function vendors() :BelongsToMany{ + return $this->belongsToMany(VendorProxy::modelClass(),'vendor_categories'); + } } \ No newline at end of file diff --git a/packages/Sarga/Shop/src/Models/Vendor.php b/packages/Sarga/Shop/src/Models/Vendor.php index 1e6e3165f..8ab9efe5a 100644 --- a/packages/Sarga/Shop/src/Models/Vendor.php +++ b/packages/Sarga/Shop/src/Models/Vendor.php @@ -3,17 +3,16 @@ namespace Sarga\Shop\Models; use Illuminate\Database\Eloquent\Relations\BelongsToMany; -use Illuminate\Database\Eloquent\Relations\HasOne; use Sarga\Brand\Models\BrandProxy; +use Webkul\Category\Models\CategoryProxy; use Webkul\Marketplace\Models\Seller; -use Webkul\Marketplace\Models\SellerCategoryProxy; use Sarga\Shop\Contracts\Vendor as VendorContract; class Vendor extends Seller implements VendorContract { - public function categories() : HasOne + public function categories() : BelongsToMany { - return $this->hasOne(SellerCategoryProxy::modelClass(),'seller_id',); + return $this->belongsToMany(CategoryProxy::modelClass(),'vendor_categories',); } public function brands() : BelongsToMany