Merge remote-tracking branch 'origin/hotfix/yohocoinuse' into hotfix

- Subproject commit 75bbc3b075de19f239532f60c5995d06c5f814e2
+ Subproject commit e9d066dd88a8e7e37103021c427a205a5cfcdcec

@@ -22,26 +22,33 @@ class Yohobuy
 //     const API_URL2 = 'http://api.open.yohobuy.com/';
 //     const SERVICE_URL = 'http://service.api.yohobuy.com/';
 //     const YOHOBUY_URL = 'http://www.yohobuy.com/';
-    
-    const API_URL = 'http://apih5.yoho.cn/';
-    const API_URL2 = 'http://apih5.yoho.cn/';
-    const SERVICE_URL = 'http://serviceh5.yoho.cn/';
-    const YOHOBUY_URL = 'http://www.yohobuy.com/';
-    const API_OLD = 'http://api2.open.yohobuy.com/';
 
-//    /* 测试环境 */
-//    const API_URL = 'http://testapi.yoho.cn:28078/';
-//    const SERVICE_URL = 'http://testservice.yoho.cn:28077/';
-//    const YOHOBUY_URL = 'http://www.yohobuy.com/';
-//    const API_OLD = 'http://test2.open.yohobuy.com/';
-    
-//    /* 预览环境 */
-//    const API_URL = 'http://preapi.yoho.cn/';
-//    const API_URL2 = 'http://preapi.yoho.cn/';
+//    const API_URL = 'http://apih5.yoho.cn/';
+//    const API_URL2 = 'http://apih5.yoho.cn/';
 //    const SERVICE_URL = 'http://serviceh5.yoho.cn/';
 //    const YOHOBUY_URL = 'http://www.yohobuy.com/';
 //    const API_OLD = 'http://api2.open.yohobuy.com/';
 
+//    /* 测试环境 */
+    //       const API_URL = 'http://192.168.102.205:8080/gateway/'; // 先临时使用网关
+      const API_URL = 'http://testapi.yoho.cn:28078/';
+      const SERVICE_URL = 'http://testservice.yoho.cn:28077/';
+      const YOHOBUY_URL = 'http://www.yohobuy.com/';
+      const API_OLD = 'http://test2.open.yohobuy.com/';
+
+    /* 预览环境 */
+//     const API_URL = 'http://preapi.yoho.cn/';
+//     const API_URL2 = 'http://preapi.yoho.cn/';
+//     const SERVICE_URL = 'http://serviceh5.yoho.cn/';
+//     const YOHOBUY_URL = 'http://www.yohobuy.com/';
+//     const API_OLD = 'http://api2.open.yohobuy.com/';
+
+    /* PC重构地址 */
+//     const API_URL = 'http://test.open.yohobuy.com/';
+//     const SERVICE_URL = 'http://test.service.api.yohobuy.com/';
+//     const YOHOBUY_URL = 'http://www.yohobuy.com/';
+//     const API_OLD = 'http://api2.open.yohobuy.com/';
+
     /**
      * 私钥列表
      *
@@ -51,6 +58,7 @@ class Yohobuy
         'android' => 'fd4ad5fcfa0de589ef238c0e7331b585',
         'iphone' => 'a85bb0674e08986c6b115d5e3a4884fa',
         'ipad' => 'ad9fcda2e679cf9229e37feae2cdcf80',
+         'web' => '0ed29744ed318fd28d2c07985d3ba633',
     );
 
     /**
@@ -64,8 +72,12 @@ class Yohobuy
         }
         // 苹果IPAD
         elseif (strstr($_SERVER['HTTP_USER_AGENT'], 'iPad')) {
+
             return 'ipad';
         }
+        elseif (stristr($_SERVER['HTTP_USER_AGENT'], 'android')) {
+            return 'android';
+        }
         // 其它
         else {
             return 'android';
@@ -150,7 +162,6 @@ class Yohobuy
         if (!empty($data)) {
             $url = self::httpBuildQuery($url, $data);
         }
-
         /* 开启缓存的情况 */
         if ($cache && USE_CACHE) {
             // 先尝试获取一级缓存(master), 有数据则直接返回.
@@ -168,7 +179,7 @@ class Yohobuy
         if (!$returnJson && !empty($result)) {
             $result = json_decode($result, true);
         }
-        
+
         curl_close($ch);
         $data = array();
 
@@ -216,7 +227,7 @@ class Yohobuy
             }
             curl_setopt($ch, CURLOPT_COOKIE, implode(';', $cookie_str));
         }
-
+        curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/5.0 (Windows NT 5.1) AppleWebKit/534.30 (KHTML, like Gecko) Chrome/12.0.742.122 YOHOWEB');
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
         curl_setopt($ch, CURLOPT_POST, true);
         // 销毁私钥参数

@@ -248,13 +248,15 @@ class CartData
      *
      * @param int $uid 用户ID
      * @param string $cartType 购物车类型，ordinary表示普通购物车
+     * @param int $isUseYohoCoin 是否使用有货币，默认0不使用, 1使用
      * @return array 接口返回的数据
      */
-    public static function cartPay($uid, $cartType)
+    public static function cartPay($uid, $cartType, $isUseYohoCoin = 0)
     {
         $param = Yohobuy::param();
         $param['method'] = 'app.Shopping.payment';
         $param['cart_type'] = $cartType;
+        $param['yoho_coin_mode'] = $isUseYohoCoin;
         $param['uid'] = $uid;
         $param['client_secret'] = Sign::getSign($param);
 

@@ -111,6 +111,10 @@ function showChooseGifDialog() {
     }, function() {
         window.location.href = cartContentShow().find('.freebie > a').attr('href');
     }, function() {
+        var info = window.cookie('order-info');
+        if (info) {
+            window.setCookie('order-info', '');
+        }
         window.location.href = '/cart/index/orderEnsure?cartType=' + cartType;
     });
 }
@@ -185,6 +189,7 @@ if ($('.freebie').length > 0) {
 }
 
 $('.btn-balance').on('touchend', function() {
+    var info = window.cookie('order-info');
     if (shouldLowStocks()) {
         tip.show('所选商品中含有库存不足的商品');
         return false;
@@ -196,6 +201,9 @@ $('.btn-balance').on('touchend', function() {
     }
 
     if (hasChecked()) {
+        if (info) {
+            window.setCookie('order-info', '');
+        }
         window.location.href = '/cart/index/orderEnsure?cartType=' + cartType;
     } else {
         tip.show('请先勾选商品');

@@ -10,8 +10,7 @@ var $ = require('jquery'),
     lazyLoad = require('yoho.lazyload');
 
 var dialog = require('../me/dialog'),
-    tip = require('../plugin/tip'),
-    orderInfo = require('./order-info').orderInfo;
+    tip = require('../plugin/tip');
 
 var $selectAllBtn = $('.balance .checkbox'),
     requesting = false;
@@ -106,8 +105,7 @@ $('.icon-del').on('touchstart', function(e) {
                     autoHide: true,
                     fast: true
                 });
-                orderInfo('couponCode', null);
-                orderInfo('couponName', null);
+                //window.setCookie('order-info', '');
                 window.setCookie('_yoho-cart-refreshByDelete', true);
                 window.location.href = '/cart/index/index?cartType=' + $('#cartType').val();
             } else {

@@ -71,18 +71,20 @@ $('.checkbox').on('touchstart', function() {
     }
 });
 
-$('.invoice').on('touchend', '.checkbox', function() {
+$invoice.on('touchend', '.checkbox', function() {
     var $this = $(this);
 
     if ($this.hasClass('icon-cb-checked')) {
-        $('.invoice').addClass('focus');
+        $invoice.addClass('focus');
     }
     if ($this.hasClass('icon-checkbox')) {
-        $('.invoice').removeClass('focus');
+        $invoice.removeClass('focus');
     }
 });
 
 function orderCompute() {
+    var yohoCoin = orderInfo('yohoCoin');
+
     $.ajax({
         method: 'POST',
         url: '/cart/index/orderCompute',
@@ -91,7 +93,7 @@ function orderCompute() {
             deliveryId: orderInfo('deliveryId'),
             paymentTypeId: orderInfo('paymentTypeId'),
             couponCode: orderInfo('couponCode'),
-            yohoCoin: orderInfo('yohoCoin')
+            yohoCoin: yohoCoin
         }
     }).then(function(res) {
         var priceHtml;
@@ -232,10 +234,12 @@ $('.coin').on('touchend', function() {
     orderCompute();
 });
 
-$invoice.on('touchend', function() {
+$invoice.on('touchend', function(e) {
     var $this = $(this);
 
     orderInfo('invoice', $this.find('.checkbox').hasClass('icon-cb-checked'));
+    e.preventDefault();
+    e.stopPropagation();
 });
 
 $invoice.find('[name="invoice-title"]').on('blur', function() {

@@ -11,10 +11,10 @@ require('../common');
 function init() {
     info = {
         uid: window.getUid(),
-        deliveryId: 1,
+        deliveryId: $('.dispatch-mode .chosed').data('id') || 1,
         deliveryTimeId: 1,
         paymentTypeId: 1,
-        yohoCoin: $('.coin').data('yoho-coin') || 0,
+        yohoCoin: 0,
         addressId: null,
         couponCode: null,
         couponName: null,
@@ -30,9 +30,9 @@ function init() {
 // info 必须是 JSON 字符串
 try {
     info = JSON.parse(info);
-    
+
     // 2015/12/31 hf: fixes bug to 购物车页面调用该JS, 会导致有YOHO币，值却没有传给服务端. 因此需要再设置一下
-    info['yohoCoin'] = $('.coin').data('yoho-coin') || 0;
+    //info['yohoCoin'] = $('.coin').data('yoho-coin') || 0;
 } catch (e) {
     init();
 }

@@ -69,7 +69,7 @@
                 <span class="title">YOHO币</span>
 
                 {{#if yohoCoin}}
-                <span class="desc used {{#unless useYohoCoin}}hide{{/if}}">已抵¥{{useYohoCoin}}</span>
+                <span class="desc used {{#unless useYohoCoin}}hide{{/unless}}">已抵¥{{useYohoCoin}}</span>
                 <span class="desc can-use {{#if useYohoCoin}}hide{{/if}}">可抵¥{{yohoCoin}}</span>
 
                 {{#if useYohoCoin}}

@@ -449,7 +449,11 @@ class CartModel
 
             // 有货币
             $result['yohoCoin'] = $payReturn['yoho_coin'];
-            $result['useYohoCoin'] = isset($orderCompute['use_yoho_coin']) ? $orderCompute['use_yoho_coin'] : $payReturn['use_yoho_coin'];
+            /*
+             * 默认使用有货币
+             * $result['useYohoCoin'] = isset($orderCompute['use_yoho_coin']) ? $orderCompute['use_yoho_coin'] : $payReturn['use_yoho_coin'];
+             */
+            $result['useYohoCoin'] = isset($orderCompute['use_yoho_coin']) ? $orderCompute['use_yoho_coin'] : false;
 
             // 订单数据
             if (isset($payReturn['shopping_cart_data']) && !empty($payReturn['shopping_cart_data'])) {
@@ -482,7 +486,7 @@ class CartModel
 
             // 优惠券数据
             $coupons = array('couponName' => '');
-            if (!empty($orderCompute['coupon_amount'])) {
+            if (isset($orderCompute['coupon_amount']) && (!empty($orderCompute['coupon_amount']) || ($orderCompute['coupon_amount'] === 0 && $orderCompute['shipping_cost'] === 0))) {
                 $coupons['couponName'] = $orderInfo['couponName'];
             }
             $result['coupon'] = $coupons;

@@ -285,7 +285,7 @@ class IndexController extends AbstractAction
         $cartType = $this->get('cartType', '');
         $cookieData = $this->getCookie('order-info', null);
         $orderInfo = array();
-        if (empty($cartType) && !empty($cookieData)) {
+        if (!empty($cookieData)) {
             $orderInfo = json_decode($cookieData, true);
             $cartType = $orderInfo['cartType'];
         }