effective_orders 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1cf9baa9d485752d3758cd486c22451656851a9
-  data.tar.gz: c4e7fae35b93f72319b7b525382c085272c8f016
+  metadata.gz: 68837d038f48f9503cb95b4975a88a85bf2bb5f4
+  data.tar.gz: dab5e51afb7ea037856bea992fea9ea0c9b8da73
 SHA512:
-  metadata.gz: 406fb85de09e76af4dcbd5c3ef92d911f587a8bbdce2cefeb5f095ccf2f1e1341e2e7b716a21b4106c06baff89a5285281fcd407b4e381512acaa9c3ff2add5c
-  data.tar.gz: dbff00b400518808d5071d166c8246a673fda871a71304e5ad16726e7402c355e77389a4965bc363b4cbc81715261c1efd9dc1cb6ea1887a1dbe50071f9e6d8b
+  metadata.gz: 1edcf64fe4df807a613887574d172fc86a713c03448ce9bf75d4dd82c63bce49154c7b44c056977d916a39493d1b04076d4323bed4e400716b92f485392c7f59
+  data.tar.gz: 6038dfad385dd638b9419bda5d851cd39f497a16d661111d8c8829b53cc80f8e3c0f0ae2f3d8ddfbf465d6d8fe7bb9f2692c9879ffbffb6e8d9e43e00aef5293

data/active_admin/effective_orders.rb

@@ -62,7 +62,7 @@ if defined?(ActiveAdmin)
     end
 
     collection_action :export_csv do
-      @orders = Effective::Order.purchased
+      @orders = Effective::Order.purchased.includes(:addresses)
 
       col_headers = []
       col_headers << "Order ID"
@@ -81,9 +81,9 @@ if defined?(ActiveAdmin)
           row << order.to_param
           row << (order.billing_address.try(:full_name) || order.user.to_s)
           row << order.purchased_at.strftime("%Y-%m-%d %H:%M:%S %z")
-          row << "%.2f" % order.subtotal
-          row << "%.2f" % order.tax
-          row << "%.2f" % order.total
+          row << (order.subtotal / 100.0).round(2)
+          row << (order.tax / 100.0).round(2)
+          row << (order.total / 100.0).round(2)
 
           csv << row
         end

data/app/controllers/effective/carts_controller.rb

@@ -1,7 +1,7 @@
 module Effective
   class CartsController < ApplicationController
     include EffectiveCartsHelper
-    acts_as_active_admin_controller('carts') if EffectiveOrders.use_active_admin
+    acts_as_active_admin_controller('carts') if EffectiveOrders.use_active_admin?
 
     layout (EffectiveOrders.layout.kind_of?(Hash) ? EffectiveOrders.layout[:carts] : EffectiveOrders.layout)
 

data/app/controllers/effective/orders_controller.rb

@@ -1,7 +1,7 @@
 module Effective
   class OrdersController < ApplicationController
     include EffectiveCartsHelper
-    acts_as_active_admin_controller('orders') if EffectiveOrders.use_active_admin
+    acts_as_active_admin_controller('orders') if EffectiveOrders.use_active_admin?
 
     include Providers::Moneris if EffectiveOrders.moneris_enabled
     include Providers::Paypal if EffectiveOrders.paypal_enabled

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

@@ -26,12 +26,22 @@
 
   - 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_first_name, address.first_name || order.try(:user).try(:first_name))
+    = hidden_field_tag(:bill_last_name, address.last_name || order.try(:user).try(: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)
     = hidden_field_tag(:bill_postal_code, address.postal_code)
     = hidden_field_tag(:bill_country, address.country)
 
+  - if order.shipping_address.present?
+    - address = order.shipping_address
+    = hidden_field_tag(:ship_first_name, address.first_name || order.try(:user).try(:first_name))
+    = hidden_field_tag(:ship_last_name, address.last_name || order.try(:user).try(:last_name))
+    = hidden_field_tag(:ship_address_one, address.address1)
+    = hidden_field_tag(:ship_city, address.city)
+    = hidden_field_tag(:ship_state_or_province, address.state)
+    = hidden_field_tag(:ship_postal_code, address.postal_code)
+    = hidden_field_tag(:ship_country, address.country)
+
   = submit_tag 'Pay with Moneris', :class => 'btn btn-primary', :data => {'disable_with' => 'Continuing...' }

data/config/routes.rb

@@ -47,7 +47,7 @@ EffectiveOrders::Engine.routes.draw do
     match 'webhooks/stripe', :to => 'webhooks#stripe', :via => [:post, :put]
   end
 
-  if defined?(EffectiveDatatables) && !EffectiveOrders.use_active_admin == true
+  if defined?(EffectiveDatatables) && !EffectiveOrders.use_active_admin?
     namespace :admin do
       resources :customers, :only => [:index]
       resources :orders, :only => [:index, :show]

data/lib/effective_orders.rb

@@ -80,6 +80,10 @@ module EffectiveOrders
     end
   end
 
+  def self.use_active_admin?
+    use_active_admin && defined?(ActiveAdmin)
+  end
+
   class SoldOutException < Exception; end
   class AlreadyPurchasedException < Exception; end
   class AlreadyDeclinedException < Exception; end

data/lib/effective_orders/engine.rb

@@ -42,7 +42,7 @@ module EffectiveOrders
 
     # Use ActiveAdmin (optional)
     initializer 'effective_orders.active_admin' do
-      if EffectiveOrders.use_active_admin
+      if EffectiveOrders.use_active_admin?
         require 'activeadmin'
 
         ActiveSupport.on_load :action_controller do

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '1.5.1'.freeze
+  VERSION = '1.5.2'.freeze
 end

metadata

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