ruby_omx 0.0.14 → 0.0.15

data/lib/ruby_omx/response/order_info_request.rb

@@ -6,7 +6,7 @@ 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)
-            
+
       raise MissingOrderOptions if a[:order_number].nil? && (a[:store_code].nil? || a[:order_id].nil?)
       self.version = a[:version] ||= '1.00'
       super

data/lib/ruby_omx/response/purchase_order_update_request.rb

@@ -1,36 +1,23 @@
 module RubyOmx
 
-  class PurchaseOrderLineItem < Response
-    xml_name 'LineItem'
-    xml_accessor :line_number, :from=>'@lineNumber'
-    xml_accessor :item_code # 
-    xml_accessor :quantity # required for new line, optional for update (if omitted, existing value is not changed)
-    xml_accessor :price # required for new line, optional for update (if omitted, existing value is not changed)
-  end
-
-  class PurchaseOrder < Response
-    xml_name 'PurchaseOrder'
-    xml_accessor :po_number, :from=>'@PONumber' #<PurchaseOrder PONumber="16651" supplierID="76">
-    xml_accessor :supplier_id, :from=>'@supplierID'
-    xml_accessor :line_items, :as=>[PurchaseOrderLineItem], :in => 'LineDetail'
-  end
-
   class PurchaseOrderUpdateRequest < Response
     def initialize(a=nil)
-      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)
+      if a.present?
+        http_biz_id = a.delete(:http_biz_id)
+        udi_auth_token = a.delete(:udi_auth_token)
       
-		  required_fields = [:purchase_order]
-		  raise MissingPurchaseOrderOptions if required_fields.any? { |option| a[option].nil? }
-		  raise MissingPurchaseOrderOptions if a[:purchase_order][:po_number].nil? && a[:purchase_order][:supplier_id].nil?
-		  raise MissingPurchaseOrderOptions if a[:purchase_order][:line_items].nil?
-      super
-      self.version = a[:version] ||= '1.00'
-      self.udi_parameters = []
-      self.udi_parameters << UDIParameter.new({:key=>'UDIAuthToken', :value=>udi_auth_token})
-      self.udi_parameters << UDIParameter.new({:key=>'HTTPBizID', :value=>http_biz_id})      
+  		  #required_fields = [:purchase_order]
+  		  #raise MissingPurchaseOrderOptions if required_fields.any? { |option| a[option].nil? }
+  		  #raise MissingPurchaseOrderOptions if a[:purchase_order][:po_number].nil? && a[:purchase_order][:supplier_id].nil?
+  		  #raise MissingPurchaseOrderOptions if a[:purchase_order][:line_items].nil?
+        super
+        self.version = a[:version] ||= '1.00'
+        self.udi_parameters = []
+        self.udi_parameters << UDIParameter.new({:key=>'UDIAuthToken', :value=>udi_auth_token})
+        self.udi_parameters << UDIParameter.new({:key=>'HTTPBizID', :value=>http_biz_id})      
+      else
+        super
+      end
     end
     
     attr_accessor :raw_xml
@@ -38,6 +25,9 @@ module RubyOmx
     xml_name "PurchaseOrderUpdateRequest"
     xml_accessor :version, :from => '@version'
     xml_accessor :udi_parameters, :as => [RubyOmx::UDIParameter], :in => 'UDIParameter'
-    xml_accessor :purchase_order, :as => PurchaseOrder
+
+    xml_accessor :po_number, :from=>'@PONumber', :in=>'PurchaseOrder' #<PurchaseOrder PONumber="16651" supplierID="76">
+    xml_accessor :supplier_id, :from=>'@supplierID', :in=>'PurchaseOrder'
+    xml_accessor :line_items, :as => [RubyOmx::LineItem], :in => 'PurchaseOrder/LineDetail'
   end
 end

data/lib/ruby_omx/response/purchase_order_update_response.rb

@@ -10,6 +10,15 @@
 
 module RubyOmx
 
+  class ErrorData < Response
+    xml_name 'Error'
+    xml_accessor :error_id, :from=>'@errorID'
+    xml_accessor :error_severity, :from=>'@errorSeverity'
+    xml_accessor :error_detail_0, :from=>'@errorDetail0'
+    xml_accessor :error_detail_1, :from=>'@errorDetail1'
+    xml_accessor :message, :from=>:content
+  end
+
   class PurchaseOrderResponse < Response
     xml_name 'PurchaseOrder'
     xml_accessor :po_number, :from=>'@PONumber' #<PurchaseOrder PONumber="16651" SupplierID="76">
@@ -22,7 +31,8 @@ module RubyOmx
     xml_accessor :purchase_order, :as => RubyOmx::PurchaseOrderResponse
     xml_accessor :po_date, :from=>'PODate', :as=>DateTime
     xml_accessor :total_amount, :as=>Float
-    xml_accessor :action    
+    xml_accessor :action  
+    xml_accessor :errors, :as=>[ErrorData], :in=>'ErrorData'
   end
     
 end

