Authored by 郭成尧

Merge branch 'feature/balanceSwitch' of git.yoho.cn:fe/YOHOBUYWAP into feature/balanceSwitch

... ... @@ -976,7 +976,7 @@ class HomeController extends AbstractAction
}
// 如果新版开启,则跳到新版支付页
if ($this->getCacheBy('zookeeper:/wap/pay/newPay') === 'true') {
/*if ($this->getCacheBy('zookeeper:/wap/pay/newPay') === 'true') {
header('Location: ' . Helpers::url('/home/orders/paynew',
array(
'order_code' => $orderCode,
... ... @@ -984,7 +984,7 @@ class HomeController extends AbstractAction
))
);
exit();
}
}*/
/* 判断订单信息是否存在 */
$orderDetail = OrderModel::orderDetail($orderCode, $this->_uid, $this->_usession);
... ...
... ... @@ -51,7 +51,7 @@ class IndexController extends AbstractAction
// 如果新版开启,则跳到新版购物车
if ($this->getCacheBy('zookeeper:/wap/pay/newCart') === 'true') {
header('Location: ' . Helpers::url('/cart/index/index',
header('Location: ' . Helpers::url('/cart/index/new',
array(
'refer' => $this->server('HTTP_REFERER', SITE_MAIN)
))
... ...