Index: branches/5.2.x/units/orders/orders_tag_processor.php =================================================================== diff -u -N -r14796 -r14813 --- branches/5.2.x/units/orders/orders_tag_processor.php (.../orders_tag_processor.php) (revision 14796) +++ branches/5.2.x/units/orders/orders_tag_processor.php (.../orders_tag_processor.php) (revision 14813) @@ -1,6 +1,6 @@ Application->registerClass( $gw_data['ClassName'], GW_CLASS_PATH.'/'.$gw_data['ClassFile'] ); $gateway_object =& $this->Application->recallObject( $gw_data['ClassName'] ); - $tpl = ''."\n"; + $tpl = ''."\n"; $hidden_fields = $gateway_object->getHiddenFields($object->GetFieldValues(), $params, $gw_data['gw_params']); $ret = ''; @@ -1112,6 +1112,8 @@ function NeedsPlaceButton($params) { $object =& $this->getObject($params); + /* @var $object OrdersItem */ + $gw_data = $object->getGatewayData(); $this->Application->registerClass( $gw_data['ClassName'], GW_CLASS_PATH.'/'.$gw_data['ClassFile'] ); @@ -1647,4 +1649,27 @@ return $this->Application->HREF($order_helper->getContinueShoppingTemplate($template), '', $params); } + + /** + * Checks that billing address and shipping address are the same + * + * @param Array $params + * @return string + * @access protected + */ + protected function AddressesTheSame($params) + { + $object =& $this->getObject($params); + /* @var $object kDBItem */ + + $address_fields = Array ('To', 'Company', 'Address1', 'Address2', 'City', 'Country', 'State', 'Zip'); + + foreach ($address_fields as $address_field) { + if ( $object->GetDBField('Shipping' . $address_field) != $object->GetDBField('Billing' . $address_field) ) { + return false; + } + } + + return true; + } } \ No newline at end of file