Changeset 23300 for branches/version-2_13-dev/data
- Timestamp:
- 2013/12/09 11:51:18 (10 years ago)
- Location:
- branches/version-2_13-dev/data
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/version-2_13-dev/data/Smarty/templates/admin/order/disp.tpl
r23263 r23300 87 87 <td><!--{$arrForm.order_tel01.value|h}--> - <!--{$arrForm.order_tel02.value|h}--> - <!--{$arrForm.order_tel03.value|h}--></td> 88 88 </tr> 89 <tr> 90 <th>性別</th> 91 <td><!--{$arrSex[$arrForm.order_sex.value]|h}--></td> 92 </tr> 93 <tr> 94 <th>職業</th> 95 <td><!--{$arrJob[$arrForm.order_job.value]|h}--></td> 96 </tr> 97 <tr> 98 <th>生年月日</th> 99 <td> 100 <!--{assign var=key1 value="order_birth_year"}--> 101 <!--{assign var=key2 value="order_birth_month"}--> 102 <!--{assign var=key3 value="order_birth_day"}--> 103 <!--{if $arrForm[$key1].value == "" && $arrForm[$key2].value == "" && $arrForm[$key3].value == ""}--> 104 指定無し 105 <!--{else}--> 106 <!--{$arrForm[$key1].value}-->年 107 <!--{$arrForm[$key2].value}-->月 108 <!--{$arrForm[$key3].value}-->日 109 <!--{/if}--> 110 </td> 111 </tr> 112 89 113 <!--{if $smarty.const.FORM_COUNTRY_ENABLE}--> 90 114 <tr> … … 298 322 <!--{$arrShipping[$key1]|h}--> 299 323 </td> 300 </tr> 324 </tr> 301 325 <!--{/if}--> 302 326 <tr> -
branches/version-2_13-dev/data/Smarty/templates/admin/order/edit.tpl
r23263 r23300 249 249 </td> 250 250 </tr> 251 <tr> 252 <th>性別</th> 253 <td> 254 <!--{assign var=key1 value="order_sex"}--> 255 <span class="attention"><!--{$arrErr[$key1]}--></span> 256 <span style="<!--{$arrErr[$key1]|sfGetErrorColor}-->"> 257 <!--{html_radios name=$key1 options=$arrSex selected=$arrForm[$key1].value}--> 258 </span> 259 </td> 260 </tr> 261 <tr> 262 <th>職業</th> 263 <td> 264 <!--{assign var=key1 value="order_job"}--> 265 <span class="attention"><!--{$arrErr[$key1]}--></span> 266 <span style="<!--{$arrErr[$key1]|sfGetErrorColor}-->"> 267 <select name="<!--{$key1}-->"> 268 <option value="" selected="selected">選択してください</option> 269 <!--{html_options options=$arrJob selected=$arrForm[$key1].value}--> 270 </select> 271 </span> 272 </td> 273 </tr> 274 <tr> 275 <th>生年月日</th> 276 <td> 277 <!--{assign var=key1 value="order_birth_year"}--> 278 <!--{assign var=key2 value="order_birth_month"}--> 279 <!--{assign var=key3 value="order_birth_day"}--> 280 <span class="attention"><!--{$arrErr[$key1]}--></span> 281 <span class="attention"><!--{$arrErr[$key2]}--></span> 282 <span class="attention"><!--{$arrErr[$key3]}--></span> 283 <select name="<!--{$key1}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->"> 284 <!--{html_options options=$arrBirthYear selected=$arrForm[$key1].value|default:""}--> 285 </select>年 286 <select name="<!--{$key2}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->"> 287 <!--{html_options options=$arrBirthMonth selected=$arrForm[$key2].value|default:""}--> 288 </select>月 289 <select name="<!--{$key3}-->" style="<!--{$arrErr[$key3]|sfGetErrorColor}-->"> 290 <!--{html_options options=$arrBirthDay selected=$arrForm[$key3].value|default:""}--> 291 </select>日 292 </td> 293 </tr> 294 251 295 <!--{assign var=key1 value="order_country_id"}--> 252 296 <!--{assign var=key2 value="order_zipcode"}--> -
branches/version-2_13-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Disp.php
- Property svn:eol-style deleted
r23230 r23300 88 88 $this->arrDeviceType = $masterData->getMasterData('mtb_device_type'); 89 89 $this->arrCountry = $masterData->getMasterData('mtb_country'); 90 $this->arrSex = $masterData->getMasterData('mtb_sex'); 91 $this->arrJob = $masterData->getMasterData('mtb_job'); 90 92 91 93 // 支払い方法の取得 … … 164 166 $objFormParam->addParam('電話番号2', 'order_tel02', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK')); 165 167 $objFormParam->addParam('電話番号3', 'order_tel03', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK')); 168 $objFormParam->addParam('性別', 'order_sex', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK')); 169 $objFormParam->addParam('職業', 'order_job', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK')); 170 $objFormParam->addParam('生年月日(年)', 'order_birth_year', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); 171 $objFormParam->addParam('生年月日(月)', 'order_birth_month', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); 172 $objFormParam->addParam('生年月日(日)', 'order_birth_day', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); 166 173 167 174 // 受注商品情報 … … 311 318 */ 312 319 $arrOrder = $objPurchase->getOrder($order_id); 320 321 // 生年月日の処理 322 if (!SC_Utils_Ex::isBlank($arrOrder['order_birth'])) { 323 $order_birth = substr($arrOrder['order_birth'], 0, 10); 324 $arrOrderBirth = explode("-", $order_birth); 325 $arrOrder['order_birth_year'] = intval($arrOrderBirth[0]); 326 $arrOrder['order_birth_month'] = intval($arrOrderBirth[1]); 327 $arrOrder['order_birth_day'] = intval($arrOrderBirth[2]); 328 } 329 313 330 $objFormParam->setParam($arrOrder); 314 331 -
branches/version-2_13-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php
r23251 r23300 102 102 $this->arrORDERSTATUS = $masterData->getMasterData('mtb_order_status'); 103 103 $this->arrDeviceType = $masterData->getMasterData('mtb_device_type'); 104 105 $objDate = new SC_Date_Ex(RELEASE_YEAR); 106 $this->arrYearShippingDate = $objDate->getYear('', date('Y'), ''); 107 $this->arrMonthShippingDate = $objDate->getMonth(true); 108 $this->arrDayShippingDate = $objDate->getDay(true); 104 $this->arrSex = $masterData->getMasterData('mtb_sex'); 105 $this->arrJob = $masterData->getMasterData('mtb_job'); 106 107 $objShippingDate = new SC_Date_Ex(RELEASE_YEAR); 108 $this->arrYearShippingDate = $objShippingDate->getYear('', date('Y'), ''); 109 $this->arrMonthShippingDate = $objShippingDate->getMonth(true); 110 $this->arrDayShippingDate = $objShippingDate->getDay(true); 111 112 $objBirthDate = new SC_Date_Ex(BIRTH_YEAR, date('Y',strtotime('now'))); 113 $this->arrBirthYear = $objBirthDate->getYear('', START_BIRTH_YEAR, ''); 114 $this->arrBirthMonth = $objBirthDate->getMonth(true); 115 $this->arrBirthDay = $objBirthDate->getDay(true); 109 116 110 117 // 支払い方法の取得 … … 340 347 $objFormParam->addParam('FAX番号2', 'order_fax02', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK')); 341 348 $objFormParam->addParam('FAX番号3', 'order_fax03', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK')); 349 $objFormParam->addParam('性別', 'order_sex', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK')); 350 $objFormParam->addParam('職業', 'order_job', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK')); 351 $objFormParam->addParam('生年月日(年)', 'order_birth_year', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); 352 $objFormParam->addParam('生年月日(月)', 'order_birth_month', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); 353 $objFormParam->addParam('生年月日(日)', 'order_birth_day', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); 354 $objFormParam->addParam('生年月日', 'order_birth', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); 342 355 343 356 // 受注商品情報 … … 579 592 */ 580 593 $arrOrder = $objPurchase->getOrder($order_id); 594 595 // 生年月日の処理 596 if (!SC_Utils_Ex::isBlank($arrOrder['order_birth'])) { 597 $order_birth = substr($arrOrder['order_birth'], 0, 10); 598 $arrOrderBirth = explode("-", $order_birth); 599 600 $arrOrder['order_birth_year'] = intval($arrOrderBirth[0]); 601 $arrOrder['order_birth_month'] = intval($arrOrderBirth[1]); 602 $arrOrder['order_birth_day'] = intval($arrOrderBirth[2]); 603 } 604 581 605 $objFormParam->setParam($arrOrder); 582 606 … … 710 734 $arrValuesBefore['payment_id'] = NULL; 711 735 } 736 737 // 生年月日の調整 738 $arrValues['order_birth'] = SC_Utils_Ex::sfGetTimestamp($arrValues['order_birth_year'], $arrValues['order_birth_month'], $arrValues['order_birth_day']); 712 739 713 740 // 受注テーブルの更新 -
branches/version-2_13-dev/data/class/pages/shopping/LC_Page_Shopping.php
r23256 r23300 374 374 375 375 // 登録データの作成 376 $arrValues['order_birth'] = SC_Utils_Ex::sfGetTimestamp($arrParams[' year'], $arrParams['month'], $arrParams['day']);376 $arrValues['order_birth'] = SC_Utils_Ex::sfGetTimestamp($arrParams['order_year'], $arrParams['order_month'], $arrParams['order_day']); 377 377 $arrValues['update_date'] = 'CURRENT_TIMESTAMP'; 378 378 $arrValues['customer_id'] = '0';
Note: See TracChangeset
for help on using the changeset viewer.