Index: branches/5.3.x/units/orders/orders_tag_processor.php
===================================================================
diff -u -N -r16398 -r16522
--- branches/5.3.x/units/orders/orders_tag_processor.php	(.../orders_tag_processor.php)	(revision 16398)
+++ branches/5.3.x/units/orders/orders_tag_processor.php	(.../orders_tag_processor.php)	(revision 16522)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: orders_tag_processor.php 16398 2016-11-12 18:54:52Z alex $
+* @version	$Id: orders_tag_processor.php 16522 2017-01-20 20:28:16Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -185,15 +185,15 @@
 
 		function ItemsInCart($params)
 		{
+			/** @var kDBItem $object */
 			$object = $this->getObject($params);
-			/* @var $object kDBItem */
 
 			if ( $object->GetDBField('Status') != ORDER_STATUS_INCOMPLETE || $object->GetID() == FAKE_ORDER_ID ) {
 				return 0;
 			}
 
+			/** @var kDBList $object */
 			$object = $this->Application->recallObject('orditems', 'orditems_List');
-			/* @var $object kDBList */
 
 			$object->Query();
 
@@ -242,8 +242,8 @@
 			$o = '';
 			$limitations_cache = Array ();
 
+			/** @var kDBItem $object */
 			$object = $this->getObject($params);
-			/* @var $object kDBItem */
 
 			$ord_id = $object->GetID();
 			$oi_table = $this->Application->getUnitConfig('orditems')->getTableName();
@@ -435,8 +435,8 @@
 		 */
 		function AddressValid($params)
 		{
+			/** @var kDBItem $object */
 			$object = $this->getObject($params);
-			/* @var $object kDBItem */
 
 			$address_type = isset($params['type']) ? strtolower($params['type']) : 'shipping';
 			$address_type = ucfirst($address_type);
@@ -859,19 +859,19 @@
 			}
 
 			if ( isset($params['user_prefix']) ) {
+				/** @var kDBItem $user */
 				$user = $this->Application->recallObject($params['user_prefix']);
-				/* @var $user kDBItem */
 			}
 			else {
+				/** @var kDBItem $user */
 				$user = $this->Application->recallObject('u', null, Array ('skip_autoload' => true));
-				/* @var $user kDBItem */
 			}
 
+			/** @var OrdersItem $order */
 			$order = $this->Application->recallObject($this->Prefix . '.last');
-			/* @var $order OrdersItem */
 
+			/** @var OrderHelper $order_helper */
 			$order_helper = $this->Application->recallObject('OrderHelper');
-			/* @var $order_helper OrderHelper */
 
 			$user_fields = $order_helper->getUserFields($order, $params['type'] == 'billing' ? 'Billing' : 'Shipping');
 
@@ -881,8 +881,8 @@
 				}
 			}
 
+			/** @var kCountryStatesHelper $cs_helper */
 			$cs_helper = $this->Application->recallObject('CountryStatesHelper');
-			/* @var $cs_helper kCountryStatesHelper */
 
 			$cs_helper->PopulateStates(new kEvent('u:OnBuild'), 'State', 'Country');
 		}
@@ -1049,11 +1049,11 @@
 		 */
 		function PrintOrderInfo($params)
 		{
+			/** @var OrderHelper $order_helper */
 			$order_helper = $this->Application->recallObject('OrderHelper');
-			/* @var $order_helper OrderHelper */
 
+			/** @var kDBItem $object */
 			$object = $this->getObject($params);
-			/* @var $object kDBItem */
 
 			$currency = isset($params['currency']) ? $params['currency'] : 'selected';
 
@@ -1110,8 +1110,8 @@
 
 		function GetFormAction($params)
 		{
+			/** @var OrdersItem $object */
 			$object = $this->getObject($params);
-			/* @var $object OrdersItem */
 
 			$gw_data = $object->getGatewayData( isset($params['payment_type_id']) ? $params['payment_type_id'] : null );
 
@@ -1123,8 +1123,8 @@
 
 		function GetFormHiddenFields($params)
 		{
+			/** @var OrdersItem $object */
 			$object = $this->getObject($params);
-			/* @var $object OrdersItem */
 
 			$gw_data = $object->getGatewayData( isset($params['payment_type_id']) ? $params['payment_type_id'] : null );
 
@@ -1149,8 +1149,8 @@
 
 		function NeedsPlaceButton($params)
 		{
+			/** @var OrdersItem $object */
 			$object = $this->getObject($params);
-			/* @var $object OrdersItem */
 
 			$gw_data = $object->getGatewayData( isset($params['payment_type_id']) ? $params['payment_type_id'] : null );
 
@@ -1174,8 +1174,8 @@
 
 		function ShippingType($params)
 		{
+			/** @var kDBItem $object */
 			$object = $this->getObject($params);
-			/* @var $object kDBItem */
 
 			$shipping_info = unserialize($object->GetDBField('ShippingInfo'));
 
@@ -1265,8 +1265,8 @@
 		 */
 		protected function PrintTotals($params)
 		{
+			/** @var OrdersItem $object */
 			$object = $this->getObject($params);
-			/* @var $object OrdersItem */
 
 			if ( isset($params['element_order']) ) {
 				// TODO: implement
@@ -1493,8 +1493,8 @@
 		 */
 		function TotalOrderWeight($params)
 		{
+			/** @var kDBItem $object */
 			$object = $this->getObject($params);
-			/* @var $object kDBItem */
 
 			$sql = 'SELECT SUM( IF(oi.Weight IS NULL, 0, oi.Weight * oi.Quantity) )
 					FROM '.TABLE_PREFIX.'OrderItems oi
@@ -1511,8 +1511,8 @@
 
 		function _formatWeight($weight)
 		{
+			/** @var kDBItem $regional */
 			$regional = $this->Application->recallObject('lang.current');
-			/* @var $regional kDBItem */
 
 			switch ( $regional->GetDBField('UnitSystem') ) {
 				case 1:
@@ -1591,8 +1591,8 @@
 				return '';
 			}
 
+			/** @var OrdersItem $object */
 			$object = $this->getObject($params);
-			/* @var $object OrdersItem */
 
 			$gw_data = $object->getGatewayData($payment_type_id);
 
@@ -1611,8 +1611,8 @@
 		 */
 		function USPSLabelFound($params)
 		{
+			/** @var kDBItem $object */
 			$object = $this->getObject($params);
-			/* @var $object kDBItem */
 
 			$full_path = USPS_LABEL_FOLDER . $object->GetDBField( $params['field'] ) . '.pdf';
 
@@ -1659,8 +1659,8 @@
 		 */
 		protected function ContinueShoppingLink($params)
 		{
+			/** @var OrderHelper $order_helper */
 			$order_helper = $this->Application->recallObject('OrderHelper');
-			/* @var $order_helper OrderHelper */
 
 			if ( isset($params['template']) ) {
 				$template = $params['template'];
@@ -1682,8 +1682,8 @@
 		 */
 		protected function AddressesTheSame($params)
 		{
+			/** @var kDBItem $object */
 			$object = $this->getObject($params);
-			/* @var $object kDBItem */
 
 			$address_fields = Array ('To', 'Company', 'Address1', 'Address2', 'City', 'Country', 'State', 'Zip');