diff --git a/packages/Sarga/API/Http/Resources/Catalog/Product.php b/packages/Sarga/API/Http/Resources/Catalog/Product.php index 5ac024546..27a39f743 100644 --- a/packages/Sarga/API/Http/Resources/Catalog/Product.php +++ b/packages/Sarga/API/Http/Resources/Catalog/Product.php @@ -71,16 +71,16 @@ class Product extends JsonResource ]; } - private function isWishlisted($product):bool - { - $wishlist = false; - - if ($customer = auth('sanctum')->user() && $wishlist = auth('sanctum')->user()->wishlist_items) { - $wishlist = $wishlist->filter(function ($item) use ($product) { - return $item->product_id == $product->product_id; - })->first(); - } - - return $wishlist ? true : false; - } +// private function isWishlisted($product):bool +// { +// $wishlist = false; +// +// if ($customer = auth('sanctum')->user() && $wishlist = auth('sanctum')->user()->wishlist_items) { +// $wishlist = $wishlist->filter(function ($item) use ($product) { +// return $item->product_id == $product->product_id; +// })->first(); +// } +// +// return $wishlist ? true : false; +// } } diff --git a/packages/Sarga/Admin/src/Config/menu.php b/packages/Sarga/Admin/src/Config/menu.php index 42d67fed3..542ce005e 100644 --- a/packages/Sarga/Admin/src/Config/menu.php +++ b/packages/Sarga/Admin/src/Config/menu.php @@ -9,19 +9,19 @@ return [ 'icon-class' => '', ], [ - 'key' => 'catalog.scrap.categories', - 'name' => 'sarga::app.layouts.scrap-categories', - 'route' => 'admin.scrap-categories.index', + 'key' => 'catalog.scrap.trendyol', + 'name' => 'sarga::app.catalog.scrap.trendyol', + 'route' => 'admin.scrap-trendyol.index', 'sort' => 1, 'icon-class' => '', ], - [ - 'key' => 'catalog.scrap.products', - 'name' => 'sarga::app.layouts.scrap-products', - 'route' => 'admin.scrap-products.index', - 'sort' => 2, - 'icon-class' => '', - ], +// [ +// 'key' => 'catalog.scrap.products', +// 'name' => 'sarga::app.layouts.scrap-lcw', +// 'route' => 'admin.scrap-products.index', +// 'sort' => 2, +// 'icon-class' => '', +// ], [ 'key' => 'catalog.menu', 'name' => 'sarga::app.layouts.menus', diff --git a/packages/Sarga/Admin/src/Http/Controllers/Scrap.php b/packages/Sarga/Admin/src/Http/Controllers/Scrap.php index 044bbe784..5d2b75c24 100644 --- a/packages/Sarga/Admin/src/Http/Controllers/Scrap.php +++ b/packages/Sarga/Admin/src/Http/Controllers/Scrap.php @@ -22,6 +22,14 @@ class Scrap extends \Webkul\Admin\Http\Controllers\Controller return view($this->_config['view'],compact('results')); } + public function trendyolScarp(){ + + } + + public function trendyolImport(){ + + } + /** * Get necessary extra details. * diff --git a/packages/Sarga/Admin/src/Resources/lang/en/app.php b/packages/Sarga/Admin/src/Resources/lang/en/app.php index d00837853..7e1355fc7 100644 --- a/packages/Sarga/Admin/src/Resources/lang/en/app.php +++ b/packages/Sarga/Admin/src/Resources/lang/en/app.php @@ -2,8 +2,6 @@ return [ 'layouts' => [ 'scrap' => 'Scrap', - 'scrap-categories' => 'Categories', - 'scrap-products' => 'Products', 'menus' => 'Menus' ], 'sales' => [ @@ -203,5 +201,9 @@ return [ 'sources' => 'Sources (Vendors)', 'filter' => 'Filter', ], + 'scrap' => [ + 'title' => 'Scrap', + 'trendyol' => 'Trendyol', + ] ] ]; diff --git a/packages/Sarga/Admin/src/Resources/views/scrap/category/index.blade.php b/packages/Sarga/Admin/src/Resources/views/scrap/category/index.blade.php deleted file mode 100644 index 4de2050ac..000000000 --- a/packages/Sarga/Admin/src/Resources/views/scrap/category/index.blade.php +++ /dev/null @@ -1,16 +0,0 @@ -@extends('admin::layouts.content') - -@section('page_title') - {{ __('admin::app.catalog.categories.title') }} -@stop - -@section('content') -
- -
-@stop \ No newline at end of file diff --git a/packages/Sarga/Admin/src/Resources/views/scrap/trendyol/index.blade.php b/packages/Sarga/Admin/src/Resources/views/scrap/trendyol/index.blade.php new file mode 100644 index 000000000..1d231cdfe --- /dev/null +++ b/packages/Sarga/Admin/src/Resources/views/scrap/trendyol/index.blade.php @@ -0,0 +1,33 @@ +@extends('admin::layouts.content') + +@section('page_title') + {{ __('admin::app.catalog.scrap.trendyol') }} +@stop + +@section('content') +
+ +
+ +
+
+@stop \ No newline at end of file diff --git a/packages/Sarga/Admin/src/Routes/catalog-routes.php b/packages/Sarga/Admin/src/Routes/catalog-routes.php index e02a3927e..5054c8679 100644 --- a/packages/Sarga/Admin/src/Routes/catalog-routes.php +++ b/packages/Sarga/Admin/src/Routes/catalog-routes.php @@ -1,6 +1,7 @@ ['web', 'admin'], 'prefix' => config('app.admin_ur /** * Menu routes. */ - Route::get('/menus', [Menus::class, 'index'])->defaults('_config', [ + Route::get('menus', [Menus::class, 'index'])->defaults('_config', [ 'view' => 'sarga_admin::catalog.menus.index', ])->name('admin.catalog.menus.index'); - Route::get('/menus/create', [Menus::class, 'create'])->defaults('_config', [ + Route::get('menus/create', [Menus::class, 'create'])->defaults('_config', [ 'view' => 'sarga_admin::catalog.menus.create', ])->name('admin.catalog.menus.create'); - Route::post('/menus/create', [Menus::class, 'store'])->defaults('_config', [ + Route::post('menus/create', [Menus::class, 'store'])->defaults('_config', [ 'redirect' => 'admin.catalog.menus.index', ])->name('admin.catalog.menus.store'); - Route::get('/menus/edit/{id}', [Menus::class, 'edit'])->defaults('_config', [ + Route::get('menus/edit/{id}', [Menus::class, 'edit'])->defaults('_config', [ 'view' => 'sarga_admin::catalog.menus.edit', ])->name('admin.catalog.menus.edit'); - Route::put('/menus/edit/{id}', [Menus::class, 'update'])->defaults('_config', [ + Route::put('menus/edit/{id}', [Menus::class, 'update'])->defaults('_config', [ 'redirect' => 'admin.catalog.menus.index', ])->name('admin.catalog.menus.update'); - Route::post('/menus/delete/{id}', [Menus::class, 'destroy'])->name('admin.catalog.menus.delete'); + Route::post('menus/delete/{id}', [Menus::class, 'destroy'])->name('admin.catalog.menus.delete'); Route::post('menus/massdelete', [Menus::class, 'massDestroy'])->defaults('_config', [ 'redirect' => 'admin.catalog.menus.index', ])->name('admin.catalog.menus.massdelete'); Route::get('menus/brands',[Menus::class, 'brands'])->name('admin.catalog.menus.brandsearch'); + + /* + * Scrap + */ + Route::get('scrap/trendyol', [Scrap::class, 'index'])->defaults('_config', [ + 'view' => 'sarga_admin::scrap.trendyol.index', + ])->name('admin.scrap-trendyol.index'); + + Route::get('scrap/trendyol/scrap', [Scrap::class, 'trendyolScarp'])->name('admin.catalog.scrap.trendyol.scrap'); + Route::get('scrap/trendyol/import', [Scrap::class, 'trendyolImport'])->name('admin.catalog.scrap.trendyol.import'); + + +// Route::get('/scrap/products', [Scrap::class, 'index'])->defaults('_config', [ +// 'view' => 'sarga_admin::scrap.product.index', +// ])->name('admin.scrap-products.index'); }); + + }); \ No newline at end of file diff --git a/packages/Sarga/Admin/src/Routes/settings-routes.php b/packages/Sarga/Admin/src/Routes/settings-routes.php deleted file mode 100644 index dbf693eaf..000000000 --- a/packages/Sarga/Admin/src/Routes/settings-routes.php +++ /dev/null @@ -1,20 +0,0 @@ - ['web', 'admin'], 'prefix' => config('app.admin_url')], function () { - /* - * Scrap - */ - Route::get('/scrap/categories', [Scrap::class, 'index'])->defaults('_config', [ - 'view' => 'sarga_admin::scrap.category.index', - ])->name('admin.scrap-categories.index'); - - Route::get('/scrap/products', [Scrap::class, 'index'])->defaults('_config', [ - 'view' => 'sarga_admin::scrap.product.index', - ])->name('admin.scrap-products.index'); - -}); diff --git a/packages/Sarga/Admin/src/Routes/web.php b/packages/Sarga/Admin/src/Routes/web.php index 31c88afdd..ddaa6487d 100644 --- a/packages/Sarga/Admin/src/Routes/web.php +++ b/packages/Sarga/Admin/src/Routes/web.php @@ -1,10 +1,4 @@