Changeset 23039 for branches/version-2_13-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php
- Timestamp:
- 2013/08/09 21:16:08 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/version-2_13-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php
r23024 r23039 1041 1041 $arrShipmentProducts['shipment_quantity'] = $objFormParam->getValue('shipment_quantity'); 1042 1042 1043 foreach ($arrShipmentProducts as $key => $value) { 1044 if(!is_array($value)){ 1045 $arrShipmentProducts[$key] = array(); 1046 } 1047 } 1048 1043 1049 return $arrShipmentProducts; 1044 1050 } … … 1151 1157 function checkInsertOrderProducts(&$objFormParam, $arrProductClassIds, $insert_product_class_id, $arrAddProductInfo) 1152 1158 { 1153 if(!in_array($insert_product_class_id, $arrProductClassIds)){ 1154 $arrAddProductInfo['product_name'] = ($arrAddProductInfo['product_name'])? $arrAddProductInfo['product_name']:$arrAddProductInfo['name']; 1155 $arrAddProductInfo['price'] = ($arrAddProductInfo['price'])? $arrAddProductInfo['price']:$arrAddProductInfo['price02']; 1159 if(is_array($arrProductClassIds) && !in_array($insert_product_class_id, $arrProductClassIds)){ 1160 $arrAddProducts = array(); 1161 1162 $arrAddProductInfo['product_name'] = ($arrAddProductInfo['product_name'])? 1163 $arrAddProductInfo['product_name']:$arrAddProductInfo['name']; 1164 $arrAddProductInfo['price'] = ($arrAddProductInfo['price'])? 1165 $arrAddProductInfo['price']:$arrAddProductInfo['price02']; 1156 1166 $arrAddProductInfo['quantity'] = 1; 1157 $arrAddProductInfo['tax_rate'] = ($objFormParam->getValue('order_tax_rate') == '')? $this->arrInfo['tax'] :$objFormParam->getValue('order_tax_rate'); 1158 $arrAddProductInfo['tax_rule'] = ($objFormParam->getValue('order_tax_rule') == '')? $this->arrInfo['tax_rule']:$objFormParam->getValue('order_tax_rule'); 1167 $arrAddProductInfo['tax_rate'] = ($objFormParam->getValue('order_tax_rate') == '')? 1168 $this->arrInfo['tax'] :$objFormParam->getValue('order_tax_rate'); 1169 $arrAddProductInfo['tax_rule'] = ($objFormParam->getValue('order_tax_rule') == '')? 1170 $this->arrInfo['tax_rule']:$objFormParam->getValue('order_tax_rule'); 1159 1171 foreach ($this->arrProductKeys as $insert_key) { 1160 $arrAddProducts[$insert_key] = $objFormParam->getValue($insert_key); 1172 $value = $objFormParam->getValue($insert_key); 1173 $arrAddProducts[$insert_key] = (is_array($value))? $value: array(); 1161 1174 $arrAddProducts[$insert_key][] = $arrAddProductInfo[$insert_key]; 1162 1175 }
Note: See TracChangeset
for help on using the changeset viewer.