From dfc22f4702ce5dfffdff82fc16e4efc3195bbcf6 Mon Sep 17 00:00:00 2001
From: Edward Yang <yangjin@opencart.cn>
Date: Mon, 4 Jul 2022 16:43:56 +0800
Subject: [PATCH] fixed checkout

---
 beike/Models/Cart.php                                    | 9 +++------
 beike/Models/CartProduct.php                             | 9 +++++++++
 beike/Shop/Services/CartService.php                      | 3 ++-
 .../2022_07_04_065314_add_cart_item_orders.php           | 4 ++--
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/beike/Models/Cart.php b/beike/Models/Cart.php
index 054d955b..647f4b3a 100644
--- a/beike/Models/Cart.php
+++ b/beike/Models/Cart.php
@@ -10,10 +10,7 @@ class Cart extends Model
 {
     use HasFactory;
 
-    protected $fillable = ['customer_id', 'selected', 'product_id', 'product_sku_id', 'quantity'];
-
-    public function sku(): BelongsTo
-    {
-        return $this->belongsTo(ProductSku::class, 'product_sku_id', 'id');
-    }
+    protected $fillable = [
+        'customer_id', 'shipping_address_id', 'shipping_method_code', 'payment_address_id', 'payment_method_code'
+    ];
 }
diff --git a/beike/Models/CartProduct.php b/beike/Models/CartProduct.php
index 7c42e774..ab14b58c 100644
--- a/beike/Models/CartProduct.php
+++ b/beike/Models/CartProduct.php
@@ -11,9 +11,18 @@
 
 namespace Beike\Models;
 
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 class CartProduct extends Model
 {
+    use HasFactory;
 
+    protected $fillable = ['customer_id', 'selected', 'product_id', 'product_sku_id', 'quantity'];
+
+    public function sku(): BelongsTo
+    {
+        return $this->belongsTo(ProductSku::class, 'product_sku_id', 'id');
+    }
 }
diff --git a/beike/Shop/Services/CartService.php b/beike/Shop/Services/CartService.php
index e4d42ffc..262ad5e5 100644
--- a/beike/Shop/Services/CartService.php
+++ b/beike/Shop/Services/CartService.php
@@ -11,6 +11,7 @@
 
 namespace Beike\Shop\Services;
 
+use Beike\Models\CartProduct;
 use Exception;
 use Beike\Models\Cart;
 use Beike\Shop\Http\Resources\CartList;
@@ -29,7 +30,7 @@ class CartService
         if (empty($customer)) {
             return [];
         }
-        $cartBuilder = Cart::query()
+        $cartBuilder = CartProduct::query()
             ->with(['sku.product.description'])
             ->where('customer_id', $customer->id)
             ->orderByDesc('id');
diff --git a/database/migrations/2022_07_04_065314_add_cart_item_orders.php b/database/migrations/2022_07_04_065314_add_cart_item_orders.php
index 19af647e..2c1a4ef0 100644
--- a/database/migrations/2022_07_04_065314_add_cart_item_orders.php
+++ b/database/migrations/2022_07_04_065314_add_cart_item_orders.php
@@ -18,9 +18,9 @@ class AddCartItemOrders extends Migration
         Schema::create('carts', function (Blueprint $table) {
             $table->id();
             $table->integer('customer_id');
-            $table->integer('ship_address_id');
-            $table->integer('pay_address_id');
+            $table->integer('shipping_address_id');
             $table->integer('shipping_method_code');
+            $table->integer('payment_address_id');
             $table->integer('payment_method_code');
             $table->timestamps();
         });