xeroizer 2.18.1 → 2.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea62d6d6a33c98a88703fe9f1c6b675fcfa6731e
-  data.tar.gz: cf3504a3fafc2b1a8d65e274b03373a7dd466d75
+  metadata.gz: 1ca2b2dffb8f864a2f4c82295bbfddcdeea61c1b
+  data.tar.gz: 4b9f39d61e7027ba84df0d548826cccbc0695d08
 SHA512:
-  metadata.gz: 74c217092e28ee42009e40461d99e4b542a09531cba94cfe22f07544dfc5cf7fe35c10d95691a91ffbc152738d67a07470c043b061aa963688b970095db0011e
-  data.tar.gz: 35af4e22733df6241464e95b2a33b7020fbe5590df8e84292ceabdc3f2b0f830174f69d59693af9e09c77cd318c4132767ac2dbd542f7c8c09e9219a45f72cc3
+  metadata.gz: 1e27f5e7d6b66833b4ef226ce27c9fd67b26ba434eaa35b2ea750106db4ad6c334e566132d4779192b3ccfa964811657b9ef123b552d8a4a185be0d9f78c899d
+  data.tar.gz: 6ea509718550d68b1560507fc0204c19406df17924c44ba2ebcc2ac0f27d7652929b7fd9716b9a489e564f274304a3d4cb6e72556031186b7150c304aad5a7cc

data/README.md

