Index: branches/5.1.x/units/shipping_quote_engines/custom_shipping_quote_engine.php
===================================================================
diff -u -N -r13100 -r13465
--- branches/5.1.x/units/shipping_quote_engines/custom_shipping_quote_engine.php	(.../custom_shipping_quote_engine.php)	(revision 13100)
+++ branches/5.1.x/units/shipping_quote_engines/custom_shipping_quote_engine.php	(.../custom_shipping_quote_engine.php)	(revision 13465)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: custom_shipping_quote_engine.php 12739 2009-10-20 19:38:22Z alex $
+* @version	$Id: custom_shipping_quote_engine.php 13465 2010-04-28 15:08:00Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -38,12 +38,16 @@
 		return $shipping_types;
 	}
 
-	function QueryShippingCost($user_country_abbr, $user_state_abbr, $user_zip, $weight, $items, $amount, $shipping_type=null, $promo_params)
+	function QueryShippingCost($user_country, $user_state, $user_zip, $weight, $items, $amount, $shipping_type=null, $promo_params)
 	{
 		$db =& $this->Application->GetADODBConnection();
 
-		$user_country_id = (int) $db->GetOne('SELECT DestId FROM '.TABLE_PREFIX.'StdDestinations WHERE DestType=1 AND DestAbbr = '.$db->qstr($user_country_abbr));
-		$user_state_id = (int) $db->GetOne('SELECT DestId FROM '.TABLE_PREFIX.'StdDestinations WHERE DestType=2 AND DestAbbr = '.$db->qstr($user_state_abbr));
+		$cs_helper =& $this->Application->recallObject('CountryStatesHelper');
+		/* @var $cs_helper kCountryStatesHelper */
+
+		$user_country_id = $cs_helper->getCountryStateId($user_country, DESTINATION_TYPE_COUNTRY);
+		$user_state_id = $cs_helper->getCountryStateId($user_state, DESTINATION_TYPE_STATE);
+
 		$user_zip = (string) $user_zip;
 		$weight = (float) $weight;
 		$items = (int) $items;