Index: branches/5.2.x/units/gateways/gw_classes/google_checkout.php =================================================================== diff -u -N -r16423 -r16516 --- branches/5.2.x/units/gateways/gw_classes/google_checkout.php (.../google_checkout.php) (revision 16423) +++ branches/5.2.x/units/gateways/gw_classes/google_checkout.php (.../google_checkout.php) (revision 16516) @@ -1,6 +1,6 @@ Conn->Query($sql); + /** @var kMultiLanguage $ml_formatter */ $ml_formatter = $this->Application->recallObject('kMultiLanguage'); - /* @var $ml_formatter kMultiLanguage */ $cart_xml = Array (); foreach ($order_items as $order_item) { @@ -207,11 +207,11 @@ // parse xml & get order_id from there, like sella pay $this->gwParams = $gw_params; + /** @var kXMLHelper $xml_helper */ $xml_helper = $this->Application->recallObject('kXMLHelper'); - /* @var $xml_helper kXMLHelper */ + /** @var kXMLNode $root_node */ $root_node =& $xml_helper->Parse( $this->getRequestXML() ); - /* @var $root_node kXMLNode */ $this->Application->XMLHeader(); define('DBG_SKIP_REPORTING', 1); @@ -321,17 +321,18 @@ ); foreach ($search_nodes as $search_string) { + /** @var kXMLNode $found_node */ $found_node =& $root_node; - /* @var $found_node kXMLNode */ $search_string = explode(':', $search_string); foreach ($search_string as $search_node) { $found_node =& $found_node->FindChild($search_node); } $node_data = Array (); + + /** @var kXMLNode $sub_node */ $sub_node =& $found_node->firstChild; - /* @var $sub_node kXMLNode */ do { if ($found_node->Name == 'SHIPPING') { @@ -361,8 +362,8 @@ } // 2. update shipping address in order + /** @var OrdersItem $order */ $order = $this->Application->recallObject('ord', null, Array ('skip_autoload' => true)); - /* @var $order OrdersItem */ $order->Load($order_id); @@ -372,8 +373,8 @@ 'ShippingZip' => $address_info['POSTAL-CODE'], ); + /** @var kCountryStatesHelper $cs_helper */ $cs_helper = $this->Application->recallObject('CountryStatesHelper'); - /* @var $cs_helper kCountryStatesHelper */ $shipping_address['ShippingCountry'] = $cs_helper->getCountryIso($address_info['COUNTRY-CODE'], true); @@ -434,8 +435,8 @@ $user_address = Array (); foreach ($search_nodes as $search_string) { + /** @var kXMLNode $found_node */ $found_node =& $root_node; - /* @var $found_node kXMLNode */ $search_string = explode(':', $search_string); foreach ($search_string as $search_node) { @@ -444,8 +445,8 @@ $node_data = Array (); if ($found_node->Children) { + /** @var kXMLNode $sub_node */ $sub_node =& $found_node->firstChild; - /* @var $sub_node kXMLNode */ do { $node_data[$sub_node->Name] = $sub_node->Data; @@ -481,8 +482,8 @@ } // 2. update shipping address in order + /** @var OrdersItem $order */ $order = $this->Application->recallObject('ord', null, Array ('skip_autoload' => true)); - /* @var $order OrdersItem */ $order->Load($order_id); @@ -527,8 +528,8 @@ 'POSTAL-CODE' => 'Zip', ); + /** @var kCountryStatesHelper $cs_helper */ $cs_helper = $this->Application->recallObject('CountryStatesHelper'); - /* @var $cs_helper kCountryStatesHelper */ foreach ($user_address as $field_prefix => $address_details) { foreach ($address_mapping as $src_field => $dst_field) { @@ -576,8 +577,8 @@ ); foreach ($search_nodes as $search_string) { + /** @var kXMLNode $found_node */ $found_node =& $root_node; - /* @var $found_node kXMLNode */ $search_string = explode(':', $search_string); foreach ($search_string as $search_node) { @@ -586,8 +587,8 @@ $node_data = Array (); if ($found_node->Children) { + /** @var kXMLNode $sub_node */ $sub_node =& $found_node->firstChild; - /* @var $sub_node kXMLNode */ do { $node_data[$sub_node->Name] = $sub_node->Data; @@ -607,8 +608,8 @@ } // 2. update shipping address in order + /** @var OrdersItem $order */ $order = $this->Application->recallObject('ord', null, Array ('skip_autoload' => true)); - /* @var $order OrdersItem */ $order->Load($google_order_number, 'GoogleOrderNumber'); @@ -689,8 +690,8 @@ $this->_chargeOrder($item_data); + /** @var OrdersItem $order */ $order = $this->Application->recallObject('ord.-item', null, Array ('skip_autoload' => true)); - /* @var $order OrdersItem */ $order->Load($item_data['OrderId']); if (!$order->isLoaded()) { @@ -713,11 +714,11 @@ { $submit_url = $this->gwParams['submit_url'].'/request/Merchant/'.$this->gwParams['merchant_id']; + /** @var kCurlHelper $curl_helper */ $curl_helper = $this->Application->recallObject('CurlHelper'); - /* @var $curl_helper kCurlHelper */ + /** @var kXMLHelper $xml_helper */ $xml_helper = $this->Application->recallObject('kXMLHelper'); - /* @var $xml_helper kXMLHelper */ $curl_helper->SetPostData($command_xml); $auth_options = Array ( @@ -727,8 +728,8 @@ $xml_responce = $curl_helper->Send($submit_url); + /** @var kXMLNode $root_node */ $root_node =& $xml_helper->Parse($xml_responce); - /* @var $root_node kXMLNode */ return $root_node; } @@ -749,8 +750,8 @@ $order_state = Array (); foreach ($search_nodes as $search_string) { + /** @var kXMLNode $found_node */ $found_node =& $root_node; - /* @var $found_node kXMLNode */ $search_string = explode(':', $search_string); foreach ($search_string as $search_node) { @@ -773,8 +774,8 @@ } // 2. update shipping address in order + /** @var OrdersItem $order */ $order = $this->Application->recallObject('ord', null, Array ('skip_autoload' => true)); - /* @var $order OrdersItem */ $order->Load($google_order_number, 'GoogleOrderNumber'); @@ -800,8 +801,8 @@ if ($order_charged) { // when using Pre-Authorize + /** @var OrdersEventHandler $order_eh */ $order_eh = $this->Application->recallObject('ord_EventHandler'); - /* @var $order_eh OrdersEventHandler */ $order_eh->SplitOrder( new kEvent('ord:OnMassOrderApprove'), $order); } @@ -846,8 +847,9 @@ $shipping_totals = $this->Conn->GetRow($query); $this->Application->recallObject('ShippingQuoteEngine'); + + /** @var ShippingQuoteCollector $quote_engine_collector */ $quote_engine_collector = $this->Application->recallObject('ShippingQuoteCollector'); - /* @var $quote_engine_collector ShippingQuoteCollector */ $shipping_quote_params = Array( 'dest_country' => $order->GetDBField('ShippingCountry'),