From 5b66c075a6899649346dbb92dfacca02b7137ffe Mon Sep 17 00:00:00 2001
From: Edward Yang <yangjin@opencart.cn>
Date: Fri, 29 Jul 2022 17:22:42 +0800
Subject: [PATCH] fixed latest product

---
 beike/Models/TaxRule.php                           | 2 +-
 plugins/HeaderMenu/Controllers/MenusController.php | 7 ++++++-
 plugins/HeaderMenu/Views/latest_products.blade.php | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/beike/Models/TaxRule.php b/beike/Models/TaxRule.php
index 57c0d638..ccd14dcc 100644
--- a/beike/Models/TaxRule.php
+++ b/beike/Models/TaxRule.php
@@ -15,7 +15,7 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 class TaxRule extends Base
 {
-    protected $fillable = ['tax_class_id', 'tax_rate_id', 'based'];
+    protected $fillable = ['tax_class_id', 'tax_rate_id', 'based', 'priority'];
 
     public function taxClass(): BelongsTo
     {
diff --git a/plugins/HeaderMenu/Controllers/MenusController.php b/plugins/HeaderMenu/Controllers/MenusController.php
index 477e4c9e..f9f7ac41 100644
--- a/plugins/HeaderMenu/Controllers/MenusController.php
+++ b/plugins/HeaderMenu/Controllers/MenusController.php
@@ -13,12 +13,17 @@ namespace Plugin\HeaderMenu\Controllers;
 
 use Beike\Repositories\ProductRepo;
 use Beike\Shop\Http\Controllers\Controller;
+use Beike\Shop\Http\Resources\ProductList;
 
 class MenusController extends Controller
 {
     public function latestProducts()
     {
         $products = ProductRepo::getBuilder()->orderByDesc('updated_at')->paginate(40);
-        return view("HeaderMenu::latest_products", ['products' => $products]);
+        $data = [
+            'products' => $products,
+            'items' => ProductList::collection($products)->jsonSerialize(),
+        ];
+        return view("HeaderMenu::latest_products", $data);
     }
 }
diff --git a/plugins/HeaderMenu/Views/latest_products.blade.php b/plugins/HeaderMenu/Views/latest_products.blade.php
index cb5c1a64..ec893bbd 100644
--- a/plugins/HeaderMenu/Views/latest_products.blade.php
+++ b/plugins/HeaderMenu/Views/latest_products.blade.php
@@ -10,7 +10,7 @@
         </nav>
 
         <div class="row">
-            @foreach ($products as $product)
+            @foreach ($items as $product)
                 <div class="col-6 col-md-3">@include('shared.product')</div>
             @endforeach
         </div>