data/lib/ruby_omx/response/udoa_request.rb

@@ -7,14 +7,6 @@ module RubyOmx
     xml_accessor :zip, :from => 'ZIP'
     xml_accessor :tld, :from => 'TLD'
   end
-
-  class LineItem < Response
-    xml_name "LineItem"
-    xml_accessor :line_number, :from => '@lineNumber'
-    xml_accessor :item_code
-    xml_accessor :quantity, :as => Integer
-    xml_accessor :unit_price, :as => Float
-  end
     
   class CustomField < Response
     xml_name 'Field'
@@ -31,6 +23,7 @@ module RubyOmx
 
   class UDOARequest < Response
     def initialize(a=nil)
+      super if a.nil?
       if !a.nil?
         http_biz_id = a.delete(:http_biz_id)
         udi_auth_token = a.delete(:udi_auth_token)
@@ -94,7 +87,7 @@ module RubyOmx
   	xml_accessor :card_auth_code, :in => 'Payment' 	    	
   	xml_accessor :card_transaction_id, :from => 'CardTransactionID', :in => 'Payment'
 
-    xml_accessor :line_items, :as => [LineItem], :in => 'OrderDetail'
+    xml_accessor :line_items, :as => [RubyOmx::LineItem], :in => 'OrderDetail'
     xml_accessor :custom_fields, :as => [CustomField], :in => 'CustomFields/Report'
     xml_accessor :total_amount, :in => 'Check'  
   end

data/lib/ruby_omx/response.rb

@@ -52,4 +52,13 @@ module RubyOmx
     xml_accessor :value, :from => :content
   end
 
+  class LineItem < Response
+    xml_name "LineItem"
+    xml_accessor :line_number, :from => '@lineNumber'
+    xml_accessor :item_code
+    xml_accessor :quantity, :as => Integer
+    xml_accessor :unit_price, :as => Float
+    xml_accessor :price, :as => Float
+  end  
+
 end

data/lib/ruby_omx/version.rb

@@ -1,3 +1,3 @@
 module RubyOmx
-  VERSION = "0.0.14"
+  VERSION = "0.0.15"
 end

data/test/orders_test.rb

@@ -140,6 +140,7 @@ class OrdersTest < MiniTest::Unit::TestCase
                           { :field_id => '7', :line_number => '2', :value => 'a' }]
     }
     request = @connection.build_udoa_request(request_attrs)
+    puts request.to_xml
     request2 = RubyOmx::UDOARequest.format(xml_for('UDOARequest_(UDOA200)_request',200))
     assert_equal request.to_xml.to_s, request2.to_xml.to_s
   end

data/test/purchase_orders_test.rb

@@ -12,11 +12,11 @@ class PurchaseOrdersTest < MiniTest::Unit::TestCase
   def test_request_from_xml
     request = RubyOmx::PurchaseOrderUpdateRequest.format(xml_for('PurchaseOrderUpdateRequest(1.00)',200))
     assert_equal '1.00', request.version
-    assert_equal '16651', request.purchase_order.po_number
-    assert_equal '76', request.purchase_order.supplier_id
-    assert_equal 2, request.purchase_order.line_items.length
-    assert_equal @line1[:item_code], request.purchase_order.line_items[0].item_code
-    assert_equal @line2[:item_code], request.purchase_order.line_items[1].item_code
+    assert_equal '16651', request.po_number
+    assert_equal '76', request.supplier_id
+    assert_equal 2, request.line_items.length
+    assert_equal @line1[:item_code], request.line_items[0].item_code
+    assert_equal @line2[:item_code], request.line_items[1].item_code
   
     assert_equal 'UDIAuthToken', request.udi_parameters[0].key
     assert_equal @config['udi_auth_token'], request.udi_parameters[0].value
@@ -25,13 +25,18 @@ class PurchaseOrdersTest < MiniTest::Unit::TestCase
   def test_send_purchase_order_update_request
   	@connection.stubs(:post).returns(xml_for('PurchaseOrderUpdateResponse(1.00)',200))
   	request = PurchaseOrderUpdateRequest.new
-  	po_data = { :purchase_order => {
-  	              :po_number => '16651',
-  	              :supplier_id => '76',
-  	              :line_items => [@line1, @line2]
-  	            }
-  	          }
-	
+  	l1 = RubyOmx::LineItem.new(:item_code=>'WATCH-1', :quantity=>1, :price=>122.50)
+  	l2 = RubyOmx::LineItem.new(:item_code=>'APPLE-12', :quantity=>31, :price=>1.50)
+  	
+  	po_data = { :po_number => '16651',
+                :line_items => [l1, l2],
+                :supplier_id => '76'
+              }
+  	          
+		
+	  r = @connection.build_purchase_order_update_request(po_data)
+    puts r.to_xml
+		
   	# Missing Order Options
   	begin
   	  response = @connection.send_purchase_order_update_request({})

metadata

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