effective_orders 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7ae38c1740cd0fbe0188bb662c302c209218bcf
-  data.tar.gz: 8bc72c28a5cd18d2437068c3b43f2670ba74d140
+  metadata.gz: 18b94b140cb5e27733403db8ff5c2f2d5334ec53
+  data.tar.gz: 5b50dd174ecb6da78ffadcedc8268c75dc238815
 SHA512:
-  metadata.gz: ef0673ac7015c222e065432e5bd167ab759107369127a06e5816ead520293a8292affa9189a5ec637a370764cae5b6bf90e6b0990bc3101e2b2c790ead13b6ed
-  data.tar.gz: dadf0b8b6ccc382db5c4bcfe9f89989566d46cae4e926fa1914125de8a1cdbccbb55fa8398e901fcfc2becd4c9f4549c6203db6db9be0976ba9045073926552d
+  metadata.gz: 0a7cab5b36a1ef78644e174b338862e256ab15a7d7f5debbcb41174eec48958b22b52bb9b1826aac9b5caa0b95daf7f62f70f1fbe1de142c878573ed47f3c569
+  data.tar.gz: 80193c2d5065a6fc1689a267cbe3efb8225898fbbaa3026103ecdf0914b54d2f7e7c3b5e15de67473e05ca032271c56088b8d66456325e9759ec69f466870683

data/app/controllers/effective/providers/moneris.rb

@@ -8,7 +8,11 @@ module Effective
       end
 
       def moneris_postback
-        @order ||= Effective::Order.find(params[:response_order_id].to_i - EffectiveOrders.moneris[:order_nudge].to_i)
+        response_order_id = (EffectiveOrders.obfuscate_order_ids == true ? Effective::Order.deobfuscate(params[:response_order_id]).to_i : params[:response_order_id].to_i)
+        response_order_id = response_order_id - EffectiveOrders.moneris[:order_nudge].to_i
+
+        @order ||= Effective::Order.find_by_id(response_order_id)
+        raise ActiveRecord::RecordNotFound unless @order
 
         EffectiveOrders.authorized?(self, :update, @order)
 

data/app/models/effective/cart_item.rb

@@ -20,8 +20,8 @@ module Effective
       if (purchasable.price || 0).kind_of?(Integer)
         purchasable.price || 0
       else
-        ActiveSupport::Deprecation.warn('price is a non-integer. It should be an Integer representing the number of cents.  Continuing with (price * 100.0).floor conversion') unless EffectiveOrders.silence_deprecation_warnings
-        (purchasable.price * 100.0).floor rescue 0
+        ActiveSupport::Deprecation.warn('price is a non-integer. It should be an Integer representing the number of cents.  Continuing with (price * 100.0).round(0).to_i conversion') unless EffectiveOrders.silence_deprecation_warnings
+        (purchasable.price * 100.0).round(0).to_i rescue 0
       end
     end
 
@@ -30,7 +30,7 @@ module Effective
     end
 
     def tax
-      tax_exempt ? 0 : (subtotal * tax_rate).ceil
+      tax_exempt ? 0 : (subtotal * tax_rate).round(0).to_i
     end
 
     def total

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

@@ -2,24 +2,26 @@ if defined?(EffectiveDatatables)
   module Effective
     module Datatables
       class Orders < Effective::Datatable
+        default_order :purchased_at, :desc
+
         table_column :id do |order|
           order.to_param
         end
 
-        array_column :email, :label => 'Buyer', :if => Proc.new { attributes[:user_id].blank? } do |order|
-          link_to order.user.email, (edit_admin_user_path(order.user) rescue admin_user_path(order.user) rescue '#')
+        table_column :email, :column => 'users.email', :label => 'Buyer', :if => Proc.new { 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
 
-        array_column :order_items do |order|
+        table_column :order_items, :sortable => false, :column => 'order_items.title' do |order|
           content_tag(:ul) do
-            order.order_items.map { |oi| content_tag(:li, oi.title) }.join().html_safe
+            order[:order_items].split('!!OI!!').map { |oi| content_tag(:li, oi) }.join().html_safe
           end
         end
 
         table_column :purchased_at
 
-        array_column :total do |order|
-          price_to_currency(order.total)
+        table_column :total do |order|
+          price_to_currency(order[:total].to_i)
         end
 
         table_column :actions, :sortable => false, :filter => false do |order|
@@ -32,16 +34,31 @@ if defined?(EffectiveDatatables)
         end
 
         def collection
+          collection = Effective::Order.unscoped.purchased
+            .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, '!!OI!!') AS order_items")
+
           if attributes[:user_id].present?
-            Effective::Order.purchased.where(:user_id => attributes[:user_id]).includes(:user).includes(:order_items)
+            collection.where(:user_id => attributes[:user_id])
           else
-            Effective::Order.purchased.includes(:user).includes(:order_items)
+            collection
           end
+
+        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))"
         end
 
         def search_column(collection, table_column, search_term)
-          if table_column[:name] == 'id'
-            collection.where(:id => search_term)
+          if table_column[:name] == 'total'
+            collection.having("#{query_total} = ?", (search_term.gsub(/[^0-9.]/, '').to_f * 100.0).to_i)
           else
             super
           end

data/app/models/effective/order.rb

@@ -162,10 +162,12 @@ module Effective
         billing_address.full_name
       elsif user.to_s.start_with?('#<User:') == false
         user.to_s
