Changeset 23026 for branches/version-2_13-dev/data/class/pages
- Timestamp:
- 2013/08/05 06:22:14 (11 years ago)
- Location:
- branches/version-2_13-dev/data/class/pages
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/version-2_13-dev/data/class/pages/mypage/LC_Page_Mypage_Change.php
r22926 r23026 47 47 $this->arrReminder = $masterData->getMasterData('mtb_reminder'); 48 48 $this->arrPref = $masterData->getMasterData('mtb_pref'); 49 $this->arrCountry = $masterData->getMasterData('mtb_country'); 49 50 $this->arrJob = $masterData->getMasterData('mtb_job'); 50 51 $this->arrMAILMAGATYPE = $masterData->getMasterData('mtb_mail_magazine_type'); -
branches/version-2_13-dev/data/class/pages/mypage/LC_Page_Mypage_Delivery.php
r22926 r23026 45 45 $masterData = new SC_DB_MasterData_Ex(); 46 46 $this->arrPref = $masterData->getMasterData('mtb_pref'); 47 $this->arrCountry = $masterData->getMasterData('mtb_country'); 47 48 $this->httpCacheControl('nocache'); 48 49 } -
branches/version-2_13-dev/data/class/pages/mypage/LC_Page_Mypage_DeliveryAddr.php
r22926 r23026 44 44 $masterData = new SC_DB_MasterData_Ex(); 45 45 $this->arrPref = $masterData->getMasterData('mtb_pref'); 46 $this->arrCountry = $masterData->getMasterData('mtb_country'); 46 47 $this->httpCacheControl('nocache'); 47 48 $this->validUrl = array(MYPAGE_DELIVADDR_URLPATH, -
branches/version-2_13-dev/data/class/pages/mypage/LC_Page_Mypage_History.php
r23009 r23026 48 48 $this->arrMAILTEMPLATE = $masterData->getMasterData('mtb_mail_template'); 49 49 $this->arrPref = $masterData->getMasterData('mtb_pref'); 50 $this->arrCountry = $masterData->getMasterData('mtb_country'); 50 51 $this->arrWDAY = $masterData->getMasterData('mtb_wday'); 51 52 $this->arrProductType = $masterData->getMasterData('mtb_product_type'); … … 98 99 //必要なのは商品の販売金額のみなので、遅い場合は、別途SQL作成した方が良い 99 100 $arrTempProductDetail = $objProduct->getProductsClass($arrOrderProductDetail['product_class_id']); 100 if($this->tpl_arrOrderDetail[$product_index]['price'] != $arrTempProductDetail['price02']) { 101 // 税計算 102 $this->tpl_arrOrderDetail[$product_index]['price_inctax'] = $this->tpl_arrOrderDetail[$product_index]['price'] + 103 SC_Helper_TaxRule_Ex::calcTax ( 104 $this->tpl_arrOrderDetail[$product_index]['price'], 105 $this->tpl_arrOrderDetail[$product_index]['tax_rate'], 106 $this->tpl_arrOrderDetail[$product_index]['tax_rule'] 107 ); 108 $arrTempProductDetail['price02_inctax'] = SC_Helper_TaxRule_Ex::sfCalcIncTax( 109 $arrTempProductDetail['price02'], 110 $arrTempProductDetail['product_id'], 111 $arrTempProductDetail['product_class_id'] 112 ); 113 if($this->tpl_arrOrderDetail[$product_index]['price_inctax'] != $arrTempProductDetail['price02_inctax']) { 101 114 $this->is_price_change = true; 102 115 } 103 $this->tpl_arrOrderDetail[$product_index]['product_price '] = ($arrTempProductDetail['price02'])?$arrTempProductDetail['price02']:0;116 $this->tpl_arrOrderDetail[$product_index]['product_price_inctax'] = ($arrTempProductDetail['price02_inctax']) ? $arrTempProductDetail['price02_inctax'] : 0 ; 104 117 } 105 118 -
branches/version-2_13-dev/data/class/pages/shopping/LC_Page_Shopping.php
r22980 r23026 44 44 $masterData = new SC_DB_MasterData_Ex(); 45 45 $this->arrPref = $masterData->getMasterData('mtb_pref'); 46 $this->arrCountry = $masterData->getMasterData('mtb_country'); 46 47 $this->arrSex = $masterData->getMasterData('mtb_sex'); 47 48 $this->arrJob = $masterData->getMasterData('mtb_job'); … … 138 139 } 139 140 140 141 142 143 144 145 141 // クッキー保存判定 142 if ($objFormParam->getValue('login_memory') == '1' && $objFormParam->getValue('login_email') != '') { 143 $objCookie->setCookie('login_email', $objFormParam->getValue('login_email')); 144 } else { 145 $objCookie->setCookie('login_email', ''); 146 } 146 147 147 148 SC_Response_Ex::sendRedirect( … … 173 174 } 174 175 break; 175 176 176 // お客様情報登録 177 177 case 'nonmember_confirm': … … 198 198 // 前のページに戻る 199 199 case 'return': 200 201 200 SC_Response_Ex::sendRedirect(CART_URLPATH); 202 201 SC_Response_Ex::actionExit(); … … 240 239 $this->tpl_title = $nonmember_title; 241 240 $this->lfInitParam($objFormParam); 242 } 243 // 通常はログインページ 244 else { 241 } else { 242 // 通常はログインページ 245 243 $this->lfInitLoginFormParam($objFormParam); 246 244 } … … 248 246 $this->setFormParams($objFormParam, $objPurchase, $this->tpl_uniqid); 249 247 break; 248 } 249 250 // 入力値の取得 251 // TODO: getFormParamListに統一したいが顧客登録系がgetHashArrayなので現在は切替方式 252 if ($this->tpl_mainpage == $nonmember_mainpage) { 253 $this->arrForm = $objFormParam->getHashArray(); 254 } else { 255 $this->arrForm = $objFormParam->getFormParamList(); 250 256 } 251 257 … … 255 261 $this->tpl_login_memory = '1'; 256 262 } 257 258 // 入力値の取得259 $this->arrForm = $objFormParam->getFormParamList();260 263 261 264 // 携帯端末IDが一致する会員が存在するかどうかをチェックする。 … … 299 302 { 300 303 $objFormParam->addParam('記憶する', 'login_memory', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); 301 $objFormParam->addParam('メールアドレス', 'login_email', STEXT_LEN, 'a', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));302 $objFormParam->addParam('パスワード', 'login_pass', PASSWORD_MAX_LEN, '', array('EXIST_CHECK', 'MAX_LENGTH_CHECK' ));304 $objFormParam->addParam('メールアドレス', 'login_email', '' , 'a', array('EXIST_CHECK', 'EMAIL_CHECK', 'SPTAB_CHECK' ,'EMAIL_CHAR_CHECK')); 305 $objFormParam->addParam('パスワード', 'login_pass', PASSWORD_MAX_LEN, '', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'SPTAB_CHECK')); 303 306 } 304 307 -
branches/version-2_13-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php
r23013 r23026 44 44 $masterData = new SC_DB_MasterData_Ex(); 45 45 $this->arrPref = $masterData->getMasterData('mtb_pref'); 46 $this->arrCountry = $masterData->getMasterData('mtb_country'); 46 47 $this->arrSex = $masterData->getMasterData('mtb_sex'); 47 48 $this->arrJob = $masterData->getMasterData('mtb_job'); … … 108 109 // 一時受注テーブルの読込 109 110 $arrOrderTemp = $objPurchase->getOrderTemp($this->tpl_uniqid); 110 111 111 // カート集計を元に最終計算 112 112 $arrCalcResults = $objCartSess->calculate($this->cartKey, $objCustomer, … … 163 163 else { 164 164 $objPurchase->completeOrder(ORDER_NEW); 165 SC_Helper_Purchase_Ex::sendOrderMail($this->arrForm['order_id'], $this); 165 SC_Helper_Purchase_Ex::sendOrderMail($this->arrForm['order_id'], $this); 166 166 167 167 SC_Response_Ex::sendRedirect(SHOPPING_COMPLETE_URLPATH); -
branches/version-2_13-dev/data/class/pages/shopping/LC_Page_Shopping_Deliv.php
r22942 r23026 43 43 $masterData = new SC_DB_MasterData_Ex(); 44 44 $this->arrPref = $masterData->getMasterData('mtb_pref'); 45 $this->arrCountry = $masterData->getMasterData('mtb_country'); 45 46 $this->tpl_title = 'お届け先の指定'; 46 47 $this->httpCacheControl('nocache'); … … 151 152 // 配送IDの取得 152 153 $shippingData = $objPurchase->getShippingTemp(); 153 $arrShippingId = array_keys($shippingData); 154 if (!SC_Utils_Ex::isBlank($shippingData)) { 155 $arrShippingId = array_keys($shippingData); 156 } 154 157 if (isset($arrShippingId[0])) { 155 158 $this->arrForm['deliv_check']['value'] = $arrShippingId[0] == 0 ? -1 : $arrShippingId[0]; … … 167 170 'kana01' => $objCustomer->getValue('kana01'), 168 171 'kana02' => $objCustomer->getValue('kana02'), 172 'company_name' => $objCustomer->getValue('company_name'), 173 'country_id' => $objCustomer->getValue('country_id'), 174 'zipcode' => $objCustomer->getValue('zipcode'), 169 175 'zip01' => $objCustomer->getValue('zip01'), 170 176 'zip02' => $objCustomer->getValue('zip02'),
Note: See TracChangeset
for help on using the changeset viewer.