effective_orders 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b26185e33ab463b2de7422b06b0c014c861277d
-  data.tar.gz: 98cc75f935177564e5853aafdc9d605f8ec221a9
+  metadata.gz: f869116475dda7d252b6202a1384be1bb181f7bf
+  data.tar.gz: d0288050d30d8915e2a3b255c5405e8ef9ed8567
 SHA512:
-  metadata.gz: f862dd06f8e47396576195ddeaf9b39174370bf2f6342223cd390954feab6a6bf5164bad14321216d636646438c3b3b74d1cff117fa345d8f2cb75ede69d3c0c
-  data.tar.gz: 668344bd424d1c3b828824329a21c653f3c6ce62a614107554c6e6883e486fed660ad5e8f7faf3953d920ba5c2198d38d4ec65035419430c2aaa209b4dc1b024
+  metadata.gz: 81e62b3d4520668550b0d993c4c14f0c0c26d80bd6f8be7c26537e4555af3376d3e1a061948cf1132045a684fd0a81f2cf2a0ca4b935a170176b5a8485cf684c
+  data.tar.gz: b35df012dc37eb2b2391c661947d6238b5333839c7d777ca2cdff0573b0c476b5c248043be21503deb3460d1150259ed7a5db6222fb4aae5d27de5410de3fbf0

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

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

data/app/controllers/effective/carts_controller.rb

@@ -1,6 +1,7 @@
 module Effective
   class CartsController < ApplicationController
     include EffectiveCartsHelper
+    acts_as_active_admin_controller('carts') if defined?(ActiveAdmin) && EffectiveOrders.use_active_admin == true
     layout (EffectiveOrders.layout.kind_of?(Hash) ? EffectiveOrders.layout[:carts] : EffectiveOrders.layout)
 
     def show

data/app/controllers/effective/orders_controller.rb

@@ -1,6 +1,7 @@
 module Effective
   class OrdersController < ApplicationController
     include EffectiveCartsHelper
+    acts_as_active_admin_controller('orders') if defined?(ActiveAdmin) && EffectiveOrders.use_active_admin == true
 
     include Providers::Moneris if EffectiveOrders.moneris_enabled
     include Providers::Paypal if EffectiveOrders.paypal_enabled
@@ -34,7 +35,12 @@ module Effective
     def create
       @order ||= Order.new(current_cart, current_user)
       @order.attributes = order_params
-      @order.shipping_address = @order.billing_address if @order.shipping_address_same_as_billing?
+
+      if EffectiveOrders.require_shipping_address
+        if @order.shipping_address_same_as_billing? && @order.billing_address.present?
+          @order.shipping_address ||= @order.billing_address
+        end
+      end
 
       EffectiveOrders.authorized?(self, :create, @order)
 
@@ -75,7 +81,6 @@ module Effective
         @page_title = 'Checkout'
         render(:checkout) and return
       end
-
     end
 
     def index
@@ -113,17 +118,13 @@ module Effective
       @order = Effective::Order.find(params[:id])
       EffectiveOrders.authorized?(self, :show, @order)
 
-      if (Effective::OrdersMailer.order_receipt_to_buyer(@order).deliver rescue false)
+      if @order.send_order_receipt_to_buyer!
         flash[:success] = "Successfully resent order receipt to #{@order.user.email}"
       else
         flash[:danger] = "Unable to send order receipt"
       end
 
-      begin
-        redirect_to :back
-      rescue => e
-        redirect_to effective_orders.admin_orders_path
-      end
+      redirect_to(:back) rescue effective_orders.order_path(@order)
     end
 
     def pretend_purchase

data/app/models/concerns/acts_as_active_admin.rb

@@ -0,0 +1,59 @@
+module ActsAsActiveAdmin
+  extend ActiveSupport::Concern
+
+  module ActionController
+    def acts_as_active_admin_controller(key)
+      @active_admin_resource_element_lookup_key = key
+      include ::ActsAsActiveAdmin
+    end
+  end
+
+  included do
+    include ::ActiveAdmin::BaseController::Menu
+    include ::ActiveAdmin::BaseController::Authorization
+
+    helper ::ActiveAdmin::ViewHelpers
+    helper_method :active_admin_config, :active_admin_namespace, :current_active_admin_user
+
+    resource_key = @active_admin_resource_element_lookup_key.to_s
+    self.send(:define_method, :active_admin_resource_element_key) { resource_key }
+
+    resource_ivar = '@' + resource_key.singularize
+    self.send(:define_method, :resource) { instance_variable_get(resource_ivar) }
+
+    resource_path = "effective_orders.#{resource_key.singularize}_path"
+
+    if resource_path == 'effective_orders.cart_path'
+      self.send(:define_method, :resource_path) { |resource| effective_orders.cart_path }
+    else
+      self.send(:define_method, :resource_path) { |resource| public_send(resource_path, resource) }
+    end
+
+    helper_method :resource, :resource_path
+
+  end
+
+  module ClassMethods
+  end
+
+  def active_admin_namespace
+    ActiveAdmin.application.namespaces[EffectiveOrders.active_admin_namespace || :root]
+  end
+
+  def active_admin_config
+    active_admin_namespace.resources[active_admin_resource_key]
+  end
+
+  def active_admin_resource_key
+    @active_admin_resource_key ||= begin
+      namespace = ActiveAdmin.application.namespaces[EffectiveOrders.active_admin_namespace || :root]
+      namespace.resources.keys.find { |resource| resource.element == active_admin_resource_element_key }
+    end
+  end
+
+  def current_active_admin_user
+    send(active_admin_namespace.current_user_method) if active_admin_namespace.current_user_method
+  end
+
+end
+

data/app/models/concerns/acts_as_purchasable.rb

@@ -91,6 +91,10 @@ module ActsAsPurchasable
     @is_purchased ||= orders.any? { |order| order.purchased? }
   end
 
+  def purchased_at
+    @purchased_at ||= orders.map { |order| order.purchased_at if order.purchased? }.compact.sort.first
+  end
+
   def purchased_by?(user)
     orders.any? { |order| order.purchased? && order.user_id == user.id }
   end
@@ -118,12 +122,12 @@ module ActsAsPurchasable
     # end
 
     after_purchase(order, order_item) if self.respond_to?(:after_purchase)
-    self.save!
+    save!
   end
 
   def declined!(order = nil, order_item = nil)
     after_decline(order, order_item) if self.respond_to?(:after_decline)
-    self.save!
+    save!
   end
 
   # Override me if this is a digital purchase.

data/app/models/effective/order.rb

@@ -47,7 +47,8 @@ module Effective
     scope :purchased_by, lambda { |user| purchased.where(:user_id => user.try(:id)) }
     scope :declined, -> { where(:purchase_state => EffectiveOrders::DECLINED) }
 
-    def initialize(cart = {}, user = nil)
+    # Can be an Effective::Cart, a single acts_as_purchasable, or an array of acts_as_purchasables
+    def initialize(items = {}, user = nil)
       super() # Call super with no arguments
 
       # Set up defaults
@@ -55,8 +56,7 @@ module Effective
       self.save_shipping_address = true
       self.shipping_address_same_as_billing = true
 
-      add_to_order(cart) if cart.present?
-
+      add_to_order(items) if items.present?
       self.user = user if user.present?
     end
 
@@ -193,62 +193,46 @@ module Effective
 
     # :validate => false, :email => false
     def purchase!(payment_details = nil, opts = {})
-      opts = {:validate => true, :email => true}.merge(opts)
+      opts = {validate: true, email: true}.merge(opts)
 
-      raise EffectiveOrders::AlreadyPurchasedException.new('order already purchased') if self.purchased?
-      raise EffectiveOrders::AlreadyDeclinedException.new('order already declined') if (self.declined? && opts[:validate])
+      return true if purchased?
+      raise EffectiveOrders::AlreadyDeclinedException.new('order already declined') if (declined? && opts[:validate])
 
-      Order.transaction do
-        self.purchase_state = EffectiveOrders::PURCHASED
-        self.purchased_at ||= Time.zone.now
-        self.payment = payment_details.kind_of?(Hash) ? payment_details : {:details => (payment_details || 'none').to_s}
+      success = false
 
-        self.save!(:validate => opts[:validate])
-        order_items.each { |item| item.purchasable.purchased!(self, item) }
+      Order.transaction do
+        begin
+          self.purchase_state = EffectiveOrders::PURCHASED
+          self.purchased_at ||= Time.zone.now
+          self.payment = payment_details.kind_of?(Hash) ? payment_details : {:details => (payment_details || 'none').to_s}
 
-        if EffectiveOrders.mailer[:send_order_receipt_to_admin] && opts[:email]
-          if Rails.env.production?
-            (OrdersMailer.order_receipt_to_admin(self).deliver rescue false)
-          else
-            OrdersMailer.order_receipt_to_admin(self).deliver
-          end
-        end
+          save!(validate: opts[:validate])
 
-        if EffectiveOrders.mailer[:send_order_receipt_to_buyer] && opts[:email]
-          if Rails.env.production?
-            (OrdersMailer.order_receipt_to_buyer(self).deliver rescue false)
-          else
-            OrdersMailer.order_receipt_to_buyer(self).deliver
-          end
-        end
+          order_items.each { |item| (item.purchasable.purchased!(self, item) rescue nil) }
 
-        if EffectiveOrders.mailer[:send_order_receipt_to_seller] && self.purchased?(:stripe_connect) && opts[:email]
-          self.order_items.group_by(&:seller).each do |seller, order_items|
-            if Rails.env.production?
-              (OrdersMailer.order_receipt_to_seller(self, seller, order_items).deliver rescue false)
-            else
-              OrdersMailer.order_receipt_to_seller(self, seller, order_items).deliver
-            end
-          end
+          success = true
+        rescue => e
+          raise ActiveRecord::Rollback
         end
-
-        return true
       end
 
-      false
+      send_order_receipts! if success && opts[:email]
+
+      success
     end
 
     def decline!(payment_details = nil)
-      raise EffectiveOrders::AlreadyPurchasedException.new('order already purchased') if self.purchased?
-      raise EffectiveOrders::AlreadyDeclinedException.new('order already declined') if self.declined?
+      return true if declined?
+
+      raise EffectiveOrders::AlreadyPurchasedException.new('order already purchased') if purchased?
 
       Order.transaction do
         self.purchase_state = EffectiveOrders::DECLINED
         self.payment = payment_details.kind_of?(Hash) ? payment_details : {:details => (payment_details || 'none').to_s}
 
-        order_items.each { |item| item.purchasable.declined!(self, item) }
+        order_items.each { |item| (item.purchasable.declined!(self, item) rescue nil) }
 
-        self.save!
+        save!
       end
     end
 
@@ -276,5 +260,44 @@ module Effective
     def declined?
       purchase_state == EffectiveOrders::DECLINED
     end
+
+    def send_order_receipts!
+      send_order_receipt_to_admin!
+      send_order_receipt_to_buyer!
+      send_order_receipt_to_seller!
+    end
+
+    def send_order_receipt_to_admin!
+      return false unless purchased? && EffectiveOrders.mailer[:send_order_receipt_to_admin]
+
+      if Rails.env.production?
+        (OrdersMailer.order_receipt_to_admin(self).deliver rescue false)
+      else
+        OrdersMailer.order_receipt_to_admin(self).deliver
+      end
+    end
+
+    def send_order_receipt_to_buyer!
+      return false unless purchased? && EffectiveOrders.mailer[:send_order_receipt_to_buyer]
+
+      if Rails.env.production?
+        (OrdersMailer.order_receipt_to_buyer(self).deliver rescue false)
+      else
+        OrdersMailer.order_receipt_to_buyer(self).deliver
+      end
+    end
+
+    def send_order_receipt_to_seller!
+      return false unless purchased?(:stripe_connect) && EffectiveOrders.mailer[:send_order_receipt_to_seller]
+
+      order_items.group_by(&:seller).each do |seller, order_items|
+        if Rails.env.production?
+          (OrdersMailer.order_receipt_to_seller(self, seller, order_items).deliver rescue false)
+        else
+          OrdersMailer.order_receipt_to_seller(self, seller, order_items).deliver
+        end
+      end
+    end
+
   end
 end

