effective_orders 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42e96ee4c487dfc7c3a09b34ef2fc91080b0000e
-  data.tar.gz: 5b0fdb82e518c1bff28e6af3d268c051fcc78b2f
+  metadata.gz: 9019d34aa37326aedfa30f1109d9af5ced0de13a
+  data.tar.gz: ddb700b7fbf547e81cfc90bf4234aa57fb8139e8
 SHA512:
-  metadata.gz: 5cedacdf5e24e128aa51a07ca935df574fd05cd52188d52db05457509c72e892abde6ea43bc7d36c9e3e56e5cc2dcc1243b13d7d51e918c069438b306866cab7
-  data.tar.gz: 32fecb0d4a18999bd555d8ec5c51f7c47f1647ad8d1e4302ecbc994de88e2d5e0887ec70aaceab89639f79ccdc31542fab28be8efe17918488428046cb6afc5d
+  metadata.gz: 83339fe6de29de57ae6b909ee49d409500e93c1d6a1b9ac66e561d5181f093bc3a43e78f5647b2261128a93c857b6958c6315a32026b577060884c95d899aa35
+  data.tar.gz: a4d3ee975306f6e20b7852636f9dfb97e89b462d22c7deffdc7c04d6ac44a7ab1832c9cee1bd182394135a9e316960b1c3ba2fea2b1502e41657ff0161ded830

data/README.md

@@ -657,16 +657,14 @@ Copy these two values into the appropriate lines of config/effective_orders.rb i
       :ps_store_id => '',
       :hpp_key => '',
       :hpp_url => 'https://www3.moneris.com/HPPDP/index.php',
