Changeset 18670 for branches/version-2_4-dev
- Timestamp:
- 2010/06/03 18:15:58 (14 years ago)
- bzr:base-revision:
- ohkouchi@loop-az.jp-20100603020538-3v6qivyj60dnzklk
- bzr:committer:
- Kentaro Ohkouchi <ohkouchi@loop-az.jp>
- bzr:file-ids:
data/Smarty/templates/default/admin/order/edit.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Forder%2Fedit.tpl
data/class/SC_Date.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2FSC_Date.php
data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php 15594@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Forder%2FLC_Page_Admin_Order_Edit.php- bzr:mapping-version:
- v4
- bzr:repository-uuid:
- 1e3b908f-19a9-db11-a64c-001125224ba8
- bzr:revision-id:
- ohkouchi@loop-az.jp-20100603091554-99fe2rfn0lieww1n
- bzr:revno:
- 1948
- bzr:revprop:branch-nick:
- branches/version-2_4-dev
- bzr:root:
- branches/version-2_4-dev
- bzr:text-parents:
data/Smarty/templates/default/admin/order/edit.tpl svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_4-dev:18563
data/class/SC_Date.php svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/feature-module-update:16741
data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_4-dev:18563- bzr:timestamp:
- 2010-06-03 18:15:54.209000111 +0900
- bzr:user-agent:
- bzr2.1.1+bzr-svn1.0.2
- svn:original-date:
- 2010-06-03T09:15:54.209000Z
- Location:
- branches/version-2_4-dev/data
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/version-2_4-dev/data/Smarty/templates/default/admin/order/edit.tpl
r18563 r18670 573 573 </td> 574 574 </tr> 575 <!--{assign var=key value="deliv_date"}-->576 575 <tr class="fs12n"> 577 576 <td bgcolor="#f2f1ec" colspan="6">▼お届け日指定</td> … … 579 578 <tr class="fs12n"> 580 579 <td bgcolor="#ffffff" colspan="6"> 580 <!--{assign var=key value="deliv_date_year"}--> 581 <select name="deliv_date_year" style="<!--{$arrErr[$key]|sfGetErrorColor}-->"> 582 <!--{html_options options=$arrYearDelivDate selected=$arrForm.deliv_date_year.value|default:""}--> 583 </select>年 584 <select name="deliv_date_month" style="<!--{$arrErr[$key]|sfGetErrorColor}-->"> 585 <!--{html_options options=$arrMonthDelivDate selected=$arrForm.deliv_date_month.value|default:""}--> 586 </select>月 587 <select name="deliv_date_day" style="<!--{$arrErr[$key]|sfGetErrorColor}-->"> 588 <!--{html_options options=$arrDayDelivDate selected=$arrForm.deliv_date_day.value|default:""}--> 589 </select>日 581 590 <span class="red12"><!--{$arrErr[$key]}--></span> 582 <input name="<!--{$key|escape}-->" value="<!--{$arrForm[$key].value|escape}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" size="20" maxlength="<!--{$arrForm[$key].length}-->" />583 591 </td> 584 592 </tr> -
branches/version-2_4-dev/data/class/SC_Date.php
r16741 r18670 22 22 */ 23 23 24 /* 24 /* 日時表示用クラス */ 25 25 class SC_Date { 26 var $start_year; 27 var $month; 28 var $day; 29 var $end_year; 30 31 // コンストラクタ 32 function SC_Date($start_year='', $end_year='') { 33 if ( $start_year ) $this->setStartYear($start_year); 34 if ( $end_year ) $this->setEndYear($end_year); 35 } 36 37 function setStartYear($year){ 38 $this->start_year = $year; 39 } 40 41 function getStartYear(){ 42 return $this->start_year; 43 } 44 45 function setEndYear($endYear) { 46 $this->end_year = $endYear; 47 } 48 49 function getEndYear() { 50 return $this->end_year; 51 } 52 53 function setMonth($month){ 54 $this->month = $month; 55 } 56 57 function setDay ($day){ 58 $this->day = $day; 59 } 60 61 function getYear($year = '', $default = ''){ 62 if ( $year ) $this->setStartYear($year); 63 64 $year = $this->start_year; 65 if ( ! $year ) $year = DATE("Y"); 66 67 $end_year = $this->end_year; 68 if ( ! $end_year ) $end_year = (DATE("Y") + 3); 69 70 $year_array = array(); 71 72 for ($i=$year; $i<=($end_year); $i++){ 73 $year_array[$year] = $i; 74 if($year == $default) { 75 $year_array['----'] = "----"; 76 } 77 $year++; 78 } 79 return $year_array; 80 } 81 82 function getZeroYear($year = ''){ 83 if ( $year ) $this->setStartYear($year); 84 85 $year = $this->start_year; 86 if ( ! $year ) $year = DATE("Y"); 87 88 $end_year = $this->end_year; 89 if ( ! $end_year ) $end_year = (DATE("Y") + 3); 90 91 $year_array = array(); 92 93 for ($i=$year; $i<=($end_year); $i++){ 94 $key = substr($i, -2); 95 $year_array[$key] = $key; 96 } 97 return $year_array; 98 } 99 100 function getZeroMonth(){ 101 102 $month_array = array(); 103 for ($i=1; $i <= 12; $i++){ 104 $val = sprintf("%02d", $i); 105 $month_array[$val] = $val; 106 } 107 return $month_array; 108 } 109 110 111 function getMonth(){ 112 113 $month_array = array(); 114 for ($i=0; $i < 12; $i++){ 115 $month_array[$i + 1 ] = $i + 1; 116 } 117 return $month_array; 118 } 119 120 function getDay(){ 121 122 $day_array = array(); 123 for ($i=0; $i < 31; $i++){ 124 $day_array[ $i + 1 ] = $i + 1; 125 } 126 127 return $day_array; 128 } 26 var $start_year; 27 var $month; 28 var $day; 29 var $end_year; 30 31 // コンストラクタ 32 function SC_Date($start_year='', $end_year='') { 33 if ( $start_year ) $this->setStartYear($start_year); 34 if ( $end_year ) $this->setEndYear($end_year); 35 } 36 37 function setStartYear($year){ 38 $this->start_year = $year; 39 } 40 41 function getStartYear(){ 42 return $this->start_year; 43 } 44 45 function setEndYear($endYear) { 46 $this->end_year = $endYear; 47 } 48 49 function getEndYear() { 50 return $this->end_year; 51 } 52 53 function setMonth($month){ 54 $this->month = $month; 55 } 56 57 function setDay ($day){ 58 $this->day = $day; 59 } 60 61 /** 62 * 年プルダウン用の配列を返す 63 * FIXME $default_year に一致いる行が無かった場合、先頭か末尾に付加すべきと思われる。 64 * @param string $year XMLファイル名 65 * @param bool|string $default_year 66 * false 「選択なし」は含めない。 67 * true 「選択なし」は含める。 68 * string 「選択なし」は指定された値の下に付加する。 69 * @param string $default_key 70 */ 71 function getYear($year = '', $default_year = false, $default_key = '----') { 72 if ( $year ) $this->setStartYear($year); 73 74 $year = $this->start_year; 75 if ( ! $year ) $year = DATE("Y"); 76 77 $end_year = $this->end_year; 78 if ( ! $end_year ) $end_year = (DATE("Y") + 3); 79 80 $year_array = array(); 81 82 if ($default_year === true) { 83 $year_array[$default_key] = '----'; 84 } 85 86 for ($i = $year; $i <= $end_year; $i++) { 87 $year_array[$i] = $i; 88 if ($default_year !== true && strlen($default_year) >= 1 && $i == $default_year) { 89 $year_array[$default_key] = '----'; 90 } 91 } 92 return $year_array; 93 } 94 95 function getZeroYear($year = ''){ 96 if ( $year ) $this->setStartYear($year); 97 98 $year = $this->start_year; 99 if ( ! $year ) $year = DATE("Y"); 100 101 $end_year = $this->end_year; 102 if ( ! $end_year ) $end_year = (DATE("Y") + 3); 103 104 $year_array = array(); 105 106 for ($i = $year; $i <= $end_year; $i++) { 107 $key = substr($i, -2); 108 $year_array[$key] = $key; 109 } 110 return $year_array; 111 } 112 113 function getZeroMonth(){ 114 115 $month_array = array(); 116 for ($i=1; $i <= 12; $i++){ 117 $val = sprintf("%02d", $i); 118 $month_array[$val] = $val; 119 } 120 return $month_array; 121 } 122 123 124 function getMonth($default = false) { 125 $month_array = array(); 126 127 if ($default) $month_array[''] = '--'; 128 129 for ($i=0; $i < 12; $i++){ 130 $month_array[$i + 1 ] = $i + 1; 131 } 132 return $month_array; 133 } 134 135 function getDay($default = false) { 136 $day_array = array(); 137 138 if ($default) $day_array[''] = '--'; 139 140 for ($i=0; $i < 31; $i++){ 141 $day_array[ $i + 1 ] = $i + 1; 142 } 143 144 return $day_array; 145 } 129 146 130 function getHour(){ 131 132 133 for ($i=0; $i<=23; $i++){ 134 135 136 137 138 147 function getHour(){ 148 149 $day_array = array(); 150 for ($i=0; $i<=23; $i++){ 151 $hour_array[$i] = $i; 152 } 153 154 return $hour_array; 155 } 139 156 140 function getMinutes(){ 141 142 143 for ($i=0; $i<=59; $i++){ 144 145 146 147 148 149 150 function getMinutesInterval(){ 151 152 $minutes_array = array("00"=>"00", "30"=>"30"); 153 154 } 157 function getMinutes(){ 158 159 $minutes_array = array(); 160 for ($i=0; $i<=59; $i++){ 161 $minutes_array[$i] = $i; 162 } 163 164 return $minutes_array; 165 } 166 167 function getMinutesInterval(){ 168 169 $minutes_array = array("00"=>"00", "30"=>"30"); 170 return $minutes_array; 171 } 155 172 } 156 173 ?> -
branches/version-2_4-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php
r18563 r18670 111 111 $objSiteInfo = new SC_SiteInfo(); 112 112 $objDb = new SC_Helper_DB_Ex(); 113 $objDate = new SC_Date(1970); 114 $this->arrYearDelivDate = $objDate->getYear('', date('Y'), ''); 115 $this->arrMonthDelivDate = $objDate->getMonth(true); 116 $this->arrDayDelivDate = $objDate->getDay(true); 113 117 $arrInfo = $objSiteInfo->data; 114 118 … … 377 381 $this->objFormParam->addParam("お届け時間ID", "deliv_time_id", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK")); 378 382 $this->objFormParam->addParam("対応状況", "status", INT_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK", "NUM_CHECK")); 379 $this->objFormParam->addParam("お届け日", "deliv_date", STEXT_LEN, "KVa", array("SPTAB_CHECK", "MAX_LENGTH_CHECK")); 383 $this->objFormParam->addParam("お届け日(年)", "deliv_date_year", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK")); 384 $this->objFormParam->addParam("お届け日(月)", "deliv_date_month", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK")); 385 $this->objFormParam->addParam("お届け日(日)", "deliv_date_day", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK")); 380 386 $this->objFormParam->addParam("お支払方法名称", "payment_method"); 381 387 $this->objFormParam->addParam("お届け時間", "deliv_time"); … … 406 412 $this->objFormParam->addParam("受注日", "create_date"); 407 413 $this->objFormParam->addParam("発送日", "commit_date"); 414 $this->objFormParam->addParam("お届け日", "deliv_date"); 408 415 } 409 416 … … 419 426 $this->objFormParam->setValue('total_point', $total_point); 420 427 $this->objFormParam->setValue('point', $point); 428 // XXX お届け日の処理 429 if (!empty($arrRet[0]["deliv_date"])) { 430 $delivDate = mb_strcut($arrRet[0]["deliv_date"], 0, 8); 431 $delivDate = split("/", $delivDate); 432 $ts = mktime(0, 0, 0, $delivDate[1], $delivDate[2], $delivDate[0]); 433 $this->objFormParam->setValue('deliv_date_year', date("Y", $ts)); 434 $this->objFormParam->setValue('deliv_date_month', date("n", $ts)); 435 $this->objFormParam->setValue('deliv_date_day', date("j", $ts)); 436 } 421 437 $this->arrForm = $arrRet[0]; 422 438 … … 456 472 $arrRet = $this->objFormParam->getHashArray(); 457 473 $objErr = new SC_CheckError($arrRet); 458 $objErr->arrErr = $this->objFormParam->checkError(); 459 474 $objErr->doFunc(array("お届け日", "deliv_date_year", "deliv_date_month", "deliv_date_day"), array("CHECK_DATE")); 460 475 if (count($objErr->arrErr) >= 1) { 461 476 return $objErr->arrErr; 462 477 } 463 464 return $objErr->arrErr; 478 return $this->objFormParam->checkError(); 465 479 } 466 480 … … 545 559 $sqlval['update_date'] = 'Now()'; 546 560 561 // XXX お届け日の処理 562 if (!empty($sqlval['deliv_date_year'])) { 563 $ts = mktime(0, 0, 0, $sqlval['deliv_date_month'], $sqlval['deliv_date_day'], $sqlval['deliv_date_year']); 564 $sqlval['deliv_date'] = date("y/m/d", $ts); 565 $masterData = new SC_DB_MasterData(); 566 $arrWDAY = $masterData->getMasterData("mtb_wday"); 567 $sqlval['deliv_date'] .= sprintf("(%s)", $arrWDAY[date("w", $ts)]); 568 569 } 570 unset($sqlval['deliv_date_year']); 571 unset($sqlval['deliv_date_month']); 572 unset($sqlval['deliv_date_day']); 547 573 unset($sqlval['total_point']); 548 574 unset($sqlval['point']); … … 695 721 } 696 722 723 // XXX お届け日の処理 724 if (!empty($sqlval['deliv_date_year'])) { 725 $ts = mktime(0, 0, 0, $sqlval['deliv_date_month'], $sqlval['deliv_date_day'], $sqlval['deliv_date_year']); 726 $sqlval['deliv_date'] = date("y/m/d", $ts); 727 $masterData = new SC_DB_MasterData(); 728 $arrWDAY = $masterData->getMasterData("mtb_wday"); 729 $sqlval['deliv_date'] .= sprintf("(%s)", $arrWDAY[date("w", $ts)]); 730 731 } 732 unset($sqlval['deliv_date_year']); 733 unset($sqlval['deliv_date_month']); 734 unset($sqlval['deliv_date_day']); 735 697 736 unset($sqlval['total_point']); 698 737 unset($sqlval['point']);
Note: See TracChangeset
for help on using the changeset viewer.