effective_orders 6.9.5 → 6.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41a7cabd3ec382ec58b642aed68b6b90cb608fb089e438ed550262cbc569a63d
-  data.tar.gz: 9980165d58544c3f64774230e5c50cd26c95896df5d3f329c179d8f4daf8a3e0
+  metadata.gz: 2063836a32b538b9bee6a34796df7cd23d64bee507637d074ecd41bb78504968
+  data.tar.gz: 3ee226b5149fa4e756471741e39ff95414a165b3d4a759d7255f2b4d9795bb67
 SHA512:
-  metadata.gz: 9c949c47c769eefd302ad4a789583c8cdf0e443b74a43518c7164d88c4aa53c21891f4a1c0af6d05a48b65a528bc87f41e60d8431a29aac5e9d89cff29cc0bf4
-  data.tar.gz: 941e3ec2e9453e54057e82876c33094df40cbe1255a842e276d35087f3ae7e62db99a8f1497fcd44cb434e5db0b18cf362e2c461c7d0ed93ebeac04b95cd8cd8
+  metadata.gz: b50ab28975dfb6f9ce7ab958323c90c62a81e7678e20926e4c8a043970b24950eade8d46b6d838729bb40d2eb9a80ea4eeb7fca38deb9c04ce0b5d4d20589b31
+  data.tar.gz: ac6a85948f4d0d4cc00205531f4ff134335ef84ebc2225704b89baea7dcc2189084738b0e09e9626387e790d8aeaf822d2e6c31fdab48c86f349dece946fa308

data/app/controllers/effective/concerns/purchase.rb

@@ -5,8 +5,19 @@ module Effective
 
       protected
 
+      def admin_checkout?(payment_params)
+        payment_params[:purchased_url].to_s.include?('/admin/')
+      end
+
       def order_purchased(payment:, provider:, card: 'none', email: true, skip_buyer_validations: false, purchased_url: nil, current_user: nil)
-        @order.purchase!(payment: payment, provider: provider, card: card, email: email, skip_buyer_validations: skip_buyer_validations, current_user: current_user)
+        @order.purchase!(
+          payment: payment, 
+          provider: provider, 
+          card: card, 
+          email: email, 
+          skip_buyer_validations: skip_buyer_validations, 
+          current_user: current_user
+        )
 
         Effective::Cart.where(user: current_user).destroy_all if current_user.present?
 

data/app/controllers/effective/providers/pretend.rb

@@ -23,7 +23,7 @@ module Effective
             provider: 'pretend', 
             card: 'none', 
             purchased_url: pretend_params[:purchased_url],
-            current_user: current_user
+            current_user: (current_user unless admin_checkout?(pretend_params))
           )
         end
       end

data/app/controllers/effective/providers/stripe.rb

@@ -7,7 +7,7 @@ module Effective
         raise('stripe provider is not available') unless EffectiveOrders.stripe?
 
         @order = Order.deep.find(params[:id])
-        @customer = Effective::Customer.for_user(current_user)
+        @customer = Effective::Customer.for_user(@order.user || current_user)
 
         EffectiveResources.authorize!(self, :update, @order)
 
@@ -34,7 +34,7 @@ module Effective
           provider: 'stripe',
           card: payment[:card],
           purchased_url: stripe_params[:purchased_url],
-          current_user: current_user
+          current_user: (current_user unless admin_checkout?(stripe_params))
         )
       end
 

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_stripe_helper.rb

@@ -46,7 +46,7 @@ module EffectiveStripeHelper
   end
 
   def stripe_payment_intent(order)
-    customer = Effective::Customer.for_user(order.user)
+    customer = Effective::Customer.for_user(order.user || current_user)
 
     begin
       stripe_payment_intent_payload(order, customer)

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.5'.freeze
+  VERSION = '6.9.7'.freeze
 end

metadata

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