Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Avoid returning the same InvoiceID (a.o.) for all payments from get_payments #151

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Avoid returning the same InvoiceID (a.o.) for all payments from get_payments #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
064bfcd
Avoid returning the same InvoiceID (a.o.) for all payments from get_p…
jomz Dec 4, 2019
7a62bda
Add a Payment w/o InvoiceNumber to payments stub
jomz Dec 23, 2019
bb5a510
Do not assume that all results from get_payments have a Invoice.Invoi…
jomz Dec 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/xero_gateway/payment.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ def self.from_xml(payment_element)
when 'Reference' then payment.reference = element.text
when 'CurrencyRate' then payment.currency_rate = BigDecimal(element.text)
when 'Invoice'
payment.invoice_id = element.elements["//InvoiceID"].text
payment.invoice_number = element.elements["//InvoiceNumber"].text
payment.invoice_id = element.elements["InvoiceID"].text
payment.invoice_number = element.elements["InvoiceNumber"].try(:text)
when 'IsReconciled' then payment.reconciled = (element.text == "true")
when 'Account' then payment.account_id = element.elements["//AccountID"].text
when 'Account' then payment.account_id = element.elements["AccountID"].text
end
end
payment
Expand Down
7 changes: 7 additions & 0 deletions test/integration/get_payments_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,13 @@ def test_get_payments
assert_kind_of(XeroGateway::Payment, payment.first)
end

def test_get_payments_gets_actual_invoice_ids
result = @gateway.get_payments
assert_not_equal result.payments[0].invoice_id, result.payments[1].invoice_id
# assert_equal result.payments[0].invoice_id, 'b0875d8b-ff26-4ce8-8aea-6955492ead48'
# assert_equal result.payments[1].invoice_id, '33c8d757-2db0-48a2-8daa-f54768fabeb1'
end

def test_get_payments_modified_since_date
# Create a test payment
@gateway.create_payment(create_test_payment)
Expand Down
22 changes: 22 additions & 0 deletions test/stub_responses/payments.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,5 +52,27 @@
<InvoiceNumber>RPT469-1</InvoiceNumber>
</Invoice>
</Payment>
<Payment>
<PaymentID>d3b72ed1-4269-40a4-b0de-4be6fb3586c5</PaymentID>
<Date>2019-12-29T00:00:00</Date>
<Amount>142.00</Amount>
<CurrencyRate>1.000000</CurrencyRate>
<PaymentType>ACCPAYPAYMENT</PaymentType>
<Status>AUTHORISED</Status>
<UpdatedDateUTC>2019-12-02T10:48:51.15</UpdatedDateUTC>
<Account>
<AccountID>ac993f75-035b-433c-82e0-7b7a2d40802c</AccountID>
<Code>090</Code>
</Account>
<Invoice>
<Contact>
<ContactID>16b4cdc2-b36a-4b25-b9c8-7a50c17b10ba</ContactID>
<Name>Truxton Property Management</Name>
</Contact>
<CurrencyCode>NZD</CurrencyCode>
<Type>ACCPAY</Type>
<InvoiceID>c475f4c3-2b8b-4d44-b4fc-cbe7ee6fa9dd</InvoiceID>
</Invoice>
</Payment>
</Payments>
</Response>