effective_orders 6.9.6 → 6.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 955f5276e4dadfc9a09d834e891473907954108356e1bc3df0d9ac4c6032293a
-  data.tar.gz: a818f4aa9ed8d42aeb6f6fd39d7ebe318ac3b0a0fbc6fd096af721fdc265a28b
+  metadata.gz: a1acbcb1dfcbab4ff2243b6138d32f114b65489e92c63a55be90699b797e355d
+  data.tar.gz: c8320f8933567647ad1a25925143f7ddd3f7039e00ffb85caa2a1ffd2b426dc9
 SHA512:
-  metadata.gz: 81652ea7eaaac44fbabf4834720e1c1052324dac30ecd9cf378bdf616adec172b8707b21cba29d2fc0fb0f97735c655e2ace5bf0d0534d6ca312fa5094c4e19d
-  data.tar.gz: 83dcca873a4b99b5901f0fd4cc124054edcd3a18cbb74cbf00a71d85f164cc4c2dd6390103fadeefe951c91aeb00202f8043d602f2361990df315a2e3985a6db
+  metadata.gz: 539a512a168a8783897b42358c18914b6aa56e0810c2130967bf664a0246170b9139c9eb728d940996c505aed2a68d4a408693d1e0c276aa6e115bc8af38adf6
+  data.tar.gz: 97a5d0b38c2ce7ede25db7213892bfe3e4c9abfd0caef1a21f2afe95ed61ed62cf14861e5ff1d621572b5998e00c577022a014f76ff774a79d67026a68144fb3

data/app/datatables/admin/effective_orders_datatable.rb

@@ -51,12 +51,22 @@ module Admin
 
       if attributes[:user_id].blank?
         col :user, search: :string
+
+        if defined?(EffectiveMemberships)
+          col(:member_number, label: 'Member #', sort: false) do |order|
+            order.user.try(:membership).try(:number)
+          end.search do |collection, term|
+            memberships = Effective::Membership.where(owner_type: current_user.class.name).where('number ILIKE ?', "%#{term}%")
+            collection.where(user_id: memberships.select('owner_id'))
+          end
+        end
+
         col :billing_name, visible: false
         col :email, visible: false
       end
 
       if attributes[:organization_id].blank?
-        col :organization
+        col :organization, visible: EffectiveOrders.organization_enabled?
       end
 
       col :parent, visible: false, search: :string

data/app/helpers/effective_orders_helper.rb

@@ -115,13 +115,13 @@ module EffectiveOrdersHelper
     end
   end
 
-  def render_checkout_step1(order, namespace: nil, purchased_url: nil, declined_url: nil, deferred_url: nil)
-    locals = { order: order, purchased_url: purchased_url, declined_url: declined_url, deferred_url: deferred_url, namespace: namespace }
+  def render_checkout_step1(order, namespace: nil, purchased_url: nil, declined_url: nil, deferred_url: nil, skip_deferred: false)
+    locals = { order: order, purchased_url: purchased_url, declined_url: declined_url, deferred_url: deferred_url, namespace: namespace, skip_deferred: skip_deferred }
     render(partial: 'effective/orders/checkout_step1', locals: locals)
   end
 
-  def render_checkout_step2(order, namespace: nil, purchased_url: nil, declined_url: nil, deferred_url: nil)
-    locals = { order: order, purchased_url: purchased_url, declined_url: declined_url, deferred_url: deferred_url, namespace: namespace }
+  def render_checkout_step2(order, namespace: nil, purchased_url: nil, declined_url: nil, deferred_url: nil, skip_deferred: false)
+    locals = { order: order, purchased_url: purchased_url, declined_url: declined_url, deferred_url: deferred_url, namespace: namespace, skip_deferred: skip_deferred }
     render(partial: 'effective/orders/checkout_step2', locals: locals)
   end
 

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

@@ -30,7 +30,7 @@
     - if EffectiveOrders.stripe?
       = render partial: '/effective/orders/stripe/form', locals: provider_locals
 
-    - if EffectiveOrders.deferred? && order.user == current_user
+    - if EffectiveOrders.deferred? && order.user == current_user && !local_assigns[:skip_deferred]
       %p.my-4.text-center - or -
       = render partial: '/effective/orders/deferred/form', locals: provider_locals
 

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

@@ -9,22 +9,22 @@
     %tbody
       %tr
         %td
-          - if order.billing_address.blank? || order.billing_address.full_name.blank?
-            = order.billing_name
-            %br
+          %div= order.billing_name
 
-          - if order.billing_address.present?
-            = render partial: 'effective/addresses/address', locals: { address: order.billing_address }
-            %br
+          - if order.user.try(:membership).present?
+            %div= "##{order.user.membership.number}"
 
-          = mail_to(order.email)
+          %div= mail_to(order.email)
 
           - if order.cc.present?
-            %br
-            Cc:
-            - order.cc.split(',').each do |email|
-              = mail_to(email)
+            %div
+              Cc:
+              - order.cc.split(',').each do |email|
+                = mail_to(email)
+
+          - if order.billing_address.present?
+            = render('effective/addresses/address', address: order.billing_address)
 
         - if order.shipping_address.present?
           %td
-            = render partial: 'effective/addresses/address', locals: { address: order.shipping_address }
+            = render('effective/addresses/address', address: order.shipping_address)

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '6.9.6'.freeze
+  VERSION = '6.9.8'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 6.9.6
+  version: 6.9.8
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-12 00:00:00.000000000 Z
+date: 2024-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails