tang 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afcc7d64662d251041c9106406151ef1c0eb633c4f52648aad4bf065e73d5715
-  data.tar.gz: 70a3bb4255182c594a89773546518ae1972af6dbd9efe4a48a0e04cd0048568a
+  metadata.gz: 3b6a2435aa2257528ac4196b8e9edefe6dc12c928c62d8030890a912d2b31aff
+  data.tar.gz: 96ed85b8c852c51acf3c0f36d0c0e88148339c91bdb3393d7828beb44350a39a
 SHA512:
-  metadata.gz: 729756368750f8bd9bddc7db310caa1bb0b64d93ad604b9d8718361bf68be13c58cfacc269d225308a35130c50d5ece613e3fb286f855bf10b54afeb8122579a
-  data.tar.gz: 6efa4353dfa69a47657ed8573b026907922d8dadb37f04efd8af5fd892dc4ec8cd65c789ccba00a67f2a1cdac8b87459f52909e1077ce77eb712e8bb7f16942c
+  metadata.gz: adf596987d7840506a8557ad4f031ef3ee2d76dd898f37203120c0999a8569d8e4518d123261667e94e01e1d7fb50ccc6574d5626be5e609a88ebdbb7df4f929
+  data.tar.gz: 8fe17103f00686bc4a790d6083a9cb64794ab3b29201e232b5f85472b27edfd711500e2021f144c854e51ff1f601daec7ae44638931a845181c8415fe39b4822

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

@@ -5,7 +5,7 @@ module Tang
     def index
       @invoices = current_customer.invoices.
                                    paginate(page: params[:page]).
-                                   order(period_start: :desc)
+                                   order(date: :desc)
     end
   end
 end

data/app/jobs/tang/import_subscriptions_job.rb

@@ -19,11 +19,8 @@ module Tang
     end
 
     def import_subscription(stripe_subscription)
-      customer = Tang.customer_class.find_by(stripe_id: stripe_subscription.customer)
-      plan = Plan.find_by(stripe_id: stripe_subscription.plan.id)
-      if customer.present? && plan.present?
-        subscription = Subscription.from_stripe(stripe_subscription, customer, plan)
-
+      subscription = Subscription.from_stripe(stripe_subscription)
+      if subscription.present?
         # Handle removed discounts
         subscription.update(coupon: nil, coupon_start: nil) if stripe_subscription.discount.nil?
       end

data/app/models/concerns/tang/customer.rb

@@ -64,9 +64,8 @@ module Tang
       my_card.update_from_stripe(stripe_card)
     end
 
-    def update_subscription_end(stripe_sub)
-      timestamp = stripe_sub.current_period_end.to_s
-      self.active_until = DateTime.strptime(timestamp, '%s')
+    def update_subscription_end(subscription)
+      self.active_until = subscription.period_end
       self.save!
     end
 

data/app/models/tang/coupon.rb

@@ -76,7 +76,7 @@ module Tang
         c.duration = stripe_coupon.duration
         c.duration_in_months = stripe_coupon.duration_in_months
         c.max_redemptions = stripe_coupon.max_redemptions
-        c.redeem_by = stripe_coupon.redeem_by
+        c.redeem_by = DateTime.strptime(stripe_coupon.redeem_by.to_s, '%s') if stripe_coupon.redeem_by.present?
       end
 
       return coupon

data/app/models/tang/invoice.rb

@@ -19,6 +19,10 @@ module Tang
       self[:period_start] || created_at
     end
 
+    def period_start=(val)
+      self[:period_start] = val
+    end
+
     def period_end
       if subscription.present?
         self[:period_end] || subscription.plan.period_days_from(period_start)
@@ -27,6 +31,10 @@ module Tang
       end
     end
 
+    def period_end=(val)
+      self[:period_end] = val
+    end
+
     def status
       if charge.present?
         'paid'
@@ -41,9 +49,9 @@ module Tang
       invoice = Invoice.find_or_create_by(stripe_id: stripe_invoice.id) do |i|
         i.subscription = subscription
         i.customer = customer
-        i.period_start = stripe_invoice.period_start
-        i.period_end = stripe_invoice.period_end
-        i.date = stripe_invoice.created # changed from date
+        i.period_start = DateTime.strptime(stripe_invoice.period_start.to_s, '%s')
+        i.period_end = DateTime.strptime(stripe_invoice.period_end.to_s, '%s')
+        i.date = DateTime.strptime(stripe_invoice.created.to_s, '%s') # changed from date
         i.currency = stripe_invoice.currency
         i.subtotal = stripe_invoice.subtotal
         # i.tax_percent = stripe_invoice.tax_percent # removed from api, replaced with tax rates
@@ -57,11 +65,44 @@ module Tang
           coupon = Coupon.find_by(stripe_id: stripe_invoice.discount.coupon.id)
           i.coupon = coupon
         end
-      
       end
+
+      if invoice.update_from_stripe(stripe_invoice)
+        invoice.save
+      end
+
       return invoice
     end
 