-      elsif user.respond_to?(:first_name) && user.respond_to?(:last_name)
-        user.first_name.to_s + ' ' + user.last_name.to_s
       elsif user.respond_to?(:full_name)
         user.full_name.to_s
+      elsif user.respond_to?(:first_name) && user.respond_to?(:last_name)
+        user.first_name.to_s + ' ' + user.last_name.to_s
+      else
+        ''
       end
     end
 

data/app/models/effective/order_item.rb

@@ -33,7 +33,7 @@ module Effective
     end
 
     def tax  # This is the total tax, for 3 items if quantity is 3
-      tax_exempt ? 0 : (subtotal * tax_rate).ceil
+      tax_exempt ? 0 : (subtotal * tax_rate).round(0).to_i
     end
 
     def total
@@ -46,7 +46,7 @@ module Effective
       elsif value.kind_of?(String) && !value.include?('.') # Looks like an integer
         super
       else # Could be Float, BigDecimal, or String like 9.99
-        ActiveSupport::Deprecation.warn('order_item.price= was passed a non-integer. Expecting an Integer representing the number of cents.  Continuing with (price * 100.0).floor conversion') unless EffectiveOrders.silence_deprecation_warnings
+        ActiveSupport::Deprecation.warn('order_item.price= was passed a non-integer. Expecting an Integer representing the number of cents.  Continuing with (price * 100.0).round(0).to_i conversion') unless EffectiveOrders.silence_deprecation_warnings
         super((value.to_f * 100.0).to_i)
       end
     end

data/app/models/effective/subscription.rb

@@ -85,7 +85,7 @@ module Effective
 
     def price_with_coupon(amount, coupon)
       if coupon.percent_off.present?
-        (amount * (coupon.percent_off.to_i / 100.0)).floor
+        (amount * (coupon.percent_off.to_i / 100.0)).round(0).to_i
       else
         [0, amount - coupon.amount_off].max
       end

data/app/views/effective/orders/_order_shipping.html.haml

@@ -8,14 +8,14 @@
   %tbody
     %tr
       %td{:style => 'text-align: left;'}
-        - if order.billing_name.present? && EffectiveAddresses.use_full_name == false
+        - if order.billing_address.try(:full_name).present? == false
           = order.billing_name
           %br
-        = mail_to order.user.email
+          = mail_to(order.user.email)
+          %br
 
         - if order.billing_address.present?
-          %br
-          = render :partial => 'effective/addresses/address', :locals => {:address => order.billing_address}
+          = render :partial => 'effective/addresses/address', :locals => {:address => order.billing_address, :email => (order.user.email if order.billing_address.try(:full_name).present?)}
 
       - if EffectiveOrders.require_shipping_address && order.shipping_address.present?
         %td{:style => 'text-align: left;'}

data/lib/effective_orders.rb

@@ -66,8 +66,8 @@ module EffectiveOrders
     if @@minimum_charge.nil? || @@minimum_charge.kind_of?(Integer)
       @@minimum_charge
     else
-      ActiveSupport::Deprecation.warn('EffectiveOrders.minimum_charge config option is a non-integer. It should be an Integer representing the number of cents.  Continuing with (price * 100.0).floor conversion') unless EffectiveOrders.silence_deprecation_warnings
-      ((@@minimum_charge * 100.0).floor rescue nil)
+      ActiveSupport::Deprecation.warn('EffectiveOrders.minimum_charge config option is a non-integer. It should be an Integer representing the number of cents.  Continuing with (price * 100.0).round(0).to_i conversion') unless EffectiveOrders.silence_deprecation_warnings
+      ((@@minimum_charge * 100.0).round(0).to_i rescue nil)
     end
   end
 

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '1.2.0'.freeze
+  VERSION = '1.2.1'.freeze
 end

data/spec/dummy/log/test.log

@@ -345,3 +345,10 @@ BLAHBLAH
    (0.1ms)  SELECT MAX("orders"."id") AS max_id FROM "orders"
    (0.3ms)  SELECT MAX("orders"."id") AS max_id FROM "orders"
    (0.1ms)  SELECT MAX("orders"."id") AS max_id FROM "orders"
+   (0.1ms)  SELECT MAX("orders"."id") AS max_id FROM "orders"
+   (0.1ms)  SELECT MAX("orders"."id") AS max_id FROM "orders"
+   (0.2ms)  SELECT MAX("orders"."id") AS max_id FROM "orders"
+   (0.1ms)  SELECT MAX("orders"."id") AS max_id FROM "orders"
+   (0.2ms)  SELECT MAX("orders"."id") AS max_id FROM "orders"
+   (0.1ms)  SELECT MAX("orders"."id") AS max_id FROM "orders"
+   (0.1ms)  SELECT MAX("orders"."id") AS max_id FROM "orders"

data/spec/models/subscription_spec.rb

@@ -81,7 +81,7 @@ describe Effective::Subscription do
       subscription.stripe_plan_id = plan.id
       subscription.stripe_coupon_id = coupon.id
 
-      subscription.price.should eq (plan.amount * (coupon.percent_off.to_i / 100.0)).floor
+      subscription.price.should eq (plan.amount * (coupon.percent_off.to_i / 100.0)).round(0).to_i
       subscription.title.include?('25% off').should eq true
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-22 00:00:00.000000000 Z
+date: 2014-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: effective_obfuscation
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +150,104 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: factory_girl_rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: shoulda-matchers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-livereload
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Quickly build an online store with carts, orders, automatic email receipts
   and payment collection via Stripe, StripeConnect, PayPal and Moneris.
 email: