effective_orders 6.5.7 → 6.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7d28d60b9d586ad2c1226eb3ac2bb34a7cfe6135cf1bb017165c10e13755734
-  data.tar.gz: c4ee710fa480ba14addf6c01136b4ac67f5c4e5952fb933be0d1dff7b8801715
+  metadata.gz: 42d67014fe256ed7ef96ee079c776855b73053d33bc116042ebd1a1c5e17bc5c
+  data.tar.gz: cd0503035984b062eaed51f779c10fb1124e59b97598ae2ed2cc503d0c8ddb11
 SHA512:
-  metadata.gz: ec7f4bcd7fe70b24cfbb2461b348e1829397a0f171fd8265754d7f5b5a875bebfe12b82ec6a523a3182685aef3069db84efd6f0af375f51b0e7ec91548aced96
-  data.tar.gz: e69604e9b70f6f3cc6254b21f77baca5e3747ff491bd28a42ac30becc098075d3af093eb2cc34991e41b0deb9786ec07341e8e943bc5325090491de1a9492444
+  metadata.gz: f5418c8644cf04e5bb73bd1266cbe81215db8b02d2065b48559b0dc12be511ba0b62f64910ffa7a867f84e6a54dd3d975a1236243eb6674c04aaf47ceb065ddf
+  data.tar.gz: 3488074b6f0479e0f9c8d095a0799f551c8db36804d263c208069be52c3471d35b7fc769087ac8c08964dda51823988d6155022075e5e9642d4ea29f8d49f0d2

data/app/controllers/effective/orders_controller.rb

@@ -19,8 +19,8 @@ module Effective
       layout(config.kind_of?(Hash) ? (config[:orders] || config[:application]) : config)
     end
 
-    before_action :authenticate_user!, except: [:ccbill_postback, :free, :paypal_postback, :moneris_postback, :pretend]
-    before_action :set_page_title, except: [:show]
+    before_action :authenticate_user!, except: [:free, :paypal_postback, :moneris_postback, :pretend]
+    before_action :set_page_title, except: [:show, :edit]
 
     # If you want to use the Add to Cart -> Checkout flow
     # Add one or more items however you do.
@@ -61,7 +61,7 @@ module Effective
     # This is the entry point for an existing order.
     # Might render step1 or step2
     def show
-      @order = Effective::Order.find(params[:id])
+      @order ||= Effective::Order.find(params[:id])
       @page_title ||= view_context.order_page_title(@order)
 
       EffectiveResources.authorize!(self, :show, @order)

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

@@ -3,6 +3,7 @@
     %thead
       %tr
         %th Order
+        %th Buyer
         %th Date
         %th Description
         %th
@@ -10,10 +11,13 @@
       - orders.each do |order|
         %tr
           %td ##{order.to_param}
+          %td
+            = [order.organization, order.user].compact.join('<br>').html_safe
           %td
             = (order.purchased? ? 'Purchased' : 'Created')
             = (order.purchased_at || order.created_at).strftime("%F %H:%M")
-          %td= order_summary(order)
+          %td
+            = order_summary(order)
           %td
             - if order.pending? || order.confirmed?
               = link_to_checkout(order: order)

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '6.5.7'.freeze
+  VERSION = '6.5.9'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 6.5.7
+  version: 6.5.9
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-20 00:00:00.000000000 Z
+date: 2023-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails