Merge branch 'hotfix/making-order'

@@ -390,9 +390,10 @@ class IndexController extends WebAction
             $paymentType = $this->post('paymentType', 1);
             $couponCode = $this->post('couponCode', null);
             $yohoCoin = $this->post('yohoCoin', null);
+            $promotionCode = $this->post('promotionCode', null);
             $redEnvelopes = $this->post('redEnvelopes', null);
             $uid = $this->getUid(false);
-            $result = CartModel::orderCompute($uid, $cartType, $deliveryWay, $paymentType, $couponCode, $yohoCoin, $redEnvelopes);
+            $result = CartModel::orderCompute($uid, $cartType, $deliveryWay, $paymentType, $couponCode, $promotionCode, $yohoCoin, $redEnvelopes);
         }
 
         $this->echoJson($result);