effective_orders 1.3.5 → 1.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5056701f4a034dabf5156b21f5e6d02683869636
-  data.tar.gz: 57b623f37257910d6623a4391c71237fe87c45aa
+  metadata.gz: 2320934b1b20e85e0b4b43bd665923cf2b162d3e
+  data.tar.gz: 2af569b2d128dc78dfce91d0d53e3bd9d39394f0
 SHA512:
-  metadata.gz: 3f08fae3d4705001827f035985db3d3b4992b20f28b8f98fc62f627ab1bc9dda791a916033b5d16863212aa9de0ebcee01c5e9635c87ab06ff5945fed3f66a83
-  data.tar.gz: b65667174a2bfcfb902865abce8082b50e7c904e0dc0a915249ae0b823d4897956adc81c7bcbdea318042b620a941ee2dc98dc95b2b84984f5cb7eab38e4c9e3
+  metadata.gz: ffbd42ef26796303772654798396323ad416c670bd72e9c252dcf1890e80461fa4362e9bb8b02a32a42c692163ba94ddea78c8c9127963b2cc9cf82cd2d7d41b
+  data.tar.gz: e4c189e58052bd46a814b4cf6fa2c0fa9bbc512d8bb63a2dc03f481b056b978fc2c049e6badbd4f6ca669ee0a3636a0d7677a55b46d90892f54e707a6987897d

data/app/controllers/effective/subscriptions_controller.rb

@@ -13,6 +13,9 @@ module Effective
       @page_title ||= 'My Subscriptions'
 
       @subscriptions = @customer.subscriptions.purchased
+      @active_stripe_subscription = @subscriptions.map(&:stripe_subscription).find do |subscription|
+        subscription.present? && subscription.status == 'active' && subscription.current_period_end > Time.zone.now.to_i
+      end
 
       EffectiveOrders.authorized?(self, :index, Effective::Subscription)
     end

data/app/views/effective/orders/_order_payment_details.html.haml

@@ -1,11 +1,16 @@
 %h4 Payment Details
 
-%p This order was purchased with the following details:
-%br
+- if order.payment.present?
+  - if order.purchased?
+    %p This order was purchased with the following details:
+  - elsif order.declined?
+    %p This order was declined with the following details:
 
-%table.table
-  %tbody
-    - order.payment.each do |k, v|
-      %tr
-        %td= k
-        %td= v
+  %table.table
+    %tbody
+      - order.payment.each do |k, v|
+        %tr
+          %td= k
+          %td= v
+- else
+  %p None

data/app/views/effective/subscriptions/index.html.haml

@@ -11,6 +11,10 @@
         = '-'
         = link_to 'unsubscribe', effective_orders.subscription_path(subscription.stripe_plan_id), :data => {:method => :delete, :confirm => 'This will cancel your subscription. Are you sure? This cannot be undone.'}
         = ')'
+
+  - if @active_stripe_subscription.present?
+    %p Your current subscription will be renewed automatically at #{ Time.zone.at(@active_stripe_subscription.current_period_end).strftime('%d-%b-%Y %H:%M') }.
+
 - else
   %p You have no subscriptions
 

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '1.3.5'.freeze
+  VERSION = '1.3.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.3.6
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-31 00:00:00.000000000 Z
+date: 2015-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails