effective_orders 1.2.6 → 1.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e18ac05ae929a3e8cba5f191a3d72cbc834b72b
-  data.tar.gz: 3fb8c09f1ccab9fa69eb7fc56b93273fa46fd28d
+  metadata.gz: 9e77f25b6d0e0a68b65f915274bac55854e97671
+  data.tar.gz: a7b178984581033d45d4bebacc8be65700b9609b
 SHA512:
-  metadata.gz: cfca6b00e5f4d62f7a156ec33d91daef472091adc30f234aa493aaf0856ac4912089e6a3692ed580f4bc64d2be821a4201c873e1b4a502d5396af5f5b7aa2b99
-  data.tar.gz: 8cb50d9d1f38a76d715e32840249ed53c0cac14dcea8bdd10c908e071dbec2132d77ffa4069b5df52260c6c97f04e2f2155c3cc71020f43997574c05e65b9bde
+  metadata.gz: 9049fbc41f9edb0792e992b1376ce845f28c73499d3764972a665abbb1faf94f775d2b7eb763270b96bdf7423e1877d5d013ed8df533887020df3f25700914a9
+  data.tar.gz: 3f89d86ee7cdc7ef9e479805d08962df11ae7e239058154a1e7baa3f90d847892dc7b04c4f3b47169ad5be3df8df0168a886d12bdf85228dfc723479f291055a

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

@@ -2,43 +2,36 @@ if defined?(EffectiveDatatables)
   module Effective
     module Datatables
       class Customers < Effective::Datatable
-        table_column :email, :column => 'users.email' do |user|
-          mail_to user.email, user.email
-        end
+        default_order :email, :asc
+
+        table_column :id, visible: false
+        table_column(:email, column: 'users.email') { |user| mail_to user.email, user.email }
 
         if EffectiveOrders.stripe_enabled
-          table_column :stripe_customer_id 
+          table_column :stripe_customer_id
           table_column :stripe_active_card
         end
 
         if EffectiveOrders.stripe_connect_enabled
-          table_column :stripe_connect_access_token 
+          table_column :stripe_connect_access_token
         end
 
-        table_column :subscription_types, :column => 'subscription_types'
+        table_column :subscription_types, column: 'subscription_types'
 
-        table_column :actions, :sortable => false, :filter => false, :partial => '/admin/customers/actions'
+        table_column :actions, sortable: false, filter: false, partial: '/admin/customers/actions'
 
         def collection
           Effective::Customer.customers.uniq
-            .joins(:user)
-            .joins(:subscriptions)
-            .select('customers.*')
-            .select('users.email AS email')
+            .joins(:user, :subscriptions)
+            .select('customers.*, users.email AS email')
             .select("array_to_string(array(#{Effective::Subscription.purchased.select('subscriptions.stripe_plan_id').where('subscriptions.customer_id = customers.id').to_sql}), ' ,') AS subscription_types")
-            .group('customers.id')
-            .group('subscriptions.stripe_plan_id')
-            .group('users.email')
+            .group('customers.id, subscriptions.stripe_plan_id, users.email')
         end
 
         def search_column(collection, table_column, search_term)
-          if table_column[:name] == 'subscription_types'
-            collection.where('subscriptions.stripe_plan_id ILIKE ?', "%#{search_term}%")
-          else
-            super
-          end
+          return collection.where('subscriptions.stripe_plan_id ILIKE ?', "%#{search_term}%") if table_column[:name] == 'subscription_types'
+          super
         end
-
       end
     end
   end

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

@@ -4,80 +4,70 @@ if defined?(EffectiveDatatables)
       class Orders < Effective::Datatable
         default_order :purchased_at, :desc
 
+        table_column(:purchased_at) { |order| order.purchased_at.try(:strftime, '%Y-%m-%d %H:%M') }
         table_column :id
 
-        table_column :email, :column => 'users.email', :label => 'Buyer Email', :if => Proc.new { attributes[:user_id].blank? } do |order|
+        table_column :email, column: 'users.email', label: 'Buyer Email', if: proc { attributes[:user_id].blank? } do |order|
           link_to order[:email], (edit_admin_user_path(order.user_id) rescue admin_user_path(order.user_id) rescue '#')
         end
 
         if EffectiveOrders.require_billing_address
-          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? }
+          table_column :buyer_name, sortable: false, label: 'Buyer Name', if: proc { attributes[:user_id].blank? } do |order|
+            (order[:buyer_name] || '').split('!!SEP!!').find(&:present?)
           end
         end
 
