ruby_omx 0.0.12 → 0.0.13

data/lib/ruby_omx/base.rb

@@ -1,6 +1,7 @@
 module RubyOmx
 	DEFAULT_HOST = 'https://api.omx.ordermotion.com/hdde/xml/udi.asp'
-	
+	ALT_HOST = 'https://api.omx.ordermotion.com/OM2/udi.ashx'
+  
 	class Base
   	attr_accessor :connection
 

data/lib/ruby_omx/response/order_info_request.rb

@@ -6,20 +6,21 @@ module RubyOmx
       return super unless a.present? # bail if no array of options has been given
       http_biz_id = a.delete(:http_biz_id)
       udi_auth_token = a.delete(:udi_auth_token)
-      #udi_auth_token = a.delete(:udi_auth_token)
-      
-		  required_fields = [:order_number]
-		  raise MissingOrderOptions if required_fields.any? { |option| a[option].nil? }
+            
+      raise MissingOrderOptions if a[:order_number].nil? && (a[:store_code].nil? || a[:order_id].nil?)
       super
-      self.version = a[:version] ||= '1.00'
+      self.version = a[:version] ||= '2.00'
       
-      self.udi_parameters = [ RubyOmx::UDIParameter.new({:key=>'UDIAuthToken', :value=>udi_auth_token}),
-                              RubyOmx::UDIParameter.new({:key=>'HTTPBizID', :value=>http_biz_id}),
-                              RubyOmx::UDIParameter.new({:key=>'OrderNumber', :value=>a[:order_number]}),
-                              RubyOmx::UDIParameter.new({:key=>'level', :value=>a[:level] ||=0 })]
+      self.udi_parameters = []
+      self.udi_parameters << RubyOmx::UDIParameter.new({:key=>'UDIAuthToken', :value=>udi_auth_token})
+      self.udi_parameters << RubyOmx::UDIParameter.new({:key=>'HTTPBizID', :value=>http_biz_id})
+      self.udi_parameters << RubyOmx::UDIParameter.new({:key=>'OrderNumber', :value=>a[:order_number]}) if a[:order_number]
+      self.udi_parameters << RubyOmx::UDIParameter.new({:key=>'OrderId', :value=>a[:order_id]}) if a[:order_id]
+      self.udi_parameters << RubyOmx::UDIParameter.new({:key=>'StoreCode', :value=>a[:store_code]}) if a[:store_code]
+      self.udi_parameters << RubyOmx::UDIParameter.new({:key=>'level', :value=>a[:level] ||=2 })
     end
     
-    attr_accessor :order_number, :raw_xml
+    attr_accessor :order_number, :order_id, :store_code, :raw_xml
     
     xml_name "OrderInformationRequest"
     xml_accessor :version, :from => '@version'

data/lib/ruby_omx/response/order_info_response.rb

@@ -6,7 +6,7 @@ module RubyOmx
     xml_name "LineStatus"
     #<LineStatus date="2/9/2006 2:47:00 PM" text="OK">40</LineStatus>
     xml_reader :text, :from => '@text'  # C/L means cancelled, OK with a date means processing
-    xml_reader :date, :from => '@date', :as=>DateTime # cancellation date if cancelled, processing date if processing
+    xml_reader :date, :from => "@date" # reverting to string as date is invalid, cancellation date if cancelled, processing date if processing
     xml_reader :value, :from => :content, :as=>Integer
   end
   
@@ -14,6 +14,8 @@ module RubyOmx
     xml_name "OrderHeader"
     xml_reader :order_id
     xml_reader :order_number
+    xml_reader :order_status_code, :from => '@statusCode', :in=>'OrderStatus'
+    xml_reader :order_status_date, :as=>DateTime
     xml_reader :order_date, :as=>DateTime
   end
       
@@ -47,6 +49,8 @@ module RubyOmx
 
   class OrderInformationResponse < Response
     xml_name "OrderInformationResponse"
+    xml_reader :success
+    
     xml_reader :order_header, :as=>OrderInfoOrderHeader
     #xml_reader :shipping_information, :as=>OrderInfoShippingInfo
     xml_reader :line_items, :as => [OrderInfoLineItem], :in=>'OrderDetail'

data/lib/ruby_omx/version.rb

@@ -1,3 +1,3 @@
 module RubyOmx
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

data/test/orders_test.rb

@@ -184,26 +184,37 @@ class OrdersTest < MiniTest::Unit::TestCase
   end
   
   def test_send_info_request
-  	@connection.stubs(:post).returns(xml_for('OrderInformationResponse(1.00)',200))
+  	@connection.stubs(:post).returns(xml_for('OrderInformationResponse(2.00)',200))
 		response = @connection.send_info_request({ :order_number => '16651' })
 		assert_kind_of OrderInformationResponse, response
-		assert !response.accessors.include?("code")
 
-    assert_equal DateTime.parse('2006-02-09 14:47:00'), response.ship_date
+    assert_nil response.ship_date
     assert_equal "", response.tracking_number
-    assert_equal '16651', response.order_header.order_number
-    assert_equal DateTime.parse('2005-06-20 14:25:00'), response.order_header.order_date
-    assert_equal 1, response.line_items.length
-    assert_equal '16651-1', response.line_items[0].shipment_number
-    assert_equal 6.52, response.line_items[0].line_cogs
-    assert_equal 6.52, response.line_items[0].unit_cogs
-    assert_equal '01-113', response.line_items[0].supplier_item_code
-    assert_equal '01-113', response.line_items[0].item_code
+
+    assert_nil response.order_header.order_id    
+    assert_equal '24603', response.order_header.order_number
+    assert_equal DateTime.parse('2003-04-01 22:15:00'), response.order_header.order_date
+    assert_equal DateTime.parse('2010-05-31 05:36:00'), response.order_header.order_status_date
+    assert_equal '4', response.order_header.order_status_code
+
+    
+    assert_equal 2, response.line_items.length
+    assert_equal '24603-0', response.line_items[0].shipment_number
+    assert_equal 10, response.line_items[0].line_cogs
+    assert_equal 10, response.line_items[0].unit_cogs
+
+    assert_equal 'APPLE', response.line_items[0].warehouse_reference
+    assert_equal 'APPLE', response.line_items[0].item_code
+    assert_equal 'APPLE', response.line_items[0].supplier_item_code
+    
     assert_instance_of OrderInfoLineStatus, response.line_items[0].line_status
     assert_equal "OK", response.line_items[0].line_status.text
     assert_equal 40, response.line_items[0].line_status.value  
-    assert_equal DateTime.parse('2/9/2006 2:47:00 PM'), response.line_items[0].line_status.date
+    assert_equal '5/31/2010 5:36:00 AM', response.line_items[0].line_status.date
 		assert_kind_of Hash, response.as_hash
+		
+		response = @connection.send_info_request({ :order_id=> 'AZ-43253-234', :store_code=>'XX01' })
+		assert_kind_of OrderInformationResponse, response
   end
   
   def test_send_smart_report_request

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_omx
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
   prerelease: 
 platform: ruby
 authors: