diff --git a/packages/Sarga/API/Http/Controllers/Vendors.php b/packages/Sarga/API/Http/Controllers/Vendors.php index 942ea7859..205fdb831 100644 --- a/packages/Sarga/API/Http/Controllers/Vendors.php +++ b/packages/Sarga/API/Http/Controllers/Vendors.php @@ -18,7 +18,7 @@ class Vendors extends Controller public function index() { - $vendors = $this->vendorRepository->select('marketplace_sellers.id','url','logo','banner','shop_title') + $vendors = $this->vendorRepository->select('marketplace_sellers.id','url','logo','banner','shop_title','brand_attribute_id') ->where('is_approved',true) ->with(['categories:seller_id,type,categories']) // ->leftJoin('seller_categories','marketplace_sellers.id','=','seller_categories.seller_id') diff --git a/packages/Sarga/API/Http/Resources/Core/Vendor.php b/packages/Sarga/API/Http/Resources/Core/Vendor.php index 9d65873ed..3634a5638 100644 --- a/packages/Sarga/API/Http/Resources/Core/Vendor.php +++ b/packages/Sarga/API/Http/Resources/Core/Vendor.php @@ -21,6 +21,7 @@ class Vendor extends JsonResource 'shop_title' => $this->shop_title, 'logo' => $this->logo_url, 'banner' => $this->banner_url, + 'brand_id' => $this->brand_attribute_id, 'categories' => SellerCategory::collection($this->categories), ]; } diff --git a/packages/Sarga/Admin/src/Database/Migrations/2021_12_29_312834_update_sellers_table.php b/packages/Sarga/Admin/src/Database/Migrations/2021_12_29_312834_update_sellers_table.php new file mode 100644 index 000000000..535e5c988 --- /dev/null +++ b/packages/Sarga/Admin/src/Database/Migrations/2021_12_29_312834_update_sellers_table.php @@ -0,0 +1,31 @@ +unsignedInteger('brand_attribute_id')->nullable(); + }); + } + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('marketplace_sellers', function (Blueprint $table) { + $table->dropColumn('brand_attribute_id'); + }); + } +} diff --git a/packages/Sarga/Admin/src/Listeners/Sellers.php b/packages/Sarga/Admin/src/Listeners/Sellers.php new file mode 100644 index 000000000..9a20ec069 --- /dev/null +++ b/packages/Sarga/Admin/src/Listeners/Sellers.php @@ -0,0 +1,27 @@ +optionRepository = $optionRepository; + } + + public function edit($seller){ + Log::info(json_encode($seller)); + return view('sarga_admin::sellers.seller-brand'); + } +} \ No newline at end of file diff --git a/packages/Sarga/Admin/src/Providers/AdminServiceProvider.php b/packages/Sarga/Admin/src/Providers/AdminServiceProvider.php index a70c9ab4c..b7607daaa 100644 --- a/packages/Sarga/Admin/src/Providers/AdminServiceProvider.php +++ b/packages/Sarga/Admin/src/Providers/AdminServiceProvider.php @@ -20,6 +20,7 @@ class AdminServiceProvider extends ServiceProvider $this->loadViewsFrom(__DIR__ . '/../Resources/views', 'sarga_admin'); $this->loadMigrationsFrom(__DIR__ . '/../Database/Migrations'); $this->loadTranslationsFrom(__DIR__ . '/../Resources/lang', 'sarga'); + $this->app->register(EventServiceProvider::class); } public function register() diff --git a/packages/Sarga/Admin/src/Providers/EventServiceProvider.php b/packages/Sarga/Admin/src/Providers/EventServiceProvider.php new file mode 100644 index 000000000..eb3545e16 --- /dev/null +++ b/packages/Sarga/Admin/src/Providers/EventServiceProvider.php @@ -0,0 +1,23 @@ +addTemplate('sarga_admin::sellers.seller-brand'); + }); + } +} \ No newline at end of file diff --git a/packages/Sarga/Admin/src/Resources/views/sellers/seller-brand.blade.php b/packages/Sarga/Admin/src/Resources/views/sellers/seller-brand.blade.php new file mode 100644 index 000000000..7277ac10c --- /dev/null +++ b/packages/Sarga/Admin/src/Resources/views/sellers/seller-brand.blade.php @@ -0,0 +1,18 @@ +@php + $attributes = app('Webkul\Attribute\Repositories\AttributeRepository')->findWhere(['type'=>'select']); +@endphp +
+ + + @{{ errors.first('brand_attribute_id') }} +
+ + diff --git a/packages/Sarga/Admin/src/Routes/marketplace-routes.php b/packages/Sarga/Admin/src/Routes/marketplace-routes.php new file mode 100644 index 000000000..3f1144b74 --- /dev/null +++ b/packages/Sarga/Admin/src/Routes/marketplace-routes.php @@ -0,0 +1,35 @@ + ['web', 'admin', 'admin_locale'], 'prefix' => config('app.admin_url')], function () { + Route::prefix('marketplace/seller-categories')->group(function () { + + Route::get('/', 'Webkul\Marketplace\Http\Controllers\Admin\SellerCategoryController@index')->defaults('_config', [ + 'view' => 'sarga_admin::sellers.category.index' + ])->name('admin.marketplace.seller.category.index'); + + Route::get('create', [SellerCategoryController::class, 'create'])->defaults('_config', [ + 'view' => 'sarga_admin::sellers.category.create', + ])->name('admin.marketplace.seller.category.create'); + + Route::get('edit/{id}', 'Webkul\Marketplace\Http\Controllers\Admin\SellerCategoryController@edit')->defaults('_config', [ + 'view' => 'sarga_admin::sellers.category.edit', + ])->name('admin.marketplace.seller.category.edit'); + + // seller profile routes start here + Route::get('sellers/profile/edit/{id}', 'Webkul\Marketplace\Http\Controllers\Admin\SellerController@editProfile')->defaults('_config', [ + 'view' => 'marketplace::admin.sellers.edit' + ])->name('admin.marketplace.seller.edit'); + + // seller profile routes end here + }); +}); diff --git a/packages/Sarga/Admin/src/Routes/settings-routes.php b/packages/Sarga/Admin/src/Routes/settings-routes.php index fe78cbae6..f0c5634ed 100644 --- a/packages/Sarga/Admin/src/Routes/settings-routes.php +++ b/packages/Sarga/Admin/src/Routes/settings-routes.php @@ -10,14 +10,14 @@ Route::group(['middleware' => ['web', 'admin', 'admin_locale'], 'prefix' => conf * Channels routes. */ - Route::get('/channels/create', [ChannelController::class, 'create'])->defaults('_config', [ - 'view' => 'sarga_admin::settings.channels.create', - ])->name('admin.channels.create'); - - - Route::get('/channels/edit/{id}', [ChannelController::class, 'edit'])->defaults('_config', [ - 'view' => 'sarga_admin::settings.channels.edit', - ])->name('admin.channels.edit'); +// Route::get('/channels/create', [ChannelController::class, 'create'])->defaults('_config', [ +// 'view' => 'sarga_admin::settings.channels.create', +// ])->name('admin.channels.create'); +// +// +// Route::get('/channels/edit/{id}', [ChannelController::class, 'edit'])->defaults('_config', [ +// 'view' => 'sarga_admin::settings.channels.edit', +// ])->name('admin.channels.edit'); /* * Scrap diff --git a/packages/Sarga/Admin/src/Routes/web.php b/packages/Sarga/Admin/src/Routes/web.php index 4ad54b9f6..d68887cc3 100644 --- a/packages/Sarga/Admin/src/Routes/web.php +++ b/packages/Sarga/Admin/src/Routes/web.php @@ -9,3 +9,8 @@ require 'catalog-routes.php'; * Settings routes. */ require 'settings-routes.php'; + +/** + * marketplace routes + */ +require 'marketplace-routes.php'; \ No newline at end of file