effective_orders 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9019d34aa37326aedfa30f1109d9af5ced0de13a
-  data.tar.gz: ddb700b7fbf547e81cfc90bf4234aa57fb8139e8
+  metadata.gz: c1e228be4429904e02e51771125e189f2c917642
+  data.tar.gz: 60ca8ea9cb693199784c7bfaf6d1424fc6bd6412
 SHA512:
-  metadata.gz: 83339fe6de29de57ae6b909ee49d409500e93c1d6a1b9ac66e561d5181f093bc3a43e78f5647b2261128a93c857b6958c6315a32026b577060884c95d899aa35
-  data.tar.gz: a4d3ee975306f6e20b7852636f9dfb97e89b462d22c7deffdc7c04d6ac44a7ab1832c9cee1bd182394135a9e316960b1c3ba2fea2b1502e41657ff0161ded830
+  metadata.gz: 89ab63b17901c6dd25e2f590f78d77427bde9dcaec50ff36d86760b57b1c24356ef7c4b3b6bf086dbb744b73e2e962a8f04fa8a8022d136a94a6921d9d9c31b1
+  data.tar.gz: f1714b29a9588dd1b78c034f74ad95305876713e5780def64c82bffe59153ed86a716d593f3853eb5bb0a325900b9b2e64a4efbcd3db8c95d24cc945208e596c

data/app/models/effective/datatables/orders.rb

@@ -11,8 +11,8 @@ if defined?(EffectiveDatatables)
         end
 
         if EffectiveOrders.require_billing_address
-          table_column :full_name, :sortable => false, :label => 'Buyer Name', :if => Proc.new { attributes[:user_id].blank? } do |order|
-            (order[:full_name] || '').split('!!SEP!!').find { |name| name.present? }
+          table_column :buyer_name, :sortable => false, :label => 'Buyer Name', :if => Proc.new { attributes[:user_id].blank? } do |order|
+            (order[:buyer_name] || '').split('!!SEP!!').find { |name| name.present? }
           end
         end
 
@@ -33,12 +33,7 @@ if defined?(EffectiveDatatables)
         end
 
         table_column :actions, :sortable => false, :filter => false do |order|
-          content_tag(:span, :style => 'white-space: nowrap;') do
-            [
-              link_to('View', (datatables_admin_path? ? effective_orders.admin_order_path(order) : effective_orders.order_path(order))),
-              (link_to('Resend Receipt', effective_orders.resend_buyer_receipt_path(order), {'data-confirm' => 'This action will resend a copy of the original email receipt.  Send receipt now?'}) if order.try(:purchased?))
-            ].compact.join(' - ').html_safe
-          end
+          link_to('View', (datatables_admin_path? ? effective_orders.admin_order_path(order) : effective_orders.order_path(order)))
         end
 
         def collection
@@ -52,11 +47,13 @@ if defined?(EffectiveDatatables)
             .select("#{query_total} AS total")
             .select("string_agg(order_items.title, '!!SEP!!') AS order_items")
 
-          if EffectiveOrders.require_billing_address
+          if EffectiveOrders.require_billing_address && defined?(EffectiveAddresses)
+            tblAddresses = EffectiveAddresses.addresses_table_name
+
             collection = collection
-              .joins("LEFT OUTER JOIN addresses ON addresses.addressable_id = orders.id AND addresses.addressable_type = 'Effective::Order'")
-              .select("string_agg(addresses.full_name, '!!SEP!!') AS full_name")
-              .where("addresses IS NULL OR addresses.category = 'billing'")
+              .joins("LEFT JOIN (SELECT addressable_id, string_agg(#{tblAddresses}.full_name, '!!SEP!!') AS buyer_name FROM #{tblAddresses} WHERE #{tblAddresses}.category = 'billing' AND #{tblAddresses}.addressable_type = 'Effective::Order' GROUP BY #{tblAddresses}.addressable_id) #{tblAddresses} ON orders.id = #{tblAddresses}.addressable_id")
+              .group("#{tblAddresses}.buyer_name")
+              .select("#{tblAddresses}.buyer_name AS buyer_name")
           end
 
           if attributes[:user_id].present?

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '1.2.4'.freeze
+  VERSION = '1.2.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-31 00:00:00.000000000 Z
+date: 2015-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails