zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-08-14 21:43:50 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2443 from internetee/prohibition-bank-transaction-over-paid-invoice

Browse source 
protected public method account activity create
This commit is contained in:
Timo Võhmar 2022-10-03 15:29:29 +03:00 • committed by GitHub
commit 8528a5bab1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/eis_billing/payment_status_controller.rb
View file

@ -10,9 +10,7 @@ module EisBilling
bank = create_bank_transfer(invoice: invoice, sum: params[:standing_amount], paid_at: params[:transaction_time])
create_payment_order(invoice: invoice, everypay_response: params, payment_status: payment_status)
registrar = invoice.buyer
bank.create_activity(registrar, invoice)
bank.bind_invoice(params[:order_reference])
respond_to do |format|
format.json do

15
app/models/bank_transaction.rb
View file

@ -88,7 +88,16 @@ class BankTransaction < ApplicationRecord
errors.add(:base, I18n.t('invoice_and_transaction_sums_do_not_match')) if invoice.total != sum
end
def parsed_ref_number
reference_no || ref_number_from_description
end
private
def create_activity(registrar, invoice)
validate_invoice_data(invoice)
return if errors.any?
activity = AccountActivity.new(account: registrar.cash_account, bank_transaction: self,
invoice: invoice, sum: invoice.subtotal,
currency: currency, description: description,
@ -102,12 +111,6 @@ class BankTransaction < ApplicationRecord
end
end
def parsed_ref_number
reference_no || ref_number_from_description
end
private
def reset_pending_registrar_balance_reload(registrar)
return unless registrar.settings['balance_auto_reload']

3
test/models/bank_transaction_test.rb
View file

@ -37,8 +37,7 @@ class BankTransactionTest < ActiveSupport::TestCase
first_transaction = BankTransaction.new(sum: 10,
description: 'Order nr 1 from registrar 1234567 second number 2345678')
first_transaction.create_activity(another_invoice.buyer, another_invoice)
first_transaction.bind_invoice(another_invoice.number)
transaction = BankTransaction.new(sum: 10,
description: 'Order nr 1 from registrar 1234567 second number 2345678')