disco_app 0.12.7 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21023f5d93c241f965421518ec230e8586692ffb52ff8fdddc660a05a6494cd6
-  data.tar.gz: e8b82986937577901b5e4d1e1d899fd88781cad4806881607901ba84e3ae60ae
+  metadata.gz: 11ac38e563eec9da84822f94baad848cebf35c61f42e0da681cb655cb0c48e6b
+  data.tar.gz: 0d8755c4a5b7629fab63debe1a0909c9c51919d8aaf322afe827c39eb7b2a524
 SHA512:
-  metadata.gz: 2cba29ccd78c5507a1d4de5cda36abf0150f95808f69cd53b31f113fd72216c2827233e58637ef9f00d17987492f5932cacd2147b9bff144346046be708108df
-  data.tar.gz: f75e2ee5578db73961aef1a740b771535a299d0507a587befa8eb4f8106b90374e4831fa696be8ef5b97b443c2a84b80f4b0daf2dd812833774259857f3bc17d
+  metadata.gz: dfdc79a378ecae13b4f9d1f19715f65dbad5d3ee89aa5aed2bf57d09129bec8327eccc3a9212d71d66f8362a0d6138d3f3329af2739b795010fc6d0efc8bb11e
+  data.tar.gz: 5d08032f8abf215f2d5b7704c4d042bd73742611abc80ff60ea234dfbd5630dfd05a2f7f3188d68d354d611c544389e0e76b1f8ea9cf96738a1ca60b34446f3d

data/app/assets/javascripts/disco_app/components/ui-kit/forms/input-checkbox.es6.jsx

