disco_app 0.8.7 → 0.8.8

data/app/services/disco_app/charges_service.rb

@@ -1,73 +1,81 @@
-module DiscoApp
-  class ChargesService
+class DiscoApp::ChargesService
 
-    # Create a new charge for the given Shop using the Shopify API.
-    #
-    # The attributes of the charge are fetched using the shop's `new_charge_attributes` method, which can be overriden
-    # to provide custom charge types for individual shops.
-    #
-    # Returns the new Shopify charge model on success, nil otherwise.
-    def self.create(shop)
-      shopify_charge = shop.temp {
-        self.charge_api_class(shop).create(self.new_charge_attributes(shop))
-      }
+  # Create the appropriate type of Shopify charge for the given subscription
+  # (either one-time or recurring) and return.
+  def self.create(shop, subscription)
+    # Create the charge object locally first.
+    charge = subscription.charge_class.create!(
+      shop: shop,
+      subscription: subscription,
+    )
 
-      # If the charge was successfully created, update the charge status on the shop.
-      shop.update_charge_status(shopify_charge) if shopify_charge
+    # Create the charge object on Shopify.
+    shopify_charge = shop.temp {
+      subscription.shopify_charge_class.create(
+        name: subscription.plan.name,
+        price: '%.2f' % (subscription.amount.to_f / 100.0),
+        trial_days: subscription.plan.has_trial? ? subscription.plan.trial_period_days : nil,
+        return_url: charge.activate_url,
+        test: !DiscoApp.configuration.real_charges?
+      )
+    }
 
-      # Return the charge.
-      shopify_charge
+    # If we couldn't create the charge on Shopify, return nil.
+    if shopify_charge.nil?
+      return nil
     end
 
-    # Fetch the specified charge for the given Shop using the Shopify API and check that it has been actioned (either
-    # accepted or declined). Updates the shop object's charge status, then returns the charge if it was accepted or
-    # nil otherwise.
-    def self.get_accepted_charge(shop, charge_id)
-      begin
-        shopify_charge = shop.temp {
-          self.charge_api_class(shop).find(charge_id)
-        }
+    # Update the local record of the charge from Shopify's created charge, then
+    # return it.
+    charge.update(
+      shopify_id: shopify_charge.id,
+      confirmation_url: shopify_charge.confirmation_url
+    )
+    charge
+  end
 
-        # If the charge was successfully fetched, update the status for the shop accordingly.
-        shop.update_charge_status(shopify_charge) if shopify_charge
+  # Attempt to activate the given Shopify charge for the given Shop using the
+  # Shopify API. Returns true on successful activation, false otherwise.
+  def self.activate(shop, charge)
+    begin
+      # Start by fetching the Shopify charge to check that it was accepted.
+      shopify_charge = shop.temp {
+        charge.subscription.shopify_charge_class.find(charge.shopify_id)
+      }
 
-        shopify_charge
-      rescue
-        nil
-      end
-    end
+      # Update the status of the local charge based on the Shopify charge.
+      charge.send("#{shopify_charge.status}!") if charge.respond_to? "#{shopify_charge.status}!"
 
-    # Attempt to activate the given Shopify charge for the given Shop using the Shopify API.
-    # Returns true on successful activation, false otherwise.
-    def self.activate(shop, shopify_charge)
-      begin
-        shop.temp {
-          shopify_charge.activate
-        }
-        shop.charge_active!
-        true
-      rescue
-        false
-      end
-    end
+      # If the charge wasn't accepted, fail and return.
+      return false unless charge.accepted?
 
-    # Merge the new_charge_attributes returned by the given shop model and merge them with some application-level
-    # charge attributes.
-    def self.new_charge_attributes(shop)
-      shop.new_charge_attributes.merge(
-        return_url: DiscoApp::Engine.routes.url_helpers.activate_charge_url,
-        test: !Rails.configuration.x.shopify_charges_real,
-      )
-    end
+      # If the charge was indeed accepted, activate it via Shopify.
+      charge.shop.temp {
+        shopify_charge.activate
+      }
 
-    # Get the appropriate Shopify API class for the given shop (either ApplicationCharge or RecurringApplicationCharge).
-    def self.charge_api_class(shop)
-      if shop.new_charge_attributes[:type] == :one_time
-        ShopifyAPI::ApplicationCharge
-      else
-        ShopifyAPI::RecurringApplicationCharge
+      # If the charge was recurring, make sure that all other local recurring
+      # charges are marked inactive.
+      if charge.recurring?
+        self.cancel_recurring_charges(shop, charge)
       end
+
+      charge.active!
+
+      true
+    rescue
+      false
     end
+  end
 
+  # Cancel all recurring charges for the given shop. If the optional charge
+  # parameter is given, it will be excluded from the cancellation.
+  def self.cancel_recurring_charges(shop, charge = nil)
+    charges = DiscoApp::RecurringApplicationCharge.where(shop: shop)
+    if charge.present?
+      charges = charges.where.not(id: charge)
+    end
+    charges.update_all(status: DiscoApp::RecurringApplicationCharge.statuses[:cancelled])
   end
+
 end

data/app/services/disco_app/subscription_service.rb

@@ -1,25 +1,37 @@
 class DiscoApp::SubscriptionService
 
-  # Subscribe the given shop to the given plan.
-  def self.subscribe(shop, plan)
-    # Mark all existing active subscriptions as replaced.
-    shop.subscriptions.active.update_all(status: DiscoApp::Subscription.statuses[:replaced])
+  # Subscribe the given shop to the given plan, optionally using the given plan
+  # code.
+  def self.subscribe(shop, plan, plan_code = nil)
+    # Cancel any existing current subscriptions.
+    shop.subscriptions.current.update_all(
+      status: DiscoApp::Subscription.statuses[:cancelled],
+      cancelled_at: Time.now
+    )
+
+    # Get the amount that should be charged for the subscription.
+    subscription_amount = plan_code.present? ? plan_code.amount : plan.amount
+
+    # Get the date the subscription trial should end.
+    subscription_trial_end_at = plan.has_trial? ? (plan_code.present? ? plan_code.trial_period_days: plan.trial_period_days).days.from_now : nil
 
