Authored by cailing

订单详情页地址修改

... ... @@ -473,7 +473,7 @@ class HomeController extends AbstractAction
$this->_view->display('address_modify', array(
'addressModifyPage' => true,
'pageFooter' => true,
'pageFooter' => true,
'address' => $address,
'showAddBtn' => (count($address) <= 5),
));
... ... @@ -1080,8 +1080,6 @@ class HomeController extends AbstractAction
$this->setTitle('订单详情');
$this->setNavHeader('订单详情', true, false);
//以下是添加的测试数据
$orderDetail['hasChanged'] = 'false';
$this->_view->display('order-detail', array(
'orderDetailPage' => true,
... ... @@ -1099,7 +1097,7 @@ class HomeController extends AbstractAction
/**
* 订单详情页地址修改
*/
public function selectAddress()
public function chooseAddressAction()
{
$result = array('code' => 400, 'message' => '', 'data' => '');
... ...
... ... @@ -232,16 +232,17 @@ class OrderModel
}
//判断是否可以修改地址
if (isset($orderDetail['data']['can_update_delivery_address']) && $orderDetail['data']['can_update_delivery_address'] == 'Y') {
$result['changeable'] = true;
$result['changeable'] = 'true';
}
//判断是否有关联订单
if (isset($orderDetail['data']['relate_order_code']) && $orderDetail['data']['relate_order_code'] == 'Y') {
$result['relation'] = true;
$result['relation'] = 'true';
}
//测试
$result['changeable'] = true;
$result['changeable'] = 'true';
}
$result['url'] = Helpers::url('/home/addressModify', array('orderCode' => $orderCode, 'relation' => $result['relation']));
return $result;
}
... ...