@@ -5,7 +5,7 @@ Xeroizer API Library ![Project status](http://stillmaintained.com/waynerobinson/
 **Git**: 					[git://github.com/waynerobinson/xeroizer.git](git://github.com/waynerobinson/xeroizer.git)		
 **Github**: 			[https://github.com/waynerobinson/xeroizer](https://github.com/waynerobinson/xeroizer)		
 **Author**: 			Wayne Robinson [http://www.wayne-robinson.com](http://www.wayne-robinson.com)		
-**Contributors**: See Contributors section below	
+**Contributors**: See Contributors section below
 **Copyright**:    2007-2013
 **License**:      MIT License		
 
@@ -34,7 +34,7 @@ client = Xeroizer::PublicApplication.new(YOUR_OAUTH_CONSUMER_KEY, YOUR_OAUTH_CON
 # Retrieve list of contacts (note: all communication must be made through the client).
 contacts = client.Contact.all(:order => 'Name')
 ```
-	
+
 Authentication
 --------------
 
@@ -44,13 +44,13 @@ There are three methods of authentication detailed below:
 
 ### All: Consumer Key/Secret
 
-All methods of authentication require your OAuth consumer key and secret. This can be found for your application 
+All methods of authentication require your OAuth consumer key and secret. This can be found for your application
 in the API management console at [http://api.xero.com](http://api.xero.com).
 
 ### Public Applications
 
-Public applications use a 3-legged authorisation process. A user will need to authorise your 
-application against each organisation that you want access to. Your application can have access 
+Public applications use a 3-legged authorisation process. A user will need to authorise your
+application against each organisation that you want access to. Your application can have access
 to many organisations at once by going through the authorisation process for each organisation.
 
 The access token received will expire after 30 minutes. If you want access for longer you will need
@@ -75,69 +75,69 @@ redirect_to request_token.authorize_url
 
 # 3. Exchange RequestToken for AccessToken.
 #    This access token will be used for all subsequent requests but it is stored within the client
-#    application so you don't have to record it. 
+#    application so you don't have to record it.
 #
 #    Note: This example assumes the callback URL is a Rails action.
 client.authorize_from_request(request_token.token, request_token.secret, :oauth_verifier => params[:oauth_verifier])
 ```
-	
+
 You can now use the client to access the Xero API methods, e.g.
 
 ```ruby
 contacts = client.Contact.all
 ```
-	
+
 #### Example Rails Controller
 
 ```ruby
 class XeroSessionController < ApplicationController
 
 	before_filter :get_xero_client
-	
+
 	public
-	
+
 		def new
 			request_token = @xero_client.request_token(:oauth_callback => 'http://yourapp.com/xero_session/create')
 			session[:request_token] = request_token.token
 			session[:request_secret] = request_token.secret
-			
+
 			redirect_to request_token.authorize_url
 		end
-		
+
 		def create
 			@xero_client.authorize_from_request(
-					session[:request_token], 
-					session[:request_secret], 
+					session[:request_token],
+					session[:request_secret],
 					:oauth_verifier => params[:oauth_verifier] )
-						
+
 			session[:xero_auth] = {
 					:access_token => @xero_client.access_token.token,
 					:access_key => @xero_client.access_token.secret }
-															
+
 			session.data.delete(:request_token)
 			session.data.delete(:request_secret)
 		end
-		
+
 		def destroy
 			session.data.delete(:xero_auth)
 		end
-		
+
 	private
-		
+
 		def get_xero_client
 			@xero_client = Xeroizer::PublicApplication.new(YOUR_OAUTH_CONSUMER_KEY, YOUR_OAUTH_CONSUMER_SECRET)
-			
+
 			# Add AccessToken if authorised previously.
 			if session[:xero_auth]
 				@xero_client.authorize_from_access(
-					session[:xero_auth][:access_token], 
+					session[:xero_auth][:access_token],
 					session[:xero_auth][:access_key] )
 			end
 		end
 end
 ```
-	
-#### Storing AccessToken 
+
+#### Storing AccessToken
 
 You can store the access token/secret pair so you can access the API again without user intervention. Currently these
 tokens are only valid for 30 minutes and will raise a `Xeroizer::OAuth::TokenExpired` exception if you try to access
@@ -152,9 +152,9 @@ access_secret = client.access_token.secret
 
 ### Private Applications
 
-Private applications use a 2-legged authorisation process. When you register your application, you will select 
-the organisation that is authorised to your application. This cannot be changed afterwards, although you can 
-register another private application if you have multiple organisations. 
+Private applications use a 2-legged authorisation process. When you register your application, you will select
+the organisation that is authorised to your application. This cannot be changed afterwards, although you can
+register another private application if you have multiple organisations.
 
 Note: You can only register organisations you are authorised to yourself.
 
@@ -178,7 +178,7 @@ contacts = client.Contact.all
 
 Partner applications use a combination of 3-legged authorisation and private key message signing.
 
-You will need to contact Xero (network@xero.com) to get permission to create a partner application.
+Visit the [https://developer.xero.com/partner/app-partner](Becoming an app partner) page to get permission to create a partner application.
 
 After you have followed the instructions provided by Xero for partner applications and uploaded your certificate you can
 access the partner application in a similar way to public applications.
@@ -188,7 +188,7 @@ Authentication occcurs in 3 steps:
 ```ruby
 client = Xeroizer::PartnerApplication.new(
 					YOUR_OAUTH_CONSUMER_KEY,
-					YOUR_OAUTH_CONSUMER_SECRET, 
+					YOUR_OAUTH_CONSUMER_SECRET,
 					"/path/to/privatekey.pem"
 					)
 
@@ -206,7 +206,7 @@ redirect_to request_token.authorize_url
 
 # 3. Exchange RequestToken for AccessToken.
 #    This access token will be used for all subsequent requests but it is stored within the client
-#    application so you don't have to record it. 
+#    application so you don't have to record it.
 #
 #    Note: This example assumes the callback URL is a Rails action.
 client.authorize_from_request(request_token.token, request_token.secret, :oauth_verifier => params[:oauth_verifier])
@@ -221,7 +221,7 @@ session_handle = client.session_handle
 access_key = client.access_token.token
 access_secret = client.access_token.secret
 ```
-	
+
 Two other interesting attributes of the PartnerApplication client are:
 
 > **`#expires_at`**:								Time this AccessToken will expire (usually 30 minutes into the future).		
@@ -245,6 +245,10 @@ session.
 
 If you lose these details at any stage you can always reauthorise by redirecting the user back to the Xero OAuth gateway.
 
+#### Branding Themes API
+
+Once you are approved as a Xero Partner you can request unofficial documentation to do with customizing Payment Services and Branding Themes using the API. There is more info on that [here](  https://github.com/waynerobinson/xeroizer/pull/439).
+
 Retrieving Data
 ---------------
 
@@ -264,10 +268,10 @@ saved = new_contact.save
 
 ### \#all([options])
 
-Retrieves list of all records with matching options. 
+Retrieves list of all records with matching options.
 
 **Note:** Some records (Invoice, CreditNote) only return summary information for the contact and no line items
-when returning them this list operation. This library takes care of automatically retrieving the 
+when returning them this list operation. This library takes care of automatically retrieving the
 contact and line items from Xero on first access however, this first access has a large performance penalty
 and will count as an extra query towards your 5,000/day and 60/minute request per organisation limit.
 
@@ -281,6 +285,18 @@ Valid options are:
 
 > Field to order by. Should be formatted as Xero-based field (e.g. 'Name', 'ContactID', etc)
 
+> **:status**
+
+> Status field for PurchaseOrder. Should be a valid Xero purchase order status.
+
+> **:date_from**
+
+> DateFrom field for PurchaseOrder. Should be in YYYY-MM-DD format.
+
+> **:date_to**
+
+> DateTo field for PurchaseOrder. Should be in YYYY-MM-DD format.
+
 > **:where**
 
 > __See *Where Filters* section below.__
@@ -305,11 +321,11 @@ You can specify find filters by providing the :where option with a hash. For exa
 ```ruby
 invoices = Xero.Invoice.all(:where => {:type => 'ACCREC', :amount_due_is_not => 0})
 ```
-	
+
 will automatically create the Xero string:
 
 	Type=="ACCREC"&&AmountDue<>0
-	
+
 The default method for filtering is the equality '==' operator however, these can be overridden
 by modifying the postfix of the attribute name (as you can see for the :amount\_due field above).
 
@@ -318,9 +334,9 @@ by modifying the postfix of the attribute name (as you can see for the :amount\_
 	\{attribute_name}_is_greater_than_or_equal_to will use '>='
 	\{attribute_name}_is_less_than will use '<'
 	\{attribute_name}_is_less_than_or_equal_to will use '<='
-	
+
 	The default is '=='
-	
+
 **Note:** Currently, the hash-conversion library only allows for AND-based criteria and doesn't
 take into account associations. For these, please use the custom filter method below.
 
@@ -332,15 +348,15 @@ in the resulting response, including all nested XML elements.
 **Example 1: Retrieve all invoices for a specific contact ID:**
 
 		invoices = xero.Invoice.all(:where => 'Contact.ContactID.ToString()=="cd09aa49-134d-40fb-a52b-b63c6a91d712"')
-	
+
 **Example 2: Retrieve all unpaid ACCREC Invoices against a particular Contact Name:**
-	
+
 		invoices = xero.Invoice.all(:where => 'Contact.Name=="Basket Case" && Type=="ACCREC" && AmountDue<>0')
-	
+
 **Example 3: Retrieve all Invoices PAID between certain dates**
-	
+
 		invoices = xero.Invoice.all(:where => 'FullyPaidOnDate>=DateTime.Parse("2010-01-01T00:00:00")&&FullyPaidOnDate<=DateTime.Parse("2010-01-08T00:00:00")')
-	
+
 **Example 4: Retrieve all Invoices using Paging (batches of 100)**
 
 		invoices = xero.Invoice.find_in_batches({page_number: 1}) do |invoice_batch|
@@ -348,15 +364,15 @@ in the resulting response, including all nested XML elements.
 		    ...
 		  end
 		end
-				
+
 **Example 5: Retrieve all Bank Accounts:**
-	
+
 		accounts = xero.Account.all(:where => 'Type=="BANK"')
-	
+
 **Example 6: Retrieve all DELETED or VOIDED Invoices:**
-	
+
 		invoices = xero.Invoice.all(:where => 'Status=="VOIDED" OR Status=="DELETED"')
-	
+
 **Example 7: Retrieve all contacts with specific text in the contact name:**
 
 		contacts = xero.Contact.all(:where => 'Name.Contains("Peter")')
@@ -376,7 +392,7 @@ invoice.line_items.each do | line_item |
 	puts "Line Description: #{line_item.description}"
 end
 ```
-	
+
 **belongs\_to example:**
 
 ```ruby
@@ -430,21 +446,21 @@ contact.add_phone(:type => 'DEFAULT', :area_code => '07', :number => '3033 1234'
 contact.add_phone(:type => 'MOBILE', :number => '0412 123 456')
 contact.save
 ```
-	
+
 To add to a `has_many` association use the `add_{association}` method. For example:
 
 ```ruby
 contact.add_address(:type => 'STREET', :line1 => '12 Testing Lane', :city => 'Brisbane')
 ```
-	
+
 To add to a `belongs_to` association use the `build_{association}` method. For example:
-	
+
 ```ruby
 invoice.build_contact(:name => 'ABC Company')
 ```
 
 ### Updating
-	
+
 If the primary GUID for the record is present, the library will attempt to update the record instead of
 creating it. It is important that this record is downloaded from the Xero API first before attempting
 an update. For example:
@@ -454,10 +470,17 @@ contact = xero.Contact.find("cd09aa49-134d-40fb-a52b-b63c6a91d712")
 contact.name = "Another Name Change"
 contact.save
 ```
-	
-Have a look at the models in `lib/xeroizer/models/` to see the valid attributes, associations and 
+
+Have a look at the models in `lib/xeroizer/models/` to see the valid attributes, associations and
 minimum validation requirements for each of the record types.
 
+Some Xero endpoints, such as Payment, will only accept specific attributes for updates. Because the library does not have this knowledge encoded (and doesn't do dirty tracking of attributes), it's necessary to construct new objects instead of using the ones retrieved from Xero:
+
+```ruby
+delete_payment = gateway.Payment.build(id: payment.id, status: 'DELETED')
+delete_payment.save
+```
+
 ### Bulk Creates & Updates
 
 Xero has a hard daily limit on the number of API requests you can make (currently 5,000 requests
@@ -501,7 +524,7 @@ saved = contact.save
 
 # contact.errors will contain [[:name, "can't be blank"]]
 ```
-	
+
 \#errors\_for(:attribute\_name) is a helper method to return just the errors associated with
 that attribute. For example:
 
@@ -530,7 +553,7 @@ invoice.save
 # An invoice created without a status will default to 'DRAFT'
 invoice.approved?
 
-# Payments can only be created against 'AUTHROISED' invoices
+# Payments can only be created against 'AUTHORISED' invoices
 invoice.approve!
 
 # Find the first bank account
@@ -582,16 +605,16 @@ trial_balance.rows.each do | row |
 	case row
 		when Xeroizer::Report::HeaderRow
 			# do something with header
-			
+
 		when Xeroizer::Report::SectionRow
 			# do something with section, will need to step into the rows for this section
-			
+
 		when Xeroizer::Report::Row
 			# do something for standard report rows
-			
+
 		when Xeroizer::Report::SummaryRow
 			# do something for summary rows
-			
+
 	end
 end
 ```
@@ -660,7 +683,7 @@ throttling and logging:
 Xeroizer::PublicApplication.new(
   credentials[:key], credentials[:secret],
   before_request: ->(request) { puts "Hitting this URL: #{request.url}" },
-  after_request: ->(request, response) { puts "Got this response: #{response.code}" }
+  after_request: ->(request, response) { puts "Got this response: #{response.code}" },
   around_request: -> (request, &block)  { puts "About to send request"; block.call; puts "After request"}
 )
 ```
@@ -686,7 +709,7 @@ This option adds the unitdp=4 query string parameter to all requests for models
 Tests
 -----
 
-The tests within the repository can be run by setting up a [Private App](https://developer.xero.com/documentation/auth-and-limits/private-applications).  You can create a Private App in the [developer portal](https://developer.xero.com/myapps/), it's suggested that you create it against the [Demo Company](https://developer.xero.com/documentation/getting-started/development-accounts) (note: the Demo Company expires after 28 days, so you will need to reset it and create a new Private App if you Demo Company has expired).
+The tests within the repository can be run by setting up a [Private App](https://developer.xero.com/documentation/auth-and-limits/private-applications).  You can create a Private App in the [developer portal](https://developer.xero.com/myapps/), it's suggested that you create it against the [Demo Company (AU)](https://developer.xero.com/documentation/getting-started/development-accounts). Demo Company expires after 28 days, so you will need to reset it and create a new Private App if you Demo Company has expired. Make sure you create the Demo Company in Australia region.
 
 Once you have created your Private App, set these environment variables:
 ```
@@ -704,6 +727,6 @@ rake test
 
 
 ### Contributors
-Xeroizer was inspired by the https://github.com/tlconnor/xero_gateway gem created by Tim Connor 
-and Nik Wakelin and portions of the networking and authentication code are based completely off 
+Xeroizer was inspired by the https://github.com/tlconnor/xero_gateway gem created by Tim Connor
+and Nik Wakelin and portions of the networking and authentication code are based completely off
 this project. Copyright for these components remains held in the name of Tim Connor.

data/lib/xeroizer.rb

@@ -56,6 +56,7 @@ require 'xeroizer/models/manual_journal_line'
 require 'xeroizer/models/option'
 require 'xeroizer/models/organisation'
 require 'xeroizer/models/payment'
+require 'xeroizer/models/payment_service'
 require 'xeroizer/models/prepayment'
 require 'xeroizer/models/overpayment'
 require 'xeroizer/models/phone'

data/lib/xeroizer/generic_application.rb

@@ -32,6 +32,7 @@ module Xeroizer
     record :ManualJournal
     record :Organisation
     record :Payment
+    record :PaymentService
     record :Prepayment
     record :Overpayment
     record :PurchaseOrder
@@ -80,6 +81,6 @@ module Xeroizer
         xero_client.xero_url = options[:xero_url] || "https://api.xero.com/payroll.xro/1.0"
         @payroll ||= PayrollApplication.new(xero_client)
       end
-          
+
   end
 end

data/lib/xeroizer/http.rb

@@ -112,6 +112,8 @@ module Xeroizer
         case response.code.to_i
           when 200
             response.plain_body
+          when 204
+            nil
           when 400
             handle_error!(response, body)
           when 401

data/lib/xeroizer/models/bank_account.rb

@@ -7,6 +7,7 @@ module Xeroizer
     class BankAccount < Base
       guid   :account_id
       string :code
+      string :name
     end
   end
 end

data/lib/xeroizer/models/branding_theme.rb

@@ -1,22 +1,62 @@
+require "xeroizer/models/payment_service"
+
 module Xeroizer
   module Record
-    
+
     class BrandingThemeModel < BaseModel
-    
-      set_permissions :read
-    
+
+      set_permissions :read, :write
+
+      public
+
+      def payment_services(id)
+        @payment_services ||= @application.http_get(@application.client, payment_services_endpoint(id))
+      end
+
+      def add_payment_service(id:, payment_service_id:)
+        xml = {
+          PaymentService: {
+            PaymentServiceID: payment_service_id
+          }
+        }.to_xml
+
+        @application.http_post(@application.client, payment_services_endpoint(id), xml)
+      end
+
+      private
+
+      def payment_services_endpoint(id)
+        "#{url}/#{id}/PaymentServices"
+      end
+
     end
-    
+
     class BrandingTheme < Base
-      
+
       set_primary_key :branding_theme_id
-      
+
       guid      :branding_theme_id
       string    :name
       integer   :sort_order
       datetime_utc  :created_date_utc, :api_name => 'CreatedDateUTC'
 
+      # Unfortunately, this part of the API does not work the same as the rest.
+      # You cannot POST child records to Branding Themes.
+      #
+      # The endpoints are:
+      # GET /BrandingThemes/{BrandingThemeID}/PaymentServices
+      # POST /BrandingThemes/{BrandingThemeID}/PaymentServices
+      #
+      # has_one :payment_service, :model_name => 'PaymentService', :list_complete => true
+
+      def payment_services
+        parent.payment_services(id)
+      end
+
+      def add_payment_service(payment_service_id)
+        parent.add_payment_service(id: id, payment_service_id: payment_service_id)
+      end
     end
-    
+
   end
-end
+end

data/lib/xeroizer/models/credit_note.rb

@@ -66,6 +66,7 @@ module Xeroizer
       datetime      :fully_paid_on_date
       boolean       :sent_to_contact
       decimal       :remaining_credit
+      decimal       :applied_amount
       boolean       :has_attachments
 
       belongs_to    :contact
@@ -100,7 +101,7 @@ module Xeroizer
         # Calculate sub_total from line_items.
         def sub_total(always_summary = false)
           if !always_summary && (new_record? || (!new_record? && line_items && line_items.size > 0))
-            overall_sum = (line_items || []).inject(BigDecimal.new('0')) { | sum, line_item | sum + line_item.line_amount }
+            overall_sum = (line_items || []).inject(BigDecimal('0')) { | sum, line_item | sum + line_item.line_amount }
             
             # If the default amount types are inclusive of 'tax' then remove the tax amount from this sub-total.
             overall_sum -= total_tax if line_amount_types == 'Inclusive' 
@@ -113,7 +114,7 @@ module Xeroizer
         # Calculate total_tax from line_items.
         def total_tax(always_summary = false)
           if !always_summary && (new_record? || (!new_record? && line_items && line_items.size > 0))
-            (line_items || []).inject(BigDecimal.new('0')) { | sum, line_item | sum + line_item.tax_amount }
+            (line_items || []).inject(BigDecimal('0')) { | sum, line_item | sum + line_item.tax_amount }
           else
             attributes[:total_tax]
           end

data/lib/xeroizer/models/from_bank_account.rb

@@ -7,6 +7,7 @@ module Xeroizer
     class FromBankAccount < Base
       guid   :account_id
       string :code
+      string :name
     end
   end
 end

data/lib/xeroizer/models/invoice.rb

@@ -89,6 +89,7 @@ module Xeroizer
       has_many     :line_items, :complete_on_page => true
       has_many     :payments
       has_many     :credit_notes
+      has_many     :prepayments
 
       validates_presence_of :date, :due_date, :unless => :new_record?
       validates_inclusion_of :type, :in => INVOICE_TYPES
@@ -151,7 +152,7 @@ module Xeroizer
         # Calculate sub_total from line_items.
         def sub_total(always_summary = false)
           if !@sub_total_is_set && not_summary_or_loaded_record(always_summary)
-            overall_sum = (line_items || []).inject(BigDecimal.new('0')) { | sum, line_item | sum + line_item.line_amount }
+            overall_sum = (line_items || []).inject(BigDecimal('0')) { | sum, line_item | sum + line_item.line_amount }
 
             # If the default amount types are inclusive of 'tax' then remove the tax amount from this sub-total.
             overall_sum -= total_tax if line_amount_types == 'Inclusive'
@@ -164,7 +165,7 @@ module Xeroizer
         # Calculate total_tax from line_items.
         def total_tax(always_summary = false)
           if !@total_tax_is_set && not_summary_or_loaded_record(always_summary)
-            (line_items || []).inject(BigDecimal.new('0')) { | sum, line_item | sum + line_item.tax_amount }
+            (line_items || []).inject(BigDecimal('0')) { | sum, line_item | sum + line_item.tax_amount }
           else
             attributes[:total_tax]
           end
@@ -209,6 +210,12 @@ module Xeroizer
           change_status!('AUTHORISED')
         end
 
+        # Send an email containing the invoice.
+        def email
+          email_url = "#{parent.url}/#{CGI.escape(id)}/Email"
+          parent.application.http_post(parent.application.client, email_url, "")
+        end
+
       protected
 
         def change_status!(new_status)

data/lib/xeroizer/models/line_item.rb

@@ -39,7 +39,7 @@ module Xeroizer
         return attributes[:line_amount] if summary_only || @line_amount_set
 
         if quantity && unit_amount
-          total = quantity * unit_amount
+          total = coerce_numeric(quantity) * coerce_numeric(unit_amount)
           if discount_rate
             BigDecimal((total * ((100 - discount_rate) / 100)).to_s).round(2)
           else
@@ -48,7 +48,14 @@ module Xeroizer
         end
       end
 
+      private
+
+      def coerce_numeric(number)
+        return number if number.is_a? Numeric
+        BigDecimal(number)
+      end
+
     end
-    
+
   end
 end

data/lib/xeroizer/models/organisation.rb

@@ -1,3 +1,4 @@
+require "xeroizer/models/payment_terms"
 module Xeroizer
   module Record
     
@@ -62,6 +63,7 @@ module Xeroizer
       has_many :addresses
       has_many :phones
       has_many :external_links
+      has_one :payment_terms, :model_name => 'PaymentTerms'
 
       validates :sales_tax_basis, :message => "is not a valid option" do
         valid = true

data/lib/xeroizer/models/payment_service.rb

@@ -0,0 +1,22 @@
+module Xeroizer
+  module Record
+
+    class PaymentServiceModel < BaseModel
+
+      set_permissions :read, :write, :update
+
+    end
+
+    class PaymentService < Base
+
+      set_primary_key :payment_service_id
+
+      guid :payment_service_id
+      string :payment_service_name
+      string :payment_service_url
+      string :payment_service_type
+      string :pay_now_text
+
+    end
+  end
+end

data/lib/xeroizer/models/prepayment.rb

@@ -25,6 +25,7 @@ module Xeroizer
       string        :reference
       decimal       :currency_rate
       decimal       :remaining_credit
+      decimal       :applied_amount
       boolean       :has_attachments
 
       belongs_to    :contact

data/lib/xeroizer/models/purchase_order.rb

@@ -30,15 +30,15 @@ module Xeroizer
       boolean :is_discounted 
       string  :reference
       string  :type
-      string  :currency_rate
+      decimal  :currency_rate
       string  :currency_code
-      guid  :branding_theme_id 
+      guid    :branding_theme_id 
       string  :status 
       string  :line_amount_types
-      string  :sub_total
-      string  :total_tax
-      string  :total 
-      date    :updated_date_UTC
+      decimal  :sub_total
+      decimal  :total_tax
+      decimal  :total 
+      datetime_utc :updated_date_utc, :api_name => 'UpdatedDateUTC'
       boolean :has_attachments
 
       has_many     :line_items

data/lib/xeroizer/models/schedule.rb

@@ -10,6 +10,7 @@ module Xeroizer
       UNIT = {
         'WEEKLY'  => 'Weekly',
         'MONTHLY' => 'Monthly',
+        'YEARLY'  => 'Yearly',
       } unless defined?(UNIT)
 
       PAYMENT_TERM = {

data/lib/xeroizer/models/to_bank_account.rb

@@ -7,6 +7,7 @@ module Xeroizer
     class ToBankAccount < Base
       guid   :account_id
       string :code
+      string :name
     end
   end
 end

data/lib/xeroizer/record/base.rb

@@ -30,7 +30,7 @@ module Xeroizer
         def build(attributes, parent)
           record = new(parent)
           attributes.each do | key, value |
-            attr = record.respond_to?("#{key}=") ? key : record.class.fields[key][:internal_name]
+            attr = record.respond_to?("#{key}=") || record.class.fields[key].nil? ? key : record.class.fields[key][:internal_name]
             record.send("#{attr}=", value)
           end
           record

data/lib/xeroizer/record/base_model_http_proxy.rb

@@ -33,6 +33,9 @@ module Xeroizer
                                 end
             end
             params[:offset] = options[:offset] if options[:offset]
+            params[:Status] = options[:status] if options[:status]
+            params[:DateFrom] = options[:date_from] if options[:date_from]
+            params[:DateTo] = options[:date_to] if options[:date_to]
             params[:page] = options[:page] if options[:page]
             params
           end

data/lib/xeroizer/record/model_definition_helper.rb

@@ -68,7 +68,7 @@ module Xeroizer
             :type           => field_type
           })
           define_method internal_field_name do 
-            @attributes[field_name] || value_if_nil
+            @attributes[field_name].nil? ? value_if_nil : @attributes[field_name]
           end
           
           unless options[:skip_writer]

data/lib/xeroizer/record/xml_helper.rb

@@ -22,7 +22,7 @@ module Xeroizer
                 when :string      then element.text
                 when :boolean     then (element.text == 'true')
                 when :integer     then element.text.to_i
-                when :decimal     then BigDecimal.new(element.text)
+                when :decimal     then BigDecimal(element.text)
                 when :date        then Date.parse(element.text)
                 when :datetime    then Time.parse(element.text)
                 when :datetime_utc then ActiveSupport::TimeZone['UTC'].parse(element.text).utc
@@ -98,7 +98,7 @@ module Xeroizer
               when :decimal   
                 real_value = case value
                   when BigDecimal   then value.to_s
-                  when String       then BigDecimal.new(value).to_s
+                  when String       then BigDecimal(value).to_s
                   else              value
                 end
                 b.tag!(field[:api_name], real_value)

data/lib/xeroizer/report/aged_receivables_by_contact.rb

@@ -31,7 +31,7 @@ module Xeroizer
         end
 
         def sum(column_name, &block)
-          sections.first.rows.inject(BigDecimal.new('0')) do | sum, row |
+          sections.first.rows.inject(BigDecimal('0')) do | sum, row |
             sum += row.cell(column_name).value if row.class == Xeroizer::Report::Row && (block.nil? || block.call(row))
             sum
           end

data/lib/xeroizer/report/cell_xml_helper.rb

@@ -47,7 +47,7 @@ module Xeroizer
 
           def parse_value(value)
             case value
-              when /^[-]?\d+(\.\d+)?$/                      then BigDecimal.new(value)
+              when /^[-]?\d+(\.\d+)?$/                      then BigDecimal(value)
               when /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}$/  then Time.xmlschema(value)
               else                                          value
             end

data/lib/xeroizer/version.rb

@@ -1,3 +1,3 @@
 module Xeroizer
-  VERSION = "2.18.1".freeze
+  VERSION = "2.19.0".freeze
 end

data/test/acceptance/about_fetching_bank_transactions_test.rb

@@ -18,7 +18,7 @@ class AboutFetchingBankTransactions < Test::Unit::TestCase
       keys = [:line_amount_types, :contact, :date, :status, :line_items,
               :updated_date_utc, :currency_code, :bank_transaction_id,
               :bank_account, :type, :reference, :is_reconciled, :currency_rate]
-      assert_equal(@a_new_bank_transaction.attributes.keys, keys)
+      assert_equal(keys, @a_new_bank_transaction.attributes.keys)
     end
 
     it "returns full line item details" do
@@ -38,7 +38,7 @@ class AboutFetchingBankTransactions < Test::Unit::TestCase
       keys = [:line_amount_types, :contact, :date, :status, :updated_date_utc, 
               :currency_code, :bank_transaction_id, :bank_account, :type, :reference, 
               :is_reconciled]
-      assert_equal(@the_first_bank_transaction.attributes.keys, keys)
+      assert_equal(keys, @the_first_bank_transaction.attributes.keys)
     end
 
     it "returns contact" do

data/test/stub_responses/organisations.xml

@@ -20,6 +20,16 @@
       <FinancialYearEndMonth>6</FinancialYearEndMonth>
       <PeriodLockDate>2008-06-30T00:00:00</PeriodLockDate>
       <CreatedDateUTC>2011-05-19T05:26:03.95</CreatedDateUTC>
+      <PaymentTerms>
+        <Bills>
+          <Day>4</Day>
+          <Type>OFFOLLOWINGMONTH</Type>
+        </Bills>
+        <Sales>
+          <Day>2</Day>
+          <Type>OFFOLLOWINGMONTH</Type>
+        </Sales>
+       </PaymentTerms>
     </Organisation>
   </Organisations>
 </Response>

data/test/stub_responses/payment_service.xml

@@ -0,0 +1,15 @@
+<Response xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Id>42d8b00c-2fdd-4a8a-9b84-82cfe78ff34a</Id>
+  <Status>OK</Status>
+  <ProviderName>Test Provider Name</ProviderName>
+  <DateTimeUTC>2018-06-18T04:13:44.7828584Z</DateTimeUTC>
+  <PaymentServices>
+    <PaymentService>
+      <PaymentServiceID>4d7f4335-6f16-437a-86e3-a856ebc576b8</PaymentServiceID>
+      <PaymentServiceName>Custom Service</PaymentServiceName>
+      <PaymentServiceType>Custom</PaymentServiceType>
+      <PaymentServiceUrl>http://example.com</PaymentServiceUrl>
+      <PayNowText>Pay Me</PayNowText>
+    </PaymentService>
+  </PaymentServices>
+</Response>

data/test/unit/http_test.rb

@@ -3,12 +3,12 @@ require 'test_helper'
 class HttpTest < Test::Unit::TestCase
   include TestHelper
 
-  def setup
-    @headers = {"User-Agent" => "Xeroizer/2.15.5"}
-    @application = Xeroizer::PublicApplication.new(CONSUMER_KEY, CONSUMER_SECRET, :default_headers => @headers)
-  end
-
   context "default_headers" do
+    setup do
+      @headers = { "User-Agent" => "Xeroizer/2.15.5" }
+      @application = Xeroizer::PublicApplication.new(CONSUMER_KEY, CONSUMER_SECRET, :default_headers => @headers)
+    end
+
     should "recognize default_headers" do
       Xeroizer::OAuth.any_instance.expects(:get).with("/test", has_entry(@headers)).returns(stub(:plain_body => "", :code => "200"))
       @application.http_get(@application.client, "http://example.com/test")

data/test/unit/models/line_item_test.rb

@@ -75,4 +75,12 @@ class LineItemTest < Test::Unit::TestCase
     assert_equal "0.0", line_item.line_amount.to_s,
       "expected line amount to be zero when unit_amount is zero"
   end
+
+  it "coerces decimals when calculating line amount" do
+    line_item = LineItem.new(nil)
+    line_item.quantity = "1"
+    line_item.unit_amount = 50
+    assert_equal 50, line_item.line_amount,
+      "expected line amount to be calculated from coerced values"
+  end
 end

data/test/unit/models/organisation_test.rb

@@ -35,4 +35,18 @@ class OrganisationTest < Test::Unit::TestCase
     end
   end
 
+  context "parse response" do
+    it "includes payment_terms" do
+      @instance = Xeroizer::Record::OrganisationModel.new(nil, "Organisation")
+      some_xml = get_record_xml("organisations")
+
+      result = @instance.parse_response(some_xml)
+      organisation = result.response_items.first
+
+      assert_equal(organisation.payment_terms.bills.day, "4")
+      assert_equal(organisation.payment_terms.bills.type, "OFFOLLOWINGMONTH")
+      assert_equal(organisation.payment_terms.sales.day, "2")
+      assert_equal(organisation.payment_terms.sales.type, "OFFOLLOWINGMONTH")
+    end
+  end
 end

data/test/unit/models/payment_service_test.rb

@@ -0,0 +1,29 @@
+require 'test_helper'
+
+class PaymentServiceTest < Test::Unit::TestCase
+  include TestHelper
+
+  def setup
+    @client = Xeroizer::PublicApplication.new(CONSUMER_KEY, CONSUMER_SECRET)
+  end
+
+  context "response parsing" do
+    it "parses default attributes" do
+      @instance = Xeroizer::Record::PaymentServiceModel.new(nil, "PaymentService")
+
+      some_xml = get_record_xml("payment_service")
+
+      result = @instance.parse_response(some_xml)
+      payment_service = result.response_items.first
+
+      keys = [:payment_service_id,
+              :payment_service_name,
+              :payment_service_type,
+              :payment_service_url,
+              :pay_now_text
+      ]
+
+      assert_equal(payment_service.attributes.keys, keys)
+    end
+  end
+end

data/test/unit/models/repeating_invoice_test.rb

@@ -18,7 +18,7 @@ class RepeatingInvoiceTest < Test::Unit::TestCase
       repeating_invoice = repeating_invoices.first
 
       assert_equal "PowerDirect", repeating_invoice.contact_name
-      assert_equal BigDecimal.new(90), repeating_invoice.total
+      assert_equal BigDecimal(90), repeating_invoice.total
       assert_equal true, repeating_invoice.accounts_payable?
 
       schedule = repeating_invoice.schedule

data/test/unit/record/base_test.rb

@@ -104,6 +104,16 @@ class RecordBaseTest < Test::Unit::TestCase
     end
   end
 
+  context 'build' do
+
+    should "raise an undefined method error with useful message" do
+      assert_raise_message("undefined method `this_method_does_not_exist=' for #<Xeroizer::Record::Contact >") do
+        @client.Contact.build(:this_method_does_not_exist =>  true)
+      end
+    end
+
+  end
+
   context 'saving' do
     context 'invalid record' do
       setup do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xeroizer
 version: !ruby/object:Gem::Version
-  version: 2.18.1
+  version: 2.19.0
 platform: ruby
 authors:
 - Wayne Robinson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-07 00:00:00.000000000 Z
+date: 2019-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,20 +80,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rest-client
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: turn
   requirement: !ruby/object:Gem::Requirement
@@ -297,6 +283,7 @@ files:
 - lib/xeroizer/models/organisation.rb
 - lib/xeroizer/models/overpayment.rb
 - lib/xeroizer/models/payment.rb
+- lib/xeroizer/models/payment_service.rb
 - lib/xeroizer/models/payment_terms.rb
 - lib/xeroizer/models/payroll/bank_account.rb
 - lib/xeroizer/models/payroll/employee.rb
@@ -382,6 +369,7 @@ files:
 - test/stub_responses/nonce_used
 - test/stub_responses/organisation.xml
 - test/stub_responses/organisations.xml
+- test/stub_responses/payment_service.xml
 - test/stub_responses/payments.xml
 - test/stub_responses/prepayments.xml
 - test/stub_responses/rate_limit_exceeded
@@ -611,6 +599,7 @@ files:
 - test/unit/models/line_item_test.rb
 - test/unit/models/manual_journal_test.rb
 - test/unit/models/organisation_test.rb
+- test/unit/models/payment_service_test.rb
 - test/unit/models/phone_test.rb
 - test/unit/models/prepayment_test.rb
 - test/unit/models/repeating_invoice_test.rb
@@ -654,7 +643,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby Library for Xero accounting API
@@ -693,6 +682,7 @@ test_files:
 - test/stub_responses/nonce_used
 - test/stub_responses/organisation.xml
 - test/stub_responses/organisations.xml
+- test/stub_responses/payment_service.xml
 - test/stub_responses/payments.xml
 - test/stub_responses/prepayments.xml
 - test/stub_responses/rate_limit_exceeded
@@ -922,6 +912,7 @@ test_files:
 - test/unit/models/line_item_test.rb
 - test/unit/models/manual_journal_test.rb
 - test/unit/models/organisation_test.rb
+- test/unit/models/payment_service_test.rb
 - test/unit/models/phone_test.rb
 - test/unit/models/prepayment_test.rb
 - test/unit/models/repeating_invoice_test.rb