tang 0.0.8 → 0.2.2

data/app/services/tang/delete_card.rb

@@ -2,10 +2,12 @@ module Tang
   class DeleteCard
     def self.call(card)
       begin
-        customer = Stripe::Customer.retrieve(card.customer.stripe_id)
-        customer.sources.retrieve(card.stripe_id).delete
+        Stripe::Customer.delete_source(
+          card.customer.stripe_id,
+          card.stripe_id,
+        )
       rescue Stripe::StripeError => e
-        card.errors[:base] << e.message
+        card.errors.add(:base, :invalid, message: e.message)
       end
       return card
     end

data/app/services/tang/delete_coupon.rb

@@ -5,7 +5,7 @@ module Tang
         c = Stripe::Coupon.retrieve(coupon.stripe_id)
         c.delete        
       rescue Stripe::StripeError => e
-        coupon.errors[:base] << e.message
+        coupon.errors.add(:base, :invalid, message: e.message)
       end
       return coupon
     end

data/app/services/tang/delete_customer.rb

@@ -6,7 +6,7 @@ module Tang
           c = Stripe::Customer.retrieve(customer.stripe_id)
           c.delete
         rescue Stripe::StripeError => e
-          customer.errors[:base] << e.message
+          customer.errors.add(:base, :invalid, message: e.message)
         end
       end
       return customer

data/app/services/tang/delete_plan.rb

@@ -5,7 +5,7 @@ module Tang
         p = Stripe::Plan.retrieve(plan.stripe_id)
         p.delete
       rescue Stripe::StripeError => e
-        plan.errors[:base] << e.message
+        plan.errors.add(:base, :invalid, message: e.message)
       end
       return plan
     end

data/app/services/tang/fail_invoice.rb

@@ -1,7 +1,8 @@
 module Tang
   class FailInvoice
     def self.call(stripe_invoice)
-      invoice = Invoice.find_by(stripe_id: stripe_invoice.id)
+      # invoice = Invoice.find_by(stripe_id: stripe_invoice.id)
+      invoice = Invoice.from_stripe(stripe_invoice)
 
       # create charge
       charge = nil
@@ -12,8 +13,15 @@ module Tang
 
       # update subscription
       subscription = Subscription.find_by(stripe_id: stripe_invoice.subscription)
-      subscription.fail! if !subscription.past_due?
-
+      if subscription.nil?
+        stripe_subscription = Stripe::Subscription.retrieve(stripe_invoice.subscription)
+        subscription = Subscription.from_stripe(stripe_subscription)
+        invoice.update(subscription: subscription)
+      end
+      if subscription.present?
+        subscription.fail! if !subscription.past_due?
+      end
+      
       return charge
     end
   end

data/app/services/tang/pay_invoice.rb

@@ -1,7 +1,18 @@
 module Tang
   class PayInvoice
     def self.call(stripe_invoice)
-      # invoice = Invoice.find_by(stripe_id: stripe_invoice.id)
+
+      # ensure the subscription exists
+      stripe_subscription = Stripe::Subscription.retrieve(stripe_invoice.subscription)
+      subscription = Subscription.find_by(stripe_id: stripe_invoice.subscription)
+      if subscription.nil?
+        subscription = Subscription.from_stripe(stripe_subscription)
+      elsif stripe_subscription.discount.nil?
+        # update discount
+        subscription.update(coupon: nil, coupon_start: nil)
+      end
+
+      # create the invoice
       invoice = Invoice.from_stripe(stripe_invoice)
 
       # create charge
@@ -11,19 +22,10 @@ module Tang
         charge = Charge.from_stripe(stripe_charge, invoice)
       end
 
-      # update subscription
-      stripe_subscription = Stripe::Subscription.retrieve(stripe_invoice.subscription)      
-      subscription = Subscription.find_by(stripe_id: stripe_invoice.subscription)
-
+      # update customer active until
       if subscription.present?
-        # update discount
-        if stripe_subscription.discount.nil?
-          subscription.update(coupon: nil, coupon_start: nil)
-        end
-
-        # update customer active until
         customer = subscription.customer
-        customer.update_subscription_end(stripe_subscription)
+        customer.update_subscription_end(subscription)
       end
 
       return charge

data/app/services/tang/remove_customer_discount.rb

@@ -5,7 +5,7 @@ module Tang
         cu = Stripe::Customer.retrieve(customer.stripe_id)
         cu.delete_discount
       rescue Stripe::StripeError => e
-        customer.errors[:base] << e.message
+        customer.errors.add(:base, :invalid, message: e.message)
       end
 
       customer.update(coupon: nil, coupon_start: nil)

data/app/services/tang/remove_subscription_discount.rb

@@ -4,7 +4,7 @@ module Tang
       begin
         Stripe::Subscription.retrieve(subscription.stripe_id).delete_discount()
       rescue Stripe::StripeError => e
-        subscription.errors[:base] << e.message
+        subscription.errors.add(:base, :invalid, message: e.message)
       end
 
       subscription.update(coupon: nil, coupon_start: nil)

data/app/services/tang/save_card.rb

@@ -22,11 +22,14 @@ module Tang
         end
 
         # Save the payment method
-        stripe_card = cu.sources.retrieve(cu.default_source)
+        stripe_card = Stripe::Customer.retrieve_source(
+          cu.id,
+          cu.default_source,
+        )
         card.update_from_stripe(stripe_card)
 
       rescue Stripe::StripeError => e
-        card.errors[:base] << e.message
+        card.errors.add(:base, :invalid, message: e.message)
       end
       return card
     end

data/app/services/tang/update_coupon.rb

@@ -10,7 +10,7 @@ module Tang
         c.id = coupon.id
         c.save
       rescue Stripe::StripeError => e
-        coupon.errors[:base] << e.message
+        coupon.errors.add(:base, :invalid, message: e.message)
       end
 
       return coupon

data/app/services/tang/update_customer.rb

@@ -9,7 +9,7 @@ module Tang
           c = populate_customer(c, customer)
           c.save
         rescue Stripe::StripeError => e
-          customer.errors[:base] << e.message
+          customer.errors.add(:base, :invalid, message: e.message)
         end
       end
 

data/app/services/tang/update_plan.rb

@@ -10,7 +10,7 @@ module Tang
         p.name = plan.name
         p.save
       rescue Stripe::StripeError => e
-        plan.errors[:base] << e.message
+        plan.errors.add(:base, :invalid, message: e.message)
       end
 
       return plan

data/app/services/tang/update_subscription.rb

@@ -10,11 +10,11 @@ module Tang
         s.plan = subscription.plan.stripe_id
         s.quantity = subscription.quantity
         s.trial_end = subscription.stripe_trial_end if subscription.stripe_trial_end.present?
-        s.tax_percent = subscription.tax_percent if subscription.tax_percent.present?
+        # s.tax_percent = subscription.tax_percent if subscription.tax_percent.present?
         s.coupon = subscription.coupon.stripe_id if subscription.coupon.present?
         s.save
       rescue Stripe::StripeError => e
-        subscription.errors[:base] << e.message
+        subscription.errors.add(:base, :invalid, message: e.message)
       end
 
       return subscription

data/app/validators/future_validator.rb

@@ -1,7 +1,7 @@
 class FutureValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, _value)
     if record[attribute] < Time.now
-      record.errors[attribute] << (options[:message] || "must be in the future.")
+      record.errors.add(attribute, :invalid, message: (options[:message] || "must be in the future."))
     end
   end
 end

data/app/views/tang/account/cards/_payment.html.erb

@@ -1,30 +1,11 @@
-<span class="payment-errors"></span>
-
 <div class="payment-row">
-  <label for="name">
-    <span>Cardholder name</span>
-  </label>
-    <input id="name" type="text" data-stripe="name" autocomplete="cc-name" placeholder="Full Name" required class="form-control">
-
-  <label for="number">
-    <span>Card number</span>
-  </label>
-  <input id="number" type="tel" size="20" data-stripe="number" autocomplete="cc-number" placeholder="•••• •••• •••• ••••" required class="form-control">
+  <label for="name">Cardholder name</label>
+  <input id="name" type="text" autocomplete="cc-name" placeholder="Full Name" required class="form-control">
 </div>
 
 <div class="payment-row">
-  <label>
-    <span>Expiration (MM/YY)</span>
-    <input type="tel" size="5" data-stripe="exp" autocomplete="cc-exp" placeholder="•• / ••" required class="form-control">
-  </label>
-
-  <label>
-    <span>CVC</span>
-    <input type="tel" size="4" data-stripe="cvc" autocomplete="off" placeholder="•••" required class="form-control">
-  </label>
+  <label for="card-element">Credit or debit card</label>
+  <div id="card-element"></div>
+</div>
 
