- Timestamp:
- 2010/06/21 11:37:04 (14 years ago)
- bzr:base-revision:
- ohkouchi@loop-az.jp-20100616050255-mkan21dnvj9wx8ks
- 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-20100621023700-03sldt18320io1i7
- bzr:revno:
- 1920
- bzr:revprop:branch-nick:
- branches/version-2_4
- bzr:root:
- branches/version-2_4
- bzr:text-parents:
data/Smarty/templates/default/admin/order/edit.tpl ohkouchi@loop-az.jp-20100202034440-4y5fjdlxcdtq62zs
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 ohkouchi@loop-az.jp-20100202021053-53f6wpklom2hsuoe- bzr:timestamp:
- 2010-06-21 11:37:00.411999941 +0900
- bzr:user-agent:
- bzr2.1.1+bzr-svn1.0.2
- svn:original-date:
- 2010-06-21T02:37:00.412000Z
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/version-2_4/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php
r18527 r18712 111 111 $objSiteInfo = new SC_SiteInfo(); 112 112 $objDb = new SC_Helper_DB_Ex(); 113 $objDate = new SC_Date(19 01);113 $objDate = new SC_Date(1970); 114 114 $this->arrYearDelivDate = $objDate->getYear('', date('Y'), ''); 115 115 $this->arrMonthDelivDate = $objDate->getMonth(true); … … 381 381 $this->objFormParam->addParam("お届け時間ID", "deliv_time_id", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK")); 382 382 $this->objFormParam->addParam("対応状況", "status", INT_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK", "NUM_CHECK")); 383 $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")); 384 386 $this->objFormParam->addParam("お支払方法名称", "payment_method"); 385 387 $this->objFormParam->addParam("お届け時間", "deliv_time"); … … 410 412 $this->objFormParam->addParam("受注日", "create_date"); 411 413 $this->objFormParam->addParam("発送日", "commit_date"); 412 $this->objFormParam->addParam("お届け日", "deliv_date"); 414 $this->objFormParam->addParam("お届け日", "deliv_date"); 413 415 } 414 416 … … 424 426 $this->objFormParam->setValue('total_point', $total_point); 425 427 $this->objFormParam->setValue('point', $point); 426 $delivDate = split(" ", $arrRet[0]["deliv_date"]); 427 $delivDate = split("-", $delivDate[0]); 428 $this->objFormParam->setValue('deliv_date_year', $delivDate[0]); 429 $this->objFormParam->setValue('deliv_date_month', isset($delivDate[1]) ? $delivDate[1] : ""); 430 $this->objFormParam->setValue('deliv_date_day', isset($delivDate[2]) ? $delivDate[2] : ""); 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 } 431 437 $this->arrForm = $arrRet[0]; 432 438 … … 466 472 $arrRet = $this->objFormParam->getHashArray(); 467 473 $objErr = new SC_CheckError($arrRet); 468 $objErr->arrErr = $this->objFormParam->checkError();469 470 474 $objErr->doFunc(array("お届け日", "deliv_date_year", "deliv_date_month", "deliv_date_day"), array("CHECK_DATE")); 471 472 475 if (count($objErr->arrErr) >= 1) { 473 476 return $objErr->arrErr; 474 477 } 475 476 return $objErr->arrErr; 478 return $this->objFormParam->checkError(); 477 479 } 478 480 … … 557 559 $sqlval['update_date'] = 'Now()'; 558 560 559 if (strlen($sqlval['deliv_date_year']) >= 0) { 560 $sqlval['deliv_date'] = $sqlval['deliv_date_year'] . '-' . $sqlval['deliv_date_month'] . '-' . $sqlval['deliv_date_day']; 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 } else { 569 $sqlval['deliv_date'] = ""; 561 570 } 562 571 unset($sqlval['deliv_date_year']); 563 572 unset($sqlval['deliv_date_month']); 564 573 unset($sqlval['deliv_date_day']); 565 566 574 unset($sqlval['total_point']); 567 575 unset($sqlval['point']); … … 714 722 } 715 723 724 // XXX お届け日の処理 725 if (!empty($sqlval['deliv_date_year'])) { 726 $ts = mktime(0, 0, 0, $sqlval['deliv_date_month'], $sqlval['deliv_date_day'], $sqlval['deliv_date_year']); 727 $sqlval['deliv_date'] = date("y/m/d", $ts); 728 $masterData = new SC_DB_MasterData(); 729 $arrWDAY = $masterData->getMasterData("mtb_wday"); 730 $sqlval['deliv_date'] .= sprintf("(%s)", $arrWDAY[date("w", $ts)]); 731 732 } 733 unset($sqlval['deliv_date_year']); 734 unset($sqlval['deliv_date_month']); 735 unset($sqlval['deliv_date_day']); 736 716 737 unset($sqlval['total_point']); 717 738 unset($sqlval['point']);
Note: See TracChangeset
for help on using the changeset viewer.