From 0d7fbf615a82451a50a7456f2b4acfce34406f2e Mon Sep 17 00:00:00 2001
From: merdan <merdan.m@gmail.com>
Date: Mon, 14 Mar 2022 15:38:15 +0500
Subject: [PATCH] category default limit

---
 .../Sarga/API/Http/Controllers/Categories.php | 10 +++-
 .../Sarga/API/Http/Controllers/Orders.php     |  4 ++
 packages/Sarga/API/Http/routes.php            |  2 +
 packages/Sarga/Shop/src/Models/Category.php   | 56 +++++++++++++++++++
 .../src/Repositories/CategoryRepository.php   | 10 ++++
 .../Webkul/Shop/src/Resources/lang/ru/app.php |  4 --
 6 files changed, 79 insertions(+), 7 deletions(-)
 create mode 100644 packages/Sarga/Shop/src/Models/Category.php

diff --git a/packages/Sarga/API/Http/Controllers/Categories.php b/packages/Sarga/API/Http/Controllers/Categories.php
index c8aa73849..ead48fb6d 100644
--- a/packages/Sarga/API/Http/Controllers/Categories.php
+++ b/packages/Sarga/API/Http/Controllers/Categories.php
@@ -4,6 +4,7 @@ namespace Sarga\API\Http\Controllers;
 
 use App\Http\Controllers\Controller;
 use Sarga\API\Http\Resources\Catalog\Attribute;
+use Sarga\API\Http\Resources\Catalog\Brand;
 use Sarga\API\Http\Resources\Catalog\Category;
 use Sarga\Shop\Repositories\CategoryRepository;
 
@@ -35,12 +36,15 @@ class Categories extends Controller
     }
 
     public function filters($id){
-        $category = $this->categoryRepository->with('filterableAttributes')->find($id);
+        $category = $this->categoryRepository->with(['filterableAttributes','brands'])->find($id);
 
         if($category)
-            return Attribute::collection($category->filterableAttributes);
+            return response([
+                'attributes' =>Attribute::collection($category->filterableAttributes),
+                'brands' => Brand::collection($category->brands),
+                ]);
         else{
-            return response()->json(['error'=>'not found'],404);
+            return response(['error'=>'not found'],404);
         }
     }
 
diff --git a/packages/Sarga/API/Http/Controllers/Orders.php b/packages/Sarga/API/Http/Controllers/Orders.php
index d3cce4136..36a718e76 100644
--- a/packages/Sarga/API/Http/Controllers/Orders.php
+++ b/packages/Sarga/API/Http/Controllers/Orders.php
@@ -17,4 +17,8 @@ class Orders extends OrderController
     {
         return OrderResource::class;
     }
+
+    public function cancelItem(){
+
+    }
 }
\ No newline at end of file
diff --git a/packages/Sarga/API/Http/routes.php b/packages/Sarga/API/Http/routes.php
index 8d1a46d58..59faddf27 100644
--- a/packages/Sarga/API/Http/routes.php
+++ b/packages/Sarga/API/Http/routes.php
@@ -117,6 +117,8 @@ Route::group(['prefix' => 'api'], function () {
 
                 Route::post('orders/{id}/cancel', [Orders::class, 'cancel']);
 
+                Route::post('orders/{id}/cancel/{item_id}', [Orders::class, 'cancelItem']);
+
                 Route::get('invoices', [InvoiceController::class, 'allResources']);
 
                 Route::get('invoices/{id}', [InvoiceController::class, 'getResource']);
diff --git a/packages/Sarga/Shop/src/Models/Category.php b/packages/Sarga/Shop/src/Models/Category.php
new file mode 100644
index 000000000..c913ee61d
--- /dev/null
+++ b/packages/Sarga/Shop/src/Models/Category.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace Sarga\Shop\Models;
+
+use Illuminate\Database\Eloquent\Factories\Factory;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
+use Sarga\Brand\Models\BrandProxy;
+use Webkul\Category\Database\Factories\CategoryFactory;
+use Webkul\Category\Models\Category as WCategory;
+class Category extends WCategory
+{
+    /**
+     * Fillables.
+     *
+     * @var array
+     */
+    protected $fillable = [
+        'position',
+        'status',
+        'display_mode',
+        'parent_id',
+        'additional',
+        'trendyol_url',
+        'lcw_url',
+        'default_weight',//todo remove when implemented in scraper
+        'product_limit'
+    ];
+
+    /**
+     * Eager loading.
+     *
+     * @var array
+     */
+    protected $with = ['translations'];
+
+    /**
+     * Appends.
+     *
+     * @var array
+     */
+    protected $appends = ['image_url', 'category_icon_url'];
+
+    /**
+     * Create a new factory instance for the model.
+     *
+     * @return \Illuminate\Database\Eloquent\Factories\Factory
+     */
+    protected static function newFactory(): Factory
+    {
+        return CategoryFactory::new ();
+    }
+
+    public function brands() :BelongsToMany{
+        return $this->belongsToMany(BrandProxy::modelClass(),'category_brands');
+    }
+}
\ No newline at end of file
diff --git a/packages/Sarga/Shop/src/Repositories/CategoryRepository.php b/packages/Sarga/Shop/src/Repositories/CategoryRepository.php
index 5fce34c76..d78e016c5 100644
--- a/packages/Sarga/Shop/src/Repositories/CategoryRepository.php
+++ b/packages/Sarga/Shop/src/Repositories/CategoryRepository.php
@@ -2,10 +2,20 @@
 
 namespace Sarga\Shop\Repositories;
 
+use Sarga\Shop\Models\Category;
 use Webkul\Category\Repositories\CategoryRepository as WCategoryRepository;
 
 class CategoryRepository extends WCategoryRepository
 {
+    /**
+     * Specify model class name.
+     *
+     * @return mixed
+     */
+    public function model()
+    {
+        return Category::class;
+    }
 
     public function getCategoryTree($id = null)
     {
diff --git a/packages/Webkul/Shop/src/Resources/lang/ru/app.php b/packages/Webkul/Shop/src/Resources/lang/ru/app.php
index 750f7a8a1..12b11b036 100644
--- a/packages/Webkul/Shop/src/Resources/lang/ru/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/ru/app.php
@@ -38,7 +38,6 @@ return [
         'cart'          => 'Корзина',
         'profile'       => 'Профиль',
         'wishlist'      => 'список желаний',
-        'cart'          => 'Корзина',
         'logout'        => 'Выйти',
         'search-text'   => 'Искать товары здесь',
     ],
@@ -65,7 +64,6 @@ return [
         'already'        => 'Вы уже подписаны на наш список подписки.',
         'unsubscribed'   => 'Вы отписались от подписных писем.',
         'already-unsub'  => 'Вы уже отписались.',
-        'not-subscribed' => 'Ошибка! Почта не может быть отправлена ​​в настоящее время, повторите попытку позже.',
     ],
 
     'search' => [
@@ -568,8 +566,6 @@ return [
             'summary'             => 'Итог заказа',
             'price'               => 'Цена',
             'quantity'            => 'Количество',
-            'billing-address'     => 'Адрес для выставления счета',
-            'shipping-address'    => 'Адреса доставки',
             'contact'             => 'Контакт',
             'place-order'         => 'Разместить заказ',
             'new-address'         => 'Добавьте новый адрес',