data/app/views/admin/order_items/index.html.haml

@@ -1,4 +1,10 @@
 %h2 Order Items
 
-= render_datatable @datatable do
-  %p There are no orders items
+- if @datatable.nil?
+  %p
+    Please install
+    = link_to 'effective_datatables', 'https://github.com/code-and-effect/effective_datatables'
+    to see this page.
+- else
+  = render_datatable @datatable do
+    %p There are no order items

data/app/views/admin/orders/index.html.haml

@@ -1,4 +1,10 @@
 %h2 Orders
 
-= render_datatable @datatable do
-  %p There are no orders
+- if @datatable.nil?
+  %p
+    Please install
+    = link_to 'effective_datatables', 'https://github.com/code-and-effect/effective_datatables'
+    to see this page.
+- else
+  = render_datatable @datatable do
+    %p There are no orders

data/app/views/admin/orders/show.html.haml

@@ -3,7 +3,7 @@
 = render :partial => 'effective/orders/order_payment_details', :locals => {:order => @order}
 
 %hr
-= link_to 'Back', effective_orders.admin_orders_path, :class => 'btn btn-primary'
+= link_to 'Back', :back, :class => 'btn btn-primary'
 - if @order.purchased?
   = '-'
   = link_to 'Resend Receipt', effective_orders.resend_buyer_receipt_path(@order), 'data-confirm' => 'This action will email the buyer a copy of the original email receipt.  Send receipt now?', :class => 'btn btn-default'

data/config/routes.rb

@@ -35,7 +35,6 @@ EffectiveOrders::Engine.routes.draw do
       match 'orders/:id/pretend_purchase', :to => 'orders#pretend_purchase', :as => 'pretend_purchase', :via => [:get, :post]
     end
 
-    # This must be below the other routes defined above.
     resources :orders, :only => [:new, :create, :show, :index]
 
     match 'cart', :to => 'carts#show', :as => 'cart', :via => :get
@@ -48,7 +47,7 @@ EffectiveOrders::Engine.routes.draw do
     match 'webhooks/stripe', :to => 'webhooks#stripe', :via => [:post, :put]
   end
 
-  if defined?(EffectiveDatatables)
+  if defined?(EffectiveDatatables) && !EffectiveOrders.use_active_admin == true
     namespace :admin do
       resources :customers, :only => [:index]
       resources :orders, :only => [:index, :show]

data/lib/effective_orders.rb

@@ -2,6 +2,7 @@ require 'effective_addresses'
 require 'effective_obfuscation'
 require "effective_orders/engine"
 require 'migrant'     # Required for rspec to run properly
+require 'simple_form'
 
 module EffectiveOrders
   PURCHASED = 'purchased'
@@ -20,7 +21,10 @@ module EffectiveOrders
 
   mattr_accessor :layout
   mattr_accessor :simple_form_options
+
   mattr_accessor :use_active_admin
+  mattr_accessor :active_admin_namespace
+
   mattr_accessor :obfuscate_order_ids
   mattr_accessor :silence_deprecation_warnings
 

data/lib/effective_orders/engine.rb

@@ -45,6 +45,7 @@ module EffectiveOrders
     initializer 'effective_orders.active_admin' do
       if defined?(ActiveAdmin) && EffectiveOrders.use_active_admin == true
         ActiveAdmin.application.load_paths.unshift Dir["#{config.root}/active_admin"]
