saas_payments 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 399ad7181e74c3e135ffbf7c1990babb8d1aec389a453fe0b5b2414401bb6f9b
-  data.tar.gz: da5bc44556fd4496ae64bece2da30f42cbdba80f77d79278714dad01681075f2
+  metadata.gz: ce17de72e16596e973ee323fe642f744afcbad16589fcd1ef0ac53c363dff461
+  data.tar.gz: 0e3fc7823f91df6b934fee91e3a8a82005075119a127400ecf70716977c66096
 SHA512:
-  metadata.gz: da830a93f1a7c9a757fa2a21c2068296b6d40198479ff802d8740a09ff0ee297582adbc94f50b127ee315ad3e3e00d5e08efb6818bba62753ff24642af20e4f5
-  data.tar.gz: 0765fa876818e55cd8b521199edf1adc58a77b96269bb54012a5ab1f74bebbab03555ac3f4571d98e02d8ad8b2479d82f79a9ad571157227944b79afd911facb
+  metadata.gz: '09f0fea75408fee1c60f4977b8ecd16ec9fd45167debe7705d8af9f406b0c0ac1310acd6a149b03ffc24f1d3499d40304e713d5e7ff58bf69ee4f035cebf2663'
+  data.tar.gz: cc114c1c7a728f9208d4109d66681c5fdc3996df3d92f09a4dd3ef7e0b52851bc62fb998b9c669b29094575b59c95bd16567388649801ba66957209096e6d31e

data/README.md

@@ -1,15 +1,10 @@
 # SaasPayments
 
 SaasPayments is a thin wrapper around the Stripe API to manage the most common
-SAAS subscription actions. This gem includes
+SAAS subscription actions.
 
-- [ ] Subscription model to hold the state of a user's subscription
-- [ ] Payment form template
-- [ ] Webhook to handle subscription updates from Stripe
-- [ ] Sign up, cancel, and change plan routes
 
-
-This Gem also assumes you already have:
+This Gem assumes you already have:
 
 - A `User` model (If you don't, try [Devise](https://github.com/plataformatec/devise))
 

data/app/assets/javascripts/saas_payments/elements.js

@@ -104,7 +104,7 @@ document.addEventListener('DOMContentLoaded', function() {
 
     var setHiddenValue = function(form, className, value) {
       var field = form.getElementsByClassName(className)[0]
-      field.value = value
+      if(!!field) field.value = value
     }
 
     this.show = function(id) {
@@ -127,7 +127,7 @@ document.addEventListener('DOMContentLoaded', function() {
         return
       }
 
-      var defaults = ['plan_id', 'user_id']
+      var defaults = ['sku_id', 'plan_id', 'user_id']
       for (var i = 0; i < defaults.length; i++) {
         var key = defaults[i]
         if(options[key]) setHiddenValue(this.form, 'form_'+key, options[key])

data/app/controllers/concerns/saas_payments/payable.rb

@@ -0,0 +1,189 @@
+module SaasPayments
+  module Payable
+    extend ActiveSupport::Concern
+
+    Stripe.api_key = SaasPayments.config.stripe_secret_key
+
+    class FailedPayment < StandardError; end
+    class ActionRequired < StandardError; end
+
+    def purchase(customer, sku)
+      order = create_order customer, sku
+      pay_order customer, order
+    end
+
+    def sign_up_for_plan(customer, plan)
+      update_subscription customer, plan
+      render_success
+    rescue ActionRequired
+      render_action_required
+    rescue FailedPayment
+      render_card_failure
+    rescue Stripe::CardError
+      render_card_failure
+    end
+
+    def change_plan(customer, plan)
+      sub = customer.subscription remote: true
+      update_plan sub, customer, plan
+      render_success
+    rescue StandardError
+      render_error
+    end
+
+    def cancel_at_period_end(customer)
+      sub = customer.subscription remote: true
+
+      # Customer has an existing subscription, change plans
+      remote_sub = Stripe::Subscription.update(
+        sub[:id],
+        cancel_at_period_end: true
+      )
+
+      customer.subscription.update Subscription.from_stripe(remote_sub)
+      render_success
+    rescue StandardError
+      render_error
+    end
+
+    def resume_subscription(customer)
+      sub = customer.subscription
+      remote_sub = Stripe::Subscription.update(
+        sub.stripe_id,
+        cancel_at_period_end: false
+      )
+
+      customer.subscription.update Subscription.from_stripe(remote_sub)
+      render_success
+    rescue StandardError
+      render_error
+    end
+
+    def cancel_now(customer)
+      Stripe::Subscription.delete customer.subscription.stripe_id
+    end
+
+    def create_customer(email, card_token)
+      # Create a new customer in stripe
+      customer = Stripe::Customer.create(email: email, source: card_token)
+
+      # Create a new customer locally that maps to the stripe customer
+      Customer.create Customer.from_stripe(customer)
+    end
+
+    private
+
+    def create_order(customer, sku)
+      order = Stripe::Order.create({
+        currency: 'usd',
+        customer: customer.stripe_id,
+        items: [
+          { type: 'sku', parent: sku.stripe_id },
+        ],
+      })
+
+      Order.create Order.from_stripe(order)
+    end
+
+    def pay_order(customer, order)
+      # Pay the order
+      stripe_order = Stripe::Order.pay(
+        order[:stripe_id],
+        { customer: customer.stripe_id }
+      )
+      order.update Order.from_stripe(stripe_order)
+      order
+    end
+
+    def render_success
+      respond_to do |format|
+        format.html do
+          redirect_to SaasPayments.config.account_path
+        end
+        format.json do
+          render json: { message: "success" }
+        end
+      end
+    end
+
+    def render_error
+      format.html do
+        flash[:sp_error] = 'Failed to update plan'
+        redirect_back fallback_location: root_path
+      end
+      format.json { render json: { message: "update_failed" }, status: :bad_request }
+    end
+
+    def render_action_required
+      respond_to do |format|
+        format.html do
+          flash[:sp_notice] = 'Payment requires customer action'
+          redirect_to SaasPayments.successPath
+        end
+        format.json { render json: { message: "action_required" } }
+      end
+    end
+
+    def render_card_failure
+      respond_to do |format|
+        format.html do
+          flash[:sp_error] = 'Failed to process card'
+          redirect_back fallback_location: root_path
+        end
+        format.json { render json: { message: "card_error" }, status: :bad_request }
+      end
+    end
+
+    def update_subscription(customer, plan)
+      sub = customer.subscription remote: true
+      if sub.present?
+        update_plan sub, customer, plan
+      else
+        sub = create_subscription customer, plan
+      end
+
+      sub
+    end
+
+    def update_plan(sub, customer, plan)
+      # Customer has an existing subscription, change plans
+      remote_sub = Stripe::Subscription.update(
+        sub[:id],
+        cancel_at_period_end: false,
+        items: [
+          { id: sub[:items][:data][0][:id], plan: plan.stripe_id },
+        ]
+      )
+
+      customer.subscription.update Subscription.from_stripe(remote_sub)
+    end
+
+    def create_subscription(customer, plan)
+      # Customer does not have a subscription, sign them up
+      sub = Stripe::Subscription.create(
+        customer: customer.stripe_id,
+        items: [{ plan: plan.stripe_id }]
+      )
+      complete_subscription sub
+    end
+
+    def complete_subscription(sub)
+      if incomplete? sub
+        raise FailedPayment if payment_intent sub, :requires_payment_method
+        raise ActionRequired if payment_intent sub, :requires_action
+      end
+
+      # Successful payment, or trialling: provision the subscription
+      # Create a local subscription
+      Subscription.create Subscription.from_stripe(sub)
+    end
+
+    def incomplete?(sub)
+      sub[:status] == "incomplete"
+    end
+
+    def payment_intent(sub, intent)
+      sub[:latest_invoice][:payment_intent][:status] == intent.to_s
+    end
+  end
+end

data/app/controllers/concerns/saas_payments/webhook.rb

@@ -0,0 +1,28 @@
+module SaasPayments
+  module Webhook
+    extend ActiveSupport::Concern
+    Stripe.api_key = SaasPayments.config.stripe_secret_key
+    SECRET = SaasPayments.config.webhook_secret
+
+    def webhook
+      event = parse_event request.body.read
+      WebhookService.new(event).process
+    rescue ActiveRecord::RecordNotFound => e
+      raise SaasPayments::WebhookError, e.message
+    rescue StandardError => e
+      raise SaasPayments::WebhookError, e.message
+    end
+
+    private
+
+    def parse_event(payload)
+      if SaasPayments.config.webhook_secret.present?
+        header = request.headers['HTTP_STRIPE_SIGNATURE']
+        Stripe::Webhook.construct_event payload, header, SECRET
+      else
+        data = JSON.parse(request.body.read, symbolize_names: true)
+        Stripe::Event.construct_from(data)
+      end
+    end
+  end
+end

data/app/controllers/saas_payments/application_controller.rb

@@ -12,6 +12,5 @@ module SaasPayments
     def init_stripe
       Stripe.api_key = SaasPayments.config.stripe_secret_key || ENV["STRIPE_SECRET_KEY"]
     end
-
   end
 end

data/app/controllers/saas_payments/webhook_controller.rb

@@ -2,9 +2,7 @@ require_dependency "saas_payments/application_controller"
 
 module SaasPayments
   class WebhookController < ApplicationController
-
     def create
     end
-
   end
 end

data/app/lib/saas_payments/products_service.rb

@@ -1,24 +1,39 @@
 module SaasPayments
   class ProductsService
-    def self.sync
+    def initialize
       Stripe.api_key = SaasPayments.config.stripe_secret_key
-      Stripe::Product.all.each{ |p| create_product p }
-      Stripe::Plan.list.each{ |p| create_plan p }
+    end
+
+    def sync
+      Stripe::Product.all.each { |p| create_product p }
+      Stripe::Plan.list.each { |p| create_plan p }
+      Stripe::SKU.list.each { |s| create_sku s }
+    end
+
+    def shippable(product, on)
+      p = Stripe::Product.retrieve(product)
+      p.shippable = on
+      p.save
+    rescue StandardError => e
+      puts "ERROR: #{e.message}"
+      false
     end
 
     private
 
-    def self.create_product product
-      Product.create!(Product.from_stripe(product))
+    def create_sku(sku)
+      Sku.create! Sku.from_stripe(sku)
+    end
+
+    def create_product(product)
+      Product.create! Product.from_stripe(product)
     rescue ActiveRecord::RecordInvalid
-      puts "Product (#{product[:id]}) already exists. Updating..."
       Product.find_by_stripe_id(product[:id]).update!(Product.from_stripe(product))
     end
 
-    def self.create_plan plan
-      Plan.create!(Plan.from_stripe(plan))
+    def create_plan(plan)
+      Plan.create! Plan.from_stripe(plan)
     rescue ActiveRecord::RecordInvalid
-      puts "Plan (#{plan[:id]}) already exists. Updating..."
       Plan.find_by_stripe_id(plan[:id]).update!(Plan.from_stripe(plan))
     end
   end

data/app/lib/saas_payments/webhook/customer_event.rb

@@ -1,16 +1,16 @@
 module SaasPayments
   class Webhook::CustomerEvent
-    def created data
-      Customer.create(Customer.from_stripe(data).merge({ user_id: user_id(data) }))
+    def created(data)
+      Customer.create Customer.from_stripe(data)
     end
 
-    def updated data
+    def updated(data)
       customer = Customer.find_by_stripe_id(data[:id])
       raise_not_found(data[:id]) unless customer
       customer.update(Customer.from_stripe(data))
     end
 
-    def deleted data
+    def deleted(data)
       customer = Customer.find_by_stripe_id(data[:id])
       raise_not_found(data[:id]) unless customer
       customer.delete
@@ -18,11 +18,7 @@ module SaasPayments
 
     private
 
-    def user_id data
-      data[:metadata][:user_id] rescue nil
-    end
-
-    def raise_not_found id
+    def raise_not_found(id)
       raise ActiveRecord::RecordNotFound.new("Could not find customer with stripe id: #{id}")
     end
   end

data/app/lib/saas_payments/webhook/order_event.rb

@@ -0,0 +1,31 @@
+module SaasPayments
+  class Webhook::OrderEvent
+    def created(data)
+      Order.create!(Order.from_stripe(data))
+    end
+
+    def updated(data)
+      order = Order.find_by_stripe_id(data[:id])
+      raise_not_found(data[:id]) unless order
+      order.update(Order.from_stripe(data))
+    end
+
+    def payment_failed(data)
+      order = Order.find_by_stripe_id(data[:id])
+      raise_not_found(data[:id]) unless order
+      order.update(Order.from_stripe(data))
+    end
+
+    def payment_succeeded(data)
+      order = Order.find_by_stripe_id(data[:id])
+      raise_not_found(data[:id]) unless order
+      order.update(Order.from_stripe(data))
+    end
+
+    private
+
+    def raise_not_found(id)
+      raise ActiveRecord::RecordNotFound.new("Could not find order with stripe_id: #{id}")
+    end
+  end
+end

data/app/lib/saas_payments/webhook/plan_event.rb

@@ -1,16 +1,16 @@
 module SaasPayments
   class Webhook::PlanEvent
-    def created data
+    def created(data)
       Plan.create!(Plan.from_stripe(data))
     end
 
-    def updated data
+    def updated(data)
       plan = Plan.find_by_stripe_id(data[:id])
       raise_not_found(data[:id]) unless plan
       plan.update(Plan.from_stripe(data))
     end
 
-    def deleted data
+    def deleted(data)
       plan = Plan.find_by_stripe_id(data[:id])
       raise_not_found(data[:id]) unless plan
       plan.delete
@@ -18,7 +18,7 @@ module SaasPayments
 
     private
 
-    def raise_not_found id
+    def raise_not_found(id)
       raise ActiveRecord::RecordNotFound.new("Could not find plan with stripe id: #{id}")
     end
   end

data/app/lib/saas_payments/webhook/product_event.rb

@@ -1,16 +1,16 @@
 module SaasPayments
   class Webhook::ProductEvent
-    def created data
+    def created(data)
       Product.create!(Product.from_stripe(data))
     end
 
-    def updated data
+    def updated(data)
       product = Product.find_by_stripe_id(data[:id])
       raise_not_found(data[:id]) unless product
       product.update(Product.from_stripe(data))
     end
 
-    def deleted data
+    def deleted(data)
       product = Product.find_by_stripe_id(data[:id])
       raise_not_found(data[:id]) unless product
       product.delete
@@ -18,7 +18,7 @@ module SaasPayments
 
     private
 
-    def raise_not_found id
+    def raise_not_found(id)
       raise ActiveRecord::RecordNotFound.new("Could not find product with stripe_id: #{id}")
     end
   end

data/app/lib/saas_payments/webhook/session_event.rb

@@ -1,6 +1,6 @@
 module SaasPayments
   class Webhook::SessionEvent
-    def completed data
+    def completed(data)
     end
   end
 end

data/app/lib/saas_payments/webhook/sku_event.rb

@@ -0,0 +1,25 @@
+module SaasPayments
+  class Webhook::SkuEvent
+    def created(data)
+      Sku.create!(Sku.from_stripe(data))
+    end
+
+    def updated(data)
+      sku = Sku.find_by_stripe_id(data[:id])
+      raise_not_found(data[:id]) unless sku
+      sku.update(Sku.from_stripe(data))
+    end
+
+    def deleted(data)
+      sku = Sku.find_by_stripe_id(data[:id])
+      raise_not_found(data[:id]) unless sku
+      sku.delete
+    end
+
+    private
+
+    def raise_not_found(id)
+      raise ActiveRecord::RecordNotFound.new("Could not find sku with stripe id: #{id}")
+    end
+  end
+end

data/app/lib/saas_payments/webhook/subscription_event.rb

@@ -1,16 +1,16 @@
 module SaasPayments
   class Webhook::SubscriptionEvent
-    def created data
+    def created(data)
       Subscription.create!(Subscription.from_stripe(data))
     end
 
-    def updated data
+    def updated(data)
       sub = Subscription.find_by_stripe_id(data[:id])
       raise_not_found(data[:id]) unless sub
       sub.update(Subscription.from_stripe(data))
     end
 
-    def deleted data
+    def deleted(data)
       sub = Subscription.find_by_stripe_id(data[:id])
       raise_not_found(data[:id]) unless sub
       sub.delete
@@ -18,7 +18,7 @@ module SaasPayments
 
     private
 
-    def raise_not_found id
+    def raise_not_found(id)
       raise ActiveRecord::RecordNotFound.new("Could not find subscription with stripe id: #{id}")
     end
   end

data/app/lib/saas_payments/webhook_service.rb

@@ -11,6 +11,11 @@ module SaasPayments
       'plan.deleted' => [Webhook::PlanEvent, 'deleted'],
       'plan.updated' => [Webhook::PlanEvent, 'updated'],
 
+      # Register Plan events
+      'sku.created' => [Webhook::SkuEvent, 'created'],
+      'sku.deleted' => [Webhook::SkuEvent, 'deleted'],
+      'sku.updated' => [Webhook::SkuEvent, 'updated'],
+
       # Register Customer events
       'customer.created' => [Webhook::CustomerEvent, 'created'],
       'customer.deleted' => [Webhook::CustomerEvent, 'deleted'],
@@ -22,10 +27,16 @@ module SaasPayments
       'customer.subscription.updated' => [Webhook::SubscriptionEvent, 'updated'],
 
       # Register Session events
-      'checkout.session.completed' => [Webhook::SessionEvent, 'completed']
-    }
+      'checkout.session.completed' => [Webhook::SessionEvent, 'completed'],
 
-    def initialize event
+      # Order events
+      'order.created' => [Webhook::OrderEvent, 'created'],
+      'order.payment_failed' => [Webhook::OrderEvent, 'payment_failed'],
+      'order.payment_succeeded' => [Webhook::OrderEvent, 'payment_succeeded'],
+      'order.updated' => [Webhook::OrderEvent, 'updated'],
+    }.freeze
+
+    def initialize(event)
       @event = event
     end
 
@@ -34,6 +45,5 @@ module SaasPayments
       raise WebhookError.new("Unrecognized event") unless event && action
       event.new.send(action, @event[:data][:object])
     end
-
   end
 end

data/app/models/concerns/saas_payments/stripe_model.rb

@@ -3,30 +3,28 @@ module SaasPayments
     extend ActiveSupport::Concern
 
     module ClassMethods
-      def truthy? val
+      def truthy?(val)
         val.present? ? val : false
       end
 
-      def stripe_hash data
+      def stripe_hash(data)
         (data || {}).to_hash
       end
 
-      def date ts
+      def stripe_array(data)
+        (data || []).map(&:to_hash)
+      end
+
+      def date(ts)
         ts.present? ? Time.at(ts).to_datetime : nil
       rescue
         nil
       end
 
-      def parse_id val
+      def parse_id(val)
         return nil unless val
-
-        if val.is_a?(String)
-          val
-        else
-          val[:id]
-        end
+        val.is_a?(String) ? val : val[:id]
       end
     end
-
   end
 end

data/app/models/saas_payments/customer.rb

@@ -4,25 +4,23 @@ module SaasPayments
 
     validates_uniqueness_of :stripe_id
 
-    belongs_to :user, optional: true
-
     serialize :discount
     serialize :metadata
 
-    def self.from_stripe c
+    def self.from_stripe(c)
       {
-        stripe_id: c[:id],
-        delinquent: truthy?(c[:delinquent]),
-        description: c[:description],
-        discount: stripe_hash(c[:discount]),
-        email: c[:email],
-        livemode: truthy?(c[:livemode]),
-        metadata: stripe_hash(c[:metadata]),
-        name: c[:name]
+        stripe_id:    c[:id],
+        delinquent:   truthy?(c[:delinquent]),
+        description:  c[:description],
+        discount:     stripe_hash(c[:discount]),
+        email:        c[:email],
+        livemode:     truthy?(c[:livemode]),
+        metadata:     stripe_hash(c[:metadata]),
+        name:         c[:name],
       }
     end
 
-    def subscription options={}
+    def subscription(options = {})
       sub = Subscription.where(customer_id: stripe_id).first
       if sub.present? && options[:remote]
         sub = Stripe::Subscription.retrieve(sub.stripe_id)
@@ -34,9 +32,19 @@ module SaasPayments
     end
 
     def plan
-      return nil if !subscription.present?
+      return nil if subscription.blank?
       Plan.find_by_stripe_id(subscription.plan_id)
     end
 
+    def products
+      items = []
+      Order.where(customer_id: stripe_id).map do |order|
+        order.items.each do |item|
+          sku = Sku.find_by_stripe_id(item[:parent].to_s)
+          items << sku if sku.present?
+        end
+      end
+      items
+    end
   end
 end

data/app/models/saas_payments/order.rb

@@ -0,0 +1,28 @@
+module SaasPayments
+  class Order < ApplicationRecord
+    include StripeModel
+
+    serialize :metadata
+    serialize :status_transitions
+    serialize :items
+
+    def self.from_stripe(o)
+      {
+        stripe_id: parse_id(o[:id]),
+        customer_id: parse_id(o[:customer]),
+        amount: o[:amount],
+        amount_returned: o[:amount_returned],
+        application: o[:application],
+        application_fee: o[:application_fee],
+        charge: o[:charge],
+        currency: o[:currency],
+        email: o[:email],
+        livemode: o[:livemode],
+        status: o[:status],
+        metadata: stripe_hash(o[:metadata]),
+        status_transitions: stripe_hash(o[:status_transitions]),
+        items: stripe_array(o[:items]),
+      }
+    end
+  end
+end

data/app/models/saas_payments/plan.rb

@@ -6,10 +6,9 @@ module SaasPayments
 
     serialize :metadata
 
-    def self.from_stripe p
+    def self.from_stripe(p)
       {
         product_id:         parse_id(p[:product]),
-
         stripe_id:          p[:id],
         active:             p[:active],
         amount:             p[:amount].to_i,
@@ -20,9 +19,8 @@ module SaasPayments
         livemode:           truthy?(p[:livemode]),
         metadata:           stripe_hash(p[:metadata]),
         nickname:           p[:nickname],
-        trial_period_days:  p[:trial_period_days].to_i
+        trial_period_days:  p[:trial_period_days].to_i,
       }
-
     end
   end
 end

data/app/models/saas_payments/product.rb

@@ -8,17 +8,16 @@ module SaasPayments
 
     serialize :metadata
 
-    def self.from_stripe p
+    def self.from_stripe(p)
       {
-        stripe_id:             p[:id],
-        active:                p[:active],
-        caption:               p[:caption],
-        livemode:              truthy?(p[:livemode]),
-        metadata:              stripe_hash(p[:metadata]),
-        name:                  p[:name],
-        unit_label:            p[:unit_label],
+        stripe_id:   p[:id],
+        active:      p[:active],
+        caption:     p[:caption],
+        livemode:    truthy?(p[:livemode]),
+        metadata:    stripe_hash(p[:metadata]),
+        name:        p[:name],
+        unit_label:  p[:unit_label],
       }
     end
-
   end
 end

data/app/models/saas_payments/sku.rb

@@ -0,0 +1,30 @@
+module SaasPayments
+  class Sku < ApplicationRecord
+    include StripeModel
+
+    serialize :metadata
+    serialize :attrs
+    serialize :inventory
+    serialize :package_dimensions
+
+    def self.from_stripe(p)
+      {
+        product_id:          parse_id(p[:product]),
+        stripe_id:           p[:id],
+        active:              p[:active],
+        currency:            p[:currency],
+        image:               p[:image],
+        livemode:            truthy?(p[:livemode]),
+        price:               p[:price].to_i,
+        package_dimensions:  stripe_hash(p[:package_dimensions]),
+        metadata:            stripe_hash(p[:metadata]),
+        inventory:           stripe_hash(p[:inventory]),
+        attrs:               stripe_hash(p[:attributes]),
+      }
+    end
+
+    def name
+      attrs[:name]
+    end
+  end
+end

data/app/models/saas_payments/subscription.rb

@@ -6,7 +6,7 @@ module SaasPayments
 
     serialize :metadata
 
-    def self.from_stripe s
+    def self.from_stripe(s)
       {
         plan_id:               parse_id(s[:plan]),
         customer_id:           parse_id(s[:customer]),
@@ -23,9 +23,8 @@ module SaasPayments
         start_date:            date(s[:start_date]),
         status:                s[:status], # TODO: Status might not come from stripe?
         trial_end:             date(s[:trial_end]),
-        trial_start:           date(s[:trial_start])
+        trial_start:           date(s[:trial_start]),
       }
     end
-
   end
 end

data/app/views/saas_payments/_stripe_elements.html.erb

@@ -1,11 +1,13 @@
 <% css_id = 'sp_form' if local_assigns[:css_id].nil? %>
 <% user_id = nil if local_assigns[:user_id].nil? %>
 <% plan_id = nil if local_assigns[:plan_id].nil? %>
+<% sku_id = nil if local_assigns[:sku_id].nil? %>
 
 <form action="<%= submit_path %>" method="post" class="payment-form" id="<%= css_id %>" style="display: none">
   <%= hidden_field_tag :authenticity_token, form_authenticity_token -%>
   <%= hidden_field_tag :user_id, user_id, class: 'form_user_id' -%>
   <%= hidden_field_tag :plan_id, plan_id, class: 'form_plan_id' -%>
+  <%= hidden_field_tag :sku_id, sku_id, class: 'form_sku_id' -%>
 
   <div id="publishable-key" data-publishable="<%= SaasPayments.config.stripe_publishable_key %>"></div>
   <div class="form-row">

data/db/migrate/20191006144720_create_saas_payments_skus.rb

@@ -0,0 +1,22 @@
+class CreateSaasPaymentsSkus < ActiveRecord::Migration[5.2]
+  def change
+    create_table :saas_payments_skus do |t|
+      t.string :stripe_id
+      t.string :product_id
+
+      t.boolean :active
+      t.string :currency
+      t.string :image
+      t.boolean :livemode
+      t.integer :price
+
+      # Serialized objects
+      t.text :package_dimensions
+      t.text :metadata
+      t.text :inventory
+      t.text :attrs
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20191008134837_remove_user_id_from_customer.rb

@@ -0,0 +1,5 @@
+class RemoveUserIdFromCustomer < ActiveRecord::Migration[5.2]
+  def change
+    remove_column :saas_payments_customers, :user_id
+  end
+end

data/db/migrate/20191010013513_create_saas_payments_orders.rb

@@ -0,0 +1,24 @@
+class CreateSaasPaymentsOrders < ActiveRecord::Migration[5.2]
+  def change
+    create_table :saas_payments_orders do |t|
+      t.string :stripe_id
+      t.string :customer_id
+      t.integer :amount
+      t.integer :amount_returned
+      t.string :application
+      t.integer :application_fee
+      t.string :charge
+      t.string :currency
+      t.string :email
+      t.boolean :livemode
+      t.string :status
+
+      # Serialize
+      t.text :metadata
+      t.text :status_transitions
+      t.text :items
+
+      t.timestamps
+    end
+  end
+end

data/lib/saas_payments/config.rb

@@ -1,4 +1,3 @@
-
 module SaasPayments
   class Configuration
     attr_accessor :stripe_secret_key

data/lib/saas_payments/engine.rb

@@ -14,5 +14,4 @@ module SaasPayments
       yield(self)
     end
   end
-
 end

data/lib/saas_payments/version.rb

@@ -1,3 +1,3 @@
 module SaasPayments
-  VERSION = '0.0.2'
+  VERSION = '0.1.0'
 end

data/lib/tasks/products.rake

@@ -1,6 +1,20 @@
 namespace :products do
   desc "Create products in the database that come from stripe"
   task sync: :environment do
-    SaasPayments::ProductsService.sync
+    SaasPayments::ProductsService.new.sync
+  end
+
+  desc "Digitize a product by toggling the shippable flag"
+  task :digitize, [:product, :shippable] => :environment do |t, args|
+    product = args.product
+    shippable = args.shippable.to_s == 'true'
+
+    if !['true', 'false'].include? args.shippable.to_s
+      puts "Shippable must be a boolean"
+      next
+    end
+
+    success = SaasPayments::ProductsService.new.shippable product, shippable
+    puts "Could not digitize product: #{args.product}" unless success
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: saas_payments
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Cody
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-03 00:00:00.000000000 Z
+date: 2019-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -123,25 +123,29 @@ files:
 - app/assets/javascripts/saas_payments/elements.js
 - app/assets/stylesheets/saas_payments/application.css
 - app/assets/stylesheets/saas_payments/elements.css
-- app/controllers/concerns/saas_payments/subscription_concerns.rb
-- app/controllers/concerns/saas_payments/webhook_concerns.rb
+- app/controllers/concerns/saas_payments/payable.rb
+- app/controllers/concerns/saas_payments/webhook.rb
 - app/controllers/saas_payments/application_controller.rb
 - app/controllers/saas_payments/webhook_controller.rb
 - app/helpers/saas_payments/application_helper.rb
 - app/jobs/saas_payments/application_job.rb
 - app/lib/saas_payments/products_service.rb
 - app/lib/saas_payments/webhook/customer_event.rb
+- app/lib/saas_payments/webhook/order_event.rb
 - app/lib/saas_payments/webhook/plan_event.rb
 - app/lib/saas_payments/webhook/product_event.rb
 - app/lib/saas_payments/webhook/session_event.rb
+- app/lib/saas_payments/webhook/sku_event.rb
 - app/lib/saas_payments/webhook/subscription_event.rb
 - app/lib/saas_payments/webhook_service.rb
 - app/mailers/saas_payments/application_mailer.rb
 - app/models/concerns/saas_payments/stripe_model.rb
 - app/models/saas_payments/application_record.rb
 - app/models/saas_payments/customer.rb
+- app/models/saas_payments/order.rb
 - app/models/saas_payments/plan.rb
 - app/models/saas_payments/product.rb
+- app/models/saas_payments/sku.rb
 - app/models/saas_payments/subscription.rb
 - app/views/saas_payments/_scripts.html.erb
 - app/views/saas_payments/_stripe_elements.html.erb
@@ -151,6 +155,9 @@ files:
 - db/migrate/20190820040835_create_saas_payments_products.rb
 - db/migrate/20190820040959_create_saas_payments_plans.rb
 - db/migrate/20190823023237_create_saas_payments_customers.rb
+- db/migrate/20191006144720_create_saas_payments_skus.rb
+- db/migrate/20191008134837_remove_user_id_from_customer.rb
+- db/migrate/20191010013513_create_saas_payments_orders.rb
 - lib/saas_payments.rb
 - lib/saas_payments/config.rb
 - lib/saas_payments/engine.rb

data/app/controllers/concerns/saas_payments/subscription_concerns.rb

@@ -1,173 +0,0 @@
-module SaasPayments
-  module SubscriptionConcerns
-    Stripe.api_key = SaasPayments.config.stripe_secret_key
-
-    class FailedPayment < StandardError; end
-    class ActionRequired < StandardError; end
-
-    extend ActiveSupport::Concern
-
-    def sign_up_for_plan user, plan
-      customer = get_customer user
-      sub = update_subscription customer, plan
-      render_success
-    rescue ActionRequired
-      render_action_required
-    rescue FailedPayment
-      render_card_failure
-    rescue Stripe::CardError
-      render_card_failure
-    end
-
-    def change_plan user, plan
-      customer = get_customer user
-      sub = customer.subscription(remote: true)
-      update_plan sub, customer, plan
-      render_success
-    rescue StandardError
-      render_error
-    end
-
-    def cancel_at_period_end user
-      customer = get_customer user
-      sub = customer.subscription(remote: true)
-
-      # Customer has an existing subscription, change plans
-      remote_sub = Stripe::Subscription.update(sub[:id], {
-        cancel_at_period_end: true
-      })
-
-      customer.subscription.update(Subscription.from_stripe(remote_sub))
-      render_success
-    rescue StandardError
-      render_error
-    end
-
-    def resume_subscription user
-      customer = get_customer user
-      sub = customer.subscription
-      remote_sub = Stripe::Subscription.update(sub.stripe_id, {
-        cancel_at_period_end: false
-      })
-
-      customer.subscription.update(Subscription.from_stripe(remote_sub))
-      render_success
-    rescue StandardError
-      render_error
-    end
-
-    def cancel_now user
-      customer = get_customer user
-      Stripe::Subscription.delete(customer.subscription.stripe_id)
-    end
-
-
-    private
-
-    def render_success
-      respond_to do |format|
-        format.html { redirect_to SaasPayments.config.account_path }
-        format.json { render json: { message: "success" } }
-      end
-    end
-
-    def render_error
-      format.html {
-        flash[:sp_error] = 'Failed to update plan'
-        redirect_back fallback_location: root_path
-      }
-      format.json { render json: { message: "update_failed" }, status: :bad_request }
-    end
-
-    def render_action_required
-      respond_to do |format|
-        format.html {
-          flash[:sp_notice] = 'Payment requires customer action'
-          redirect_to SaasPayments.successPath
-        }
-        format.json { render json: { message: "action_required" } }
-      end
-    end
-
-    def render_card_failure
-      respond_to do |format|
-        format.html {
-          flash[:sp_error] = 'Failed to process card'
-          redirect_back fallback_location: root_path
-        }
-        format.json { render json: { message: "card_error" }, status: :bad_request }
-      end
-    end
-
-    def get_customer user
-      # Try to find a customer in the database by the user id
-      customer = SaasPayments::Customer.find_by_user_id(user.id)
-
-      # If no customer exists, create a new one
-      if !customer.present?
-        # Create a new customer in stripe
-        c = Stripe::Customer.create({
-          email: user.email,
-          source: params.require(:stripeToken),
-          metadata: { user_id: user.id }
-        })
-
-        # Create a new customer locally that maps to the stripe customer
-        customer = Customer.create(Customer.from_stripe(c).merge({ user_id: user.id }))
-      end
-      customer
-    end
-
-    def update_subscription customer, plan
-      sub = customer.subscription(remote: true)
-      if sub.present?
-        update_plan sub, customer, plan
-      else
-        sub = create_subscription customer, plan
-      end
-
-      sub
-    end
-
-    def update_plan sub, customer, plan
-      # Customer has an existing subscription, change plans
-      remote_sub = Stripe::Subscription.update(sub[:id], {
-        cancel_at_period_end: false,
-        items: [{
-          id: sub[:items][:data][0][:id],
-          plan: plan.stripe_id
-        }]
-      })
-
-      customer.subscription.update(Subscription.from_stripe(remote_sub))
-    end
-
-    def create_subscription customer, plan
-      # Customer does not have a subscription, sign them up
-      sub = Stripe::Subscription.create({
-        customer: customer.stripe_id,
-        items: [{ plan: plan.stripe_id }]
-      })
-      complete_subscription sub
-    end
-
-    def complete_subscription sub
-      if incomplete?(sub)
-        raise FailedPayment if payment_intent(sub, :requires_payment_method)
-        raise ActionRequired if payment_intent(sub, :requires_action)
-      end
-
-      # Successful payment, or trialling: provision the subscription
-      # Create a local subscription
-      Subscription.create(Subscription.from_stripe(sub))
-    end
-
-    def incomplete? sub
-      sub[:status] == "incomplete"
-    end
-
-    def payment_intent sub, intent
-      sub[:latest_invoice][:payment_intent][:status] == intent.to_s
-    end
-  end
-end

data/app/controllers/concerns/saas_payments/webhook_concerns.rb

@@ -1,22 +0,0 @@
-module SaasPayments
-  module WebhookConcerns
-    extend ActiveSupport::Concern
-    Stripe.api_key = SaasPayments.config.stripe_secret_key
-    SECRET = SaasPayments.config.webhook_secret
-
-    def webhook
-      event = params
-      if SaasPayments.config.webhook_secret.present?
-        header = request.headers['HTTP_STRIPE_SIGNATURE']
-        event = Stripe::Webhook.construct_event(request.body.read, header, SECRET)
-      end
-      WebhookService.new(event).process
-      head :ok
-    rescue ActiveRecord::RecordNotFound
-      head :not_found
-    rescue StandardError => e
-      head :bad_request
-    end
-
-  end
-end