Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop

@@ -310,7 +310,7 @@ $yohoPage.on('touchstart', '.btn-minus', function() {
 
 
     if (2 === $chosed.length && 0 === $chosed.closest('.zero-stock').length) {
     if (2 === $chosed.length && 0 === $chosed.closest('.zero-stock').length) {
         productSku = $curSizeBlock.data('skuid');
         productSku = $curSizeBlock.data('skuid');
-        promotionId = $('[data-id="' + productSku + '"]').closest('.advance-block').data('promotion-id');
+        promotionId = $('#promotionId').val();
         if (confirming) {
         if (confirming) {
             return false;
             return false;
         }
         }

@@ -67,4 +67,5 @@
         </div>
         </div>
     </div>
     </div>
 </div>
 </div>
-{{/cartInfo}}
+{{/cartInfo}}
+<input id="promotionId" type="hidden" value="{{promotionId}}">

@@ -243,7 +243,6 @@ class CartModel
 
 
         $product = CartData::giftProductData($skn, $promotionId);
         $product = CartData::giftProductData($skn, $promotionId);
         if (isset($product['code']) && $product['code'] === 200) {
         if (isset($product['code']) && $product['code'] === 200) {
-            $result['code'] = 200;
             $result['data'] = self::procGoodsDetail($product['data']);
             $result['data'] = self::procGoodsDetail($product['data']);
         }
         }
 
 

@@ -216,6 +216,7 @@ class IndexController extends AbstractAction
         }
         }
 
 
         $this->_view->display('gift-info', array(
         $this->_view->display('gift-info', array(
+            'promotionId' => $promotionId,
             'cartInfo' => $result['data']
             'cartInfo' => $result['data']
         ));
         ));
     }
     }