tang 0.0.9 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df85707ff7cd740755608c6f6f5a4a396fe36de36ac30561fd0ff8139eb872ee
-  data.tar.gz: a3a632a34b2f807f290a3434853d73a9d3288ca91fd4ea4377f8ed68e238493d
+  metadata.gz: afcc7d64662d251041c9106406151ef1c0eb633c4f52648aad4bf065e73d5715
+  data.tar.gz: 70a3bb4255182c594a89773546518ae1972af6dbd9efe4a48a0e04cd0048568a
 SHA512:
-  metadata.gz: badaae0c19b133cd7d7ec66248f16b1d84e94851f26f5e9002ceaf92b608bf42b22438442d2a60553fee2e30928e84c78859787ac93e7adfb76fa9a230a5a246
-  data.tar.gz: 6a6e10e51fcdf7fb172b7cfdeb03b46f29726c4e0869a2dd3220bc6d3ba7874d43409e3ab80bc627cc4a3abc7e3263ceb330b198c8528c6bea8ad810377a773b
+  metadata.gz: 729756368750f8bd9bddc7db310caa1bb0b64d93ad604b9d8718361bf68be13c58cfacc269d225308a35130c50d5ece613e3fb286f855bf10b54afeb8122579a
+  data.tar.gz: 6efa4353dfa69a47657ed8573b026907922d8dadb37f04efd8af5fd892dc4ec8cd65c789ccba00a67f2a1cdac8b87459f52909e1077ce77eb712e8bb7f16942c

data/README.md

@@ -7,4 +7,12 @@ Stripe subscriptions
 [![Test Coverage](https://codeclimate.com/github/sixoverground/tang/badges/coverage.svg)](https://codeclimate.com/github/sixoverground/tang/coverage)
 [![Issue Count](https://codeclimate.com/github/sixoverground/tang/badges/issue_count.svg)](https://codeclimate.com/github/sixoverground/tang)
 
+## Publishing
+
+```
+gem build tang.gemspec
+gem push tang-x.x.x.gem
+npm publish
+```
+
 

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

@@ -67,7 +67,7 @@ module Tang
 
       # Only allow a trusted parameter "white list" through.
       def subscription_params
-        params.require(:subscription).permit(:plan_id, :quantity, :trial_end, :tax_percent)
+        params.require(:subscription).permit(:plan_id, :quantity, :trial_end)
       end
   end
 end

data/app/jobs/tang/import_customers_job.rb

@@ -16,7 +16,13 @@ module Tang
         customer = update_customer(customer, stripe_customer)
 
         # import card
-        Card.from_stripe(stripe_customer.sources.retrieve(stripe_customer.default_source), customer) if stripe_customer.default_source.present?
+        if stripe_customer.default_source.present?
+          stripe_card = Stripe::Customer.retrieve_source(
+            stripe_customer.id,
+            stripe_customer.default_source,
+          )
+          Card.from_stripe(stripe_card, customer)
+        end
       end
     end
 

data/app/models/tang/invoice.rb

@@ -43,10 +43,10 @@ module Tang
         i.customer = customer
         i.period_start = stripe_invoice.period_start
         i.period_end = stripe_invoice.period_end
-        i.date = stripe_invoice.date
+        i.date = stripe_invoice.created # changed from date
         i.currency = stripe_invoice.currency
         i.subtotal = stripe_invoice.subtotal
-        i.tax_percent = stripe_invoice.tax_percent
+        # i.tax_percent = stripe_invoice.tax_percent # removed from api, replaced with tax rates
         i.tax = stripe_invoice.tax
         i.total = stripe_invoice.total
         i.amount_due = stripe_invoice.amount_due

data/app/models/tang/subscription.rb

@@ -37,8 +37,8 @@ module Tang
     validates :stripe_id, presence: true, uniqueness: true
     validates :application_fee_percent, numericality: { greater_than_or_equal_to: 0 }, allow_nil: true
     validates :quantity, numericality: { greater_than_or_equal_to: 0 }, allow_nil: true
-    validates :tax_percent, numericality: { greater_than_or_equal_to: 0 }, allow_nil: true,
-                            format: { with: /\A\d+(?:\.\d{0,4})?\z/ }
+    # validates :tax_percent, numericality: { greater_than_or_equal_to: 0 }, allow_nil: true,
+    #                         format: { with: /\A\d+(?:\.\d{0,4})?\z/ }
 
     # before_save :nil_if_blank
     before_update :update_stripe_subscription
@@ -54,7 +54,7 @@ module Tang
         s.plan = plan
         s.application_fee_percent = stripe_subscription.application_fee_percent
         s.quantity = stripe_subscription.quantity
-        s.tax_percent = stripe_subscription.tax_percent
+        # s.tax_percent = stripe_subscription.tax_percent # removed from api in favor of tax rates
         s.trial_end = stripe_subscription.trial_end
         s.coupon = Coupon.find_by(stripe_id: stripe_subscription.discount.coupon.id) if stripe_subscription.discount.present?
         s.status = stripe_subscription.status

data/app/services/tang/create_subscription.rb

@@ -31,7 +31,10 @@ module Tang
         subscription.activate!
 
         # Save the payment method
-        stripe_card = stripe_customer.sources.retrieve(stripe_customer.default_source)
+        stripe_card = Stripe::Customer.retrieve_source(
+          stripe_customer.id,
+          stripe_customer.default_source,
+        )
 
         # Finalize customer with subscription and payment method
         finalize_customer(customer, stripe_sub, stripe_card)

data/app/services/tang/delete_card.rb

@@ -2,8 +2,10 @@ 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
       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,10 @@ module Tang
 
       # update subscription
       subscription = Subscription.find_by(stripe_id: stripe_invoice.subscription)
-      subscription.fail! if !subscription.past_due?
-
+      if subscription.present?
+        subscription.fail! if !subscription.past_due?
+      end
+      
       return charge
     end
   end

data/app/services/tang/save_card.rb

@@ -22,7 +22,10 @@ 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

data/app/services/tang/update_subscription.rb

@@ -10,7 +10,7 @@ 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

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

@@ -1,35 +1,3 @@
-<% if false %>
-<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">
-</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>
-    <span>Postal code</span>
-    <input type="text" data-stripe="address_zip" autocomplete="postal-code" placeholder="•••••" required class="form-control">
-  </label>
-</div>
-<% end %>
-
 <div class="payment-row">
   <label for="name">Cardholder name</label>
   <input id="name" type="text" autocomplete="cc-name" placeholder="Full Name" required class="form-control">

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/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/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

@@ -1,5 +1,6 @@
 // Create a Stripe client.
-var stripe = Stripe('pk_test_ufmXOx2149BsFX2Hf6i8zTTL');
+// var stripe = Stripe(process.env.STRIPE_PUBLISHABLE_KEY);
+var stripe = Stripe(window.Tang.STRIPE_PUBLISHABLE_KEY)
 
 const registerElements = () => {
 
@@ -83,4 +84,4 @@ const registerElements = () => {
 
 }
 
-module.exports = { registerElements }
+export default registerElements

data/lib/tang/version.rb

@@ -1,3 +1,3 @@
 module Tang
-  VERSION = "0.0.9"
+  VERSION = "0.1.0"
 end

data/spec/fixtures/stripe_webhooks/invoice.created.json

@@ -6,7 +6,7 @@
   "object": "event",
   "data": {
     "object": {
-      "date": 1380674206,
+      "created": 1380674206,
       "id": "in_00000000000000",
       "period_start": 1378082075,
       "period_end": 1380674075,
@@ -66,7 +66,6 @@
       "subscription": "sub_00000000000000",
       "metadata": {},
       "description": null,
-      "tax_percent": 0,
       "tax": 0,
       "invoice_pdf": "pdf_url"
     }

data/spec/fixtures/stripe_webhooks/invoice.payment_failed.json

@@ -0,0 +1,172 @@
+{
+    "id": "evt_00000000000000",
+    "object": "event",
+    "api_version": "2020-08-27",
+    "created": 1601579547,
+    "data": {
+      "object": {
+        "id": "in_00000000000000",
+        "object": "invoice",
+        "account_country": "US",
+        "account_name": "Link My Photos",
+        "account_tax_ids": null,
+        "amount_due": 499,
+        "amount_paid": 0,
+        "amount_remaining": 499,
+        "application_fee_amount": null,
+        "attempt_count": 4,
+        "attempted": true,
+        "auto_advance": true,
+        "billing_reason": "subscription_cycle",
+        "charge": "ch_00000000000000",
+        "collection_method": "charge_automatically",
+        "created": 1600279843,
+        "currency": "usd",
+        "custom_fields": null,
+        "customer": "cus_00000000000000",
+        "customer_address": null,
+        "customer_email": "test@example.com",
+        "customer_name": null,
+        "customer_phone": null,
+        "customer_shipping": null,
+        "customer_tax_exempt": "none",
+        "customer_tax_ids": [
+        ],
+        "default_payment_method": null,
+        "default_source": null,
+        "default_tax_rates": [
+        ],
+        "description": null,
+        "discount": null,
+        "discounts": [
+        ],
+        "due_date": null,
+        "ending_balance": 0,
+        "footer": null,
+        "hosted_invoice_url": "https://pay.stripe.com/invoice/acct_00000000000000/invst_00000000000000",
+        "invoice_pdf": "https://pay.stripe.com/invoice/acct_00000000000000/invst_00000000000000/pdf",
+        "lines": {
+          "object": "list",
+          "data": [
+            {
+              "id": "il_00000000000000",
+              "object": "line_item",
+              "amount": 499,
+              "currency": "usd",
+              "description": "1 × Shutterbug (at $4.99 / month)",
+              "discount_amounts": [
+              ],
+              "discountable": true,
+              "discounts": [
+              ],
+              "livemode": true,
+              "metadata": {
+              },
+              "period": {
+                "end": 1602871812,
+                "start": 1600279812
+              },
+              "plan": {
+                "id": "shutterbug",
+                "object": "plan",
+                "active": true,
+                "aggregate_usage": null,
+                "amount": 499,
+                "amount_decimal": "499",
+                "billing_scheme": "per_unit",
+                "created": 1467324765,
+                "currency": "usd",
+                "interval": "month",
+                "interval_count": 1,
+                "livemode": true,
+                "metadata": {
+                },
+                "nickname": null,
+                "product": "prod_00000000000000",
+                "tiers_mode": null,
+                "transform_usage": null,
+                "trial_period_days": null,
+                "usage_type": "licensed"
+              },
+              "price": {
+                "id": "shutterbug",
+                "object": "price",
+                "active": true,
+                "billing_scheme": "per_unit",
+                "created": 1467324765,
+                "currency": "usd",
+                "livemode": true,
+                "lookup_key": null,
+                "metadata": {
+                },
+                "nickname": null,
+                "product": "prod_00000000000000",
+                "recurring": {
+                  "aggregate_usage": null,
+                  "interval": "month",
+                  "interval_count": 1,
+                  "trial_period_days": null,
+                  "usage_type": "licensed"
+                },
+                "tiers_mode": null,
+                "transform_quantity": null,
+                "type": "recurring",
+                "unit_amount": 499,
+                "unit_amount_decimal": "499"
+              },
+              "proration": false,
+              "quantity": 1,
+              "subscription": "sub_00000000000000",
+              "subscription_item": "si_00000000000000",
+              "tax_amounts": [
+              ],
+              "tax_rates": [
+              ],
+              "type": "subscription"
+            }
+          ],
+          "has_more": false,
+          "total_count": 1,
+          "url": "/v1/invoices/in_00000000000000/lines"
+        },
+        "livemode": true,
+        "metadata": {
+        },
+        "next_payment_attempt": null,
+        "number": "6E05A6C5-0010",
+        "paid": false,
+        "payment_intent": "pi_00000000000000",
+        "period_end": 1600279812,
+        "period_start": 1597601412,
+        "post_payment_credit_notes_amount": 0,
+        "pre_payment_credit_notes_amount": 0,
+        "receipt_number": null,
+        "starting_balance": 0,
+        "statement_descriptor": null,
+        "status": "open",
+        "status_transitions": {
+          "finalized_at": 1600283533,
+          "marked_uncollectible_at": null,
+          "paid_at": null,
+          "voided_at": null
+        },
+        "subscription": "sub_00000000000000",
+        "subtotal": 499,
+        "tax": null,
+        "total": 499,
+        "total_discount_amounts": [
+        ],
+        "total_tax_amounts": [
+        ],
+        "transfer_data": null,
+        "webhooks_delivered_at": 1600279844
+      }
+    },
+    "livemode": true,
+    "pending_webhooks": 3,
+    "request": {
+      "id": null,
+      "idempotency_key": null
+    },
+    "type": "invoice.payment_failed"
+  }