diff options
| -rw-r--r-- | README.md | 4 | ||||
| -rw-r--r-- | app/models/solidus_subscriptions/line_item.rb | 8 | ||||
| -rw-r--r-- | docs/api/v1/subscriptions.md | 4 | ||||
| -rw-r--r-- | lib/solidus_subscriptions/testing_support/factories/line_item_factory.rb | 2 | ||||
| -rw-r--r-- | spec/controllers/orders/create_subscription_line_items_spec.rb | 2 | ||||
| -rw-r--r-- | spec/controllers/spree/api/orders_controller_spec.rb | 2 | ||||
| -rw-r--r-- | spec/controllers/spree/api/users_controller_spec.rb | 2 |
7 files changed, 12 insertions, 12 deletions
@@ -45,8 +45,8 @@ To subscribe to a variant include the following parameters when posting to quantity: 2, // number of units in each subscription order. subscribable_id: 1234, // Which variant the subscription is for. interval_length: 1, // The time between subscription activations. - interval_units: "months", // A plural qualifier for length. - // Can be one of "days", "weeks", "months", or "years". + interval_units: "month", // A plural qualifier for length. + // Can be one of "day", "week", "month", or "year". max_installments: 12 // Stop processing after this many subscription orders. // (use null to process the subscription ad nauseam) } diff --git a/app/models/solidus_subscriptions/line_item.rb b/app/models/solidus_subscriptions/line_item.rb index f95618f..e912be5 100644 --- a/app/models/solidus_subscriptions/line_item.rb +++ b/app/models/solidus_subscriptions/line_item.rb @@ -26,10 +26,10 @@ module SolidusSubscriptions ) enum interval_units: [ - :days, - :weeks, - :months, - :years + :day, + :week, + :month, + :year ] validates :spree_line_item, :subscribable_id, presence: :true diff --git a/docs/api/v1/subscriptions.md b/docs/api/v1/subscriptions.md index 2532267..78124b5 100644 --- a/docs/api/v1/subscriptions.md +++ b/docs/api/v1/subscriptions.md @@ -44,7 +44,7 @@ Make changes to the Subscription object or the subscription line item object "line_item_attributes": { "quantity": 5, "interval_length": 1, - "interval_units": "months" + "interval_units": "month" } } ``` @@ -69,7 +69,7 @@ HTTP/1.1 200 OK "subscribable_id": 2, "created_at": "2016-09-26T23:50:32.923Z", "updated_at": "2016-09-26T23:51:05.784Z", - "interval_units": "months", + "interval_units": "month", "interval_length": 1 } } diff --git a/lib/solidus_subscriptions/testing_support/factories/line_item_factory.rb b/lib/solidus_subscriptions/testing_support/factories/line_item_factory.rb index 6a3304b..b2ae3c4 100644 --- a/lib/solidus_subscriptions/testing_support/factories/line_item_factory.rb +++ b/lib/solidus_subscriptions/testing_support/factories/line_item_factory.rb @@ -3,7 +3,7 @@ FactoryGirl.define do subscribable_id { create(:variant, subscribable: true).id } quantity 1 interval_length 1 - interval_units :months + interval_units :month association :spree_line_item, factory: :line_item diff --git a/spec/controllers/orders/create_subscription_line_items_spec.rb b/spec/controllers/orders/create_subscription_line_items_spec.rb index 53e35b5..4495020 100644 --- a/spec/controllers/orders/create_subscription_line_items_spec.rb +++ b/spec/controllers/orders/create_subscription_line_items_spec.rb @@ -32,7 +32,7 @@ RSpec.describe Spree::Controllers::Orders::SubscriptionParams, type: :controller max_installments: 3, subscribable_id: variant.id, interval_length: 30, - interval_units: "days" + interval_units: "day" } } end diff --git a/spec/controllers/spree/api/orders_controller_spec.rb b/spec/controllers/spree/api/orders_controller_spec.rb index 366537e..845d95c 100644 --- a/spec/controllers/spree/api/orders_controller_spec.rb +++ b/spec/controllers/spree/api/orders_controller_spec.rb @@ -38,7 +38,7 @@ RSpec.describe Spree::Api::OrdersController, type: :controller do quantity: 1, subscribable_id: variant.id, interval_length: 30, - interval_units: "days", + interval_units: "day", max_installments: 12 } end diff --git a/spec/controllers/spree/api/users_controller_spec.rb b/spec/controllers/spree/api/users_controller_spec.rb index 3a43314..73470ed 100644 --- a/spec/controllers/spree/api/users_controller_spec.rb +++ b/spec/controllers/spree/api/users_controller_spec.rb @@ -32,7 +32,7 @@ RSpec.describe Spree::Api::UsersController, type: :controller do id: subscription.line_item.id, quantity: 6, interval_length: 1, - interval_units: 'months' + interval_units: 'month' } end |