mirror of
https://github.com/internetee/registry.git
synced 2025-06-08 21:54:48 +02:00
Rename Payments to PaymentOrders
This commit is contained in:
parent
a1bbdc0d8e
commit
d92004cbe0
9 changed files with 20 additions and 20 deletions
|
@ -17,14 +17,14 @@ class Registrar
|
||||||
bank, invoice_id: invoice
|
bank, invoice_id: invoice
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
@payment = ::Payments.create_with_type(bank, invoice, opts)
|
@payment = ::PaymentOrders.create_with_type(bank, invoice, opts)
|
||||||
@payment.create_transaction
|
@payment.create_transaction
|
||||||
end
|
end
|
||||||
|
|
||||||
def back
|
def back
|
||||||
invoice = Invoice.find(params[:invoice_id])
|
invoice = Invoice.find(params[:invoice_id])
|
||||||
opts = { response: params }
|
opts = { response: params }
|
||||||
@payment = ::Payments.create_with_type(params[:bank], invoice, opts)
|
@payment = ::PaymentOrders.create_with_type(params[:bank], invoice, opts)
|
||||||
if @payment.valid_response_from_intermediary? && @payment.settled_payment?
|
if @payment.valid_response_from_intermediary? && @payment.settled_payment?
|
||||||
@payment.complete_transaction
|
@payment.complete_transaction
|
||||||
|
|
||||||
|
@ -42,7 +42,7 @@ class Registrar
|
||||||
def callback
|
def callback
|
||||||
invoice = Invoice.find(params[:invoice_id])
|
invoice = Invoice.find(params[:invoice_id])
|
||||||
opts = { response: params }
|
opts = { response: params }
|
||||||
@payment = ::Payments.create_with_type(params[:bank], invoice, opts)
|
@payment = ::PaymentOrders.create_with_type(params[:bank], invoice, opts)
|
||||||
|
|
||||||
if @payment.valid_response_from_intermediary? && @payment.settled_payment?
|
if @payment.valid_response_from_intermediary? && @payment.settled_payment?
|
||||||
@payment.complete_transaction
|
@payment.complete_transaction
|
||||||
|
@ -60,7 +60,7 @@ class Registrar
|
||||||
|
|
||||||
|
|
||||||
def supported_payment_method?
|
def supported_payment_method?
|
||||||
Payments::PAYMENT_METHODS.include?(params[:bank])
|
PaymentOrders::PAYMENT_METHODS.include?(params[:bank])
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
module Payments
|
module PaymentOrders
|
||||||
PAYMENT_INTERMEDIARIES = ENV['payments_intermediaries'].to_s.strip.split(', ').freeze
|
PAYMENT_INTERMEDIARIES = ENV['payments_intermediaries'].to_s.strip.split(', ').freeze
|
||||||
PAYMENT_BANKLINK_BANKS = ENV['payments_banks'].to_s.strip.split(', ').freeze
|
PAYMENT_BANKLINK_BANKS = ENV['payments_banks'].to_s.strip.split(', ').freeze
|
||||||
PAYMENT_METHODS = [PAYMENT_INTERMEDIARIES, PAYMENT_BANKLINK_BANKS].flatten.freeze
|
PAYMENT_METHODS = [PAYMENT_INTERMEDIARIES, PAYMENT_BANKLINK_BANKS].flatten.freeze
|
|
@ -1,4 +1,4 @@
|
||||||
module Payments
|
module PaymentOrders
|
||||||
class BankLink < Base
|
class BankLink < Base
|
||||||
BANK_LINK_VERSION = '008'
|
BANK_LINK_VERSION = '008'
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
module Payments
|
module PaymentOrders
|
||||||
class Base
|
class Base
|
||||||
include ActionView::Helpers::NumberHelper
|
include ActionView::Helpers::NumberHelper
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
module Payments
|
module PaymentOrders
|
||||||
class EveryPay < Base
|
class EveryPay < Base
|
||||||
USER = ENV['payments_every_pay_api_user'].freeze
|
USER = ENV['payments_every_pay_api_user'].freeze
|
||||||
KEY = ENV['payments_every_pay_api_key'].freeze
|
KEY = ENV['payments_every_pay_api_key'].freeze
|
|
@ -17,4 +17,4 @@
|
||||||
|
|
||||||
- if !@invoice.cancelled? && !@invoice.binded?
|
- if !@invoice.cancelled? && !@invoice.binded?
|
||||||
.row.semifooter
|
.row.semifooter
|
||||||
.col-md-6-offset-6.text-right= render 'registrar/invoices/partials/banklinks', locals: { payment_channels: Payments::PAYMENT_METHODS }
|
.col-md-6-offset-6.text-right= render 'registrar/invoices/partials/banklinks', locals: { payment_channels: PaymentOrders::PAYMENT_METHODS }
|
||||||
|
|
|
@ -47,7 +47,7 @@ class BankLinkTest < ActiveSupport::TestCase
|
||||||
'VK_LANG': 'ENG'
|
'VK_LANG': 'ENG'
|
||||||
}.with_indifferent_access
|
}.with_indifferent_access
|
||||||
|
|
||||||
@completed_bank_link = Payments::BankLink.new(
|
@completed_bank_link = PaymentOrders::BankLink.new(
|
||||||
'seb', @invoice, { response: params }
|
'seb', @invoice, { response: params }
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
@ -66,14 +66,14 @@ class BankLinkTest < ActiveSupport::TestCase
|
||||||
'VK_LANG': 'ENG'
|
'VK_LANG': 'ENG'
|
||||||
}.with_indifferent_access
|
}.with_indifferent_access
|
||||||
|
|
||||||
@cancelled_bank_link = Payments::BankLink.new(
|
@cancelled_bank_link = PaymentOrders::BankLink.new(
|
||||||
'seb', @invoice, { response: params }
|
'seb', @invoice, { response: params }
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
def create_new_bank_link
|
def create_new_bank_link
|
||||||
params = { return_url: 'return.url', response_url: 'response.url' }
|
params = { return_url: 'return.url', response_url: 'response.url' }
|
||||||
@new_bank_link = Payments::BankLink.new('seb', @invoice, params)
|
@new_bank_link = PaymentOrders::BankLink.new('seb', @invoice, params)
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_response_is_not_valid_when_it_is_missing
|
def test_response_is_not_valid_when_it_is_missing
|
|
@ -35,8 +35,8 @@ class EveryPayTest < ActiveSupport::TestCase
|
||||||
invoice_id: '1',
|
invoice_id: '1',
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
@every_pay = Payments::EveryPay.new('every_pay', @invoice, params)
|
@every_pay = PaymentOrders::EveryPay.new('every_pay', @invoice, params)
|
||||||
@other_pay = Payments::EveryPay.new('every_pay', @invoice, {})
|
@other_pay = PaymentOrders::EveryPay.new('every_pay', @invoice, {})
|
||||||
|
|
||||||
travel_to Time.zone.parse('2018-04-01 00:30:00 +0000')
|
travel_to Time.zone.parse('2018-04-01 00:30:00 +0000')
|
||||||
end
|
end
|
||||||
|
@ -69,7 +69,7 @@ class EveryPayTest < ActiveSupport::TestCase
|
||||||
|
|
||||||
def test_settled_payment?
|
def test_settled_payment?
|
||||||
assert(@every_pay.settled_payment?)
|
assert(@every_pay.settled_payment?)
|
||||||
other_pay = Payments::EveryPay.new(
|
other_pay = PaymentOrders::EveryPay.new(
|
||||||
'every_pay', @invoice, {response: {payment_state: 'CANCELLED'}}
|
'every_pay', @invoice, {response: {payment_state: 'CANCELLED'}}
|
||||||
)
|
)
|
||||||
refute(other_pay.settled_payment?)
|
refute(other_pay.settled_payment?)
|
|
@ -1,6 +1,6 @@
|
||||||
require 'test_helper'
|
require 'test_helper'
|
||||||
|
|
||||||
class PaymentTest < ActiveSupport::TestCase
|
class PaymentOrdersTest < ActiveSupport::TestCase
|
||||||
def setup
|
def setup
|
||||||
super
|
super
|
||||||
|
|
||||||
|
@ -8,7 +8,7 @@ class PaymentTest < ActiveSupport::TestCase
|
||||||
@original_seb_URL = ENV['seb_payment_url']
|
@original_seb_URL = ENV['seb_payment_url']
|
||||||
ENV['payment_methods'] = 'seb, swed, credit_card'
|
ENV['payment_methods'] = 'seb, swed, credit_card'
|
||||||
ENV['seb_payment_url'] = nil
|
ENV['seb_payment_url'] = nil
|
||||||
@not_implemented_payment = Payments::Base.new(
|
@not_implemented_payment = PaymentOrders::Base.new(
|
||||||
'not_implemented', Invoice.new
|
'not_implemented', Invoice.new
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
@ -47,12 +47,12 @@ class PaymentTest < ActiveSupport::TestCase
|
||||||
|
|
||||||
def test_that_create_with_type_raises_argument_error
|
def test_that_create_with_type_raises_argument_error
|
||||||
assert_raise ArgumentError do
|
assert_raise ArgumentError do
|
||||||
Payments.create_with_type("not_implemented", Invoice.new)
|
PaymentOrders.create_with_type("not_implemented", Invoice.new)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_create_with_correct_subclass
|
def test_create_with_correct_subclass
|
||||||
payment = Payments.create_with_type('seb', Invoice.new)
|
payment = PaymentOrders.create_with_type('seb', Invoice.new)
|
||||||
assert_equal Payments::BankLink, payment.class
|
assert_equal PaymentOrders::BankLink, payment.class
|
||||||
end
|
end
|
||||||
end
|
end
|
Loading…
Add table
Add a link
Reference in a new issue