-      :verify_url => 'https://www3.moneris.com/HPPDP/verifyTxn.php',
-      :order_nudge => 0
+      :verify_url => 'https://www3.moneris.com/HPPDP/verifyTxn.php'
     }
   else
     config.moneris = {
       :ps_store_id => 'VZ9BNtore1',
       :hpp_key => 'hp1Y5J35GVDM',
       :hpp_url => 'https://esqa.moneris.com/HPPDP/index.php',
-      :verify_url => 'https://esqa.moneris.com/HPPDP/verifyTxn.php',
-      :order_nudge => 0
+      :verify_url => 'https://esqa.moneris.com/HPPDP/verifyTxn.php'
     }
   end
 ```
@@ -753,10 +751,6 @@ https://www.google.ca/url?sa=t&rct=j&q=&esrc=s&source=web&cd=1&ved=0CB8QFjAA&url
 
 Once Order id=1 has been purchased/declined, you will be unable to purchase an order with id=1 ever again.
 
-This is what the moneris order_nudge configuration setting is used for.
-
-You can set this to 1000 to start the IDs at 1+1000 instead of 1.
-
 
 ## Paying via Stripe
 

data/app/controllers/effective/orders_controller.rb

@@ -40,11 +40,11 @@ module Effective
 
       Effective::Order.transaction do
         begin
-          if @order.save_billing_address? && @order.user.respond_to?(:billing_address)
+          if @order.save_billing_address? && @order.user.respond_to?(:billing_address) && @order.billing_address.try(:empty?) == false
             @order.user.billing_address = @order.billing_address
           end
 
-          if @order.save_shipping_address? && @order.user.respond_to?(:shipping_address)
+          if @order.save_shipping_address? && @order.user.respond_to?(:shipping_address) && @order.shipping_address.try(:empty?) == false
             @order.user.shipping_address = @order.shipping_address
           end
 

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

@@ -8,17 +8,10 @@ module Effective
       end
 
       def moneris_postback
-        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
+        @order ||= Effective::Order.find(params[:response_order_id])
 
         EffectiveOrders.authorized?(self, :update, @order)
 
-        # Store the Order Nudge if present, so we can have this information in our order_purchased hash
-        params[:order_nudge] = EffectiveOrders.moneris[:order_nudge] if EffectiveOrders.moneris[:order_nudge].to_i > 0
-
         # Delete the Purchased and Declined Redirect URLs
         purchased_redirect_url = params.delete(:rvar_purchased_redirect_url)
         declined_redirect_url = params.delete(:rvar_declined_redirect_url)

data/app/helpers/effective_paypal_helper.rb

@@ -18,7 +18,7 @@ module EffectivePaypalHelper
       :notify_url => effective_orders.paypal_postback_url,
       :cert_id => EffectiveOrders.paypal[:cert_id],
       :currency_code => EffectiveOrders.paypal[:currency],
-      :invoice => order.id + EffectiveOrders.paypal[:order_id_nudge].to_i,
+      :invoice => order.id,
       :amount => (order.subtotal / 100.0).round(2),
       :tax_cart => (order.tax / 100.0).round(2)
     }

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

@@ -4,22 +4,30 @@ if defined?(EffectiveDatatables)
       class Orders < Effective::Datatable
         default_order :purchased_at, :desc
 
-        table_column :id do |order|
-          order.to_param
-        end
+        table_column :id
 
-        table_column :email, :column => 'users.email', :label => 'Buyer', :if => Proc.new { attributes[:user_id].blank? } do |order|
+        table_column :email, :column => 'users.email', :label => 'Buyer Email', :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
 
+        if EffectiveOrders.require_billing_address
+          table_column :full_name, :sortable => false, :label => 'Buyer Name', :if => Proc.new { attributes[:user_id].blank? } do |order|
+            (order[:full_name] || '').split('!!SEP!!').find { |name| name.present? }
+          end
+        end
+
         table_column :order_items, :sortable => false, :column => 'order_items.title' do |order|
           content_tag(:ul) do
-            order[:order_items].split('!!OI!!').map { |oi| content_tag(:li, oi) }.join().html_safe
+            (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|
+          order.purchase_state || 'abandoned'
+        end
+
         table_column :total do |order|
           price_to_currency(order[:total].to_i)
         end
@@ -34,7 +42,7 @@ if defined?(EffectiveDatatables)
         end
 
         def collection
-          collection = Effective::Order.unscoped.purchased
+          collection = Effective::Order.unscoped
             .joins(:user)
             .joins(:order_items)
             .group('users.email')
@@ -42,7 +50,14 @@ if defined?(EffectiveDatatables)
             .select('users.email AS email')
             .select('orders.*')
             .select("#{query_total} AS total")
-            .select("string_agg(order_items.title, '!!OI!!') AS order_items")
+            .select("string_agg(order_items.title, '!!SEP!!') AS order_items")
+
+          if EffectiveOrders.require_billing_address
+            collection = collection
+              .joins("LEFT OUTER JOIN addresses ON addresses.addressable_id = orders.id AND addresses.addressable_type = 'Effective::Order'")
+              .select("string_agg(addresses.full_name, '!!SEP!!') AS full_name")
+              .where("addresses IS NULL OR addresses.category = 'billing'")
+          end
 
           if attributes[:user_id].present?
             collection.where(:user_id => attributes[:user_id])
@@ -59,6 +74,8 @@ if defined?(EffectiveDatatables)
         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)
           else
             super
           end

data/app/models/effective/order.rb

@@ -6,7 +6,7 @@ module Effective
       acts_as_obfuscated :format => '###-####-###'
     end
 
-    acts_as_addressable :billing => EffectiveOrders.require_billing_address, :shipping => EffectiveOrders.require_shipping_address
+    acts_as_addressable :billing => {:presence => EffectiveOrders.require_billing_address, :use_full_name => true}, :shipping => {:presence => EffectiveOrders.require_shipping_address, :use_full_name => true}
     attr_accessor :save_billing_address, :save_shipping_address, :shipping_address_same_as_billing # save these addresses to the user if selected
 
     belongs_to :user  # This is the user who purchased the order
@@ -96,8 +96,15 @@ module Effective
     def user=(user)
       super
 
-      self.billing_address = user.billing_address if user.respond_to?(:billing_address)
-      self.shipping_address = user.shipping_address if user.respond_to?(:shipping_address)
+      if user.respond_to?(:billing_address) && EffectiveOrders.require_billing_address
+        self.billing_address = user.billing_address
+        self.billing_address.full_name = billing_name if self.billing_address.present? && self.billing_address.full_name.blank?
+      end
+
+      if user.respond_to?(:shipping_address) && EffectiveOrders.require_shipping_address
+        self.shipping_address = user.shipping_address
+        self.shipping_address.full_name = billing_name if self.shipping_address.present? && self.shipping_address.full_name.blank?
+      end
     end
 
     # This is used for updating Subscription codes.
@@ -160,12 +167,12 @@ module Effective
     def billing_name
       if billing_address.try(:full_name).present?
         billing_address.full_name
-      elsif user.to_s.start_with?('#<User:') == false
-        user.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
+      elsif user.to_s.start_with?('#<User:') == false
+        user.to_s
       else
         ''
       end

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

@@ -8,15 +8,14 @@
   %tbody
     %tr
       %td{:style => 'text-align: left;'}
-        - if order.billing_address.try(:full_name).present? == false
+        - if EffectiveOrders.require_billing_address && order.billing_address.present?
+          = render :partial => 'effective/addresses/address', :locals => {:address => order.billing_address, :email => order.user.email}
+        - else
           = order.billing_name
           %br
           = mail_to(order.user.email)
           %br
 
-        - if order.billing_address.present?
-          = 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;'}
           = render :partial => 'effective/addresses/address', :locals => {:address => order.shipping_address}

data/app/views/effective/orders/moneris/_form.html.haml

@@ -13,11 +13,7 @@
   = hidden_field_tag(:email, order.user.try(:email))
   = hidden_field_tag(:cust_id, order.user.to_param)
 
-  - moneris_order_id = "#{order.to_param.gsub(/[^0-9]/, '').to_i + EffectiveOrders.moneris[:order_nudge].to_i}"
-  - if EffectiveOrders.moneris[:include_billing_name_in_order_id] == true
-    - moneris_order_id = moneris_order_id + '-' + order.billing_name.parameterize
-
-  = hidden_field_tag(:order_id, moneris_order_id)
+  = hidden_field_tag(:order_id, [order.to_param, order.billing_name.try(:parameterize).presence].compact.join('-'))
   = hidden_field_tag(:gst, '%.2f' % (order.tax / 100.0))
   = hidden_field_tag(:charge_total, '%.2f' % (order.total / 100.0))
 
@@ -30,6 +26,8 @@
 
   - if order.billing_address.present?
     - address = order.billing_address
+    = hidden_field_tag(:bill_first_name, address.first_name)
+    = hidden_field_tag(:bill_last_name, address.last_name)
     = hidden_field_tag(:bill_address_one, address.address1)
     = hidden_field_tag(:bill_city, address.city)
     = hidden_field_tag(:bill_state_or_province, address.state)

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '1.2.3'.freeze
+  VERSION = '1.2.4'.freeze
 end

data/lib/generators/templates/effective_orders.rb

@@ -142,18 +142,14 @@ EffectiveOrders.setup do |config|
       :ps_store_id => '',
       :hpp_key => '',
       :hpp_url => 'https://www3.moneris.com/HPPDP/index.php',
-      :verify_url => 'https://www3.moneris.com/HPPDP/verifyTxn.php',
-      :order_nudge => 0,
-      :include_billing_name_in_order_id => false
+      :verify_url => 'https://www3.moneris.com/HPPDP/verifyTxn.php'
     }
   else
     config.moneris = {
       :ps_store_id => '',
       :hpp_key => '',
       :hpp_url => 'https://esqa.moneris.com/HPPDP/index.php',
-      :verify_url => 'https://esqa.moneris.com/HPPDP/verifyTxn.php',
-      :order_nudge => 0,
-      :include_billing_name_in_order_id => false
+      :verify_url => 'https://esqa.moneris.com/HPPDP/verifyTxn.php'
     }
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-29 00:00:00.000000000 Z
+date: 2014-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails