effective_orders 4.2.5 → 4.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 330e8560e071b8c2625a3ef75ad7f5a59076d708fcdeb68a20c9815d337e0020
-  data.tar.gz: 0d665143facaaa2db3bd1c15856a78ea5bfbf4c3d54b138def40752061c8370c
+  metadata.gz: d19a1e1d922e08fadb09424738cfd86ae5c12db5e7553cbed17d4fb8a55ca57e
+  data.tar.gz: 0d65f0bbb387bbf804296a30f6822459bae66cdbd0053f82104f08af9d9b8c99
 SHA512:
-  metadata.gz: 107af4d3f41950d0f2599a9cb2b2b6b2ede5d8c35db6dce6dd25402d98eddb47dfdccd238a71487b64db62a84cebc46b0be70f63f6ce0ce8abb30b017f5fbeb5
-  data.tar.gz: ab98527b0806e1c461f78dce2b93c1e68964f1e373c87d34bb0bc167b1048598777c8c0bb31caefd95b18bbb248f66917ea80f1ba9724e38455eb2a397f05977
+  metadata.gz: 5ca8aa77355e8edfcb23834ff7f735f1ce3d775869ae9c6682d062b5fa4e0189e3afd7f29745d04abbd82d712b8272ec188cec8d210f8f8b23ec00d2ef0ff850
+  data.tar.gz: a4c3b95cfedd8600438a08e1f1b3ed93665e0f8ac45267ed6716a55079df483c731b2ffd4ce287a6d46488a4ccc8b9ec2ba04751f6d3e8338f04f84d0a0d5d45

data/app/datatables/effective_orders_datatable.rb

@@ -22,13 +22,16 @@ class EffectiveOrdersDatatable < Effective::Datatable
   end
 
   datatable do
-    order :id
+    order :id, :desc
 
     bulk_actions_col
 
     col :created_at, visible: false
     col :updated_at, visible: false
-    col :id, visible: false
+
+    col :id, label: 'Number' do |order|
+      '#' + order.to_param
+    end
 
     col :purchased_at do |order|
       order.purchased_at&.strftime('%F %H:%M') || 'not purchased'

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

@@ -9,14 +9,14 @@
     %tbody
       %tr
         %td
-          - unless EffectiveOrders.use_address_full_name
+          - if order.billing_address.blank? || !EffectiveOrders.use_address_full_name
             = order.billing_name
             %br
 
           - if order.billing_address.present?
-            = render :partial => 'effective/addresses/address',
+            = render partial: 'effective/addresses/address',
               locals: { address: order.billing_address, email: order.user.email }
 
         - if order.shipping_address.present?
           %td
-            = render :partial => 'effective/addresses/address', locals: { address: order.shipping_address }
+            = render partial: 'effective/addresses/address', locals: { address: order.shipping_address }

data/app/views/effective/subscripter/_form.html.haml

@@ -6,6 +6,10 @@
 - subscripter.quantity ||= subscripter.subscribable.subscribable_quantity_used
 - subscripter.stripe_plan_id ||= Hash(plans.first)[:id]
 
+- if subscripter.stripe_plan_id.present? && plans.present? && plans.none? { |plan| plan[:id] == subscripter.stripe_plan_id }
+  - closest_plan = plans.find { |plan| plan[:interval] == subscripter.plan[:interval] }
+  - subscripter.stripe_plan_id = closest_plan[:id] if closest_plan.present?
+
 = effective_form_with(model: subscripter, url: effective_orders.subscripter_path, remote: true, data: { stripe: stripe, plans: plans }) do |f|
   = f.hidden_field :subscribable_global_id
   = f.hidden_field :stripe_token, value: nil
@@ -50,4 +54,7 @@
           = render 'effective/subscripter/plan', plan: plan, f: f
 
   = f.submit(border: false, center: true) do
-    = f.save('Continue to Billing', class: ('effective-orders-stripe-token-required' if f.object.token_required?))
+    - if f.object.token_required?
+      = f.save('Continue to Billing', class: 'effective-orders-stripe-token-required')
+    - else
+      = f.save('Upgrade Now')

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '4.2.5'.freeze
+  VERSION = '4.2.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 4.2.5
+  version: 4.2.6
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-23 00:00:00.000000000 Z
+date: 2020-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails