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.

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

Add currency to subscriptions #198

Merged
merged 2 commits into from
Feb 19, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions app/models/solidus_subscriptions/subscription.rb
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ class Subscription < ApplicationRecord
validates :interval_length, numericality: { greater_than: 0 }
validates :payment_method, presence: true, if: -> { payment_source }
validates :payment_source, presence: true, if: -> { payment_method&.source_required? }
validates :currency, inclusion: { in: ::Money::Currency.all.map(&:iso_code) }

accepts_nested_attributes_for :shipping_address
accepts_nested_attributes_for :billing_address
Expand Down
2 changes: 2 additions & 0 deletions config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -114,3 +114,5 @@ en:
exceeded: >
This subscription has exceeded the maximum configured skip
limit. It can no longer be skipped.
currency:
inclusion: "is not a valid currency code"
5 changes: 5 additions & 0 deletions db/migrate/20210205140422_add_currency_to_subscription.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
class AddCurrencyToSubscription < ActiveRecord::Migration[5.2]
def change
add_column :solidus_subscriptions_subscriptions, :currency, :string
end
end
3 changes: 2 additions & 1 deletion lib/solidus_subscriptions/checkout.rb
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ def create_order
email: installment.subscription.user.email,
store: installment.subscription.store || ::Spree::Store.default,
subscription_order: true,
subscription: installment.subscription
subscription: installment.subscription,
currency: installment.subscription.currency
)
end

Expand Down
1 change: 1 addition & 0 deletions lib/solidus_subscriptions/subscription_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ def activate(subscription_line_items)
billing_address: order.bill_address,
payment_source: order.payments.valid.last&.payment_source,
payment_method: order.payments.valid.last&.payment_method,
currency: order.currency,
luca-landa marked this conversation as resolved.
Show resolved Hide resolved
**configuration.to_h
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
store
interval_length { 1 }
interval_units { :month }
currency { 'USD' }

user do
new_user = create(:user, :subscription_user)
Expand Down
1 change: 1 addition & 0 deletions spec/lib/solidus_subscriptions/checkout_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
expect(order.bill_address.value_attributes).to eq(subscription.billing_address_to_use.value_attributes)
expect(order.payments.first.payment_method).to eq(subscription.payment_method_to_use)
expect(order.payments.first.source).to eq(subscription.payment_source_to_use)
expect(order.currency).to eq(subscription.currency)
expect(order.user).to eq(subscription.user)
expect(order.email).to eq(subscription.user.email)
end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
interval_units: subscription_line_item.interval_units,
end_date: subscription_line_item.end_date,
store: subscription_line_item.order.store,
currency: subscription_line_item.order.currency
)
end

Expand Down
7 changes: 6 additions & 1 deletion spec/models/solidus_subscriptions/subscription_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,14 @@
it { is_expected.to validate_presence_of :successive_skip_count }
it { is_expected.to validate_numericality_of(:skip_count).is_greater_than_or_equal_to(0) }
it { is_expected.to validate_numericality_of(:successive_skip_count).is_greater_than_or_equal_to(0) }

it { is_expected.to accept_nested_attributes_for(:line_items) }

it 'validates currency correctly' do
expect(subject).to validate_inclusion_of(:currency).
in_array(::Money::Currency.all.map(&:iso_code)).
with_message('is not a valid currency code')
end

describe 'creating a subscription' do
it 'tracks the creation' do
stub_const('Spree::Event', class_spy(Spree::Event))
Expand Down