+    def update_from_stripe(stripe_invoice)
+      changed = false
+
+      stripe_period_start = DateTime.strptime(stripe_invoice.period_start.to_s, '%s')
+      if self[:period_start] != stripe_period_start
+        self.period_start = stripe_period_start
+        changed = true
+      end
+
+      stripe_period_end = DateTime.strptime(stripe_invoice.period_end.to_s, '%s')
+      if self[:period_end] != stripe_period_end
+        self.period_end = stripe_period_end
+        changed = true
+      end
+
+      stripe_created = DateTime.strptime(stripe_invoice.created.to_s, '%s')
+      if self.date != stripe_created
+        self.date = stripe_created
+        changed = true
+      end
+
+      if self.invoice_pdf != stripe_invoice.invoice_pdf
+        self.invoice_pdf = stripe_invoice.invoice_pdf
+        changed = true
+      end
+
+      return changed
+    end
+
     def self.search(query)
       invoices = Invoice.none
       if query.present?

data/app/models/tang/invoice_item.rb

@@ -27,10 +27,8 @@ module Tang
         ii.amount = stripe_invoice_item.amount
         ii.currency = stripe_invoice_item.currency
 
-        period_start = stripe_invoice_item.period.start.to_s
-        ii.period_start = DateTime.strptime(period_start, '%s')
-        period_end = stripe_invoice_item.period.end.to_s
-        ii.period_end = DateTime.strptime(period_end, '%s')
+        ii.period_start = DateTime.strptime(stripe_invoice_item.period.start.to_s, '%s')
+        ii.period_end = DateTime.strptime(stripe_invoice_item.period.end.to_s, '%s')
 
         ii.plan = plan
         ii.proration = stripe_invoice_item.proration

data/app/models/tang/subscription.rb

@@ -48,14 +48,25 @@ module Tang
 
     STATUSES = ['trialing', 'active', 'past_due', 'canceled', 'unpaid']
 
-    def self.from_stripe(stripe_subscription, customer, plan)
+    def self.from_stripe(stripe_subscription)
+      customer = Tang.customer_class.find_by(stripe_id: stripe_subscription.customer)
+      plan = Plan.find_by(stripe_id: stripe_subscription.plan.id)
+      if customer.present? && plan.present?
+        subscription = Subscription.build(stripe_subscription, customer, plan)
+        subscription.update(coupon: nil, coupon_start: nil) if stripe_subscription.discount.nil?
+        return subscription
+      end
+      return nil
+    end
+
+    def self.build(stripe_subscription, customer, plan)
       subscription = Subscription.find_or_create_by(stripe_id: stripe_subscription.id) do |s|
         s.customer = customer
         s.plan = plan
         s.application_fee_percent = stripe_subscription.application_fee_percent
         s.quantity = stripe_subscription.quantity
         # s.tax_percent = stripe_subscription.tax_percent # removed from api in favor of tax rates
-        s.trial_end = stripe_subscription.trial_end
+        s.trial_end = DateTime.strptime(stripe_subscription.trial_end.to_s, '%s') if stripe_subscription.trial_end.present?
         s.coupon = Coupon.find_by(stripe_id: stripe_subscription.discount.coupon.id) if stripe_subscription.discount.present?
         s.status = stripe_subscription.status
       end
@@ -63,18 +74,19 @@ module Tang
     end
 
     def period_start
-      invoice = invoices.last
+      invoice = invoices.order(:date).last
       if invoice.present?
-        return invoice.period_start
+        # return invoice.period_start
+        return invoice.date
       end
       return created_at
     end
 
     def period_end
-      invoice = invoices.last
-      if invoice.present?
-        return invoice.period_end
-      end
+      # invoice = invoices.order(:period_start).last
+      # if invoice.present?
+      #   return invoice.period_end
+      # end
       return plan.period_days_from(period_start)
     end
 

data/app/services/tang/create_subscription.rb

@@ -37,7 +37,7 @@ module Tang
         )
 
         # Finalize customer with subscription and payment method
-        finalize_customer(customer, stripe_sub, stripe_card)
+        finalize_customer(customer, subscription, stripe_card)
 
       rescue Stripe::StripeError => e
         subscription.errors[:base] << e.message
@@ -87,11 +87,11 @@ module Tang
       return stripe_sub
     end
 
-    def self.finalize_customer(customer, stripe_sub, stripe_card)
+    def self.finalize_customer(customer, subscription, stripe_card)
       # Remove temporary coupon
       customer.subscription_coupon = nil
       # Save subscription data to customer
-      customer.update_subscription_end(stripe_sub)
+      customer.update_subscription_end(subscription)
       # Save the payment method
       customer.update_card_from_stripe(stripe_card)
     end

data/app/services/tang/fail_invoice.rb

@@ -13,6 +13,11 @@ module Tang
 
       # update subscription
       subscription = Subscription.find_by(stripe_id: stripe_invoice.subscription)
+      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

data/app/services/tang/pay_invoice.rb

@@ -1,7 +1,15 @@
 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)
