diff --git a/packages/Sarga/API/Http/Controllers/Vendors.php b/packages/Sarga/API/Http/Controllers/Vendors.php index 0ac2117d5..49fcb84da 100644 --- a/packages/Sarga/API/Http/Controllers/Vendors.php +++ b/packages/Sarga/API/Http/Controllers/Vendors.php @@ -32,7 +32,7 @@ class Vendors extends Controller ->get(); foreach ($vendors as $vendor){ - if($vendor->categories && $mainCats = $vendor->categories->where('type','main')->first()){ + if($vendor->categories && $mainCats = $vendor->categories->first()){ $cat_ids = json_decode($mainCats->categories,true); // $vendor->test = Category::collection($this->categoryRepository->getVisibleCategoryTree($cat_ids[0])); $vendor->main_categories = $this->categoryRepository->whereIn('id',$cat_ids) diff --git a/packages/Sarga/Admin/src/DataGrids/AddressDataGrid.php b/packages/Sarga/Admin/src/DataGrids/AddressDataGrid.php new file mode 100644 index 000000000..23708be38 --- /dev/null +++ b/packages/Sarga/Admin/src/DataGrids/AddressDataGrid.php @@ -0,0 +1,208 @@ +customerRepository = $customerRepository; + + parent::__construct(); + } + + /** + * Prepare query builder. + * + * @return void + */ + public function prepareQueryBuilder() + { + $customer = $this->customerRepository->find(request('id')); + + $queryBuilder = DB::table('addresses as ca') +// ->leftJoin('countries', 'ca.country', '=', 'countries.code') + ->leftJoin('customers as c', 'ca.customer_id', '=', 'c.id') + ->addSelect('ca.id as address_id', 'ca.company_name', 'ca.address1', 'ca.state', 'ca.city') + ->where('ca.address_type', CustomerAddress::ADDRESS_TYPE) + ->where('c.id', $customer->id); + +// $queryBuilder = $queryBuilder->leftJoin('country_states', function ($qb) { +// $qb->on('ca.state', 'country_states.code') +// ->on('countries.id', 'country_states.country_id'); +// }); + +// $queryBuilder->groupBy('ca.id') +// ->addSelect(DB::raw(DB::getTablePrefix() . 'country_states.default_name as state_name')); + + $this->addFilter('company_name', 'ca.company_name'); + $this->addFilter('address1', 'ca.address1'); +// $this->addFilter('postcode', 'ca.postcode'); + $this->addFilter('city', 'ca.city'); + $this->addFilter('state_name', DB::raw(DB::getTablePrefix() . 'country_states.default_name')); +// $this->addFilter('country_name', DB::raw(DB::getTablePrefix() . 'countries.name')); +// $this->addFilter('default_address', 'ca.default_address'); + + $this->setQueryBuilder($queryBuilder); + } + + /** + * Add columns. + * + * @return void + */ + public function addColumns() + { + $this->addColumn([ + 'index' => 'address_id', + 'label' => trans('admin::app.datagrid.id'), + 'type' => 'number', + 'searchable' => true, + 'sortable' => true, + 'filterable' => true, + ]); + + $this->addColumn([ + 'index' => 'company_name', + 'label' => 'Not', +// 'label' => trans('admin::app.customers.addresses.company-name'), + 'type' => 'string', + 'searchable' => true, + 'sortable' => true, + 'filterable' => true, + ]); + + $this->addColumn([ + 'index' => 'address1', + 'label' => trans('admin::app.customers.addresses.address-1'), + 'type' => 'string', + 'searchable' => true, + 'sortable' => true, + 'filterable' => true, + ]); + +// $this->addColumn([ +// 'index' => 'postcode', +// 'label' => trans('admin::app.customers.addresses.postcode'), +// 'type' => 'string', +// 'searchable' => true, +// 'sortable' => true, +// 'filterable' => true, +// ]); + + $this->addColumn([ + 'index' => 'city', + 'label' => trans('admin::app.customers.addresses.city'), + 'type' => 'string', + 'searchable' => true, + 'sortable' => true, + 'filterable' => true, + ]); + + $this->addColumn([ + 'index' => 'state', + 'label' => trans('admin::app.customers.addresses.state-name'), + 'type' => 'string', + 'searchable' => true, + 'sortable' => true, + 'filterable' => true, + ]); + +// $this->addColumn([ +// 'index' => 'country_name', +// 'label' => trans('admin::app.customers.addresses.country-name'), +// 'type' => 'string', +// 'searchable' => true, +// 'sortable' => true, +// 'filterable' => true, +// ]); + +// $this->addColumn([ +// 'index' => 'default_address', +// 'label' => trans('admin::app.customers.addresses.default-address'), +// 'type' => 'boolean', +// 'sortable' => true, +// 'searchable' => false, +// 'closure' => function ($row) { +// if ($row->default_address == 1) { +// return '' . trans('admin::app.customers.addresses.yes') . ''; +// } else { +// return trans('admin::app.customers.addresses.dash'); +// } +// }, +// ]); + } + + /** + * Prepare actions. + * + * @return void + */ + public function prepareActions() + { + $this->addAction([ + 'title' => trans('admin::app.datagrid.edit'), + 'method' => 'GET', + 'route' => 'admin.customer.addresses.edit', + 'icon' => 'icon pencil-lg-icon', + ]); + + $this->addAction([ + 'title' => trans('admin::app.datagrid.delete'), + 'method' => 'POST', + 'route' => 'admin.customer.addresses.delete', + 'confirm_text' => trans('ui::app.datagrid.massaction.delete', ['resource' => 'address']), + 'icon' => 'icon trash-icon', + ]); + } + + /** + * Prepare mass actions. + * + * @return void + */ + public function prepareMassActions() + { + $this->addMassAction([ + 'type' => 'delete', + 'label' => trans('admin::app.customers.addresses.delete'), + 'action' => route('admin.customer.addresses.massdelete', request('id')), + 'method' => 'POST', + ]); + } +} diff --git a/packages/Sarga/Admin/src/DataGrids/SellerCategoryDataGrid.php b/packages/Sarga/Admin/src/DataGrids/SellerCategoryDataGrid.php deleted file mode 100644 index 3a5cd398b..000000000 --- a/packages/Sarga/Admin/src/DataGrids/SellerCategoryDataGrid.php +++ /dev/null @@ -1,105 +0,0 @@ - - * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) - */ -class SellerCategoryDataGrid extends DataGrid -{ - /** - * - * @var integer - */ - public $index = 'id'; - - protected $sortOrder = 'desc'; //asc or desc - - protected $enableFilterMap = true; - - public function prepareQueryBuilder() - { - $queryBuilder = DB::table('seller_categories') - ->leftJoin('marketplace_sellers', 'seller_categories.seller_id', 'marketplace_sellers.id') - ->leftJoin('customers', 'marketplace_sellers.customer_id', 'customers.id') - - ->select(DB::raw('CONCAT(customers.first_name, " ", customers.last_name) as name'), - 'seller_categories.categories', - 'seller_categories.id', - 'seller_categories.type' - ); - - $this->addFilter('customer_name', DB::raw('CONCAT(customers.first_name, " ", customers.last_name)')); - - - $this->setQueryBuilder($queryBuilder); - } - - public function addColumns() - { - $this->addColumn([ - 'index' => 'id', - 'label' => trans('marketplace::app.admin.sellers.id'), - 'type' => 'number', - 'searchable' => false, - 'sortable' => true, - 'filterable' => true - ]); - - $this->addColumn([ - 'index' => 'name', - 'label' => trans('marketplace::app.admin.flag.name'), - 'type' => 'string', - 'searchable' => true, - 'sortable' => true, - 'filterable' => true - ]); - - $this->addColumn([ - 'index' => 'type', - 'label' => 'Type', - 'type' => 'string', - 'searchable' => true, - 'sortable' => true, - 'filterable' => true - ]); - - } - - public function prepareActions() - { - $this->addAction([ - 'type' => 'edit', - 'method' => 'GET', - 'route' => 'admin.marketplace.seller.category.edit', - 'icon' => 'icon pencil-lg-icon', - 'title' => '' - ], true); - - $this->addAction([ - 'type' => 'Delete', - 'method' => 'delete', - 'route' => 'admin.marketplace.seller.category.delete', - 'confirm_text' => trans('ui::app.datagrid.massaction.delete', ['resource' => 'product']), - 'icon' => 'icon trash-icon', - 'title' => trans('ui::app.datagrid.massaction.delete', ['resource' => 'product']) - ], true); - } - - public function prepareMassActions() - { - $this->addMassAction([ - 'type' => 'delete', - 'label' => trans('marketplace::app.admin.sellers.delete'), - 'action' => route('admin.marketplace.seller.category.mass-delete'), - 'method' => 'POST', - 'title' => '' - ], true) ; - } -} \ No newline at end of file diff --git a/packages/Sarga/Admin/src/Database/Migrations/2021_11_09_184538_add_promotion_category_id_in_channels_table.php b/packages/Sarga/Admin/src/Database/Migrations/2021_11_09_184538_add_promotion_category_id_in_channels_table.php deleted file mode 100644 index ea2864f56..000000000 --- a/packages/Sarga/Admin/src/Database/Migrations/2021_11_09_184538_add_promotion_category_id_in_channels_table.php +++ /dev/null @@ -1,33 +0,0 @@ -integer('promotion_category_id')->nullable()->unsigned(); - $table->foreign('promotion_category_id')->references('id')->on('categories')->onDelete('set null'); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::table('channels', function (Blueprint $table) { - $table->dropColumn('promotion_category_id'); - }); - } -} 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 deleted file mode 100644 index 535e5c988..000000000 --- a/packages/Sarga/Admin/src/Database/Migrations/2021_12_29_312834_update_sellers_table.php +++ /dev/null @@ -1,31 +0,0 @@ -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 deleted file mode 100644 index 9a20ec069..000000000 --- a/packages/Sarga/Admin/src/Listeners/Sellers.php +++ /dev/null @@ -1,27 +0,0 @@ -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 a2ef29ca7..79bf7a449 100644 --- a/packages/Sarga/Admin/src/Providers/AdminServiceProvider.php +++ b/packages/Sarga/Admin/src/Providers/AdminServiceProvider.php @@ -18,6 +18,11 @@ class AdminServiceProvider extends ServiceProvider $this->loadViewsFrom(__DIR__ . '/../Resources/views', 'sarga_admin'); $this->loadMigrationsFrom(__DIR__ . '/../Database/Migrations'); $this->loadTranslationsFrom(__DIR__ . '/../Resources/lang', 'sarga'); + + $this->publishes([ + __DIR__ . '/../Resources/views/catalog/categories' => resource_path('views/vendor/admin/catalog/categories'), + ]); + $this->app->register(EventServiceProvider::class); } diff --git a/packages/Sarga/Admin/src/Providers/EventServiceProvider.php b/packages/Sarga/Admin/src/Providers/EventServiceProvider.php index eb3545e16..f1bf280c4 100644 --- a/packages/Sarga/Admin/src/Providers/EventServiceProvider.php +++ b/packages/Sarga/Admin/src/Providers/EventServiceProvider.php @@ -16,8 +16,8 @@ class EventServiceProvider extends ServiceProvider { public function boot(){ - Event::listen('marketplace.sellers.account.profile.edit.before', function($viewRenderEventManager) { - $viewRenderEventManager->addTemplate('sarga_admin::sellers.seller-brand'); - }); +// Event::listen('marketplace.sellers.account.profile.edit.before', function($viewRenderEventManager) { +// $viewRenderEventManager->addTemplate('sarga_admin::sellers.seller-brand'); +// }); } } \ No newline at end of file diff --git a/packages/Sarga/Admin/src/Resources/views/sellers/category/create.blade.php b/packages/Sarga/Admin/src/Resources/views/sellers/category/create.blade.php deleted file mode 100644 index 322d93d01..000000000 --- a/packages/Sarga/Admin/src/Resources/views/sellers/category/create.blade.php +++ /dev/null @@ -1,64 +0,0 @@ -@extends('admin::layouts.content') - -@section('page_title') - {{ __('marketplace::app.admin.sellers.category.add-title') }} -@stop - -@section('content') -