Changeset 22218 for branches/version-2_12-dev/data/class/pages/admin
- Timestamp:
- 2013/01/09 12:42:43 (11 years ago)
- Location:
- branches/version-2_12-dev/data/class/pages/admin/order
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Disp.php
r22215 r22218 194 194 $objFormParam->addParam('メモ', 'note', MTEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK')); 195 195 $objFormParam->addParam('削除用項番', 'delete_no', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); 196 $objFormParam->addParam('消費税率', 'tax_rate'); 197 $objFormParam->addParam('課税規則', 'tax_rule'); 196 198 197 199 // DB読込用 -
branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php
r22215 r22218 98 98 $this->arrDeliv = SC_Helper_DB_Ex::sfGetIDValueList('dtb_deliv', 'deliv_id', 'name'); 99 99 100 $this->arrInfo = SC_Helper_DB_Ex::sfGetBasisData(); 101 100 102 $this->httpCacheControl('nocache'); 101 103 } … … 261 263 $this->arrDelivTime = $objPurchase->getDelivTime($objFormParam->getValue('deliv_id')); 262 264 $this->tpl_onload .= $this->getAnchorKey($objFormParam); 263 $this->arrInfo = SC_Helper_DB_Ex::sfGetBasisData();264 265 if ($arrValuesBefore['payment_id']) 265 266 $this->arrPayment[$arrValuesBefore['payment_id']] = $arrValuesBefore['payment_method']; … … 330 331 $objFormParam->addParam('規格名1', 'classcategory_name1'); 331 332 $objFormParam->addParam('規格名2', 'classcategory_name2'); 333 $objFormParam->addParam('税率', 'tax_rate'); 334 $objFormParam->addParam('課税規則', 'tax_rule'); 332 335 $objFormParam->addParam('メモ', 'note', MTEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK')); 333 336 $objFormParam->addParam('削除用項番', 'delete_no', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); … … 351 354 $objFormParam->addParam('入金日', 'payment_date'); 352 355 $objFormParam->addParam('端末種別', 'device_type_id'); 356 $objFormParam->addParam('税率', 'order_tax_rate'); 357 $objFormParam->addParam('課税規則', 'order_tax_rule'); 353 358 354 359 // 複数情報 … … 577 582 for ($i = 0; $i < $max; $i++) { 578 583 // 小計の計算 579 $subtotal += SC_Helper_DB_Ex::sfCalcIncTax($arrValues['price'][$i] ) * $arrValues['quantity'][$i];584 $subtotal += SC_Helper_DB_Ex::sfCalcIncTax($arrValues['price'][$i], $arrValues['tax_rate'][$i], $arrValues['tax_rule'][$i]) * $arrValues['quantity'][$i]; 580 585 // 小計の計算 581 $totaltax += SC_ Helper_DB_Ex::sfTax($arrValues['price'][$i]) * $arrValues['quantity'][$i];586 $totaltax += SC_Utils_Ex::sfTax($arrValues['price'][$i], $arrValues['tax_rate'][$i], $arrValues['tax_rule'][$i]) * $arrValues['quantity'][$i]; 582 587 // 加算ポイントの計算 583 588 $totalpoint += SC_Utils_Ex::sfPrePoint($arrValues['price'][$i], $arrValues['point_rate'][$i]) * $arrValues['quantity'][$i]; … … 672 677 'classcategory_name1', 673 678 'classcategory_name2', 679 'tax_rate', 680 'tax_rule' 674 681 )); 675 682 … … 808 815 $arrProduct['quantity'] = 1; 809 816 $arrProduct['price'] = $arrProduct['price02']; 817 $arrProduct['tax_rate'] = $objFormParam->getValue('order_tax_rate') == '' ? $this->arrInfo['tax'] : $objFormParam->getValue('order_tax_rate'); 818 $arrProduct['tax_rule'] = $objFormParam->getValue('order_tax_rule') == '' ? $this->arrInfo['tax_rule'] : $objFormParam->getValue('order_tax_rule'); 810 819 $arrProduct['product_name'] = $arrProduct['name']; 811 820 … … 813 822 'product_id', 'product_class_id', 'product_type_id', 'point_rate', 814 823 'product_code', 'product_name', 'classcategory_name1', 'classcategory_name2', 815 'quantity', 'price', 824 'quantity', 'price', 'tax_rate', 'tax_rule' 816 825 ); 817 826 foreach ($arrUpdateKeys as $key) { … … 850 859 'product_id', 'product_class_id', 'product_type_id', 'point_rate', 851 860 'product_code', 'product_name', 'classcategory_name1', 'classcategory_name2', 852 'quantity', 'price', 861 'quantity', 'price', 'tax_rate', 'tax_rule' 853 862 ); 854 863 foreach ($arrDeleteKeys as $key) {
Note: See TracChangeset
for help on using the changeset viewer.