ruby_omx 0.0.28 → 0.0.29

data/lib/ruby_omx/request/udoa_request.rb

@@ -1,13 +1,5 @@
 module RubyOmx
-    
-  class Address < Node
-    xml_name "Address"
-    xml_accessor :address_type, :from => '@type'
-    xml_accessor :title_code, :company, :firstname, :lastname, :address1, :address2, :city, :state, :phone_number, :email
-    xml_accessor :zip, :from => 'ZIP'
-    xml_accessor :tld, :from => 'TLD'
-  end
-    
+        
   class CustomField < Node
     xml_name 'Field'
     xml_accessor :field_id, :from => '@fieldID'

data/lib/ruby_omx/response/order_info_response.rb

@@ -2,30 +2,30 @@
 
 module RubyOmx
 
-  class OrderInfoLineStatus < Node
-    xml_name "LineStatus"
+  #class OrderInfoLineStatus < Node
+  #  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" # reverting to string as date is invalid, cancellation date if cancelled, processing date if processing
-    xml_reader :value, :from => :content, :as=>Integer
-  end
+  #  xml_reader :text, :from => '@text'  # C/L means cancelled, OK with a date means 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
   
-  class OrderInfoLineItem < Node
-    xml_name "LineItem"
-    xml_reader :item_code
-    xml_reader :product_name
-    xml_reader :quantity
-    xml_reader :price
-    xml_reader :line_status, :as=>OrderInfoLineStatus
-
-    xml_reader :warehouse_reference
-    xml_reader :tracking_number
+  #class OrderInfoLineItem < Node
+  #  xml_name "LineItem"
+  #  xml_reader :item_code
+  #  xml_reader :product_name
+  #  xml_reader :quantity
+  #  xml_reader :price
+  #  xml_reader :line_status, :as=>OrderInfoLineStatus
+
+  #  xml_reader :warehouse_reference
+  #  xml_reader :tracking_number
     
-    xml_reader :shipment_number
-    xml_reader :line_cogs, :from=>'LineCOGS', :as=>Float
-    xml_reader :unit_cogs, :from=>'UnitCOGS', :as=>Float
-    xml_reader :supplier_item_code
-  end
+  #  xml_reader :shipment_number
+  #  xml_reader :line_cogs, :from=>'LineCOGS', :as=>Float
+  #  xml_reader :unit_cogs, :from=>'UnitCOGS', :as=>Float
+  #  xml_reader :supplier_item_code
+  #end
 
   class OrderInfoResponse < StandardResponse
     xml_name "OrderInformationResponse"
@@ -35,9 +35,19 @@ module RubyOmx
     xml_reader :order_status_code, :from => '@statusCode', :in=>'OrderHeader/OrderStatus'
     xml_reader :order_status_date, :as=>DateTime, :in=>'OrderHeader'
     xml_reader :order_date, :as=>DateTime, :in=>'OrderHeader'
+    xml_reader :keyed_date, :as=>DateTime, :in=>'OrderHeader'
+    xml_reader :total_amount, :as => Float, :in=>'OrderHeader'
+    xml_reader :keycode, :in=>'OrderHeader'
+
+    xml_reader :bill_to, :as => Address, :in => 'Customer'
+    xml_reader :ship_to, :as => Address, :in => 'ShippingInformation'
+
+    xml_reader :method_code, :in => 'ShippingInformation/Method', :from=>'@code', :as => Integer
+    xml_reader :shipping_amount, :in => 'ShippingInformation', :as => Float
+    xml_reader :handling_amount, :in => 'ShippingInformation', :as => Float
+
+    xml_reader :line_items, :as => [LineItem], :in => 'OrderDetail'    
     
-    #xml_reader :order_header, :as=>OrderInfoOrderHeader
-    xml_reader :line_items, :as => [OrderInfoLineItem], :in=>'OrderDetail'
     xml_reader :customer_number, :from=>'@number', :in=>'Customer'
     xml_reader :tracking_number, :in=>'ShippingInformation/Shipment'
     xml_reader :ship_date, :in=>'ShippingInformation/Shipment',:as=>DateTime # if populated, it means all items have shipped
@@ -50,6 +60,9 @@ module RubyOmx
 
 =begin
 
+
+
+
   OMX STATUS CODES
   
   

data/lib/ruby_omx/response.rb

@@ -42,6 +42,14 @@ module RubyOmx
     xml_accessor :item_code, :from=>'@itemCode'
   end    
 
