tang 0.0.1 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 224650b50f31c3795f47d1ad29872887cb4a8a5a
-  data.tar.gz: 06a8bd2ae19dcece883968a224bb3969df5ab2b7
+SHA256:
+  metadata.gz: 3e71e23301ee2e5729ca54875ff10aa648586b196a171909d88b94ebaff4ed68
+  data.tar.gz: 40b45723261ed2a75c71c140ac9df6e10bec9c3f7e9a8876038a623fcdfd6716
 SHA512:
-  metadata.gz: 1ed355c211ba41563615fe9c268ca6bf57bd9a6f5cb62b4ac278412663b1bf787ab195b07b8e64b2620458e06ef8e904547104dda494bd52c9ef7e7cf9e0123e
-  data.tar.gz: aba2e02a0a9eb51d843217f2ebf048a5c928389aa97500105d6e0e08b95e2f20d6cd874663ffe296adec3d620c7893e4afb50ccd7c2b485d442d07c11bcb8469
+  metadata.gz: 911f84494c769605a8571b4809423e453fd1f84d69a561aff2cace4e991851e219579e642d58635599656808cc61bdf007d7a4f776e726850511b9ff2f4c3196
+  data.tar.gz: c7dcb9e6df8921b1c228fb46e249584fb55681be5be328c2fbc07314a78ab57838583800928149956f79cf4496470ef57a466a3543470ee1a1fae46311af0b4f

data/README.md

@@ -1,6 +1,7 @@
 # tang
 Stripe subscriptions
 
+[![Gem Version](https://badge.fury.io/rb/tang.svg)](https://badge.fury.io/rb/tang)
 [![Build Status](https://travis-ci.org/sixoverground/tang.svg?branch=master)](https://travis-ci.org/sixoverground/tang)
 [![Code Climate](https://codeclimate.com/github/sixoverground/tang/badges/gpa.svg)](https://codeclimate.com/github/sixoverground/tang)
 [![Test Coverage](https://codeclimate.com/github/sixoverground/tang/badges/coverage.svg)](https://codeclimate.com/github/sixoverground/tang/coverage)

data/Rakefile

@@ -17,19 +17,19 @@ end
 APP_RAKEFILE = File.expand_path("../spec/tang_app/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
 
-
 load 'rails/tasks/statistics.rake'
 
-
-
 Bundler::GemHelper.install_tasks
 
+load './lib/tasks/tang_tasks.rake'
+
 begin
   require 'rspec/core/rake_task'
   RSpec::Core::RakeTask.new(spec: 'app:db:test:prepare')
   task :cucumber => 'app:cucumber'
   task default: [:spec, :cucumber]
 rescue LoadError
+  puts 'rspec/core/rake_task not required'
 end
 
 namespace :assets do
@@ -54,4 +54,4 @@ namespace :rails do
       system('rails c')
     end
   end 
-end
+end

data/app/assets/javascripts/tang/subscriptions.coffee

@@ -1,7 +1,6 @@
 $ ->
   $form = $('#payment-form')
   $form.submit( (event) ->
-
     name = $('input[data-stripe="name"]').val()
     if name.trim().length == 0
       alert('Please enter a valid cardholder name.')
@@ -26,20 +25,23 @@ $ ->
       alert('Please enter a valid CVC code.')
       return false
 
-    zip = $('input[data-stripe="address_zip"]').val()
-    if zip.trim().length < 5
-      alert('Please enter a valid zip code.')
-      return false
+    # zip = $('input[data-stripe="address_zip"]').val()
+    # if zip.trim().length < 5
+    #   alert('Please enter a valid zip code.')
+    #   return false
 
     $form.find('.submit').prop('disabled', true)
-    Stripe.card.createToken($form, stripeResponseHandler)
+    if window.testStripeToken?
+      stripeResponseHandler({}, {})
+    else
+      Stripe.card.createToken($form, stripeResponseHandler)
     return false
   )
 
   $('input[data-stripe="number"]').payment('formatCardNumber')
   $('input[data-stripe="exp"]').payment('formatCardExpiry')
   $('input[data-stripe="cvc"]').payment('formatCardCVC')
-  $('input[data-stripe="address_zip"]').payment('restrictNumeric')
+  # $('input[data-stripe="address_zip"]').payment('restrictNumeric')
 
 stripeResponseHandler = (status, response) ->
   $form = $('#payment-form')

data/app/assets/javascripts/tang/tang.js

@@ -13,4 +13,7 @@
 //
 //= require jquery
 //= require jquery_ujs
+//= require tether
+//= require popper
+//= require bootstrap-sprockets
 //= require_tree .

data/app/assets/stylesheets/scaffold.css

@@ -8,15 +8,15 @@ body, p, ol, ul, td {
 
 pre {
   background-color: #eee;
-  padding: 10px;
   font-size: 11px;
+  padding: 10px;
 }
 
 a { color: #000; }
 a:visited { color: #666; }
-a:hover { color: #fff; background-color:#000; }
+a:hover { background-color:#000; color: #fff; }
 
-div.field, div.actions {
+.field, .actions {
   margin-bottom: 10px;
 }
 
@@ -25,30 +25,32 @@ div.field, div.actions {
 }
 
 .field_with_errors {
-  padding: 2px;
   background-color: red;
   display: table;
+  padding: 2px;
 }
 
 #error_explanation {
-  width: 450px;
+  background-color: #f0f0f0;
   border: 2px solid red;
+  margin-bottom: 20px;
   padding: 7px;
   padding-bottom: 0;
-  margin-bottom: 20px;
-  background-color: #f0f0f0;
+  width: 450px;
 }
 
+/*
 #error_explanation h2 {
   text-align: left;
   font-weight: bold;
   padding: 5px 5px 5px 15px;
   font-size: 12px;
   margin: -7px;
-  margin-bottom: 0px;
+  margin-bottom: 0;
   background-color: #c00;
   color: #fff;
 }
+*/
 
 #error_explanation ul li {
   font-size: 12px;

data/app/assets/stylesheets/tang/pdf.scss

@@ -0,0 +1 @@
+@import "bootstrap";

data/app/assets/stylesheets/tang/tang.scss

@@ -0,0 +1,18 @@
+/*
+ * [Engine]
+ * This is a manifest file that'll be compiled into application.css, which will include all the files
+ * listed below.
+ *
+ * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
+ * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
+ *
+ * You're free to add application-wide styles to this file and they'll appear at the bottom of the
+ * compiled file so the styles you add here take precedence over styles defined in any styles
+ * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
+ * file per style scope.
+ *
+ * require_tree .
+ * require_self
+ */
+
+@import "bootstrap";

data/app/controllers/tang/account/application_controller.rb

@@ -1,9 +1,14 @@
 module Tang
   class Account::ApplicationController < ApplicationController
-    before_action :authenticate_user!
+    before_action :ensure_customer
+
+    def ensure_customer
+      authenticate_user! if self.respond_to?(:authenticate_user!)
+      @current_customer = current_user
+    end
 
     def current_customer
-      @current_customer ||= current_user
+      @current_customer
     end
   end
 end

data/app/controllers/tang/account/cards_controller.rb

@@ -2,9 +2,12 @@ require_dependency "tang/application_controller"
 
 module Tang
   class Account::CardsController < Account::ApplicationController
-    before_action :set_card, only: [:show]
-    
+    before_action :set_card, only: [:show, :destroy]
+
     def show
+      @can_delete_card = current_customer.stripe_id.present? && 
+          current_customer.subscription.nil? &&
+          @card.present?
     end
 
     def new
@@ -15,7 +18,7 @@ module Tang
 
     def create
       @card = SaveCard.call(
-        current_customer, 
+        current_customer,
         params[:stripe_token]
       )
 
@@ -26,14 +29,19 @@ module Tang
       end
     end
 
+    def destroy
+      if current_customer.subscription.nil?
+        @card.destroy 
+        redirect_to account_card_url, notice: 'Card was successfully removed.'
+      else
+        redirect_to account_card_url, notice: 'You cannot remove your card with an active subscription.'        
+      end
+    end
+
     private
 
     def set_card
       @card = current_customer.card
     end
-
-    def card_params
-      params
-    end
   end
 end

data/app/controllers/tang/account/coupons_controller.rb

@@ -0,0 +1,39 @@
+require_dependency "tang/application_controller"
+
+module Tang
+  class Account::CouponsController < Account::ApplicationController
+    def create
+      @coupon = Coupon.find_by(stripe_id: params[:coupon][:stripe_id])
+      if @coupon.present?
+        if current_customer.subscription.present?
+          subscription = ApplySubscriptionDiscount.call(
+            current_customer.subscription,
+            @coupon
+          )
+          if subscription.errors.any?
+            redirect_to account_subscription_path, alert: 'Coupon could not be applied.'
+            return
+          end
+        else
+          current_customer.subscription_coupon = @coupon
+          current_customer.save
+        end
+        redirect_to account_subscription_path, notice: 'Coupon was successfully applied.'
+      else
+        redirect_to account_subscription_path, alert: 'Coupon could not be applied.'
+      end
+    end
+
+    def destroy
+      if current_customer.subscription.present?
+        RemoveSubscriptionDiscount.call(
+          current_customer.subscription
+        )
+      else
+        current_customer.subscription_coupon = nil
+        current_customer.save
+      end
+      redirect_to account_subscription_path, notice: 'Coupon was successfully removed.'
+    end
+  end
+end

data/app/controllers/tang/account/receipts_controller.rb

@@ -0,0 +1,11 @@
+require_dependency "tang/application_controller"
+
+module Tang
+  class Account::ReceiptsController < Account::ApplicationController
+    def index
+      @invoices = current_customer.invoices.
+                                   paginate(page: params[:page]).
+                                   order(period_start: :desc)
+    end
+  end
+end

data/app/controllers/tang/account/subscriptions_controller.rb

@@ -3,15 +3,23 @@ require_dependency "tang/application_controller"
 module Tang
   class Account::SubscriptionsController < Account::ApplicationController
     before_action :set_subscription, only: [:show, :edit, :update, :destroy]
-    
+
     def show
-      @plans = Plan.order(:order)
+      if !current_customer.stripe_enabled?
+        render :not_stripe and return
+      end
+
+      @plans = Plan.where(interval: 'month').order(:order)
 
-      if @subscription.present?
+      if @subscription.present? && @subscription.plan.present?
         @next_plan = @plans.where("tang_plans.order > ?", @subscription.plan.order).first
+        @previous_plan = @plans.where("tang_plans.order < ?", @subscription.plan.order).last
       else
         @next_plan = @plans.first
+        @previous_plan = nil
       end
+
+      @receipts = current_customer.charges.order(created: :desc).limit(5)
     end
 
     def new
@@ -23,15 +31,15 @@ module Tang
     end
 
     def create
-      puts "params: #{params}"
-      plan = Plan.find(subscription_create_params[:plan])
+      plan = Plan.find(subscription_params[:plan])
       @subscription = CreateSubscription.call(
-        plan, 
-        current_customer, 
+        plan,
+        current_customer,
         params[:stripe_token]
       )
 
       if @subscription.errors.blank?
+        flash[:upgrade] = 'true' if @subscription.upgraded
         redirect_to account_subscription_path, notice: 'Subscription was successfully created.'
       else
         render :new
@@ -39,21 +47,30 @@ module Tang
     end
 
     def update
-      plan = Plan.find(subscription_update_params[:plan])
+      if @subscription.nil?
+        redirect_to account_subscription_path, notice: 'Sorry, we could not find your subscription.' and return
+      end
+
+      plan = Plan.find(params[:plan])
       @subscription = ChangeSubscription.call(
         @subscription,
         plan
       )
       if @subscription.errors.blank?
-        redirect_to account_subscription_path, notice: 'Subscription was successfully updated.'
+        flash[:upgrade] = 'true' if @subscription.upgraded
+        redirect_to account_subscription_path, notice: 'Subscription was successfully changed.'
       else
-        render :edit
+        @plans = Plan.order(:order)
+        @next_plan = @plans.where("tang_plans.order > ?", @subscription.plan.order).first
+        @previous_plan = @plans.where("tang_plans.order < ?", @subscription.plan.order).last
+        render :show
       end
     end
 
     def destroy
-      @subscription.destroy
-      redirect_to account_subscription_path, notice: 'Subscription was successfully destroyed.'
+      # @subscription.destroy
+      @subscription.cancel!
+      redirect_to account_subscription_path, notice: 'Subscription was successfully cancelled.'
     end
 
     private
@@ -62,12 +79,12 @@ module Tang
       @subscription = current_customer.subscription
     end
 
-    def subscription_create_params
+    def subscription_params
       params.require(:subscription).permit(:plan)
     end
 
-    def subscription_update_params
-      params.permit(:plan)
-    end
+    # def subscription_update_params
+    #   params.permit(:plan)
+    # end
   end
 end

data/app/controllers/tang/admin/application_controller.rb

@@ -1,5 +1,14 @@
 module Tang
   class Admin::ApplicationController < ApplicationController
-    before_action :authenticate_user!
+    before_action :ensure_admin
+
+    layout Tang.admin_layout
+
+    def ensure_admin
+      authenticate_user! if self.respond_to?(:authenticate_user!)
+      unless current_user.present? && current_user.respond_to?(:admin?) && current_user.admin?
+        redirect_to Tang.unauthorized_url, alert: 'You do not have access to that.'
+      end
+    end
   end
 end

data/app/controllers/tang/admin/coupons_controller.rb

@@ -2,11 +2,13 @@ require_dependency "tang/application_controller"
 
 module Tang
   class Admin::CouponsController < Admin::ApplicationController
-    before_action :set_coupon, only: [:show, :edit, :update, :destroy]
+    before_action :set_coupon, only: [:show, :destroy]
 
     # GET /coupons
     def index
-      @coupons = Coupon.all
+      @coupons = Coupon.all.
+                        paginate(page: params[:page]).
+                        order(:stripe_id)
     end
 
     # GET /coupons/1
@@ -18,10 +20,6 @@ module Tang
       @coupon = Coupon.new
     end
 
-    # GET /coupons/1/edit
-    def edit
-    end
-
     # POST /coupons
     def create
       @coupon = Coupon.new(coupon_params)
@@ -33,15 +31,6 @@ module Tang
       end
     end
 
-    # PATCH/PUT /coupons/1
-    def update
-      if @coupon.update(coupon_params)
-        redirect_to [:admin, @coupon], notice: 'Coupon was successfully updated.'
-      else
-        render :edit
-      end
-    end
-
     # DELETE /coupons/1
     def destroy
       @coupon.destroy