spree_stripe_subscriptions 0.0.1 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9085cdba71a500882f7360cb06f86ef9d9ee5617c52440e6c02c57e8a04218d6
-  data.tar.gz: d4891c7b4184367479b884b3cb740273b62d5fbcb1a18de4e3eb5ebeb81953db
+  metadata.gz: 9993c64782cf530fa6c6188abe90a01237b30bceaf0966263869e5763066cf3d
+  data.tar.gz: 5ea78d7490da356490610d931046581ca43ac70891a0bbbd2fc3e5ba277b8600
 SHA512:
-  metadata.gz: 693ad9f3a7739fdd12d52410ec29ecc0036106cea56e4ee2edef986ff53e64ec5ddfc40184c03f9945eabe15c112f0aa5e2ddd252a2f351f2fe2861eaecfbecd
-  data.tar.gz: 5f4d4c7ba7b99676bd735834178a6aaf4f28f7793d13eaa465d2dd9fe3b7daa15b8fa5ae158fdd3659f1c1917e9fe4345baaef8948f74c7d9e02033b4969c91a
+  metadata.gz: 84626b69ea36f39ba111fa3c03ae4a88fa3c5061fc2cc027bb9507d81546184b45560491d1a10cfddd71021713ba30dce78516c95bc5547bc8dbd514d2e26035
+  data.tar.gz: 70aacf21c781cb71ecc138be06754d29dcfc8b957b439a6732efafb9af3046a97b2c8c8bc9cd3764fc9e7c76e905a91bad4d7608b504f2b744cd85f0df023766

data/app/controllers/spree/stripe_subscriptions_controller.rb

@@ -20,6 +20,7 @@ module Spree
             'quantity': 1
           }
         ],
+        allow_promotion_codes: @configuration.allow_promotion_codes,
         automatic_tax: { enabled: @configuration.automatic_tax },
         tax_id_collection: { enabled: @configuration.tax_id_collection },
         billing_address_collection: @configuration.billing_address_collection,

data/app/models/spree/stripe_subscription.rb

@@ -34,29 +34,42 @@ module Spree
 
     def self.create_or_update_subscription(event)
       event_data = event.data.object
-      customer = Spree::StripeCustomer.find_by!(stripe_customer_id: event_data.customer)
-      plan = Spree::StripePlan.find_by!(stripe_plan_id: event_data.plan.id)
 
-      stripe_subscription_id = event_data.id
+      subscription_event = %w[customer.subscription.updated customer.subscription.deleted].include?(event.type)
+      invoice_event = (event.type == 'invoice.paid')
+      schedule_event = (event.type == 'subscription_schedule.updated')
 
-      webhook_subscription = Spree::StripeSubscription.where(stripe_subscription_id: stripe_subscription_id).first_or_initialize
+      stripe_subscription_id = if invoice_event || schedule_event
+                                 event_data.subscription
+                               elsif subscription_event
+                                 event_data.id
+                               end
+
+      stripe_subscription = Stripe::Subscription.retrieve(stripe_subscription_id)
+
+      customer = Spree::StripeCustomer.find_by!(stripe_customer_id: stripe_subscription.customer)
+      plan = Spree::StripePlan.find_by!(stripe_plan_id: stripe_subscription.plan.id)
+
+      webhook_subscription = Spree::StripeSubscription.where(
+        stripe_subscription_id: stripe_subscription.id
+      ).first_or_initialize
 
       webhook_subscription.update(
-        customer: customer, user: customer.user, plan: plan, status: event_data.status,
-        current_period_start: event_data.current_period_start ? Time.at(event_data.current_period_start).utc.to_datetime : nil,
-        current_period_end: event_data.current_period_end ? Time.at(event_data.current_period_end).utc.to_datetime : nil,
-        billing_cycle_anchor: event_data.billing_cycle_anchor ? Time.at(event_data.billing_cycle_anchor).utc.to_datetime : nil,
-        cancel_at_period_end: event_data.cancel_at_period_end,
-        cancel_at: event_data.cancel_at ? Time.at(event_data.cancel_at).utc.to_datetime : nil,
-        canceled_at: event_data.canceled_at ? Time.at(event_data.canceled_at).utc.to_datetime : nil,
-        ended_at: event_data.ended_at ? Time.at(event_data.ended_at).utc.to_datetime : nil,
-        schedule: event_data.schedule
+        customer: customer, user: customer.user, plan: plan, status: stripe_subscription.status,
+        current_period_start: stripe_subscription.current_period_start ? Time.at(stripe_subscription.current_period_start).utc.to_datetime : nil,
+        current_period_end: stripe_subscription.current_period_end ? Time.at(stripe_subscription.current_period_end).utc.to_datetime : nil,
+        billing_cycle_anchor: stripe_subscription.billing_cycle_anchor ? Time.at(stripe_subscription.billing_cycle_anchor).utc.to_datetime : nil,
+        cancel_at_period_end: stripe_subscription.cancel_at_period_end,
+        cancel_at: stripe_subscription.cancel_at ? Time.at(stripe_subscription.cancel_at).utc.to_datetime : nil,
+        canceled_at: stripe_subscription.canceled_at ? Time.at(stripe_subscription.canceled_at).utc.to_datetime : nil,
+        ended_at: stripe_subscription.ended_at ? Time.at(stripe_subscription.ended_at).utc.to_datetime : nil,
+        schedule: stripe_subscription.schedule
       )
 
-      active_subscription = user.stripe_subscriptions.active.last
-      if active_subscription.present?
+      active_subscription = customer.user.stripe_subscriptions.active.last
+      if active_subscription.present? && subscription_event
         # Checking if customer upgraded to other plan
-        old_subscriptions = user.stripe_subscriptions.active.where.not(id: [active_subscription.id, webhook_subscription.id].uniq)
+        old_subscriptions = customer.user.stripe_subscriptions.active.where.not(id: [active_subscription.id, webhook_subscription.id].uniq)
         old_subscriptions.each do |old_subscription|
           # Unsubscribe from old subscription
           old_subscription.unsubscribe
@@ -90,6 +103,11 @@ module Spree
 
       webhook_subscription = Spree::StripeSubscription.find_by(stripe_subscription_id: stripe_subscription_id)
 
+      unless webhook_subscription.present?
+        # If invoice.paid webhook is sent earlier than subscription.updated then subscription will be created
+        webhook_subscription = Spree::StripeSubscription.create_or_update_subscription(event)
+      end
+
       if webhook_subscription.present?
         stripe_invoice_id = event_data.id
         customer = Spree::StripeCustomer.find_by(stripe_customer_id: event_data.customer)

data/app/views/spree/admin/stripe_configurations/_form.html.erb

@@ -19,6 +19,13 @@
     <%= f.select :billing_address_collection, Spree::StripeConfiguration::ADDRESS_COLLECTION_OPTIONS.collect { |k, v| [v, k] }, {}, { class: 'select2' } %>
   <% end %>
 
+  <%= f.field_container :allow_promotion_codes, class: ['checkbox'] do %>
+    <%= f.label :allow_promotion_codes do %>
+      <%= f.check_box :allow_promotion_codes %>
+      <%= I18n.t('spree_stripe_subscriptions.models.stripe_configuration.allow_promotion_codes') %>
+    <% end %>
+  <% end %>
+
   <%= f.field_container :automatic_tax, class: ['checkbox'] do %>
     <%= f.label :automatic_tax do %>
       <%= f.check_box :automatic_tax %>

data/config/locales/en.yml

@@ -35,6 +35,7 @@ en:
         active: Active
         deleted_at: Deleted At
         billing_address_collection: Billing Address Collection
+        allow_promotion_codes: Allow Promotion Codes
         automatic_tax: Automatic Tax
         tax_id_collection: Tax ID Collection
       stripe_customers:

data/db/migrate/20230711073051_add_promotion_field_to_configurations.rb

@@ -0,0 +1,5 @@
+class AddPromotionFieldToConfigurations < ActiveRecord::Migration[5.2]
+  def change
+    add_column :spree_stripe_configurations, :allow_promotion_codes, :boolean, default: false
+  end
+end

data/lib/spree_stripe_subscriptions/version.rb

@@ -1,5 +1,5 @@
 module SpreeStripeSubscriptions
-  VERSION = '0.0.1'.freeze
+  VERSION = '0.0.4'.freeze
 
   module_function
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_stripe_subscriptions
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.4
 platform: ruby
 authors:
 - Satyakam Pandya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-01 00:00:00.000000000 Z
+date: 2023-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -174,6 +174,7 @@ files:
 - db/migrate/20221209094013_add_stripe_invoices.rb
 - db/migrate/20221209131817_add_user_to_invoice.rb
 - db/migrate/20221221080141_add_extra_plan_fields.rb
+- db/migrate/20230711073051_add_promotion_field_to_configurations.rb
 - lib/generators/spree_stripe_subscriptions/install/install_generator.rb
 - lib/spree_stripe_subscriptions.rb
 - lib/spree_stripe_subscriptions/engine.rb