-    # Add the new subscription.
-    DiscoApp::Subscription.create!(
+    # Create the new subscription.
+    new_subscription = DiscoApp::Subscription.create!(
       shop: shop,
       plan: plan,
-      status: DiscoApp::Subscription.statuses[:active],
-      name: plan.name,
-      charge_type: plan.charge_type,
-      price: plan.default_price,
-      trial_days: plan.default_trial_days
+      plan_code: plan_code,
+      status: DiscoApp::Subscription.statuses[plan.has_trial? ? :trial : :active],
+      subscription_type: plan.plan_type,
+      amount: subscription_amount,
+      trial_start_at: plan.has_trial? ? Time.now : nil,
+      trial_end_at: plan.has_trial? ? subscription_trial_end_at : nil
     )
-  end
 
-  # Cancel any active subscription for the given shop.
-  def self.cancel(shop)
-    shop.subscriptions.active.update_all(status: DiscoApp::Subscription.statuses[:cancelled])
+    # Enqueue the subscription changed background job.
+    DiscoApp::SubscriptionChangedJob.perform_later(shop.shopify_domain, new_subscription)
+
+    # Return the new subscription.
+    new_subscription
   end
 
 end

data/app/views/disco_app/admin/plans/_form.html.erb

@@ -0,0 +1,27 @@
+<%= f.label(:name, 'Name') %>
+<%= f.text_field(:name) %>
+
+<%= f.label(:status, 'Status') %>
+<%= f.select(:status, DiscoApp::Plan.statuses.map { |s| [s.first.humanize, s.first] }) %>
+
+<%= f.label(:plan_type, 'Plan Type') %>
+<%= f.select(:plan_type, DiscoApp::Plan.plan_types.map { |s| [s.first.humanize, s.first] }) %>
+
+<%= f.label(:trial_period_days, 'Trial Period Days') %>
+<%= f.number_field(:trial_period_days) %>
+
+<%= f.label(:amount, 'Amount') %>
+<%= f.number_field(:amount) %>
+
+<%= f.fields_for :plan_codes do |plan_code| %>
+  <%= plan_code.label(:code, 'Code') %>
+  <%= plan_code.text_field(:code) %>
+
+  <%= plan_code.label(:trial_period_days, 'Trial Period Days') %>
+  <%= plan_code.number_field(:trial_period_days) %>
+
+  <%= plan_code.label(:amount, 'Amount') %>
+  <%= plan_code.number_field(:amount) %>
+<% end %>
+
+<%= f.submit %>

data/app/views/disco_app/admin/plans/edit.html.erb

@@ -0,0 +1,7 @@
+<% provide(:title, 'Edit Plan') %>
+
+<%= form_for(@plan, url: admin_plan_path(@plan)) do |f| %>
+  <%= render 'form', f: f %>
+<% end %>
+
+<%= link_to 'Back', admin_plans_path %>

data/app/views/disco_app/admin/plans/index.html.erb

@@ -0,0 +1,32 @@
+<% provide(:title, 'Plans') %>
+
+<table class="table">
+  <thead>
+    <tr>
+      <th>Name</th>
+      <th>Status</th>
+      <th>Plan Type</th>
+      <th>Trial Period</th>
+      <th>Amount</th>
+      <th>Currency</th>
+      <th>Interval</th>
+      <th>Interval Count</th>
+    </tr>
+  </thead>
+  <tbody>
+    <% @plans.each do |plan| %>
+    <tr>
+      <td><%= link_to(plan.name, edit_admin_plan_path(plan)) %></td>
+      <td><%= plan.status %></td>
+      <td><%= plan.plan_type %></td>
+      <td><%= plan.trial_period_days %></td>
+      <td><%= plan.amount %></td>
+      <td><%= plan.currency %></td>
+      <td><%= plan.interval %></td>
+      <td><%= plan.interval_count %></td>
+    </tr>
+    <% end %>
+  </tbody>
+</table>
+
+<%= link_to 'Create new plan', new_admin_plan_path %>

data/app/views/disco_app/admin/plans/new.html.erb

@@ -0,0 +1,7 @@
+<% provide(:title, 'New Plan') %>
+
+<%= form_for(@plan, url: admin_plans_path) do |f| %>
+  <%= render 'form', f: f %>
+<% end %>
+
+<%= link_to 'Back', admin_plans_path %>

data/app/views/disco_app/charges/new.html.erb

@@ -1,45 +1,12 @@
 <% provide(:title, 'Thankyou') %>
 
-<div class="row">
-  <% if @shop.charge_declined? %>
-    <div class="alert alert-warning">
-      <p>
-        Oops! Looks like you declined the charge.
-        Unfortunately, you'll have to accept the charge on the next screen in order to continue installing the application.
-      </p>
-    </div>
-  <% elsif @shop.charge_cancelled? %>
-    <div class="alert alert-warning">
-      <p>
-        Your authorized charge for this application has expired.
-        This could have occurred if:
-      </p>
-      <ul>
-        <li>You uninstalled and reinstalled the application; or</li>
-        <li>Your plan level has changed.</li>
-      </ul>
-      <p>
-        In either case, it's no problem!
-        Simply click okay and you'll be asked to authorize a new charge.
-        Don't worry - you *wont'* be billed twice.
-      </p>
-    </div>
-  <% else %>
-    <div class="alert alert-success">
-      <p>
-        Thanks for installing <%= DiscoApp.configuration.app_name %>!
-      </p>
-      <p>
-        Before we start setting things up, we need you to authorize a charge for the application.
-      </p>
-    </div>
-  <% end %>
-</div>
+<p>
+  Thanks for installing <%= DiscoApp.configuration.app_name %>!
+</p>
+<p>
+  Before we start setting things up, we need you to authorize a charge for the application.
+</p>
 
-<div class="row">
-  <%= form_tag disco_app.create_charge_path, method: 'POST', target: '_parent' do %>
-    <div class="form-group">
-      <%= submit_tag 'Okay', class: 'form-input' %>
-    </div>
-  <% end %>
-</div>
+<%= form_tag disco_app.subscription_charges_path(@subscription), method: 'POST', target: '_parent' do %>
+  <%= submit_tag 'Okay', class: 'form-input' %>
+<% end %>

data/app/views/disco_app/subscriptions/new.html.erb

@@ -0,0 +1,25 @@
+<% if @shop.current_subscription? %>
+  <p>
+    You are currently on the <%= @shop.current_subscription.plan.name %> plan.
+  </p>
+  <p>
+    Choose a new plan:
+  </p>
+<% else %>
+  <p>
+    Welcome!
+  </p>
+  <p>
+    Choose a plan below to get started:
+  </p>
+<% end %>
+
+<% for plan in DiscoApp::Plan.available %>
+
+  <h2><%= plan.name %></h2>
+  <%= form_for(@subscription) do |f| %>
+    <%= f.hidden_field :plan, value: plan.id %>
+    <%= f.submit %>
+  <% end %>
+
+<% end %>

data/app/views/layouts/admin/_navbar.html.erb

@@ -16,6 +16,7 @@
     <div class="collapse navbar-collapse">
       <ul class="nav navbar-nav">
         <%= active_link_to 'Shops', admin_shops_path, wrap_tag: :li %>
+        <%= active_link_to 'Plans', admin_plans_path, wrap_tag: :li %>
         <%= active_link_to 'Settings', edit_admin_app_settings_path, wrap_tag: :li %>
       </ul>
     </div>

data/config/routes.rb

@@ -4,10 +4,12 @@ DiscoApp::Engine.routes.draw do
     post 'webhooks' => :process_webhook, as: :webhooks
   end
 
-  controller :charges do
-    get 'charges/new' => :new, as: :new_charge
-    post 'charges/create' => :create, as: :create_charge
-    get 'charges/activate' => :activate, as: :activate_charge
+  resources :subscriptions, only: [:new, :create] do
+    resources :charges, only: [:new, :create] do
+      member do
+        get 'activate'
+      end
+    end
   end
 
   controller :install do
@@ -22,7 +24,8 @@ DiscoApp::Engine.routes.draw do
   end
 
   namespace :admin do
-    resources :shops, path: '/shops', only: [:index, :edit, :update]
+    resources :shops, only: [:index, :edit, :update]
+    resources :plans
     resource :app_settings, only: [:edit, :update]
 
     # JSON-API resources for admins."

data/db/migrate/20160301223215_update_plans.rb

@@ -0,0 +1,22 @@
+class UpdatePlans < ActiveRecord::Migration
+  def change
+    remove_column :disco_app_plans, :default_price, :decimal
+    rename_column :disco_app_plans, :default_trial_days, :trial_period_days
+    rename_column :disco_app_plans, :charge_type, :plan_type
+    add_column :disco_app_plans, :amount, :integer, default: 0
+    add_column :disco_app_plans, :currency, :string, default: 'USD'
+    add_column :disco_app_plans, :interval, :integer, default: 0
+    add_column :disco_app_plans, :interval_count, :integer, default: 1
+
+    reversible do |direction|
+      direction.up do
+        change_column :disco_app_plans, :plan_type, :integer, default: 0
+        change_column :disco_app_plans, :status, :integer, default: 0
+      end
+      direction.down do
+        change_column :disco_app_plans, :plan_type, :integer
+        change_column :disco_app_plans, :status, :integer
+      end
+    end
+  end
+end

data/db/migrate/20160301224558_update_subscriptions.rb

@@ -0,0 +1,13 @@
+class UpdateSubscriptions < ActiveRecord::Migration
+  def change
+    remove_column :disco_app_subscriptions, :name, :string
+    remove_column :disco_app_subscriptions, :price, :decimal
+    remove_column :disco_app_subscriptions, :trial_days, :integer
+
+    rename_column :disco_app_subscriptions, :charge_type, :subscription_type
+
+    add_column :disco_app_subscriptions, :trial_start_at, :datetime, null: true
+    add_column :disco_app_subscriptions, :trial_end_at, :datetime, null: true
+    add_column :disco_app_subscriptions, :cancelled_at, :datetime, null: true
+  end
+end

data/db/migrate/20160302104816_create_disco_app_recurring_application_charges.rb

@@ -0,0 +1,14 @@
+class CreateDiscoAppRecurringApplicationCharges < ActiveRecord::Migration
+  def change
+    create_table :disco_app_recurring_application_charges do |t|
+      t.integer :shop_id, limit: 8
+      t.integer :subscription_id, limit: 8
+      t.integer :status, default: 0
+
+      t.timestamps null: false
+    end
+
+    add_foreign_key :disco_app_recurring_application_charges, :disco_app_shops, column: :shop_id
+    add_foreign_key :disco_app_recurring_application_charges, :disco_app_subscriptions, column: :subscription_id
+  end
+end

data/db/migrate/20160302105259_create_disco_app_application_charges.rb

@@ -0,0 +1,14 @@
+class CreateDiscoAppApplicationCharges < ActiveRecord::Migration
+  def change
+    create_table :disco_app_application_charges do |t|
+      t.integer :shop_id, limit: 8
+      t.integer :subscription_id, limit: 8
+      t.integer :status, default: 0
+
+      t.timestamps null: false
+    end
+
+    add_foreign_key :disco_app_application_charges, :disco_app_shops, column: :shop_id
+    add_foreign_key :disco_app_application_charges, :disco_app_subscriptions, column: :subscription_id
+  end
+end

data/db/migrate/20160302134728_drop_charge_status_from_shops.rb

@@ -0,0 +1,5 @@
+class DropChargeStatusFromShops < ActiveRecord::Migration
+  def change
+    remove_column :disco_app_shops, :charge_status, :integer, default: 0
+  end
+end

data/db/migrate/20160302142941_add_shopify_attributes_to_charges.rb

@@ -0,0 +1,8 @@
+class AddShopifyAttributesToCharges < ActiveRecord::Migration
+  def change
+    add_column :disco_app_application_charges, :shopify_id, :integer, limit: 8, null: true
+    add_column :disco_app_recurring_application_charges, :shopify_id, :integer, limit: 8, null: true
+    add_column :disco_app_application_charges, :confirmation_url, :string, null: true
+    add_column :disco_app_recurring_application_charges, :confirmation_url, :string, null: true
+  end
+end

data/db/migrate/20160331093148_create_disco_app_plan_codes.rb

@@ -0,0 +1,14 @@
+class CreateDiscoAppPlanCodes < ActiveRecord::Migration
+  def change
+    create_table :disco_app_plan_codes do |t|
+      t.integer :plan_id, limit: 8
+      t.string :code
+      t.integer :trial_period_days
+      t.integer :amount
+
+      t.timestamps null: false
+    end
+
+    add_foreign_key :disco_app_plan_codes, :disco_app_plans, column: :plan_id
+  end
+end

data/db/migrate/20160401044420_add_status_to_plan_codes.rb

@@ -0,0 +1,5 @@
+class AddStatusToPlanCodes < ActiveRecord::Migration
+  def change
+    add_column :disco_app_plan_codes, :status, :integer, default: 0
+  end
+end

data/db/migrate/20160401045551_add_amount_and_plan_code_to_disco_app_subscriptions.rb

@@ -0,0 +1,7 @@
+class AddAmountAndPlanCodeToDiscoAppSubscriptions < ActiveRecord::Migration
+  def change
+    add_column :disco_app_subscriptions, :amount, :integer, default: 0
+    add_column :disco_app_subscriptions, :plan_code_id, :integer, limit: 8
+    add_foreign_key :disco_app_subscriptions, :disco_app_plan_codes, column: :plan_code_id
+  end
+end

data/lib/disco_app/configuration.rb

@@ -8,6 +8,10 @@ module DiscoApp
     # Set the below if using an application proxy.
     attr_accessor :app_proxy_prefix
 
+    # Set the below to create real Shopify charges.
+    attr_accessor :real_charges
+    alias_method  :real_charges?, :real_charges
+
     # Optional configuration, usually useful for development environments.
     attr_accessor :skip_proxy_verification
     alias_method  :skip_proxy_verification?, :skip_proxy_verification
@@ -15,6 +19,8 @@ module DiscoApp
     alias_method  :skip_webhook_verification?, :skip_webhook_verification
     attr_accessor :skip_carrier_request_verification
     alias_method  :skip_carrier_request_verification?, :skip_carrier_request_verification
+    attr_accessor :skip_oauth
+    alias_method  :skip_oauth?, :skip_oauth
 
   end
 

data/lib/disco_app/version.rb

@@ -1,3 +1,3 @@
 module DiscoApp
-  VERSION = '0.8.7'
+  VERSION = '0.8.8'
 end

data/lib/generators/disco_app/reactify/reactify_generator.rb

@@ -7,7 +7,7 @@ module DiscoApp
       # Install the react-rails gem and run its setup.
       def install_gem
         # Add gem to Gemfile
-        gem 'react-rails', '~> 1.5.0'
+        gem 'react-rails', '~> 1.6.0'
 
         # Install gem.
         Bundler.with_clean_env do

data/lib/generators/disco_app/templates/initializers/disco_app.rb

@@ -7,8 +7,13 @@ DiscoApp.configure do |config|
   # Set the below if using an application proxy.
   config.app_proxy_prefix = ENV['SHOPIFY_APP_PROXY_PREFIX']
 
-  # Optional configuration, usually useful for development environments.
-  config.skip_proxy_verification = ENV['SKIP_PROXY_VERIFICATION']
-  config.skip_webhook_verification = ENV['SKIP_WEBHOOK_VERIFICATION']
-  config.skip_carrier_request_verification = ENV['SKIP_CARRIER_REQUEST_VERIFICATION']
+  # Set the below to create real Shopify charges.
+  config.real_charges = ENV['SHOPIFY_REAL_CHARGES'] === 'true'
+
+  # Optional configuration. These flags are only respected in the development
+  # environment and will have no effect in production.
+  config.skip_proxy_verification = ENV['SKIP_PROXY_VERIFICATION'] == 'true'
+  config.skip_webhook_verification = ENV['SKIP_WEBHOOK_VERIFICATION'] == 'true'
+  config.skip_carrier_request_verification = ENV['SKIP_CARRIER_REQUEST_VERIFICATION'] == 'true'
+  config.skip_oauth = ENV['SKIP_OAUTH'] == 'true'
 end