提交 67b3a953 编写于 作者: T Terry

一些函数更新

上级 71c168f3
...@@ -285,6 +285,7 @@ class Index extends \yii\base\BaseObject ...@@ -285,6 +285,7 @@ class Index extends \yii\base\BaseObject
$refineInfo[] = [ $refineInfo[] = [
'name' => $refine_attr_str, 'name' => $refine_attr_str,
'url' => $refine_attr_url, 'url' => $refine_attr_url,
'attr' => $attr,
]; ];
} }
} }
......
...@@ -24,6 +24,9 @@ class Index ...@@ -24,6 +24,9 @@ class Index
return [ return [
'accountEditUrl' => Yii::$service->url->getUrl('customer/editaccount'), 'accountEditUrl' => Yii::$service->url->getUrl('customer/editaccount'),
'email' => $identity['email'], 'email' => $identity['email'],
'firstname' => $identity['firstname'],
'lastname' => $identity['lastname'],
'created_at' => $identity['created_at'],
'accountAddressUrl' => Yii::$service->url->getUrl('customer/address'), 'accountAddressUrl' => Yii::$service->url->getUrl('customer/address'),
'accountOrderUrl' => Yii::$service->url->getUrl('customer/order'), 'accountOrderUrl' => Yii::$service->url->getUrl('customer/order'),
]; ];
......
...@@ -77,6 +77,10 @@ class Resetpassword ...@@ -77,6 +77,10 @@ class Resetpassword
$status = Yii::$service->customer->changePasswordAndClearToken($password, $identity); $status = Yii::$service->customer->changePasswordAndClearToken($password, $identity);
if ($status) { if ($status) {
return true; return true;
} else {
Yii::$service->page->message->addByHelperErrors();
return false;
} }
} else { } else {
Yii::$service->page->message->addError(['Reset Password Token is Expired OR The Email you entered does not match with the resetToekn. ']); Yii::$service->page->message->addError(['Reset Password Token is Expired OR The Email you entered does not match with the resetToekn. ']);
......
...@@ -192,7 +192,7 @@ class AccountController extends AppfrontController ...@@ -192,7 +192,7 @@ class AccountController extends AppfrontController
$data['identity'] = $identity; $data['identity'] = $identity;
} else { } else {
$redirectUrl = Yii::$service->url->getUrl('customer/account/forgotpassword'); $redirectUrl = Yii::$service->url->getUrl('customer/account/forgotpassword');
Yii::$service->url->redirect($redirectUrl); return Yii::$service->url->redirect($redirectUrl);
} }
} }
$this->breadcrumbs(Yii::$service->page->translate->__('Reset Password Submit')); $this->breadcrumbs(Yii::$service->page->translate->__('Reset Password Submit'));
...@@ -217,7 +217,7 @@ class AccountController extends AppfrontController ...@@ -217,7 +217,7 @@ class AccountController extends AppfrontController
if ($resetStatus) { if ($resetStatus) {
// 重置成功,跳转 // 重置成功,跳转
$resetSuccessUrl = Yii::$service->url->getUrl('customer/account/resetpasswordsuccess'); $resetSuccessUrl = Yii::$service->url->getUrl('customer/account/resetpasswordsuccess');
Yii::$service->url->redirect($resetSuccessUrl); return Yii::$service->url->redirect($resetSuccessUrl);
} }
} }
$data = $this->getBlock()->getLastData(); $data = $this->getBlock()->getLastData();
......
...@@ -296,6 +296,7 @@ class Index extends \yii\base\BaseObject ...@@ -296,6 +296,7 @@ class Index extends \yii\base\BaseObject
$refineInfo[] = [ $refineInfo[] = [
'name' => $refine_attr_str, 'name' => $refine_attr_str,
'url' => $refine_attr_url, 'url' => $refine_attr_url,
'attr' => $attr,
]; ];
} }
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册