effective_orders 1.5.4 → 1.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69ff7ff6e5414d61ae7a6fc8982f4975917e72ac
-  data.tar.gz: d7dc79b1ccba44c64636c436ee4adc58bc0b6253
+  metadata.gz: 4c35da0558303f282bbfbfcb20c376fa2c2d5a31
+  data.tar.gz: 69dad29645d72609176efe6efc6895ecee34ed75
 SHA512:
-  metadata.gz: 2a8641f98c31e8eaf05efc5d3ec699cd68a6ad1c4fb429349d45303c685958848e0e1fb3b1a402e658b35a42e86945535a791f2e3641d3c4aadc8074efb921c9
-  data.tar.gz: 2ed81e8f55fbaa86af4428f89598a189da0abf147bbf4233098383d5cfc080270ccf4440d7f5ded06a27ad24bcc9f25d2c0a990fbe0c92e29c1bf979191e5f16
+  metadata.gz: f0bc9242bb237594aa22f088063e26b3fdd3065ba8a8ad145465c561eda6143a9952304fbb0da55c1b1ea40545bb5e44ec7b798262e288c457749d3277a1f493
+  data.tar.gz: b18ed09bc2179b7f89cca163c162eab5d9fc619d12a3b3cfec915774d84599234dc7458501bedbdb7642f4247537d94146b1f7089504e2e6fa209ac3cc4af45c

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

@@ -46,6 +46,7 @@ if defined?(EffectiveDatatables)
             .select('orders.*, users.email AS email')
             .select("#{query_total} AS total")
             .select("string_agg(order_items.title, '!!SEP!!') AS order_items")
+            .select("#{query_payment_method} AS payment_method")
 
           if EffectiveOrders.require_billing_address && defined?(EffectiveAddresses)
             addresses_tbl = EffectiveAddresses.addresses_table_name
@@ -72,7 +73,7 @@ if defined?(EffectiveDatatables)
         end
 
         def query_payment_method
-          "SUBSTRING(payment FROM 'card: (\\w{1,2})\\n')"
+          "COALESCE(SUBSTRING(payment FROM 'card: (\\w{1,2})\\n'), SUBSTRING(payment FROM 'action: (\\w+)_postback\\n'))"
         end
 
         def search_column(collection, table_column, search_term)
@@ -86,7 +87,7 @@ if defined?(EffectiveDatatables)
           when 'purchase_state'
             then search_term == 'abandoned' ? collection.where(purchase_state: nil) : super
           when 'payment_method'
-            then collection.having("#{query_payment_method} = ?", search_term)
+            then collection.having("#{query_payment_method} LIKE ?", "#{search_term}%")
           else
             super
           end

data/lib/effective_orders/version.rb

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

metadata

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