@@ -1,6 +1,6 @@
-const InputCheckbox = ({ label, name, value, checked, inline, isLast, onChange, disabled = false }) => {
+const InputCheckbox = ({ label, name, checked, inline, isLast, onChange, disabled = false }) => {
 
-  const id = `${name}[${value}]`;
+  const id = name;
 
   const wrapperClassName = classNames({
     'next-input-wrapper': true,
@@ -16,14 +16,19 @@ const InputCheckbox = ({ label, name, value, checked, inline, isLast, onChange,
   });
 
   const handleChange = (e) => {
-    onChange && onChange(e.target.value);
+    onChange && onChange(e.target.checked);
   };
 
   return(
     <div className={wrapperClassName}>
       <label htmlFor={id} className={labelClassName}>{label}</label>
-      <input id={id} className="next-checkbox" type="checkbox" value={value} name={name} checked={checked} onChange={handleChange} disabled={disabled} />
-      <span className="next-checkbox--styled" />
+      <input type="hidden" value="0" name={name} />
+      <input id={id} className="next-checkbox" type="checkbox" value="1" name={name} checked={checked} onChange={handleChange} disabled={disabled} />
+      <span className="next-checkbox--styled">
+        <svg className="next-icon next-icon--size-10 next-icon--blue checkmark">
+          <use xmlns="http://www.w3.org/1999/xlink" xlinkHref="#next-checkmark" />
+        </svg>
+      </span>
     </div>
   )
 

data/app/controllers/disco_app/admin/concerns/sources_controller.rb

@@ -0,0 +1,51 @@
+module DiscoApp::Admin::Concerns::SourcesController
+  extend ActiveSupport::Concern
+
+  included do
+    before_action :find_source, only: [:edit, :update, :destroy]
+  end
+
+  def index
+    @sources = DiscoApp::Source.all
+  end
+
+  def new
+    @source = DiscoApp::Source.new
+  end
+
+  def create
+    @source = DiscoApp::Source.new(source_params)
+    if @source.save
+      redirect_to admin_sources_path
+    else
+      render 'new'
+    end
+  end
+
+  def edit
+  end
+
+  def update
+    if @source.update_attributes(source_params)
+      redirect_to edit_admin_plan_path(@source)
+    else
+      render 'edit'
+    end
+  end
+
+  def destroy
+    source.destroy
+    redirect_to admin_sources_path
+  end
+
+  private
+
+    def find_source
+      @source = DiscoApp::Source.find(params[:id])
+    end
+
+    def source_params
+      params.require(:source).permit(:source, :name)
+    end
+
+end

data/app/controllers/disco_app/admin/sources_controller.rb

@@ -0,0 +1,3 @@
+class DiscoApp::Admin::SourcesController < DiscoApp::Admin::ApplicationController
+  include DiscoApp::Admin::Concerns::SourcesController
+end

data/app/controllers/disco_app/concerns/user_authenticated_controller.rb

@@ -0,0 +1,17 @@
+module DiscoApp::Concerns::UserAuthenticatedController
+  extend ActiveSupport::Concern
+  include ShopifyApp::LoginProtection
+
+  included do
+    before_action :shopify_user
+  end
+
+  private
+
+    def shopify_user
+      @user = DiscoApp::User.find(session[:shopify_user])
+      rescue ActiveRecord::RecordNotFound
+        redirect_to disco_app.new_user_session_path
+    end
+
+end

data/app/controllers/disco_app/user_sessions_controller.rb

@@ -0,0 +1,49 @@
+class DiscoApp::UserSessionsController < ApplicationController
+  include DiscoApp::Concerns::AuthenticatedController
+
+  def new
+  end
+
+  def create
+    authenticate
+  end
+
+  def callback
+    if auth_hash
+      login_user
+      redirect_to return_address
+    else
+      redirect_to root_path
+    end
+  end
+
+  def destroy
+    session[:shopify_user] = nil
+    redirect_to root_path
+  end
+
+  protected
+
+    def associated_user(auth_hash)
+      auth_hash['extra']['associated_user']
+    end
+
+    def authenticate
+      if sanitized_shop_name.present?
+        fullpage_redirect_to "#{main_app.root_path}auth/shopify_user?shop=#{@shop.shopify_domain}"
+      else
+        redirect_to return_address
+      end
+    end
+
+    def login_user
+      @user = DiscoApp::User.create_from_auth(associated_user(auth_hash), @shop)
+      session[:shopify_user] = @user.id
+    end
+
+    def return_address
+      session.delete(:return_to) || main_app.root_url
+    end
+
+end
+

data/app/models/disco_app/concerns/shop.rb

@@ -9,6 +9,9 @@ module DiscoApp::Concerns::Shop
     has_many :subscriptions
     has_many :plans, through: :subscriptions
 
+    # Define relationship to users.
+    has_many :users
+
     # Define relationship to sessions.
     has_many :sessions, class_name: 'DiscoApp::Session', dependent: :destroy
 
@@ -27,7 +30,7 @@ module DiscoApp::Concerns::Shop
 
     # Return true if the shop is considered as in development mode.
     def development?
-      ['staff', 'custom', 'affiliate'].include?(plan_name)
+      ['staff', 'affiliate'].include?(plan_name)
     end
 
     # Convenience method to check if this shop has a current subscription.

data/app/models/disco_app/concerns/source.rb

@@ -0,0 +1,14 @@
+module DiscoApp::Concerns::Source
+  extend ActiveSupport::Concern
+
+  included do
+
+    has_many :subscriptions
+    has_many :shops, through: :subscriptions
+
+    validates_presence_of :source
+    validates_presence_of :name
+
+  end
+
+end

data/app/models/disco_app/concerns/subscription.rb

@@ -6,7 +6,7 @@ module DiscoApp::Concerns::Subscription
     belongs_to :shop
     belongs_to :plan
     belongs_to :plan_code
-
+    belongs_to :source
     has_many :one_time_charges, class_name: 'DiscoApp::ApplicationCharge', dependent: :destroy
     has_many :recurring_charges, class_name: 'DiscoApp::RecurringApplicationCharge', dependent: :destroy
 

data/app/models/disco_app/concerns/user.rb

@@ -0,0 +1,16 @@
+module DiscoApp::Concerns::User
+  extend ActiveSupport::Concern
+
+  included do
+    belongs_to :shop
+
+    def self.create_from_auth(shopify_user, shop)
+      self.find_or_create_by(id: shopify_user.id, shop: shop).update(
+        first_name: shopify_user.first_name || '',
+        last_name: shopify_user.last_name || '',
+        email: shopify_user.email
+      )
+    end
+
+  end
+end

data/app/models/disco_app/source.rb

@@ -0,0 +1,3 @@
+class DiscoApp::Source < ActiveRecord::Base
+  include DiscoApp::Concerns::Source
+end

data/app/models/disco_app/user.rb

@@ -0,0 +1,3 @@
+class DiscoApp::User < ActiveRecord::Base
+  include DiscoApp::Concerns::User
+end

data/app/services/disco_app/subscription_service.rb

@@ -2,7 +2,7 @@ class DiscoApp::SubscriptionService
 
   # Subscribe the given shop to the given plan, optionally using the given plan
   # code and optionally tracking the subscription source.
-  def self.subscribe(shop, plan, plan_code = nil, source = nil)
+  def self.subscribe(shop, plan, plan_code = nil, source_name = nil)
 
     # If a plan code was provided, fetch it for the given plan.
     plan_code_instance = nil
@@ -10,6 +10,12 @@ class DiscoApp::SubscriptionService
       plan_code_instance = DiscoApp::PlanCode.available.find_by(plan: plan, code: plan_code)
     end
 
+    # If a source name has been provided, fetch or create it
+    source_instance = nil
+    if source_name.present?
+      source_instance = DiscoApp::Source.find_or_create_by(source: source_name)
+    end
+
     # Cancel any existing current subscriptions.
     shop.subscriptions.current.update_all(
       status: DiscoApp::Subscription.statuses[:cancelled],
@@ -33,7 +39,7 @@ class DiscoApp::SubscriptionService
       trial_period_days: plan.has_trial? ? subscription_trial_period_days : nil,
       trial_start_at: plan.has_trial? ? Time.now : nil,
       trial_end_at: plan.has_trial? ? subscription_trial_period_days.days.from_now : nil,
-      source: source
+      source: source_instance
     )
 
     # Enqueue the subscription changed background job.

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

@@ -0,0 +1,34 @@
+<section class="section">
+  <div class="layout-content">
+    <section class="layout-content__main">
+      <div class="next-grid">
+        <div class="next-grid__cell">
+          <div class="next-card">
+
+            <header class="next-card__header">
+              <h1>Source</h1>
+            </header>
+
+            <section class="next-card__section">
+              <div class="form-group">
+                <%= f.label(:source, 'Source code') %>
+                <%= f.text_field(:source, placeholder: "Enter the source name in its acronyme form (eg: Bob Dylan => bd") %>
+              </div>
+
+              <div class="form-group">
+                <%= f.label(:status, 'Full source name') %>
+                <%= f.text_field(:name, placeholder: "Enter the full source name") %>
+              </div>
+            </section>
+          </div>
+        </div>
+      </div>
+      <hr />
+      <div class="row">
+        <div class="col-md-12">
+          <%= f.submit 'Save', { class: 'btn btn-primary' } %>
+        </div>
+      </div>
+    </section>
+  </div>
+</section>

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

@@ -0,0 +1,7 @@
+<% provide(:title, 'Edit Source') %>
+
+<%= form_for(@source, url: admin_source_path(@source)) do |f| %>
+    <%= render 'form', f: f %>
+<% end %>
+
+<%= link_to 'Back', admin_sources_path, { class: 'btn btn-default' } %>

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

@@ -0,0 +1,32 @@
+<% provide(:title, 'Sources') %>
+
+<div class="next-grid">
+  <div class="next-grid__cell">
+    <div class="next-card">
+      <% unless @sources.empty? %>
+          <table class="table">
+            <thead>
+            <tr>
+              <th>Source</th>
+              <th>Source (Full name)</th>
+              <th></th>
+            </tr>
+            </thead>
+            <tbody>
+            <% @sources.each do |source| %>
+                <tr>
+                  <td><%= link_to(source.name, edit_admin_source_path(source)) %></td>
+                  <td><%= source.source %></td>
+                  <td><%= source.name %></td>
+                  <td><%= link_to 'Delete', admin_source_path(source), action: 'destroy', method: :delete,  data: {confirm: "About to delete the source: #{source.source}. Are you sure?"} %></td>
+                </tr>
+            <% end %>
+            </tbody>
+          </table>
+      <% end %>
+    </div>
+    <hr/>
+    <%= link_to 'Create new source', new_admin_source_path, { class: 'btn btn-primary' } %>
+  </div>
+</div>
+

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

@@ -0,0 +1,7 @@
+<% provide(:title, 'New Source') %>
+
+<%= form_for(@source, url: admin_sources_path) do |f| %>
+    <%= render 'form', f: f %>
+<% end %>
+
+<%= link_to 'Back', admin_sources_path, { class: 'btn btn-default' } %>

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

@@ -0,0 +1,12 @@
+<%= form_tag user_sessions_path, method: :post do %>
+  <div class="ui-empty-state">
+    <section class="ui-empty-state__section">
+      <div class="ui-empty-state__subsection">
+        <h2 class="ui-empty-state__subtitle">Login as a Shopify User to access this page</h2>
+      </div>
+      <div class="ui-empty-state__subsection">
+        <button type="submit" class="btn btn-large btn-primary">Login</button>
+      </div>
+    </section>
+  </div>
+<% end %>

data/app/views/layouts/admin/_nav_items.erb

@@ -12,6 +12,13 @@
   </a>
 </li>
 
+<li class="next-nav__item">
+  <a href="<%= admin_sources_path %>" class="next-nav__link <%= active_link_to_class(admin_sources_path, class_active: 'next-nav__link--is-selected', active: :inclusive) %>">
+    <svg class="next-icon next-icon--size-16 next-icon--no-nudge" role="img" aria-labelledby="next-dashboard-16-17dbedf316126bf9bd81f6c6b7626199-title"><title id="next-dashboard-16-17dbedf316126bf9bd81f6c6b7626199-title">Home</title><use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#next-dashboard-16"></use></svg>
+    <span class="next-nav__text">Sources</span>
+  </a>
+</li>
+
 <li class="next-nav__item">
   <a href="<%= edit_admin_app_settings_path %>" class="next-nav__link <%= active_link_to_class(edit_admin_app_settings_path, class_active: 'next-nav__link--is-selected', active: :inclusive) %>">
     <svg class="next-icon next-icon--size-16 next-icon--no-nudge" role="img" aria-labelledby="next-dashboard-16-17dbedf316126bf9bd81f6c6b7626199-title"><title id="next-dashboard-16-17dbedf316126bf9bd81f6c6b7626199-title">Home</title><use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#next-dashboard-16"></use></svg>

data/config/routes.rb

@@ -9,6 +9,9 @@ DiscoApp::Engine.routes.draw do
     post 'webhooks' => :process_webhook, as: :webhooks
   end
 
+  resources :user_sessions, only: [:new, :create, :destroy]
+  get 'auth/shopify_user/callback' => 'user_sessions#callback'
+
   resources :subscriptions, only: [:new, :create] do
     resources :charges, only: [:new, :create] do
       member do
@@ -33,6 +36,7 @@ DiscoApp::Engine.routes.draw do
       resources :subscriptions, only: [:edit, :update]
     end
     resources :plans
+    resources :sources
     resource :app_settings, only: [:edit, :update]
 
     # JSON-API resources for admins.

data/db/migrate/20170315062548_create_disco_app_sources.rb

@@ -0,0 +1,10 @@
+class CreateDiscoAppSources < ActiveRecord::Migration
+  def change
+    create_table :disco_app_sources do |t|
+      t.string :source, null: true
+      t.string :name, null: true
+      t.timestamps null: false
+    end
+    add_index :disco_app_sources, :source
+  end
+end

data/db/migrate/20170315062629_add_sources_to_shop_subscriptions.rb

@@ -0,0 +1,14 @@
+class AddSourcesToShopSubscriptions < ActiveRecord::Migration
+  def change
+    add_column :disco_app_subscriptions, :source_id, :integer, limit: 8, index: true
+    add_foreign_key :disco_app_subscriptions, :disco_app_sources, column: :source_id
+
+    DiscoApp::Subscription.where.not(source: nil).find_each do |subscription|
+      DiscoApp::Source.find_or_create_by(source: subscription.source) do |new_source|
+        new_source.name = subscription.source
+      end
+    end
+
+    remove_column :disco_app_subscriptions, :source
+  end
+end

data/db/migrate/20170327214540_create_disco_app_users.rb

@@ -0,0 +1,13 @@
+class CreateDiscoAppUsers < ActiveRecord::Migration
+  def change
+    create_table :disco_app_users do |t|
+      t.integer :shop_id, limit: 8
+      t.string :first_name
+      t.string :last_name
+      t.string :email
+
+      t.timestamps null: false
+    end
+    add_index :disco_app_users, :shop_id, unique: true
+  end
+end

data/lib/disco_app/version.rb

@@ -1,3 +1,3 @@
 module DiscoApp
-  VERSION = '0.12.7'
+  VERSION = '0.13.0'
 end

data/test/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20161105054746) do
+ActiveRecord::Schema.define(version: 20170327214540) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -99,6 +99,15 @@ ActiveRecord::Schema.define(version: 20161105054746) do
 
   add_index "disco_app_shops", ["shopify_domain"], name: "index_disco_app_shops_on_shopify_domain", unique: true, using: :btree
 
+  create_table "disco_app_sources", force: :cascade do |t|
+    t.string   "source"
+    t.string   "name"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
+  add_index "disco_app_sources", ["source"], name: "index_disco_app_sources_on_source", using: :btree
+
   create_table "disco_app_subscriptions", force: :cascade do |t|
     t.integer  "shop_id"
     t.integer  "plan_id"
@@ -111,13 +120,24 @@ ActiveRecord::Schema.define(version: 20161105054746) do
     t.datetime "cancelled_at"
     t.integer  "amount",                      default: 0
     t.integer  "plan_code_id",      limit: 8
-    t.string   "source"
     t.integer  "trial_period_days"
+    t.integer  "source_id",         limit: 8
   end
 
   add_index "disco_app_subscriptions", ["plan_id"], name: "index_disco_app_subscriptions_on_plan_id", using: :btree
   add_index "disco_app_subscriptions", ["shop_id"], name: "index_disco_app_subscriptions_on_shop_id", using: :btree
 
+  create_table "disco_app_users", force: :cascade do |t|
+    t.integer  "shop_id",    limit: 8
+    t.string   "first_name"
+    t.string   "last_name"
+    t.string   "email"
+    t.datetime "created_at",           null: false
+    t.datetime "updated_at",           null: false
+  end
+
+  add_index "disco_app_users", ["shop_id"], name: "index_disco_app_users_on_shop_id", unique: true, using: :btree
+
   create_table "js_configurations", force: :cascade do |t|
     t.integer "shop_id", limit: 8
     t.string  "label",             default: "Default"
@@ -146,6 +166,7 @@ ActiveRecord::Schema.define(version: 20161105054746) do
   add_foreign_key "disco_app_recurring_application_charges", "disco_app_subscriptions", column: "subscription_id"
   add_foreign_key "disco_app_sessions", "disco_app_shops", column: "shop_id", on_delete: :cascade
   add_foreign_key "disco_app_subscriptions", "disco_app_plan_codes", column: "plan_code_id"
+  add_foreign_key "disco_app_subscriptions", "disco_app_sources", column: "source_id"
   add_foreign_key "js_configurations", "disco_app_shops", column: "shop_id"
   add_foreign_key "products", "disco_app_shops", column: "shop_id"
   add_foreign_key "widget_configurations", "disco_app_shops", column: "shop_id"

data/test/fixtures/api/subscriptions/valid_request.json

@@ -24,8 +24,8 @@
     "cancelled_at": null,
     "amount": 999,
     "plan_code_id": null,
-    "source": null,
     "trial_period_days": 14,
+    "source_id": null,
     "active_charge": {
       "id":332186283,
       "shop_id":605094243,

data/test/fixtures/disco_app/sources.yml

@@ -0,0 +1,3 @@
+source_1:
+  source: 'smp'
+  name: 'smpodcast'

data/test/jobs/disco_app/app_installed_job_test.rb

@@ -45,13 +45,13 @@ class DiscoApp::AppInstalledJobTest < ActionController::TestCase
     @shop.current_subscription.destroy
 
     perform_enqueued_jobs do
-      DiscoApp::AppInstalledJob.perform_later(@shop, 'PODCAST', 'smpodcast')
+      DiscoApp::AppInstalledJob.perform_later(@shop, 'PODCAST', 'smp')
     end
 
     # Assert the shop was subscribed to the development plan.
     assert_equal disco_app_plans(:development), @shop.current_subscription.plan
     assert_equal disco_app_plan_codes(:podcast_dev), @shop.current_subscription.plan_code
-    assert_equal 'smpodcast', @shop.current_subscription.source
+    assert_equal 'smpodcast', @shop.current_subscription.source.name
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: disco_app
 version: !ruby/object:Gem::Version
-  version: 0.12.7
+  version: 0.13.0
 platform: ruby
 authors:
 - Gavin Ballard
@@ -540,18 +540,22 @@ files:
 - app/controllers/disco_app/admin/concerns/authenticated_controller.rb
 - app/controllers/disco_app/admin/concerns/plans_controller.rb
 - app/controllers/disco_app/admin/concerns/shops_controller.rb
+- app/controllers/disco_app/admin/concerns/sources_controller.rb
 - app/controllers/disco_app/admin/concerns/subscriptions_controller.rb
 - app/controllers/disco_app/admin/plans_controller.rb
 - app/controllers/disco_app/admin/resources/shops_controller.rb
 - app/controllers/disco_app/admin/shops_controller.rb
+- app/controllers/disco_app/admin/sources_controller.rb
 - app/controllers/disco_app/admin/subscriptions_controller.rb
 - app/controllers/disco_app/charges_controller.rb
 - app/controllers/disco_app/concerns/app_proxy_controller.rb
 - app/controllers/disco_app/concerns/authenticated_controller.rb
 - app/controllers/disco_app/concerns/carrier_request_controller.rb
+- app/controllers/disco_app/concerns/user_authenticated_controller.rb
 - app/controllers/disco_app/frame_controller.rb
 - app/controllers/disco_app/install_controller.rb
 - app/controllers/disco_app/subscriptions_controller.rb
+- app/controllers/disco_app/user_sessions_controller.rb
 - app/controllers/disco_app/webhooks_controller.rb
 - app/controllers/sessions_controller.rb
 - app/helpers/disco_app/application_helper.rb
@@ -582,15 +586,19 @@ files:
 - app/models/disco_app/concerns/plan_code.rb
 - app/models/disco_app/concerns/renders_assets.rb
 - app/models/disco_app/concerns/shop.rb
+- app/models/disco_app/concerns/source.rb
 - app/models/disco_app/concerns/subscription.rb
 - app/models/disco_app/concerns/synchronises.rb
 - app/models/disco_app/concerns/taggable.rb
+- app/models/disco_app/concerns/user.rb
 - app/models/disco_app/plan.rb
 - app/models/disco_app/plan_code.rb
 - app/models/disco_app/recurring_application_charge.rb
 - app/models/disco_app/session_storage.rb
 - app/models/disco_app/shop.rb
+- app/models/disco_app/source.rb
 - app/models/disco_app/subscription.rb
+- app/models/disco_app/user.rb
 - app/resources/disco_app/admin/resources/concerns/shop_resource.rb
 - app/resources/disco_app/admin/resources/shop_resource.rb
 - app/services/disco_app/carrier_request_service.rb
@@ -606,6 +614,10 @@ files:
 - app/views/disco_app/admin/plans/index.html.erb
 - app/views/disco_app/admin/plans/new.html.erb
 - app/views/disco_app/admin/shops/index.html.erb
+- app/views/disco_app/admin/sources/_form.html.erb
+- app/views/disco_app/admin/sources/edit.html.erb
+- app/views/disco_app/admin/sources/index.html.erb
+- app/views/disco_app/admin/sources/new.html.erb
 - app/views/disco_app/admin/subscriptions/edit.html.erb
 - app/views/disco_app/charges/activate.html.erb
 - app/views/disco_app/charges/create.html.erb
@@ -618,6 +630,7 @@ files:
 - app/views/disco_app/shared/_icons.html.erb
 - app/views/disco_app/shared/_section.html.erb
 - app/views/disco_app/subscriptions/new.html.erb
+- app/views/disco_app/user_sessions/new.html.erb
 - app/views/layouts/admin.html.erb
 - app/views/layouts/admin/_nav_items.erb
 - app/views/layouts/application.html.erb
@@ -626,6 +639,9 @@ files:
 - app/views/shopify_app/sessions/new.html.erb
 - config/routes.rb
 - db/migrate/20150525000000_create_shops_if_not_existent.rb
+- db/migrate/20170315062548_create_disco_app_sources.rb
+- db/migrate/20170315062629_add_sources_to_shop_subscriptions.rb
+- db/migrate/20170327214540_create_disco_app_users.rb
 - lib/disco_app.rb
 - lib/disco_app/configuration.rb
 - lib/disco_app/constants.rb
@@ -781,6 +797,7 @@ files:
 - test/fixtures/disco_app/plans.yml
 - test/fixtures/disco_app/recurring_application_charges.yml
 - test/fixtures/disco_app/shops.yml
+- test/fixtures/disco_app/sources.yml
 - test/fixtures/disco_app/subscriptions.yml
 - test/fixtures/js_configurations.yml
 - test/fixtures/liquid/model.liquid
@@ -945,6 +962,7 @@ test_files:
 - test/fixtures/assets/test.min.js
 - test/fixtures/widget_configurations.yml
 - test/fixtures/js_configurations.yml
+- test/fixtures/disco_app/sources.yml
 - test/fixtures/disco_app/plan_codes.yml
 - test/fixtures/disco_app/shops.yml
 - test/fixtures/disco_app/application_charges.yml