-  <label>
-    <span>Postal code</span>
-    <input type="text" data-stripe="address_zip" autocomplete="postal-code" placeholder="•••••" required class="form-control">
-  </label>
-</div>
+<div id="card-errors" role="alert"></div>

data/app/views/tang/account/cards/show.html.erb

@@ -14,7 +14,7 @@
 </div>
 
 <%= link_to 'Use a new card', new_account_card_path, class: 'btn btn-secondary' %>
-<% if @can_delete_card? %>
+<% if @can_delete_card %>
   <%= link_to 'Remove card', account_card_path, method: :delete, data: { confirm: 'Are you sure?' }, class: 'btn btn-danger' %>
 <% end %>
 <%= link_to 'Cancel', account_subscription_path, class: 'btn btn-secondary' %>

data/app/views/tang/account/receipts/_receipt.html.erb

@@ -3,5 +3,5 @@
     <%= link_to 'Download PDF', invoice.invoice_pdf, class: 'btn btn-secondary', target: '_blank' %>
   </div>
   <h5 class="list-group-item-heading"><%= number_to_currency(invoice.total.to_f / 100.0) %></h5>
-  <p class="list-group-item-text">Date <%= invoice.period_start.strftime('%b %d, %Y') %></p>
+  <p class="list-group-item-text">Date <%= invoice.date.strftime('%b %d, %Y') %></p>
 </li>

data/app/views/tang/admin/payments/index.html.erb

@@ -22,7 +22,7 @@
           <% end %>
         </td>
         <td><%= payment.stripe_id %></td>
-        <td><%= payment.invoice.customer.email if payment.invoice.present? %></td>
+        <td><%= payment.invoice.customer.email if payment.invoice.present? && payment.invoice.customer.present? %></td>
         <td><%= payment.created.strftime('%Y/%m/%d %H:%M:%S') %></td>
       </tr>
     <% end %>

data/app/views/tang/admin/plans/show.html.erb

@@ -43,7 +43,7 @@
     <tbody>
       <% @plan.subscriptions.where(status: [:trialing, :active, :past_due]).each do |subscription| %>
         <tr>
-          <td><%= link_to subscription.customer.email, tang.admin_subscription_path(subscription) %></td>
+          <td><%= link_to subscription.customer.email, tang.admin_subscription_path(subscription) if subscription.customer.present? %></td>
           <td><%= subscription.status %></td>
         </tr>
       <% end %>

data/app/views/tang/admin/subscriptions/_form.html.erb

@@ -31,11 +31,6 @@
     <% end %>
   </div>
 
-  <div class="form-group">
-    <%= f.label :tax_percent %>
-    <%= f.number_field :tax_percent, min: 0, step: 0.0001, class: 'form-control' %>
-  </div>
-
   <%= link_to 'Cancel', tang.admin_subscription_path(subscription), class: 'btn btn-secondary' %>
   <%= f.submit class: 'btn btn-primary' %>
 <% end %>

data/app/views/tang/admin/subscriptions/index.html.erb

@@ -15,7 +15,7 @@
   <tbody>
     <% @subscriptions.each do |subscription| %>
       <tr>
-        <td><%= link_to subscription.customer.email, tang.admin_subscription_path(subscription) %></td>
+        <td><%= link_to subscription.customer.email, tang.admin_subscription_path(subscription) if subscription.customer.present? %></td>
         <td><%= subscription.status %></td>
         <td>
           <%= subscription.plan.name %>

data/app/views/tang/admin/subscriptions/show.html.erb

@@ -37,13 +37,6 @@
       <dt>Trialing until:</dt>
       <dd><%= @subscription.trial_end.strftime('%Y/%m/%d') %></dd>
     <% end %>
-
-    <dt>Tax percent:</dt>
-    <% if @subscription.tax_percent.present? %>
-      <dd><%= @subscription.tax_percent %>%</dd>
-    <% else %>
-      <dd>No tax applied</dd>
-    <% end %>
   </dl>
 </div>
 

data/config/cucumber.yml

@@ -1,8 +1,8 @@
 <%
 rerun = File.file?('rerun.txt') ? IO.read('rerun.txt') : ""
 rerun_opts = rerun.to_s.strip.empty? ? "--format #{ENV['CUCUMBER_FORMAT'] || 'progress'} features" : "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} #{rerun}"
-std_opts = "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} --strict --tags not @wip"
+std_opts = "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} --strict --tags 'not @wip'"
 %>
-default: <%= std_opts %> features
+default: <%= std_opts %> --publish-quiet features
 wip: --tags @wip:3 --wip features