+  class LineStatus < Node
+    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" # reverting to string as date is invalid, cancellation date if cancelled, processing date if processing
+    xml_reader :value, :from => :content, :as=>Integer
+  end
+
   # LineItems appear in requests and responses
   class LineItem < Node
     xml_name "LineItem"
@@ -52,8 +60,18 @@ module RubyOmx
     xml_accessor :price, :as => Float
     xml_accessor :update_standard_price  # default to 'False'
     xml_accessor :cancel_line
+
+    # read only attributes that come in the response
+    xml_reader :product_name
+    xml_reader :line_status, :as=>LineStatus
+    xml_reader :warehouse_reference
+    xml_reader :tracking_number
+    xml_reader :shipment_number
+    xml_reader :line_cogs, :from=>'LineCOGS', :as=>Float
+    xml_reader :unit_cogs, :from=>'UnitCOGS', :as=>Float
+    xml_reader :supplier_item_code
   end
-  
+    
   class CustomItemAttribute < Node
     xml_name "Attribute"
     xml_reader :attribute_id, :from => '@attributeID'
@@ -61,6 +79,14 @@ module RubyOmx
     xml_reader :value, :from => :content
   end
 
+  class Address < Node
+    xml_name "Address"
+    xml_accessor :address_type, :from => '@type'
+    xml_accessor :title_code, :company, :firstname, :lastname, :address1, :address2, :county, :city, :state, :phone_number, :email, :country
+    xml_accessor :zip, :from => 'ZIP'
+    xml_accessor :tld, :from => 'TLD'
+  end
+
   class StandardResponse < Response
     xml_reader :success
 	  xml_reader :errors, :as=>[Error], :in=>'ErrorData'

data/lib/ruby_omx/version.rb

@@ -1,3 +1,3 @@
 module RubyOmx
-  VERSION = "0.0.28"
+  VERSION = "0.0.29"
 end

data/test/orders_test.rb

@@ -187,7 +187,7 @@ class OrdersTest < MiniTest::Unit::TestCase
 		assert_equal 'OMX-ofyccytnacrtnedlldmyed', response.OMX
   end
   
-  def test_send_info_request1
+  def test_send_info_request_v1
   	@connection.stubs(:post).returns(xml_for('OrderInformationResponse(1.00)',200))
 		response = @connection.send_info_request({ :order_number => '16651', :version=>'1.00' })
 		assert_kind_of OrderInfoResponse, response
@@ -197,20 +197,41 @@ class OrdersTest < MiniTest::Unit::TestCase
     assert_equal "", response.tracking_number
     assert_equal '16651', response.order_number
     assert_equal DateTime.parse('2005-06-20 14:25:00'), response.order_date
+
+    # test line item detail
     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_instance_of OrderInfoLineStatus, response.line_items[0].line_status
+    assert_instance_of LineStatus, 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 '2/9/2006 2:47:00 PM', response.line_items[0].line_status.date
 		assert_kind_of Hash, response.as_hash
+				
+		assert_equal 'A123', response.keycode
+		assert_equal DateTime.parse('2005-06-20 14:25:00'), response.keyed_date
+
+    # Shipping Address
+		assert_equal 'Dun', response.ship_to.firstname
+		assert_equal "O'neil D", response.ship_to.lastname
+		assert_equal '1 main st, 2315', response.ship_to.address1
+		assert_equal 'Richmond Hill', response.ship_to.city
+		
+		# Billing Address
+		assert_equal 'Sun', response.bill_to.firstname
+		assert_equal "O'neil S", response.bill_to.lastname
+		assert_equal '1 main st, 2314', response.bill_to.address1
+		assert_equal 'Richmond Valley', response.bill_to.city
+
+		assert_equal 1, response.method_code
+		assert_equal 0, response.shipping_amount
+		assert_nil response.handling_amount
   end
 
-  def test_send_info_request2
+  def test_send_info_request_v2
   	@connection_alt.stubs(:post).returns(xml_for('OrderInformationResponse(2.00)',200))
 		response = @connection_alt.send_info_request({ :order_number => '24603' })
 		assert_kind_of OrderInfoResponse, response
@@ -234,7 +255,7 @@ class OrdersTest < MiniTest::Unit::TestCase
     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_instance_of LineStatus, 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 '5/31/2010 5:36:00 AM', response.line_items[0].line_status.date

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_omx
 version: !ruby/object:Gem::Version
-  version: 0.0.28
+  version: 0.0.29
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-24 00:00:00.000000000 Z
+date: 2012-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: roxml