From ba32addfdb408db0d63f812c7bc92f423619fbee Mon Sep 17 00:00:00 2001
From: Edward Yang <yangjin@opencart.cn>
Date: Tue, 23 Aug 2022 16:33:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0model=E7=AD=9B=E9=80=89=20htt?=
 =?UTF-8?q?ps://guangdagit.com/beike/beikeshop/issues/173?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 beike/Repositories/ProductRepo.php                         | 6 ------
 resources/beike/admin/views/pages/products/index.blade.php | 6 ++++++
 resources/lang/en/product.php                              | 1 +
 resources/lang/zh_cn/product.php                           | 1 +
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/beike/Repositories/ProductRepo.php b/beike/Repositories/ProductRepo.php
index cf881016..1821ddf5 100644
--- a/beike/Repositories/ProductRepo.php
+++ b/beike/Repositories/ProductRepo.php
@@ -102,12 +102,6 @@ class ProductRepo
             });
         }
 
-        if (isset($data['model'])) {
-            $builder->whereHas('skus', function ($query) use ($data) {
-                $query->where('sku', 'like', "%{$data['sku']}%");
-            });
-        }
-
         if (isset($data['name'])) {
             $builder->whereHas('description', function ($query) use ($data) {
                 $query->where('name', 'like', "%{$data['name']}%");
diff --git a/resources/beike/admin/views/pages/products/index.blade.php b/resources/beike/admin/views/pages/products/index.blade.php
index 7454b0aa..a128887a 100644
--- a/resources/beike/admin/views/pages/products/index.blade.php
+++ b/resources/beike/admin/views/pages/products/index.blade.php
@@ -26,6 +26,11 @@
               <input type="text" v-model="filter.sku" class="form-control" placeholder="sku">
             </div>
 
+            <div class="col-xxl-20 col-xl-3 col-lg-4 col-md-4 d-flex align-items-center mb-3">
+              <label class="filter-title">{{ __('product.model') }}</label>
+              <input type="text" v-model="filter.model" class="form-control" placeholder="model">
+            </div>
+
             <div class="col-xxl-20 col-xl-3 col-lg-4 col-md-4 d-flex align-items-center mb-3">
               <label class="filter-title">{{ __('product.category') }}</label>
               <select v-model="filter.category_id" class="form-control">
@@ -147,6 +152,7 @@
           name: bk.getQueryString('name'),
           category_id: bk.getQueryString('category_id'),
           sku: bk.getQueryString('sku'),
+          model: bk.getQueryString('model'),
           active: bk.getQueryString('active'),
         },
         selected: [],
diff --git a/resources/lang/en/product.php b/resources/lang/en/product.php
index 331266ae..d924b92a 100644
--- a/resources/lang/en/product.php
+++ b/resources/lang/en/product.php
@@ -15,4 +15,5 @@ return [
     'price' => 'Price',
     'brand' => 'Brand',
     'category' => 'Category',
+    'model' => 'Model',
 ];
diff --git a/resources/lang/zh_cn/product.php b/resources/lang/zh_cn/product.php
index a19cfc3a..3cd7bb1c 100644
--- a/resources/lang/zh_cn/product.php
+++ b/resources/lang/zh_cn/product.php
@@ -15,4 +15,5 @@ return [
     'price' => '价格',
     'brand' => '品牌',
     'category' => '分类',
+    'model' => '型号'
 ];