Merge branch 'master' of github.com:domify/registry

This commit is contained in:
Priit Tark 2015-06-12 19:37:47 +03:00
commit 301b561ed1
5 changed files with 7 additions and 6 deletions

View file

@ -75,7 +75,7 @@ class BankTransaction < ActiveRecord::Base
create_account_activity( create_account_activity(
account: registrar.cash_account, account: registrar.cash_account,
invoice: invoice, invoice: invoice,
sum: sum, sum: invoice.sum_without_vat,
currency: currency, currency: currency,
description: description description: description
) )

View file

@ -1,6 +1,4 @@
TEST_EMAILS = %w( TEST_EMAILS = %w(
martin@gitlab.eu
priit@gitlab.eu
timo.vohmar@internet.ee timo.vohmar@internet.ee
rene.vahtel@internet.ee rene.vahtel@internet.ee
martin.mettig@internet.ee martin.mettig@internet.ee
@ -9,6 +7,9 @@ TEST_EMAILS = %w(
norman.aeg@internet.ee norman.aeg@internet.ee
martti.oigus@internet.ee martti.oigus@internet.ee
jana.jarve@internet.ee jana.jarve@internet.ee
martin@gitlab.eu
priit@gitlab.eu
info@gitlab.eu
test@example.com test@example.com
test@example.org test@example.org
) )

View file

@ -1,7 +1,7 @@
# REPP integration specification # REPP integration specification
REPP uses currently Basic Authentication (http://tools.ietf.org/html/rfc2617#section-2) with ssl certificate and key. REPP uses currently Basic Authentication (http://tools.ietf.org/html/rfc2617#section-2) with ssl certificate and key.
Credentials and certificate are issued by EIS (in an exchange for desired API username, CSR (where CN must match username) and IP). Credentials and certificate are issued by EIS (in an exchange for desired API username, CSR and IP).
To quickly test the API, use curl: To quickly test the API, use curl:

View file

@ -63,7 +63,7 @@ describe BankStatement do
AccountActivity.count.should == 1 AccountActivity.count.should == 1
r.cash_account.balance.should == 240.0 r.cash_account.balance.should == 200.0
bs.bank_transactions.unbinded.count.should == 1 bs.bank_transactions.unbinded.count.should == 1
bs.partially_binded?.should == true bs.partially_binded?.should == true

View file

@ -45,7 +45,7 @@ describe BankTransaction do
bt.bind_invoice(invoice.number) bt.bind_invoice(invoice.number)
invoice.receipt_date.should_not be_blank invoice.receipt_date.should_not be_blank
r.cash_account.balance.should == 240.0 r.cash_account.balance.should == 200.0
end end
it 'should not bind transaction with mismatching sums' do it 'should not bind transaction with mismatching sums' do