Index: branches/5.2.x/units/orders/orders_tag_processor.php =================================================================== diff -u -N -r14089 -r14099 --- branches/5.2.x/units/orders/orders_tag_processor.php (.../orders_tag_processor.php) (revision 14089) +++ branches/5.2.x/units/orders/orders_tag_processor.php (.../orders_tag_processor.php) (revision 14099) @@ -1,6 +1,6 @@ Application->recallObject('orditems', 'orditems_List'); /* @var $object kDBList */ - return $object->RecordsCount; + return $object->GetRecordsCount(); } function CartNotEmpty($params) @@ -356,7 +356,7 @@ } elseif ($regional->GetDBField('UnitSystem') == 2) { - list($pounds, $ounces) = Kg2Pounds($block_params['weight']); + list($pounds, $ounces) = kUtil::Kg2Pounds($block_params['weight']); $block_params['weight'] = $pounds.' '.$this->Application->Phrase('lu_pounds').' '. $ounces.' '.$this->Application->Phrase('lu_ounces'); } @@ -967,7 +967,7 @@ $gateway_object =& $this->Application->recallObject( $gw_data['ClassName'] ); $tpl = ''."\n"; - $hidden_fields = $gateway_object->getHiddenFields($object->FieldValues, $params, $gw_data['gw_params']); + $hidden_fields = $gateway_object->getHiddenFields($object->GetFieldValues(), $params, $gw_data['gw_params']); $ret = ''; if (!is_array($hidden_fields)) { @@ -988,7 +988,7 @@ $this->Application->registerClass( $gw_data['ClassName'], GW_CLASS_PATH.'/'.$gw_data['ClassFile'] ); $gateway_object =& $this->Application->recallObject( $gw_data['ClassName'] ); - return $gateway_object->NeedPlaceButton($object->FieldValues, $params, $gw_data['gw_params']); + return $gateway_object->NeedPlaceButton($object->GetFieldValues(), $params, $gw_data['gw_params']); } function HasGatewayError($params) @@ -1215,7 +1215,7 @@ $addr_list->Query(); $object =& $this->getObject(); - if (!$addr_list->CheckAddress($object->FieldValues, $address_type)) { + if (!$addr_list->CheckAddress($object->GetFieldValues(), $address_type)) { $addr_list->CopyAddress($address_id, $address_type); } } @@ -1258,7 +1258,7 @@ $cycle = ceil($order_item_data['Duration'] / 86400); $cycle_units = 'D'; - $item_data = $object->FieldValues; + $item_data = $object->GetFieldValues(); $item_data['item_name'] = $order_item['ProductName']; $item_data['item_number'] = $order_item['OrderItemId']; $item_data['custom'] = $order_item['OrderId']; @@ -1308,7 +1308,7 @@ $max = $this->Application->ConfigValue('MaxAddresses'); - return $max <= 0 ? true : $address_list->RecordsCount < $max; + return $max <= 0 ? true : $address_list->GetRecordsCount() < $max; } function FreePromoShippingAvailable($params) @@ -1368,7 +1368,7 @@ case 2: // uk system -> convert to pounds - list($pounds, $ounces) = Kg2Pounds($total_weight); + list($pounds, $ounces) = kUtil::Kg2Pounds($total_weight); $total_weight = $pounds.' '.$this->Application->Phrase('lu_pounds').' '.$ounces.' '.$this->Application->Phrase('lu_ounces'); break; }