effective_orders 1.5.3 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c08f993d24d281ba8e17af297fc43eda2d25425
-  data.tar.gz: 405e69619e74b45eeb3808dc31403e681666ed5d
+  metadata.gz: 69ff7ff6e5414d61ae7a6fc8982f4975917e72ac
+  data.tar.gz: d7dc79b1ccba44c64636c436ee4adc58bc0b6253
 SHA512:
-  metadata.gz: 456c396d95df8356f5db6a1985b0814955cda265c04162540ba9ac6dae48aa7b575183137ec00ae84445127d351b1673f7abc3441cd6cc0f3ebb4bd159a8bfd6
-  data.tar.gz: b1e31fdf1558cdf2160be96e1b289595e8f341fd2a244f35f4302061d88027d81ae2fa1828002384c89e285e9af65d4831c6ee3562b28a854f931990a8f21000
+  metadata.gz: 2a8641f98c31e8eaf05efc5d3ec699cd68a6ad1c4fb429349d45303c685958848e0e1fb3b1a402e658b35a42e86945535a791f2e3641d3c4aadc8074efb921c9
+  data.tar.gz: 2ed81e8f55fbaa86af4428f89598a189da0abf147bbf4233098383d5cfc080270ccf4440d7f5ded06a27ad24bcc9f25d2c0a990fbe0c92e29c1bf979191e5f16

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

@@ -29,6 +29,7 @@ if defined?(EffectiveDatatables)
           end
 
           table_column(:total) { |order| price_to_currency(order[:total].to_i) }
+          table_column :payment_method
 
           table_column :created_at, :visible => false
           table_column :updated_at, :visible => false
@@ -70,15 +71,22 @@ if defined?(EffectiveDatatables)
           '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 query_payment_method
+          "SUBSTRING(payment FROM 'card: (\\w{1,2})\\n')"
+        end
+
         def search_column(collection, table_column, search_term)
-          if table_column[:name] == 'subtotal'
-            collection.having("#{query_subtotal} = ?", (search_term.gsub(/[^0-9.]/, '').to_f * 100.0).to_i)
-          elsif table_column[:name] == 'tax'
-            collection.having("#{query_tax} = ?", (search_term.gsub(/[^0-9.]/, '').to_f * 100.0).to_i)
-          elsif 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)
+          case table_column[:name]
+          when 'subtotal'
+            then collection.having("#{query_subtotal} = ?", (search_term.gsub(/[^0-9.]/, '').to_f * 100.0).to_i)
+          when 'tax'
+            then collection.having("#{query_tax} = ?", (search_term.gsub(/[^0-9.]/, '').to_f * 100.0).to_i)
+          when 'total'
+            then collection.having("#{query_total} = ?", (search_term.gsub(/[^0-9.]/, '').to_f * 100.0).to_i)
+          when 'purchase_state'
+            then search_term == 'abandoned' ? collection.where(purchase_state: nil) : super
+          when 'payment_method'
+            then collection.having("#{query_payment_method} = ?", search_term)
           else
             super
           end

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '1.5.3'.freeze
+  VERSION = '1.5.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.5.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-26 00:00:00.000000000 Z
+date: 2015-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails