Changeset 23157 for branches/version-2_13_0/data/class/pages
- Timestamp:
- 2013/08/29 17:11:06 (11 years ago)
- Location:
- branches/version-2_13_0/data/class/pages/admin
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/version-2_13_0/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tax.php
r23126 r23157 194 194 $objFormParam->addParam('適用時', 'apply_date_hour', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK')); 195 195 $objFormParam->addParam('適用分', 'apply_date_minutes', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK')); 196 $objFormParam->addParam('適用日時', 'apply_date_year', 'apply_date_month', 'apply_date_day', INT_LEN, 'n', array("CHECK_DATE"));197 196 } 198 197 … … 256 255 $arrErr = $objFormParam->checkError(); 257 256 $arrForm = $objFormParam->getHashArray(); 257 $objErr = new SC_CheckError_Ex($arrForm); 258 258 259 259 // tax_rule_id の正当性チェック … … 267 267 } 268 268 269 if ($arrForm['tax_rule_id'] != '0') { 270 $apply_date = SC_Utils_Ex::sfGetTimestampistime( 271 $arrForm['apply_date_year'], 272 sprintf("%02d", $arrForm['apply_date_month']), 273 sprintf("%02d", $arrForm['apply_date_day']), 274 sprintf("%02d", $arrForm['apply_date_hour']), 275 sprintf("%02d", $arrForm['apply_date_minutes']) 276 ); 277 278 // 税規約情報読み込み 279 $arrTaxRuleByTime = $objTaxRule->getTaxRuleByTime($apply_date); 280 // 編集中のレコード以外に同じ消費税率、課税規則が存在する場合 269 // 適用日時チェック 270 $objErr->doFunc(array('適用日時', 'apply_date_year', 'apply_date_month', 'apply_date_day'), array('CHECK_DATE')); 271 if (SC_Utils_Ex::isBlank($objErr->arrErr['apply_date_year']) && $arrForm['tax_rule_id'] != '0') { 272 $apply_date = SC_Utils_Ex::sfGetTimestampistime( 273 $arrForm['apply_date_year'], 274 sprintf("%02d", $arrForm['apply_date_month']), 275 sprintf("%02d", $arrForm['apply_date_day']), 276 sprintf("%02d", $arrForm['apply_date_hour']), 277 sprintf("%02d", $arrForm['apply_date_minutes']) 278 ); 279 280 // 税規約情報読み込み 281 $arrTaxRuleByTime = $objTaxRule->getTaxRuleByTime($apply_date); 282 283 // 編集中のレコード以外に同じ消費税率、課税規則が存在する場合 281 284 if ( 282 285 !SC_Utils_Ex::isBlank($arrTaxRuleByTime) … … 287 290 } 288 291 } 292 if (!SC_Utils_Ex::isBlank($objErr->arrErr)) { 293 $arrErr = array_merge($arrErr, $objErr->arrErr); 294 } 289 295 290 296 return $arrErr; -
branches/version-2_13_0/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php
r23126 r23157 367 367 $objFormParam->addParam('規格名1', 'classcategory_name1'); 368 368 $objFormParam->addParam('規格名2', 'classcategory_name2'); 369 $objFormParam->addParam('税率', 'tax_rate' );370 $objFormParam->addParam('課税規則', 'tax_rule' );369 $objFormParam->addParam('税率', 'tax_rate', INT_LEN, 'n', array('NUM_CHECK')); 370 $objFormParam->addParam('課税規則', 'tax_rule', INT_LEN, 'n', array('NUM_CHECK')); 371 371 $objFormParam->addParam('メモ', 'note', MTEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK')); 372 372 $objFormParam->addParam('削除用項番', 'delete_no', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
Note: See TracChangeset
for help on using the changeset viewer.