wbase 0.3.16 → 0.3.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 524d11d2757c3eeccd8194fb20d5715ef53196a1
-  data.tar.gz: 3e02d5bb4eff80e3cafeb4103c5d77f62e53d75a
+  metadata.gz: f737866525a133d24be7dff57cfcab0dfad3a26c
+  data.tar.gz: 5ca0572e21ba92771724c9b5b6004578f3ce95cb
 SHA512:
-  metadata.gz: 71f66b797a6bc64473760338aed061b0367993ea4eeefaefedbd03e103543581019d54acc5b553c2af24f9fcf7181555054d48ab028be486dc11e75cc7edaeaa
-  data.tar.gz: ef89ec4ce1d543d1b068ede1e60233b2f600226c6de8fb700f229dbcf370103c93272d42a96f09ed5f3ac68eacb47aa875983a8ab7e4a4136fad413f3a561815
+  metadata.gz: 70bc1dbff42bb371870d8faf6cf129da803fa510800d3aebb74b738db74c2190e79fdcb0ae5d45312a47765f53c3ee12f310f8cce35bc9e4222a2fd4b37e4a94
+  data.tar.gz: f48825e24bd5cc67d283859040ffc7a152fd190c81ce11fb572dabaa887ef8b292c02d637f8d4fb9cec8e9033b6d44f7aeb2ff06f6683aa1839ea960a66a8aa2

data/app/controllers/wbase/subscriptions_controller.rb

@@ -33,6 +33,15 @@ module Wbase
       end
     end
 
+    def update
+      service = UpdateSubscription.new(current_user, subscription_params)
+      service.call
+      if !service.valid?
+        flash[:errors] = service.errors
+      end
+      redirect_to '/user'
+    end
+
     private
 
     def subscription_params

data/app/services/wbase/update_subscription.rb

@@ -0,0 +1,47 @@
+module Wbase
+  class UpdateSubscription
+    attr_reader :subscription, :user, :errors, :params
+
+    def initialize(user, params)
+      @params = params
+      @user = user
+      @errors = []
+    end
+
+    def subscription
+      user.subscription
+    end
+
+    def stripe_customer
+      @stripe_customer ||= subscription.stripe_customer
+    end
+
+    def call
+      Rails.logger.info("Updating Stripe Customer for #{ user.email }")
+      card = stripe_customer.sources.create(card:  params[:credit_card_token])
+      card.save
+      stripe_customer.default_source = card.id
+      stripe_customer.save
+      subscription.update!(params)
+      Rails.logger.info stripe_customer
+    rescue Stripe::CardError => e
+      # Since it's a decline, Stripe::CardError will be caught
+      body = e.json_body
+      err  = body[:error]
+      @errors << body[:error]
+      puts "Status is: #{e.http_status}"
+      puts "Type is: #{err[:type]}"
+      puts "Code is: #{err[:code]}"
+      # param is '' in this case
+      puts "Param is: #{err[:param]}"
+      puts "Message is: #{err[:message]}"
+    rescue Stripe::InvalidRequestError => e
+      Rails.logger.error "Stripe error while updating card: #{ e.message }"
+      @errors << e.message
+    end
+
+    def valid?
+      errors.empty?
+    end
+  end
+end

data/app/views/wbase/subscriptions/edit.html.erb

@@ -1,2 +1,92 @@
-<h1>Subscriptions#edit</h1>
-<p>Find me in app/views/subscriptions/edit.html.erb</p>
+<div class="panel-heading">
+  <h3 class="text-center">
+    Current Plan: <strong><%= current_user.get_selected_plan.name %></strong>
+  </h3>
+</div>
+
+<p class="text-center">
+  <%= number_to_currency(current_user.get_selected_plan.price) %> / <small>month</small>
+</p>
+
+<!-- <p class="text&#45;center"> -->
+<!--   <%= link_to "See other plans", "/welcome#pricing&#45;section" %> -->
+<!-- </p> -->
+
+<script type="text/javascript" src="https://js.stripe.com/v2/"></script>
+<script type="text/javascript">
+  Stripe.setPublishableKey('<%= ENV["STRIPE_PUBLISHABLE_KEY"] %>');
+</script>
+
+<form action="/subscription" method="POST" id="payment-form">
+  <input type="hidden" name="_method" value="PATCH">
+  <input type="hidden" name="authenticity_token" value="<%= form_authenticity_token %>">
+  <input type="hidden" name="subscription[plan_id]" value="<%= current_user.get_selected_plan.id %>">
+  <span class="payment-errors"></span>
+
+  <div class="form-group">
+    <label for="card-number" class="control-label">Card Number</label>
+    <input id="card-number" type="text" size="20" data-stripe="number" class="form-control boxed" autofocus>
+  </div>
+
+  <div class="row form-group">
+    <div class="col-xs-6">
+      <label for="exp_month">Exp (MM / YY)</label>
+    </div>
+    <div class="col-xs-4 col-xs-offset-2">
+      <label for="cvc">CVC</label>
+    </div>
+    <div class="col-xs-3">
+      <input id="exp_month" type="text" size="2" data-stripe="exp_month" class="form-control boxed" placeholder="MM">
+    </div>
+    <div class="col-xs-3">
+      <input type="text" size="2" data-stripe="exp_year" class="form-control boxed" placeholder="YY">
+    </div>
+    <div class="col-xs-4 col-xs-offset-2">
+      <input id="cvc" type="text" size="4" data-stripe="cvc" class="form-control boxed" placeholder="CVC">
+    </div>
+  </div>
+
+  <input type="submit" class="submit btn btn-block btn-primary" value="Update!">
+  <hr>
+
+  <div class="form-group">
+    <p class="text-muted text-center"><a href="/user">Nevermind...</a></p>
+  </div>
+</form>
+
+<% content_for :javascripts do %>
+<script type="text/javascript">
+  function stripeResponseHandler(status, response) {
+    // Grab the form:
+    var $form = $('#payment-form');
+
+    if (response.error) { // Problem!
+      // Show the errors on the form:
+      $form.find('.payment-errors').text(response.error.message);
+      $form.find('.submit').prop('disabled', false); // Re-enable submission
+    } else { // Token was created!
+      // Get the token ID:
+      var token = response.id,
+        lastFour = response.card.last4,
+        cardType = response.card.brand;
+      // Insert the token ID into the form so it gets submitted to the server:
+      $form.append($('<input type="hidden" name="subscription[credit_card_token]">').val(token));
+      $form.append($('<input type="hidden" name="subscription[last_four]">').val(lastFour));
+      $form.append($('<input type="hidden" name="subscription[card_type]">').val(cardType));
+      // Submit the form:
+      $form.get(0).submit();
+    }
+  };
+  $(function() {
+    var $form = $('#payment-form');
+    $form.submit(function(event) {
+      // Disable the submit button to prevent repeated clicks:
+      $form.find('.submit').prop('disabled', true);
+      // Request a token from Stripe:
+      Stripe.card.createToken($form, stripeResponseHandler);
+      // Prevent the form from being submitted:
+      return false;
+    });
+  });
+</script>
+<% end %>

data/config/routes.rb

@@ -20,7 +20,7 @@ Wbase::Engine.routes.draw do
   resource :session, only: [:new, :create, :destroy]
   get '/session', to: 'sessions#new'
   resource :password_reset, only: [:new, :create, :edit, :update]
-  resource :subscription, only: [:new, :create]
+  resource :subscription, only: [:new, :create, :update, :edit]
   resources :mail_events
   resources :stripe_webhooks
   get '/.well-known/acme-challenge/:id' => 'static_pages#letsencrypt'

data/lib/wbase/version.rb

@@ -1,3 +1,3 @@
 module Wbase
-  VERSION = "0.3.16"
+  VERSION = "0.3.17"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wbase
 version: !ruby/object:Gem::Version
-  version: 0.3.16
+  version: 0.3.17
 platform: ruby
 authors:
 - CJ Avilla
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-09 00:00:00.000000000 Z
+date: 2017-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -300,6 +300,7 @@ files:
 - app/models/wbase/userable.rb
 - app/services/wbase/mail_event_batch.rb
 - app/services/wbase/start_subscription.rb
+- app/services/wbase/update_subscription.rb
 - app/views/layouts/mailer.html.erb
 - app/views/layouts/mailer.text.erb
 - app/views/layouts/wbase/_common_foot.html.erb
@@ -1171,7 +1172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Base for SAAS Apps