notes_for_saasu.txt @@ -2,6 +2,10 @@ NOT READY! So don't bother pulling unless you want to help out :P +== TODO + +No way to pass in "createAsAdjustmentNote" to Invoice.update! + == Note on Patches/Pull Requests * Fork the project. README.rdoc @@ -36,6 +36,17 @@ module SaasuConnect @fields end + def self.attributes(*args) + @attributes ||= [] + + args.each do |a| + @attributes << a + field_accessor a + end + + @attributes + end + def self.field_accessor(*args) # Create mutalators for all of the fields. This will also cast the variable if needed args.each do |a| @@ -43,18 +54,21 @@ module SaasuConnect when(:integer) class_eval <<-END def #{a[0]} + return nil unless @#{a[0]} @#{a[0]}.to_i end END when(:float) class_eval <<-END def #{a[0]} + return nil unless @#{a[0]} @#{a[0]}.to_f end END when(:date) class_eval <<-END def #{a[0]} + return nil unless @#{a[0]} return @#{a[0]} if @#{a[0]}.is_a?(Date) || @#{a[0]}.to_s == "" Date.parse(@#{a[0]}) end lib/saasu_connect/base.rb @@ -1,6 +1,8 @@ module SaasuConnect class Invoice < Base fields [ :uid, :integer ], [ :lastUpdatedUid, :string ], [ :transactionType, :string ], [ :date, :date ], [ :contactUid, :integer ], [ :shipToContactUid, :integer ], [ :folderUid, :integer ], [ :tags, :string ], [ :reference, :string ], [ :summary, :string ], [ :notes, :string ], [ :requiresFollowUp, :boolean ], [ :dueOrExpiryDate, :date ], [ :layout, :string ], [ :status, :string ], [ :invoiceNumber, :string ], [ :purchaseOrderNumber, :string ], [ :invoiceItems, :array ], [ :quickPayment, :quick_payment ], [ :payments, :payment_list ], [ :isSent, :boolean ] + attributes [ :emailToContact, :boolean ] + include Writable end end lib/saasu_connect/invoice.rb @@ -12,13 +12,13 @@ module SaasuConnect end end - def delete!(uid, options = {}) - delete({ :uid => uid }.merge(options)) + def delete!(options = {}) + self.class.delete({ :uid => uid }.merge(options)) end def to_xml(&block) klass = self.class.to_s.split('::').last - if uid != 0 + if uid && lastUpdatedUid action = XML::Node.new("update#{klass}") action << parent = XML::Node.new(SaasuConnect::Rest.downcase_first(klass)) parent['uid'] = uid.to_s @@ -28,6 +28,10 @@ module SaasuConnect action << parent = XML::Node.new(SaasuConnect::Rest.downcase_first(klass)) parent['uid'] = '0' end + + self.class.attributes.each do |a| + action[a[0].to_s] = self.send(a[0]).to_s unless self.send(a[0]).nil? + end if block_given? yield(parent) @@ -56,8 +60,13 @@ module SaasuConnect def cast_for_xml(field, value) value = value.strftime('%Y-%m-%d') if value.is_a?(Date) - if value.kind_of?(SaasuConnect) - value.build_xml + if SaasuConnect.constants.include?(klass = value.class.to_s.split('::').last) + # The value belongs to the SaasuConnect namespace + parent = XML::Node.new(SaasuConnect::Rest.downcase_first(klass)) + value.build_xml do |n| + parent << n + end + parent elsif value.is_a?(Array) node = XML::Node.new(field.to_s) value.each do |element| lib/saasu_connect/writable.rb @@ -116,7 +116,8 @@ class TestSaasuConnect < Test::Unit::TestCase invoice.status = 'I' invoice.invoice_number = "<Auto Number>" invoice.purchase_order_number = 'PO123456789' - + invoice.email_to_contact = false + invoice.invoice_items = [ SaasuConnect::ServiceInvoiceItem.new( :description => 'LINE 1 LINE 1 LINE 1', @@ -142,13 +143,20 @@ class TestSaasuConnect < Test::Unit::TestCase :date_paid => Date.parse('2001-01-01'), :date_cleared => Date.parse('2001-01-01'), :banked_to_account_uid => 0, - :amount => 0 + :amount => 0.0 ) invoice.is_sent = false SaasuConnect::Tasks.expects(:post).with(load_xml_mock('update_invoice'), {}) - invoice.update!(:create_as_adjustment_note => false) + invoice.update! + end + + def test_invoice_delete + invoice = SaasuConnect::Invoice.new(:uid => 12345) + endpoint = SaasuConnect::Invoice.send(:endpoint, :uid => 12345) + SaasuConnect::Invoice.expects(:http_delete).with(endpoint) + invoice.delete! end def test_contact_update test/test_saasu_connect.rb @@ -1,11 +1,11 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="UTF-8"?> <tasks> <updateInvoice emailToContact="false"> <invoice uid="256875" lastUpdatedUid="AAAAAAAVBCc="> <transactionType>S</transactionType> <date>2005-09-15</date> <contactUid>22738</contactUid> - <shipToContactUid>22738</contactUid> + <shipToContactUid>22738</shipToContactUid> <tags>Online Sales</tags> <summary>Service Sale 2</summary> <requiresFollowUp>false</requiresFollowUp> @@ -35,13 +35,12 @@ </serviceInvoiceItem> </invoiceItems> <quickPayment> - <datePaid>0001-01-01</datePaid> - <dateCleared>0001-01-01</dateCleared> + <datePaid>2001-01-01</datePaid> + <dateCleared>2001-01-01</dateCleared> <bankedToAccountUid>0</bankedToAccountUid> - <amount>0</amount> + <amount>0.0</amount> </quickPayment> <isSent>false</isSent> </invoice> - <createAsAdjustmentNote>false</createAsAdjustmentNote> </updateInvoice> </tasks> test/xml_mock/update_invoice.xml 0611e7b1486fc68732fdb9832b21dc2bc5b13b14 Myles Eftos myles@myles-ubuntu.madpilot.hanger http://github.com/madpilot/saasu_connect/commit/3a0b54935474ffb9e76199e23857b8303c601469 3a0b54935474ffb9e76199e23857b8303c601469 2009-11-09T08:12:13-08:00 2009-11-09T08:12:13-08:00 Finished mocked tests for invoices f4eeb532d73ff3ec78019d0d2a35258603313fac Myles Eftos myles@myles-ubuntu.madpilot.hanger