+      end
+
+      # create the invoice
       invoice = Invoice.from_stripe(stripe_invoice)
 
       # create charge
@@ -11,21 +19,15 @@ 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)
-
-      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)
+      # 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(subscription)
+
       return charge
     end
   end

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/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/config/cucumber.yml

@@ -3,6 +3,6 @@ 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'"
 %>
-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"

data/lib/tang/version.rb

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

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

@@ -3,7 +3,9 @@
   "livemode": false,
   "id": "evt_00000000000000",
   "type": "invoice.created",
+  "status": "paid",
   "object": "event",
+  "api_version": "2020-08-27",
   "data": {
     "object": {
       "created": 1380674206,
@@ -30,7 +32,6 @@
             "quantity": 1,
             "plan": {
               "interval": "month",
-              "name": "Member's Club",
               "amount": 100,
               "currency": "usd",
               "id": "fkx0AFo",
@@ -38,11 +39,11 @@
               "livemode": false,
               "interval_count": 1,
               "trial_period_days": null,
+              "product": "pr_00000000000000",
               "metadata": {}
             },
             "description": null,
-            "metadata": null,
-            "subscription": "su_00000000000000"
+            "metadata": null
           }
         ]
       },
@@ -66,8 +67,8 @@
       "subscription": "sub_00000000000000",
       "metadata": {},
       "description": null,
-      "tax": 0,
-      "invoice_pdf": "pdf_url"
+      "invoice_pdf": "https://pay.stripe.com/invoice/acct_00000000000000/invst_00000000000000/pdf",
+      "tax": null
     }
   }
 }

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

@@ -0,0 +1,114 @@
+{
+    "created": 1326853478,
+    "livemode": false,
+    "id": "evt_00000000000000",
+    "type": "invoice.payment_succeeded",
+    "object": "event",
+    "api_version": "2020-08-27",
+    "data": {
+      "object": {
+        "id": "in_00000000000000",
+        "object": "invoice",
+        "amount_due": 999,
+        "application_fee": null,
+        "attempt_count": 1,
+        "attempted": true,
+        "charge": "ch_18EcOcLrgDIZ7iq8TaNlErVv",
+        "closed": true,
+        "currency": "eur",
+        "customer": "cus_00000000000000",
+        "created": 1464084258,
+        "description": null,
+        "discount": null,
+        "ending_balance": 0,
+        "forgiven": false,
+        "lines": {
+          "data": [{
+            "id": "sub_00000000000000",
+            "object": "line_item",
+            "amount": 50,
+            "currency": "eur",
+            "description": null,
+            "discountable": true,
+            "livemode": true,
+            "metadata": {},
+            "period": {
+              "start": 1500637196,
+              "end": 1532173196
+            },
+            "plan": {
+              "id": "platinum",
+              "object": "plan",
+              "amount": 500,
+              "created": 1499943145,
+              "currency": "eur",
+              "interval": "month",
+              "interval_count": 1,
+              "livemode": false,
+              "metadata": {},
+              "name": "New Plan Test",
+              "statement_descriptor": null,
+              "trial_period_days": null
+            },
+            "proration": false,
+            "quantity": 1,
+            "subscription": null,
+            "subscription_item": "si_18ZfWyLrgDIZ7iq8fSlSNGIV",
+            "type": "subscription"
+          },
+          {
+            "id": "sub_00000000000000",
+            "object": "line_item",
+            "amount": 50,
+            "currency": "eur",
+            "description": null,
+            "discountable": true,
+            "livemode": true,
+            "metadata": {},
+            "period": {
+              "start": 1500637196,
+              "end": 1532173196
+            },
+            "plan": {
+              "id": "gold",
+              "object": "plan",
+              "amount": 300,
+              "created": 1499943155,
+              "currency": "eur",
+              "interval": "month",
+              "interval_count": 1,
+              "livemode": false,
+              "metadata": {},
+              "name": "New gold Plan Test",
+              "statement_descriptor": null,
+              "trial_period_days": null
+            },
+            "proration": false,
+            "quantity": 1,
+            "subscription": null,
+            "subscription_item": "si_18ZfWyLrgDIZ7iq8fSlSNGIV",
+            "type": "subscription"
+          }],
+          "total_count": 1,
+          "object": "list",
+          "url": "/v1/invoices/in_18EcOcLrgDIZ7iq8zsDkunZ0/lines"
+        },
+        "livemode": false,
+        "metadata": {},
+        "next_payment_attempt": null,
+        "paid": true,
+        "period_end": 1464084258,
+        "period_start": 1464084258,
+        "receipt_number": null,
+        "starting_balance": 0,
+        "statement_descriptor": null,
+        "subscription": "sub_00000000000000",
+        "subtotal": 999,
+        "tax": null,
+        "tax_percent": null,
+        "total": 999,
+        "webhooks_delivered_at": 1464084258,
+        "invoice_pdf": "https://pay.stripe.com/invoice/acct_00000000000000/invst_00000000000000/pdf"
+      }
+    }
+  }