提交 3b0f177e 编写于 作者: T Terry 提交者: GitHub

Apply fixes from StyleCI (#15)

上级 e5d90177
......@@ -13,7 +13,7 @@ use Yii;
/**
* @author Terry Zhao <2358269014@qq.com>
* @since 1.0
* @since 1.0
*/
class Placeorder
{
......@@ -65,9 +65,10 @@ class Placeorder
$startUrl = Yii::$service->payment->getStandardStartUrl();
$innerTransaction->commit();
Yii::$service->url->redirect($startUrl);
return true;
} else {
$innerTransaction->rollBack();
$innerTransaction->rollBack();
}
} catch (Exception $e) {
$innerTransaction->rollBack();
......
......@@ -26,8 +26,9 @@ class CartController extends AppfrontController
return $this->render($this->action->id, $data);
}
/**
* 把产品加入到购物车
* 把产品加入到购物车.
*/
public function actionAdd()
{
......@@ -61,7 +62,7 @@ class CartController extends AppfrontController
]);
$innerTransaction->commit();
exit;
}else {
} else {
$errors = Yii::$service->helper->errors->get(',');
echo json_encode([
'status' => 'fail',
......@@ -70,9 +71,9 @@ class CartController extends AppfrontController
]);
$innerTransaction->rollBack();
exit;
}
}
} catch (Exception $e) {
$innerTransaction->rollBack();
$innerTransaction->rollBack();
}
}
}
......@@ -97,9 +98,9 @@ class CartController extends AppfrontController
if ($coupon_code) {
$innerTransaction = Yii::$app->db->beginTransaction();
try {
if(Yii::$service->cart->coupon->addCoupon($coupon_code)){
if (Yii::$service->cart->coupon->addCoupon($coupon_code)) {
$innerTransaction->commit();
}else{
} else {
$innerTransaction->rollBack();
}
} catch (Exception $e) {
......
......@@ -57,7 +57,7 @@ class Placeorder
$genarateStatus = Yii::$service->order->generateOrderByCart($this->_billing, $this->_shipping_method, $this->_payment_method, false);
if ($genarateStatus) {
$innerTransaction->commit();
}else{
} else {
$innerTransaction->rollBack();
}
} catch (Exception $e) {
......@@ -180,7 +180,7 @@ class Placeorder
} else {
if (!Yii::$service->shipping->ifIsCorrect($shipping_method)) {
Yii::$service->helper->errors->add('shipping method is not correct');
return false;
}
}
......
......@@ -65,9 +65,10 @@ class Placeorder
$startUrl = Yii::$service->payment->getStandardStartUrl();
$innerTransaction->commit();
Yii::$service->url->redirect($startUrl);
return true;
} else {
$innerTransaction->rollBack();
$innerTransaction->rollBack();
}
} catch (Exception $e) {
$innerTransaction->rollBack();
......@@ -263,7 +264,7 @@ class Placeorder
Yii::$service->helper->errors->add('payment method can not empty');
return false;
} else {
} else {
if (!Yii::$service->payment->ifIsCorrectStandard($payment_method)) {
Yii::$service->helper->errors->add('payment method is not correct');
......
......@@ -26,8 +26,9 @@ class CartController extends AppfrontController
return $this->render($this->action->id, $data);
}
/**
* 把产品加入到购物车
* 把产品加入到购物车.
*/
public function actionAdd()
{
......@@ -61,7 +62,7 @@ class CartController extends AppfrontController
]);
$innerTransaction->commit();
exit;
}else {
} else {
$errors = Yii::$service->helper->errors->get(',');
echo json_encode([
'status' => 'fail',
......@@ -72,7 +73,7 @@ class CartController extends AppfrontController
exit;
}
} catch (Exception $e) {
$innerTransaction->rollBack();
$innerTransaction->rollBack();
}
}
}
......@@ -96,10 +97,10 @@ class CartController extends AppfrontController
$coupon_code = \Yii::$service->helper->htmlEncode($coupon_code);
if ($coupon_code) {
$innerTransaction = Yii::$app->db->beginTransaction();
try {
if(Yii::$service->cart->coupon->addCoupon($coupon_code)){
try {
if (Yii::$service->cart->coupon->addCoupon($coupon_code)) {
$innerTransaction->commit();
}else{
} else {
$innerTransaction->rollBack();
}
} catch (Exception $e) {
......
......@@ -57,7 +57,7 @@ class Placeorder
$genarateStatus = Yii::$service->order->generateOrderByCart($this->_billing, $this->_shipping_method, $this->_payment_method, false);
if ($genarateStatus) {
$innerTransaction->commit();
}else{
} else {
$innerTransaction->rollBack();
}
} catch (Exception $e) {
......@@ -166,7 +166,7 @@ class Placeorder
$address_one = '';
$billing = isset($post['billing']) ? $post['billing'] : '';
if (!Yii::$service->order->checkRequiredAddressAttr($billing)) {
return false;
return false;
}
$this->_billing = $billing;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册