+        ActionController::Base.extend(ActsAsActiveAdmin::ActionController)
       end
     end
 

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '1.4.1'.freeze
+  VERSION = '1.4.2'.freeze
 end

data/lib/generators/templates/effective_orders.rb

@@ -31,7 +31,10 @@ EffectiveOrders.setup do |config|
   config.authorization_method = Proc.new { |controller, action, resource| true }
 
   # Register Effective::Order with ActiveAdmin if ActiveAdmin is present
+  # You must have authorization to authorized?(:manage, Effective::Order)
+  # For the activeadmin menu to item to show up
   config.use_active_admin = true
+  config.active_admin_namespace = :admin  # Passed internally to ActiveAdmin.register
 
   # Use effective_obfuscation gem to change order.id into a seemingly random 10-digit number
   config.obfuscate_order_ids = true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-30 00:00:00.000000000 Z
+date: 2015-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -122,20 +122,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
-- !ruby/object:Gem::Dependency
-  name: effective_datatables
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: effective_obfuscation
   requirement: !ruby/object:Gem::Requirement
@@ -352,6 +338,7 @@ files:
 - app/helpers/effective_paypal_helper.rb
 - app/helpers/effective_stripe_helper.rb
 - app/mailers/effective/orders_mailer.rb
+- app/models/concerns/acts_as_active_admin.rb
 - app/models/concerns/acts_as_purchasable.rb
 - app/models/effective/access_denied.rb
 - app/models/effective/cart.rb
@@ -370,7 +357,6 @@ files:
 - app/models/inputs/price_input.rb
 - app/models/inputs/price_simple_form_input.rb
 - app/models/validators/effective/sold_out_validator.rb
-- app/views/active_admin/effective_orders/orders/_show.html.haml
 - app/views/admin/customers/_actions.html.haml
 - app/views/admin/customers/index.html.haml
 - app/views/admin/order_items/index.html.haml

data/app/views/active_admin/effective_orders/orders/_show.html.haml

@@ -1,70 +0,0 @@
-.panel
-  %h3= "Order ##{order.to_param} Details"
-  .panel_contents
-    .attributes_table
-      %table
-        %tbody
-          %tr
-            %th order
-            %td= "##{order.to_param}"
-          %tr
-            %th buyer
-            %td= link_to order.user, admin_user_path(order.user)
-          %tr
-            %th purchase state
-            %td= order.purchase_state
-          - if order.purchased?
-            %tr
-              %th purchased
-              %td= order.purchased_at.strftime("%Y-%m-%d %H:%M")
-          - if order.billing_address.present?
-            %tr
-              %th billing address
-              %td= order.billing_address.to_html
-          - if order.shipping_address.present?
-            %tr
-              %th shipping address
-              %td= order.shipping_address.to_html
-
-.panel
-  %h3 Order Items
-  .panel_contents
-    .attributes_table
-      - has_seller = order.purchased?(:stripe_connect)
-      %table.table
-        %thead
-          %tr
-            %th Items
-            %th Price
-            - if has_seller
-              %th Seller
-        %tbody
-          - order.order_items.each do |item|
-            %tr
-              %td
-                - if item.quantity > 1
-                  = "#{item.quantity}x "
-                = item.title
-              %td= price_to_currency(item.subtotal)
-              - if has_seller
-                %td= link_to item.seller.user, admin_user_path(item.seller.user)
-        %tfoot
-          %tr
-            %th Subtotal
-            %td= price_to_currency(order.subtotal)
-          %tr
-            %th Tax
-            %td= price_to_currency(order.tax)
-          %tr
-            %th Total
-            %td= price_to_currency(order.total)
-
-- if order.payment.present?
-  .panel
-    %h3 Payment
-    .panel_contents
-      .attributes_table
-        = order_payment_to_html(order) rescue order.payment
-
-
-