Index: /branches/version-2_13-dev/data/Smarty/templates/admin/order/disp.tpl
===================================================================
--- /branches/version-2_13-dev/data/Smarty/templates/admin/order/disp.tpl (revision 23263)
+++ /branches/version-2_13-dev/data/Smarty/templates/admin/order/disp.tpl (revision 23300)
@@ -87,4 +87,28 @@
- - |
+
+ 性別 |
+ |
+
+
+ 職業 |
+ |
+
+
+ 生年月日 |
+
+
+
+
+
+ 指定無し
+
+ 年
+ 月
+ 日
+
+ |
+
+
@@ -298,5 +322,5 @@
-
+
Index: /branches/version-2_13-dev/data/Smarty/templates/admin/order/edit.tpl
===================================================================
--- /branches/version-2_13-dev/data/Smarty/templates/admin/order/edit.tpl (revision 23263)
+++ /branches/version-2_13-dev/data/Smarty/templates/admin/order/edit.tpl (revision 23300)
@@ -249,4 +249,48 @@
+
+ 性別 |
+
+
+
+
+
+
+ |
+
+
+ 職業 |
+
+
+
+
+
+
+ |
+
+
+ 生年月日 |
+
+
+
+
+
+
+
+ 年
+ 月
+ 日
+ |
+
+
Index: /branches/version-2_13-dev/data/class/pages/shopping/LC_Page_Shopping.php
===================================================================
--- /branches/version-2_13-dev/data/class/pages/shopping/LC_Page_Shopping.php (revision 23256)
+++ /branches/version-2_13-dev/data/class/pages/shopping/LC_Page_Shopping.php (revision 23300)
@@ -374,5 +374,5 @@
// 登録データの作成
- $arrValues['order_birth'] = SC_Utils_Ex::sfGetTimestamp($arrParams['year'], $arrParams['month'], $arrParams['day']);
+ $arrValues['order_birth'] = SC_Utils_Ex::sfGetTimestamp($arrParams['order_year'], $arrParams['order_month'], $arrParams['order_day']);
$arrValues['update_date'] = 'CURRENT_TIMESTAMP';
$arrValues['customer_id'] = '0';
Index: /branches/version-2_13-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Disp.php
===================================================================
--- /branches/version-2_13-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Disp.php (revision 23230)
+++ /branches/version-2_13-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Disp.php (revision 23300)
@@ -88,4 +88,6 @@
$this->arrDeviceType = $masterData->getMasterData('mtb_device_type');
$this->arrCountry = $masterData->getMasterData('mtb_country');
+ $this->arrSex = $masterData->getMasterData('mtb_sex');
+ $this->arrJob = $masterData->getMasterData('mtb_job');
// 支払い方法の取得
@@ -164,4 +166,9 @@
$objFormParam->addParam('電話番号2', 'order_tel02', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK'));
$objFormParam->addParam('電話番号3', 'order_tel03', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK'));
+ $objFormParam->addParam('性別', 'order_sex', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK'));
+ $objFormParam->addParam('職業', 'order_job', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK'));
+ $objFormParam->addParam('生年月日(年)', 'order_birth_year', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
+ $objFormParam->addParam('生年月日(月)', 'order_birth_month', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
+ $objFormParam->addParam('生年月日(日)', 'order_birth_day', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
// 受注商品情報
@@ -311,4 +318,14 @@
*/
$arrOrder = $objPurchase->getOrder($order_id);
+
+ // 生年月日の処理
+ if (!SC_Utils_Ex::isBlank($arrOrder['order_birth'])) {
+ $order_birth = substr($arrOrder['order_birth'], 0, 10);
+ $arrOrderBirth = explode("-", $order_birth);
+ $arrOrder['order_birth_year'] = intval($arrOrderBirth[0]);
+ $arrOrder['order_birth_month'] = intval($arrOrderBirth[1]);
+ $arrOrder['order_birth_day'] = intval($arrOrderBirth[2]);
+ }
+
$objFormParam->setParam($arrOrder);
Index: /branches/version-2_13-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php
===================================================================
--- /branches/version-2_13-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php (revision 23251)
+++ /branches/version-2_13-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php (revision 23300)
@@ -102,9 +102,16 @@
$this->arrORDERSTATUS = $masterData->getMasterData('mtb_order_status');
$this->arrDeviceType = $masterData->getMasterData('mtb_device_type');
-
- $objDate = new SC_Date_Ex(RELEASE_YEAR);
- $this->arrYearShippingDate = $objDate->getYear('', date('Y'), '');
- $this->arrMonthShippingDate = $objDate->getMonth(true);
- $this->arrDayShippingDate = $objDate->getDay(true);
+ $this->arrSex = $masterData->getMasterData('mtb_sex');
+ $this->arrJob = $masterData->getMasterData('mtb_job');
+
+ $objShippingDate = new SC_Date_Ex(RELEASE_YEAR);
+ $this->arrYearShippingDate = $objShippingDate->getYear('', date('Y'), '');
+ $this->arrMonthShippingDate = $objShippingDate->getMonth(true);
+ $this->arrDayShippingDate = $objShippingDate->getDay(true);
+
+ $objBirthDate = new SC_Date_Ex(BIRTH_YEAR, date('Y',strtotime('now')));
+ $this->arrBirthYear = $objBirthDate->getYear('', START_BIRTH_YEAR, '');
+ $this->arrBirthMonth = $objBirthDate->getMonth(true);
+ $this->arrBirthDay = $objBirthDate->getDay(true);
// 支払い方法の取得
@@ -340,4 +347,10 @@
$objFormParam->addParam('FAX番号2', 'order_fax02', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK'));
$objFormParam->addParam('FAX番号3', 'order_fax03', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK'));
+ $objFormParam->addParam('性別', 'order_sex', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK'));
+ $objFormParam->addParam('職業', 'order_job', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK'));
+ $objFormParam->addParam('生年月日(年)', 'order_birth_year', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
+ $objFormParam->addParam('生年月日(月)', 'order_birth_month', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
+ $objFormParam->addParam('生年月日(日)', 'order_birth_day', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
+ $objFormParam->addParam('生年月日', 'order_birth', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
// 受注商品情報
@@ -579,4 +592,15 @@
*/
$arrOrder = $objPurchase->getOrder($order_id);
+
+ // 生年月日の処理
+ if (!SC_Utils_Ex::isBlank($arrOrder['order_birth'])) {
+ $order_birth = substr($arrOrder['order_birth'], 0, 10);
+ $arrOrderBirth = explode("-", $order_birth);
+
+ $arrOrder['order_birth_year'] = intval($arrOrderBirth[0]);
+ $arrOrder['order_birth_month'] = intval($arrOrderBirth[1]);
+ $arrOrder['order_birth_day'] = intval($arrOrderBirth[2]);
+ }
+
$objFormParam->setParam($arrOrder);
@@ -710,4 +734,7 @@
$arrValuesBefore['payment_id'] = NULL;
}
+
+ // 生年月日の調整
+ $arrValues['order_birth'] = SC_Utils_Ex::sfGetTimestamp($arrValues['order_birth_year'], $arrValues['order_birth_month'], $arrValues['order_birth_day']);
// 受注テーブルの更新