-        table_column :order_items, :sortable => false, :column => 'order_items.title' do |order|
-          content_tag(:ul) do
-            (order[:order_items] || '').split('!!SEP!!').map { |oi| content_tag(:li, oi) }.join().html_safe
-          end
-        end
-
-        table_column :purchased_at
-
-        table_column :purchase_state, :filter => {:type => :select, :values => [['abandoned', 'abandoned'], [EffectiveOrders::PURCHASED, EffectiveOrders::PURCHASED], [EffectiveOrders::DECLINED, EffectiveOrders::DECLINED]], :selected => EffectiveOrders::PURCHASED} do |order|
+        table_column :purchase_state, filter: { type: :select, values: [%w(abandoned abandoned), [EffectiveOrders::PURCHASED, EffectiveOrders::PURCHASED], [EffectiveOrders::DECLINED, EffectiveOrders::DECLINED]], selected: EffectiveOrders::PURCHASED } do |order|
           order.purchase_state || 'abandoned'
         end
 
-        table_column :total do |order|
-          price_to_currency(order[:total].to_i)
+        table_column :order_items, sortable: false, column: 'order_items.title' do |order|
+          content_tag(:ul) do
+            (order[:order_items] || '').split('!!SEP!!').map { |oi| content_tag(:li, oi) }.join.html_safe
+          end
         end
 
-        table_column :actions, :sortable => false, :filter => false do |order|
+        table_column(:total) { |order| price_to_currency(order[:total].to_i) }
+        table_column(:created_at, visible: false) { |order| order.updated_at.strftime('%Y-%m-%d %H:%M') }
+        table_column(:updated_at, visible: false) { |order| order.updated_at.strftime('%Y-%m-%d %H:%M') }
+
+        table_column :actions, sortable: false, filter: false do |order|
           link_to('View', (datatables_admin_path? ? effective_orders.admin_order_path(order) : effective_orders.order_path(order)))
         end
 
         def collection
           collection = Effective::Order.unscoped
-            .joins(:user)
-            .joins(:order_items)
-            .group('users.email')
-            .group('orders.id')
-            .select('users.email AS email')
-            .select('orders.*')
-            .select("#{query_total} AS total")
-            .select("string_agg(order_items.title, '!!SEP!!') AS order_items")
+                       .joins(:user, :order_items)
+                       .group('users.email, orders.id')
+                       .select('orders.*, users.email AS email')
+                       .select("#{query_total} AS total")
+                       .select("string_agg(order_items.title, '!!SEP!!') AS order_items")
 
           if EffectiveOrders.require_billing_address && defined?(EffectiveAddresses)
-            tblAddresses = EffectiveAddresses.addresses_table_name
+            addresses_tbl = EffectiveAddresses.addresses_table_name
 
             collection = collection
-              .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?
-            collection.where(:user_id => attributes[:user_id])
-          else
-            collection
+                         .joins("LEFT JOIN (SELECT addressable_id, string_agg(#{addresses_tbl}.full_name, '!!SEP!!') AS buyer_name FROM #{addresses_tbl} WHERE #{addresses_tbl}.category = 'billing' AND #{addresses_tbl}.addressable_type = 'Effective::Order' GROUP BY #{addresses_tbl}.addressable_id) #{addresses_tbl} ON orders.id = #{addresses_tbl}.addressable_id")
+                         .group("#{addresses_tbl}.buyer_name")
+                         .select("#{addresses_tbl}.buyer_name AS buyer_name")
           end
 
+          attributes[:user_id].present? ? collection.where(user_id: attributes[:user_id]) : collection
         end
 
         def query_total
-          "SUM((order_items.price * order_items.quantity) + (CASE order_items.tax_exempt WHEN true THEN 0 ELSE ((order_items.price * order_items.quantity) * order_items.tax_rate) END))"
+          'SUM((order_items.price * order_items.quantity) + (CASE order_items.tax_exempt WHEN true THEN 0 ELSE ((order_items.price * order_items.quantity) * order_items.tax_rate) END))'
         end
 
         def search_column(collection, table_column, search_term)
           if table_column[:name] == 'total'
             collection.having("#{query_total} = ?", (search_term.gsub(/[^0-9.]/, '').to_f * 100.0).to_i)
           elsif table_column[:name] == 'purchase_state' && search_term == 'abandoned'
-            collection.where(:purchase_state => nil)
+            collection.where(purchase_state: nil)
           else
             super
           end
         end
-
       end
     end
   end

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '1.2.6'.freeze
+  VERSION = '1.2.7'.freeze
 end

metadata

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