-rerun: <%= rerun_opts %> --format rerun --out rerun.txt --strict --tags not @wip
+rerun: <%= rerun_opts %> --format rerun --out rerun.txt --strict --tags "not @wip"

data/config/initializers/stripe_event.rb

@@ -7,7 +7,6 @@ end
 
 StripeEvent.configure do |events|
   events.all do |event|
-    # puts "stripe_event: #{event}"
   end
 
   # Disputes

data/config/routes.rb

@@ -24,7 +24,7 @@ Tang::Engine.routes.draw do
 
   namespace :account do
     resource :subscription
-    resource :card, only: [:show, :new, :create, :destroy]
+    resource :card, only: [:show, :new, :create, :update, :destroy]
     resource :coupon, only: [:create, :destroy]
     resources :receipts, only: [:index]
   end

data/lib/css/main.css

@@ -0,0 +1,31 @@
+/**
+ * The CSS shown here will not be introduced in the Quickstart guide, but shows
+ * how you can use CSS to style your Element's container.
+ */
+ .StripeElement {
+  box-sizing: border-box;
+
+  height: 40px;
+
+  padding: 10px 12px;
+
+  border: 1px solid transparent;
+  border-radius: 4px;
+  background-color: white;
+
+  box-shadow: 0 1px 3px 0 #e6ebf1;
+  -webkit-transition: box-shadow 150ms ease;
+  transition: box-shadow 150ms ease;
+}
+  
+  .StripeElement--focus {
+    box-shadow: 0 1px 3px 0 #cfd7df;
+  }
+  
+  .StripeElement--invalid {
+    border-color: #fa755a;
+  }
+  
+  .StripeElement--webkit-autofill {
+    background-color: #fefde5 !important;
+  }

data/lib/js/index.js

@@ -0,0 +1,87 @@
+// Create a Stripe client.
+// var stripe = Stripe(process.env.STRIPE_PUBLISHABLE_KEY);
+var stripe = Stripe(window.Tang.STRIPE_PUBLISHABLE_KEY)
+
+const registerElements = () => {
+
+  if (!document.getElementById('card-element')) {
+    return
+  }
+
+  // Create an instance of Elements.
+  var elements = stripe.elements();
+
+  // Custom styling can be passed to options when creating an Element.
+  // (Note that this demo uses a wider set of styles than the guide below.)
+  var style = {
+    base: {
+      color: '#32325d',
+      fontFamily: '"Helvetica Neue", Helvetica, sans-serif',
+      fontSmoothing: 'antialiased',
+      fontSize: '16px',
+      '::placeholder': {
+        color: '#aab7c4'
+      }
+    },
+    invalid: {
+      color: '#fa755a',
+      iconColor: '#fa755a'
+    }
+  };
+
+  // Create an instance of the card Element.
+  var card = elements.create('card', {style: style});
+
+  // Add an instance of the card Element into the `card-element` <div>.
+  card.mount('#card-element');
+  // Handle real-time validation errors from the card Element.
+  card.on('change', function(event) {
+    var displayError = document.getElementById('card-errors');
+    if (event.error) {
+      displayError.textContent = event.error.message;
+    } else {
+      displayError.textContent = '';
+    }
+  });
+
+  // Handle form submission.
+  var form = document.getElementById('payment-form');
+  form.addEventListener('submit', function(event) {
+    event.preventDefault();
+
+    const name = form.querySelector('#name')
+    // const zip = form.querySelector('#zip')
+    const additionalData = {
+      name: name ? name.value : undefined,
+      // address_zip: zip ? zip.value : undefined
+    }
+
+    stripe.createToken(card, additionalData).then(function(result) {
+      if (result.error) {
+        // Inform the user if there was an error.
+        var errorElement = document.getElementById('card-errors');
+        errorElement.textContent = result.error.message;
+      } else {
+        // Send the token to your server.
+        stripeTokenHandler(result.token);
+      }
+    });
+  });
+
+  // Submit the form with the token ID.
+  function stripeTokenHandler(token) {
+    // Insert the token ID into the form so it gets submitted to the server
+    var form = document.getElementById('payment-form');
+    var hiddenInput = document.createElement('input');
+    hiddenInput.setAttribute('type', 'hidden');
+    hiddenInput.setAttribute('name', 'stripe_token');
+    hiddenInput.setAttribute('value', token.id);
+    form.appendChild(hiddenInput);
+
+    // Submit the form
+    form.submit();
+  }
+
+}
+
+export default registerElements