From d92004cbe009fca29363cf2709ed494f45f753d9 Mon Sep 17 00:00:00 2001 From: Maciej Szlosarczyk Date: Mon, 30 Apr 2018 09:30:34 +0300 Subject: [PATCH] Rename Payments to PaymentOrders --- app/controllers/registrar/payments_controller.rb | 8 ++++---- app/models/{payments.rb => payment_orders.rb} | 2 +- app/models/{payments => payment_orders}/bank_link.rb | 2 +- app/models/{payments => payment_orders}/base.rb | 2 +- app/models/{payments => payment_orders}/every_pay.rb | 2 +- app/views/registrar/invoices/show.haml | 2 +- .../{payments => payment_orders}/bank_link_test.rb | 6 +++--- .../{payments => payment_orders}/every_pay_test.rb | 6 +++--- .../{payments_test.rb => payment_orders_test.rb} | 10 +++++----- 9 files changed, 20 insertions(+), 20 deletions(-) rename app/models/{payments.rb => payment_orders.rb} (96%) rename app/models/{payments => payment_orders}/bank_link.rb (99%) rename app/models/{payments => payment_orders}/base.rb (97%) rename app/models/{payments => payment_orders}/every_pay.rb (99%) rename test/models/{payments => payment_orders}/bank_link_test.rb (95%) rename test/models/{payments => payment_orders}/every_pay_test.rb (94%) rename test/models/{payments_test.rb => payment_orders_test.rb} (80%) diff --git a/app/controllers/registrar/payments_controller.rb b/app/controllers/registrar/payments_controller.rb index fbefaf50d..57565b9c2 100644 --- a/app/controllers/registrar/payments_controller.rb +++ b/app/controllers/registrar/payments_controller.rb @@ -17,14 +17,14 @@ class Registrar bank, invoice_id: invoice ) } - @payment = ::Payments.create_with_type(bank, invoice, opts) + @payment = ::PaymentOrders.create_with_type(bank, invoice, opts) @payment.create_transaction end def back invoice = Invoice.find(params[:invoice_id]) 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? @payment.complete_transaction @@ -42,7 +42,7 @@ class Registrar def callback invoice = Invoice.find(params[:invoice_id]) 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? @payment.complete_transaction @@ -60,7 +60,7 @@ class Registrar def supported_payment_method? - Payments::PAYMENT_METHODS.include?(params[:bank]) + PaymentOrders::PAYMENT_METHODS.include?(params[:bank]) end end end diff --git a/app/models/payments.rb b/app/models/payment_orders.rb similarity index 96% rename from app/models/payments.rb rename to app/models/payment_orders.rb index e84e44de9..921af0cd4 100644 --- a/app/models/payments.rb +++ b/app/models/payment_orders.rb @@ -1,4 +1,4 @@ -module Payments +module PaymentOrders PAYMENT_INTERMEDIARIES = ENV['payments_intermediaries'].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 diff --git a/app/models/payments/bank_link.rb b/app/models/payment_orders/bank_link.rb similarity index 99% rename from app/models/payments/bank_link.rb rename to app/models/payment_orders/bank_link.rb index 59a97e454..e568da0df 100644 --- a/app/models/payments/bank_link.rb +++ b/app/models/payment_orders/bank_link.rb @@ -1,4 +1,4 @@ -module Payments +module PaymentOrders class BankLink < Base BANK_LINK_VERSION = '008' diff --git a/app/models/payments/base.rb b/app/models/payment_orders/base.rb similarity index 97% rename from app/models/payments/base.rb rename to app/models/payment_orders/base.rb index d8b94e03d..cf0293025 100644 --- a/app/models/payments/base.rb +++ b/app/models/payment_orders/base.rb @@ -1,4 +1,4 @@ -module Payments +module PaymentOrders class Base include ActionView::Helpers::NumberHelper diff --git a/app/models/payments/every_pay.rb b/app/models/payment_orders/every_pay.rb similarity index 99% rename from app/models/payments/every_pay.rb rename to app/models/payment_orders/every_pay.rb index 054baf023..b4ddcdf29 100644 --- a/app/models/payments/every_pay.rb +++ b/app/models/payment_orders/every_pay.rb @@ -1,4 +1,4 @@ -module Payments +module PaymentOrders class EveryPay < Base USER = ENV['payments_every_pay_api_user'].freeze KEY = ENV['payments_every_pay_api_key'].freeze diff --git a/app/views/registrar/invoices/show.haml b/app/views/registrar/invoices/show.haml index c52d76289..c2c5331c2 100644 --- a/app/views/registrar/invoices/show.haml +++ b/app/views/registrar/invoices/show.haml @@ -17,4 +17,4 @@ - if !@invoice.cancelled? && !@invoice.binded? .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 } diff --git a/test/models/payments/bank_link_test.rb b/test/models/payment_orders/bank_link_test.rb similarity index 95% rename from test/models/payments/bank_link_test.rb rename to test/models/payment_orders/bank_link_test.rb index 6c2a86b80..16f790d13 100644 --- a/test/models/payments/bank_link_test.rb +++ b/test/models/payment_orders/bank_link_test.rb @@ -47,7 +47,7 @@ class BankLinkTest < ActiveSupport::TestCase 'VK_LANG': 'ENG' }.with_indifferent_access - @completed_bank_link = Payments::BankLink.new( + @completed_bank_link = PaymentOrders::BankLink.new( 'seb', @invoice, { response: params } ) end @@ -66,14 +66,14 @@ class BankLinkTest < ActiveSupport::TestCase 'VK_LANG': 'ENG' }.with_indifferent_access - @cancelled_bank_link = Payments::BankLink.new( + @cancelled_bank_link = PaymentOrders::BankLink.new( 'seb', @invoice, { response: params } ) end def create_new_bank_link 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 def test_response_is_not_valid_when_it_is_missing diff --git a/test/models/payments/every_pay_test.rb b/test/models/payment_orders/every_pay_test.rb similarity index 94% rename from test/models/payments/every_pay_test.rb rename to test/models/payment_orders/every_pay_test.rb index 5e09f2980..2be3401dc 100644 --- a/test/models/payments/every_pay_test.rb +++ b/test/models/payment_orders/every_pay_test.rb @@ -35,8 +35,8 @@ class EveryPayTest < ActiveSupport::TestCase invoice_id: '1', }, } - @every_pay = Payments::EveryPay.new('every_pay', @invoice, params) - @other_pay = Payments::EveryPay.new('every_pay', @invoice, {}) + @every_pay = PaymentOrders::EveryPay.new('every_pay', @invoice, params) + @other_pay = PaymentOrders::EveryPay.new('every_pay', @invoice, {}) travel_to Time.zone.parse('2018-04-01 00:30:00 +0000') end @@ -69,7 +69,7 @@ class EveryPayTest < ActiveSupport::TestCase def test_settled_payment? assert(@every_pay.settled_payment?) - other_pay = Payments::EveryPay.new( + other_pay = PaymentOrders::EveryPay.new( 'every_pay', @invoice, {response: {payment_state: 'CANCELLED'}} ) refute(other_pay.settled_payment?) diff --git a/test/models/payments_test.rb b/test/models/payment_orders_test.rb similarity index 80% rename from test/models/payments_test.rb rename to test/models/payment_orders_test.rb index 2579af20b..252ba0582 100644 --- a/test/models/payments_test.rb +++ b/test/models/payment_orders_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class PaymentTest < ActiveSupport::TestCase +class PaymentOrdersTest < ActiveSupport::TestCase def setup super @@ -8,7 +8,7 @@ class PaymentTest < ActiveSupport::TestCase @original_seb_URL = ENV['seb_payment_url'] ENV['payment_methods'] = 'seb, swed, credit_card' ENV['seb_payment_url'] = nil - @not_implemented_payment = Payments::Base.new( + @not_implemented_payment = PaymentOrders::Base.new( 'not_implemented', Invoice.new ) end @@ -47,12 +47,12 @@ class PaymentTest < ActiveSupport::TestCase def test_that_create_with_type_raises_argument_error assert_raise ArgumentError do - Payments.create_with_type("not_implemented", Invoice.new) + PaymentOrders.create_with_type("not_implemented", Invoice.new) end end def test_create_with_correct_subclass - payment = Payments.create_with_type('seb', Invoice.new) - assert_equal Payments::BankLink, payment.class + payment = PaymentOrders.create_with_type('seb', Invoice.new) + assert_equal PaymentOrders::BankLink, payment.class end end