From ebd0ec87f54a0f8b7a60d4da9660aadb4bfa80a4 Mon Sep 17 00:00:00 2001
From: Terry <2358269014@qq.com>
Date: Sat, 24 Feb 2018 16:38:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E5=8B=BE=E9=80=89?=
 =?UTF-8?q?=E4=BA=A7=E5=93=81=E5=8A=9F=E8=83=BD=EF=BC=88appserver=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/apphtml5/theme/base/html5/checkout/cart/index.php       | 5 +++--
 .../modules/Checkout/controllers/CartController.php         | 6 +++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/apphtml5/theme/base/html5/checkout/cart/index.php b/app/apphtml5/theme/base/html5/checkout/cart/index.php
index e3141b4e..17a018d9 100644
--- a/app/apphtml5/theme/base/html5/checkout/cart/index.php
+++ b/app/apphtml5/theme/base/html5/checkout/cart/index.php
@@ -25,8 +25,9 @@ use fecshop\app\apphtml5\helper\Format;
 				</div>
 				<div class="cart_info">
                     <div class="cart_select_div">
-                        <input type="checkbox" name="cart_select_all" class="cart_select cart_select_all">
-                        &nbsp;Select All Product
+                        <input id="cart_select_all" type="checkbox" name="cart_select_all" class="cart_select cart_select_all">
+                        &nbsp;
+                        <label for="cart_select_all">Select All Product</label>
                     </div>
 					<?php if(is_array($cart_info['products']) && (!empty($cart_info['products']))): ?>
 						<?php foreach($cart_info['products'] as $product_one): ?>
diff --git a/app/appserver/modules/Checkout/controllers/CartController.php b/app/appserver/modules/Checkout/controllers/CartController.php
index 24c06658..bd6cc8a2 100644
--- a/app/appserver/modules/Checkout/controllers/CartController.php
+++ b/app/appserver/modules/Checkout/controllers/CartController.php
@@ -24,8 +24,10 @@ class CartController extends AppserverController
         }
         $currency_info = Yii::$service->page->currency->getCurrencyInfo();
         $code = Yii::$service->helper->appserver->status_success;
+        $cart_info = $this->getCartInfo(false);
+        
         $data = [
-            'cart_info' => $this->getCartInfo(false),
+            'cart_info' => $cart_info,
             'currency'  => $currency_info,
         ];
         $reponseData = Yii::$service->helper->appserver->getReponseData($code, $data);
@@ -85,6 +87,8 @@ class CartController extends AppserverController
                 if ($custom_option_image) {
                     $cart_info['products'][$k]['img_url'] = Yii::$service->product->image->getResize($custom_option_image,[150,150],false);
                 }
+                $activeStatus = Yii::$service->cart->quoteItem->activeStatus;
+                $cart_info['products'][$k]['active'] = ($product_one['active'] == $activeStatus) ? 1 : 0;
             }
         }
 
-- 
GitLab