effective_orders 1.5.5 → 1.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c35da0558303f282bbfbfcb20c376fa2c2d5a31
-  data.tar.gz: 69dad29645d72609176efe6efc6895ecee34ed75
+  metadata.gz: 75b721d5cabea376b54181ca7287d4e33ac3cdb3
+  data.tar.gz: 5f3601dc3f0b485dcbceef6554f2c262814568f1
 SHA512:
-  metadata.gz: f0bc9242bb237594aa22f088063e26b3fdd3065ba8a8ad145465c561eda6143a9952304fbb0da55c1b1ea40545bb5e44ec7b798262e288c457749d3277a1f493
-  data.tar.gz: b18ed09bc2179b7f89cca163c162eab5d9fc619d12a3b3cfec915774d84599234dc7458501bedbdb7642f4247537d94146b1f7089504e2e6fa209ac3cc4af45c
+  metadata.gz: 67bf705408eeef41f9b756737eb74fd900f6cd8c0e6fcab331e963756c74bb3de996fa7fc9794f6ce6e6e5cc68822e3fefae2328f7e31f18d1dfc0ceb3881be5
+  data.tar.gz: eae01bfd78dcdc3407305f6466a68994dd7412060d67a6bddbd60cc82d94dc744142c38fd4f25b4ce1c11e9e948819d10359f02b785a650c36ed199a54daf9a3

data/app/assets/javascripts/effective_orders/shipping_address_toggle.js.coffee

@@ -1,5 +1,5 @@
 hideShippingAddressFields = (shipping_address) ->
-  shipping_address.hide().find('input,select').removeProp('required')
+  shipping_address.hide().find('input,select').removeAttr('required')
 
 showShippingAddressFields = (shipping_address) ->
   shipping_address.show().find("input:not([name$='[address2]']),select:not([name$='[state_code]'])").prop('required', true)

data/app/assets/javascripts/effective_orders/stripe_charges.js.coffee

@@ -3,7 +3,7 @@ stripeCheckoutHandler = (key, form) ->
     key: key
     token: (token, args) ->
       if token.error
-        form.find("input[type='submit']").removeProp('disabled')
+        form.find("input[type='submit']").removeAttr('disabled')
         $('input[data-disable-with]').each -> try $.rails.enableFormElement($(this))
 
         alert("An error ocurred when contacting Stripe.  Your card has not been charged.  Please refresh the page and try again. #{token.error.message}")
@@ -30,5 +30,5 @@ $(document).on 'click', "#effective-orders-new-charge-form form input[type='subm
     description: obj.data('description')
     amount: obj.data('amount')
     closed: ->
-      form.find("input[type='submit']").removeProp('disabled')
+      form.find("input[type='submit']").removeAttr('disabled')
       $('input[data-disable-with]').each -> try $.rails.enableFormElement($(this))

data/app/assets/javascripts/effective_orders/stripe_subscriptions.js.coffee

@@ -3,7 +3,7 @@ stripeCheckoutHandler = (key, form) ->
     key: key
     token: (token, args) ->
       if token.error
-        form.find("input[type='submit']").removeProp('disabled')
+        form.find("input[type='submit']").removeAttr('disabled')
         alert("An error ocurred when contacting Stripe.  Your card has not been charged.  Please refresh the page and try again. #{token.error.message}")
       else
         form.find("input[type='submit']").prop('disabled', true)
@@ -25,4 +25,4 @@ $(document).on 'click', "#effective-orders-new-subscription-form form input[type
       email: obj.data('user-email')
       description: plan.text()
       panelLabel: 'Start Subscription'
-      closed: -> form.find("input[type='submit']").removeProp('disabled')
+      closed: -> form.find("input[type='submit']").removeAttr('disabled')

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

@@ -22,9 +22,9 @@ if defined?(EffectiveDatatables)
             order.purchase_state || 'abandoned'
           end
 
-          table_column :order_items, sortable: false, column: 'order_items.title' do |order|
+          table_column :items, label: 'Order Items', sortable: false, column: query_items_list do |order|
             content_tag(:ul) do
-              (order[:order_items] || '').split('!!SEP!!').map { |oi| content_tag(:li, oi) }.join.html_safe
+              (order[:items] || '').split('!!SEP!!').map { |oi| content_tag(:li, oi) }.join.html_safe
             end
           end
 
@@ -45,7 +45,7 @@ if defined?(EffectiveDatatables)
             .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")
+            .select("#{query_items_list} AS items")
             .select("#{query_payment_method} AS payment_method")
 
           if EffectiveOrders.require_billing_address && defined?(EffectiveAddresses)
@@ -72,6 +72,10 @@ 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_items_list
+          "string_agg(order_items.title, '!!SEP!!')"
+        end
+
         def query_payment_method
           "COALESCE(SUBSTRING(payment FROM 'card: (\\w{1,2})\\n'), SUBSTRING(payment FROM 'action: (\\w+)_postback\\n'))"
         end
@@ -86,6 +90,8 @@ if defined?(EffectiveDatatables)
             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 'items'
+            then collection.having("#{query_items_list} ILIKE ?", "%#{search_term}%")
           when 'payment_method'
             then collection.having("#{query_payment_method} LIKE ?", "#{search_term}%")
           else

data/lib/effective_orders/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 1.5.5
+  version: 1.5.7
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-02 00:00:00.000000000 Z
+date: 2015-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.3.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.3.6
 - !ruby/object:Gem::Dependency
   name: effective_obfuscation
   requirement: !ruby/object:Gem::Requirement