Index: branches/version-2_5-dev/data/class/helper/SC_Helper_Customer.php =================================================================== --- branches/version-2_5-dev/data/class/helper/SC_Helper_Customer.php (revision 20147) +++ branches/version-2_5-dev/data/class/helper/SC_Helper_Customer.php (revision 20148) @@ -288,8 +288,22 @@ + /** + * 会員登録時フォーム初期化 + * + * @param mixed $objFormParam + * @access public + * @return void + */ function sfCustomerEntryParam (&$objFormParam) { SC_Helper_Customer_Ex::sfCustomerCommonParam($objFormParam); } + /** + * 会員情報変更フォーム初期化 + * + * @param mixed $objFormParam + * @access public + * @return void + */ function sfCustomerMypageParam (&$objFormParam) { SC_Helper_Customer_Ex::sfCustomerCommonParam($objFormParam); @@ -300,4 +314,11 @@ } + /** + * 会員フォーム共通 + * + * @param mixed $objFormParam + * @access public + * @return void + */ function sfCustomerCommonParam (&$objFormParam) { @@ -336,4 +357,11 @@ } + /** + * 会員登録エラーチェック + * + * @param mixed $objFormParam + * @access public + * @return array エラーの配列 + */ function sfCustomerEntryErrorCheck(&$objFormParam) { $objErr->arrErr = SC_Helper_Customer_Ex::sfCustomerCommonErrorCheck(&$objFormParam); @@ -341,4 +369,11 @@ } + /** + * 会員情報変更エラーチェック + * + * @param mixed $objFormParam + * @access public + * @return array エラーの配列 + */ function sfCustomerMypageErrorCheck(&$objFormParam) { @@ -359,5 +394,5 @@ /** - * 入力エラーチェック + * 会員エラーチェック共通 * * @param mixed $objFormParam @@ -390,6 +425,3 @@ return $objErr->arrErr; } - - - } Index: branches/version-2_5-dev/data/class/SC_Product.php =================================================================== --- branches/version-2_5-dev/data/class/SC_Product.php (revision 20116) +++ branches/version-2_5-dev/data/class/SC_Product.php (revision 20148) @@ -739,5 +739,5 @@ return $sql; } - + /** * 商品規格ID1、2に紐づいた,product_class_idを取得する. Index: branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_Order.php =================================================================== --- branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_Order.php (revision 20139) +++ branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_Order.php (revision 20148) @@ -23,5 +23,5 @@ // {{{ requires -require_once(CLASS_REALDIR . "pages/LC_Page.php"); +require_once(CLASS_REALDIR . "pages/mypage/LC_Page_AbstractMypage.php"); /** @@ -32,5 +32,5 @@ * @version $Id$ */ -class LC_Page_Mypage_Order extends LC_Page { +class LC_Page_Mypage_Order extends LC_Page_AbstractMypage { // }}} @@ -53,6 +53,4 @@ function process() { parent::process(); - $this->action(); - $this->sendResponse(); } @@ -69,5 +67,5 @@ //ログインしていない、またはDBに情報が無い場合 - if (!$objCustomer->isLoginSuccess(true) || empty($arrOrderDetail)){ + if (empty($arrOrderDetail)){ SC_Utils_Ex::sfDispSiteError(CUSTOMER_ERROR); } Index: branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage.php =================================================================== --- branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage.php (revision 20116) +++ branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage.php (revision 20148) @@ -23,5 +23,5 @@ // {{{ requires -require_once(CLASS_REALDIR . "pages/LC_Page.php"); +require_once(CLASS_REALDIR . "pages/mypage/LC_Page_AbstractMypage.php"); /** @@ -32,5 +32,5 @@ * @version $Id$ */ -class LC_Page_MyPage extends LC_Page { +class LC_Page_MyPage extends LC_Page_AbstractMypage { // {{{ properties @@ -49,5 +49,5 @@ function init() { parent::init(); - $this->tpl_title = 'MYページ'; + $this->tpl_title = 'MYページ'; if (Net_UserAgent_Mobile::isMobile() === true){ $this->tpl_subtitle = 'MYページ'; @@ -55,7 +55,7 @@ $this->tpl_subtitle = '購入履歴一覧'; } - $this->tpl_navi = TEMPLATE_REALDIR . 'mypage/navi.tpl'; - $this->tpl_mainno = 'mypage'; - $this->tpl_mypageno = 'index'; + $this->tpl_navi = TEMPLATE_REALDIR . 'mypage/navi.tpl'; + $this->tpl_mainno = 'mypage'; + $this->tpl_mypageno = 'index'; $this->httpCacheControl('nocache'); } @@ -68,8 +68,6 @@ function process() { parent::process(); - $this->action(); - $this->sendResponse(); } - + /** * Page のAction. @@ -81,17 +79,4 @@ $objQuery = new SC_Query(); $objCustomer = new SC_Customer(); - - // 退会判定用情報の取得 - $this->tpl_login = $objCustomer->isLoginSuccess(true); - - // ログインチェック - if(!$objCustomer->isLoginSuccess(true)) { - SC_Utils_Ex::sfDispSiteError(CUSTOMER_ERROR); - }else { - //マイページトップ顧客情報表示用 - $this->CustomerName1 = $objCustomer->getvalue('name01'); - $this->CustomerName2 = $objCustomer->getvalue('name02'); - $this->CustomerPoint = $objCustomer->getvalue('point'); - } //ページ送り用 @@ -146,9 +131,9 @@ $this->tpl_strnavi = $objNavi->strnavi; // 表示文字列 $startno = $objNavi->start_row; - + // 取得範囲の指定(開始行番号、行数のセット) $objQuery->setLimitOffset(SEARCH_PMAX, $startno); } - + // 表示順序 $objQuery->setOrder($order); @@ -171,22 +156,3 @@ parent::destroy(); } - - //エラーチェック - - function lfErrorCheck() { - $objErr = new SC_CheckError(); - $objErr->doFunc(array("メールアドレス", "login_email", MTEXT_LEN), array("EXIST_CHECK","SPTAB_CHECK","EMAIL_CHECK","MAX_LENGTH_CHECK")); - $objErr->dofunc(array("パスワード", "login_password", PASSWORD_LEN2), array("EXIST_CHECK","ALNUM_CHECK")); - return $objErr->arrErr; - } - - /* パラメータ情報の初期化 */ - function lfInitParam(&$objFormParam) { - - $objFormParam->addParam("記憶する", "login_memory", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK")); - $objFormParam->addParam("メールアドレス", "login_email", MTEXT_LEN, "a", array("EXIST_CHECK", "MAX_LENGTH_CHECK")); - $objFormParam->addParam("パスワード", "login_pass", STEXT_LEN, "a", array("EXIST_CHECK", "MAX_LENGTH_CHECK")); - } - } -?> Index: branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_History.php =================================================================== --- branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_History.php (revision 20144) +++ branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_History.php (revision 20148) @@ -68,5 +68,4 @@ */ function action() { - $objQuery = new SC_Query(); $objCustomer = new SC_Customer(); $objDb = new SC_Helper_DB_Ex(); @@ -171,3 +170,2 @@ } } -?> Index: branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_Refusal.php =================================================================== --- branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_Refusal.php (revision 20140) +++ branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_Refusal.php (revision 20148) @@ -44,8 +44,5 @@ function init() { parent::init(); - $this->tpl_title = 'MYページ'; $this->tpl_subtitle = '退会手続き(入力ページ)'; - $this->tpl_navi = TEMPLATE_REALDIR . 'mypage/navi.tpl'; - $this->tpl_mainno = 'mypage'; $this->tpl_mypageno = 'refusal'; } @@ -104,5 +101,5 @@ */ function lfDeleteCustomer($customer_id){ - $objQuery = SC_Query::getSingletonInstance(); + $objQuery = SC_Query::getSingletonInstance(); $sqlval['del_flg'] = 1; Index: branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_Login.php =================================================================== --- branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_Login.php (revision 20143) +++ branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_Login.php (revision 20148) @@ -44,5 +44,4 @@ function init() { parent::init(); - $this->tpl_title = 'MYページ(ログイン)'; $this->httpCacheControl('nocache'); }