Changeset 21653 for branches/version-2_12-dev
- Timestamp:
- 2012/03/17 16:40:27 (12 years ago)
- Location:
- branches/version-2_12-dev
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/version-2_12-dev/data/Smarty/templates/admin/customer/edit.tpl
r21539 r21653 235 235 </tr> 236 236 <tr> 237 <th>所持ポイント< /th>237 <th>所持ポイント<span class="attention"> *</span></th> 238 238 <td> 239 239 <span class="attention"><!--{$arrErr.point}--></span> -
branches/version-2_12-dev/data/class/helper/SC_Helper_Customer.php
r21528 r21653 320 320 $objFormParam->addParam('会員状態', 'status', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); 321 321 $objFormParam->addParam('SHOP用メモ', 'note', LTEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK')); 322 $objFormParam->addParam('所持ポイント', 'point', INT_LEN, 'n', array(' NUM_CHECK'));322 $objFormParam->addParam('所持ポイント', 'point', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK'), 0); 323 323 } 324 324 -
branches/version-2_12-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer_Edit.php
r21591 r21653 98 98 switch ($this->getMode()) { 99 99 case 'edit_search': 100 // 検索引き継ぎ用パラメーター処理100 // 検索引き継ぎ用パラメーター処理 101 101 $this->lfInitSearchParam($objFormSearchParam); 102 102 $objFormSearchParam->setParam($_REQUEST); … … 106 106 return; 107 107 } 108 // 指定会員の情報をセット108 // 指定会員の情報をセット 109 109 $this->arrForm = SC_Helper_Customer_Ex::sfGetCustomerData($objFormSearchParam->getValue('edit_customer_id'), true); 110 // 購入履歴情報の取得110 // 購入履歴情報の取得 111 111 list($this->tpl_linemax, $this->arrPurchaseHistory, $this->objNavi) = $this->lfPurchaseHistory($objFormSearchParam->getValue('edit_customer_id')); 112 112 $this->arrPagenavi = $this->objNavi->arrPagenavi; … … 115 115 break; 116 116 case 'confirm': 117 // パラメーター処理117 // パラメーター処理 118 118 $this->lfInitParam($objFormParam); 119 119 $objFormParam->setParam($_POST); … … 122 122 $this->arrErr = $this->lfCheckError($objFormParam); 123 123 $this->arrForm = $objFormParam->getHashArray(); 124 // 検索引き継ぎ用パラメーター処理124 // 検索引き継ぎ用パラメーター処理 125 125 $this->lfInitSearchParam($objFormSearchParam); 126 126 $objFormSearchParam->setParam($objFormParam->getValue('search_data')); … … 134 134 break; 135 135 case 'return': 136 // パラメーター処理136 // パラメーター処理 137 137 $this->lfInitParam($objFormParam); 138 138 $objFormParam->setParam($_POST); … … 141 141 $this->arrErr = $this->lfCheckError($objFormParam); 142 142 $this->arrForm = $objFormParam->getHashArray(); 143 // 検索引き継ぎ用パラメーター処理143 // 検索引き継ぎ用パラメーター処理 144 144 $this->lfInitSearchParam($objFormSearchParam); 145 145 $objFormSearchParam->setParam($objFormParam->getValue('search_data')); … … 149 149 return; 150 150 } 151 // 購入履歴情報の取得151 // 購入履歴情報の取得 152 152 list($this->tpl_linemax, $this->arrPurchaseHistory, $this->objNavi) = $this->lfPurchaseHistory($objFormParam->getValue('customer_id'), $objFormParam->getValue('search_pageno')); 153 153 $this->arrPagenavi = $this->objNavi->arrPagenavi; … … 157 157 break; 158 158 case 'complete': 159 // 登録・保存処理160 // パラメーター処理159 // 登録・保存処理 160 // パラメーター処理 161 161 $this->lfInitParam($objFormParam); 162 162 $objFormParam->setParam($_POST); … … 165 165 $this->arrErr = $this->lfCheckError($objFormParam); 166 166 $this->arrForm = $objFormParam->getHashArray(); 167 // 検索引き継ぎ用パラメーター処理167 // 検索引き継ぎ用パラメーター処理 168 168 $this->lfInitSearchParam($objFormSearchParam); 169 169 $objFormSearchParam->setParam($objFormParam->getValue('search_data')); … … 177 177 break; 178 178 case 'complete_return': 179 // 検索引き継ぎ用パラメーター処理179 // 入力パラメーターチェック 180 180 $this->lfInitParam($objFormParam); 181 181 $objFormParam->setParam($_POST); 182 // 検索引き継ぎ用パラメーター処理 182 183 $this->lfInitSearchParam($objFormSearchParam); 183 184 $objFormSearchParam->setParam($objFormParam->getValue('search_data')); … … 188 189 } 189 190 default: 191 $this->lfInitParam($objFormParam); 192 $this->arrForm = $objFormParam->getHashArray(); 190 193 break; 191 194 } … … 250 253 $arrErr = SC_Helper_Customer_Ex::sfCustomerMypageErrorCheck($objFormParam, true); 251 254 252 // メアド重複チェック(共通ルーチンは使えない)255 // メアド重複チェック(共通ルーチンは使えない) 253 256 $objQuery =& SC_Query_Ex::getSingletonInstance(); 254 257 $col = 'email, email_mobile, customer_id'; … … 324 327 $where = 'customer_id = ? AND del_flg <> 1'; 325 328 $arrVal = array($customer_id); 326 // 購入履歴の件数取得329 // 購入履歴の件数取得 327 330 $linemax = $objQuery->count($table, $where, $arrVal); 328 331 // ページ送りの取得 … … 333 336 $order = 'order_id DESC'; 334 337 $objQuery->setOrder($order); 335 // 購入履歴情報の取得338 // 購入履歴情報の取得 336 339 $arrPurchaseHistory = $objQuery->select('*', $table, $where, $arrVal); 337 340 -
branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php
r21592 r21653 338 338 $objFormParam->addParam('支払い合計', 'payment_total'); 339 339 $objFormParam->addParam('加算ポイント', 'add_point'); 340 $objFormParam->addParam('お誕生日ポイント', 'birth_point' );340 $objFormParam->addParam('お誕生日ポイント', 'birth_point', null, 'n', array(), 0); 341 341 $objFormParam->addParam('消費税合計', 'tax'); 342 342 $objFormParam->addParam('最終保持ポイント', 'total_point'); -
branches/version-2_12-dev/html/install/sql/create_table_mysql.sql
r21643 r21653 315 315 price02 numeric NOT NULL, 316 316 deliv_fee numeric, 317 point_rate numeric ,317 point_rate numeric NOT NULL DEFAULT 0, 318 318 creator_id int NOT NULL, 319 319 create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, … … 500 500 buy_times numeric DEFAULT 0, 501 501 buy_total numeric DEFAULT 0, 502 point numeric DEFAULT 0,502 point numeric NOT NULL DEFAULT 0, 503 503 note text, 504 504 status smallint NOT NULL DEFAULT 1, … … 541 541 deliv_fee numeric, 542 542 charge numeric, 543 use_point numeric ,544 add_point numeric ,545 birth_point numeric DEFAULT 0,543 use_point numeric NOT NULL DEFAULT 0, 544 add_point numeric NOT NULL DEFAULT 0, 545 birth_point numeric NOT NULL DEFAULT 0, 546 546 tax numeric, 547 547 total numeric, … … 598 598 deliv_fee numeric, 599 599 charge numeric, 600 use_point numeric ,601 add_point numeric ,602 birth_point numeric DEFAULT 0,600 use_point numeric NOT NULL DEFAULT 0, 601 add_point numeric NOT NULL DEFAULT 0, 602 birth_point numeric NOT NULL DEFAULT 0, 603 603 tax numeric, 604 604 total numeric, … … 701 701 price numeric, 702 702 quantity numeric, 703 point_rate numeric ,703 point_rate numeric NOT NULL DEFAULT 0, 704 704 PRIMARY KEY (order_detail_id) 705 705 ); … … 750 750 update_date timestamp NOT NULL, 751 751 php_path text, 752 deletable_flg smallint NOT NULL DEFAULT 1, 752 753 plugin_id int, 753 deletable_flg smallint NOT NULL DEFAULT 1,754 754 PRIMARY KEY (device_type_id, bloc_id), 755 755 UNIQUE (device_type_id, filename(255)) -
branches/version-2_12-dev/html/install/sql/create_table_pgsql.sql
r21643 r21653 315 315 price02 numeric NOT NULL, 316 316 deliv_fee numeric, 317 point_rate numeric ,317 point_rate numeric NOT NULL DEFAULT 0, 318 318 creator_id int NOT NULL, 319 319 create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, … … 500 500 buy_times numeric DEFAULT 0, 501 501 buy_total numeric DEFAULT 0, 502 point numeric DEFAULT 0,502 point numeric NOT NULL DEFAULT 0, 503 503 note text, 504 504 status smallint NOT NULL DEFAULT 1, … … 541 541 deliv_fee numeric, 542 542 charge numeric, 543 use_point numeric ,544 add_point numeric ,545 birth_point numeric DEFAULT 0,543 use_point numeric NOT NULL DEFAULT 0, 544 add_point numeric NOT NULL DEFAULT 0, 545 birth_point numeric NOT NULL DEFAULT 0, 546 546 tax numeric, 547 547 total numeric, … … 598 598 deliv_fee numeric, 599 599 charge numeric, 600 use_point numeric ,601 add_point numeric ,602 birth_point numeric DEFAULT 0,600 use_point numeric NOT NULL DEFAULT 0, 601 add_point numeric NOT NULL DEFAULT 0, 602 birth_point numeric NOT NULL DEFAULT 0, 603 603 tax numeric, 604 604 total numeric, … … 701 701 price numeric, 702 702 quantity numeric, 703 point_rate numeric ,703 point_rate numeric NOT NULL DEFAULT 0, 704 704 PRIMARY KEY (order_detail_id) 705 705 );
Note: See TracChangeset
for help on using the changeset viewer.