effective_orders 2.1.3 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a1297dcbb14c49c194aa9573568cabda9f59054
-  data.tar.gz: 4adc9e432d25558315f906ff80b92e217b5c11fd
+  metadata.gz: 44ad2e1c15d7e9257ce8517cdb3637cf63c83d53
+  data.tar.gz: 8b1d66707077365edfe37c1c1d69392807492684
 SHA512:
-  metadata.gz: 071868aabb5d8cf49c75bde7d71850343b3565317420ee369b5d3f5ebff3469447f2f17671de28096aa3d3d78919e662801b44bc747398ea834fa8f796bbd35f
-  data.tar.gz: 900466161445c4e200890a7b1982888cd316b222416be323a2d13839d82dd80551bca6e8801b54335600ee1d3e90d57ed4b85751b1c572ff61a52420c441f3fc
+  metadata.gz: 54dfe24a820d5759ff2708472a498a435b63bc76ea60b681ef297243297dc7b8bafeeb5854f64ab83c78dbddb18a9d25c11818cf32122a2f6962d79ef563aad3
+  data.tar.gz: 8f8030d38899be69d6349551be5ba96075bfc69f2e57437a1aa812730578faee9fb9351667f6f9652f63fe56819323ce25eabcac0db60ef435f45c2f2e462194

data/app/controllers/effective/orders_controller.rb

@@ -130,10 +130,9 @@ module Effective
 
     def index
       @orders = Effective::Order.purchased_by(current_user)
+      @pending_orders = Effective::Order.pending.where(user: current_user)
 
       EffectiveOrders.authorized?(self, :index, Effective::Order.new(user: current_user))
-
-      render action: :my_purchases
     end
 
     # Basically an index page.
@@ -230,7 +229,7 @@ module Effective
 
     def set_page_title
       @page_title ||= case params[:action]
-        when 'index'        ; 'Order History'
+        when 'index'        ; 'Orders'
         when 'my_purchases' ; 'Order History'
         when 'my_sales'     ; 'Sales History'
         when 'purchased'    ; 'Thank You'

data/app/helpers/effective_carts_helper.rb

@@ -56,7 +56,7 @@ module EffectiveCartsHelper
     label = options.delete(:label)
     options[:class] = ((options[:class] || '') + ' btn-add-to-cart')
 
-    link_to label, effective_orders.add_to_cart_path(purchasable_type: purchasable.class.name, purchasable_id: purchasable.id.to_i), options
+    link_to(label, effective_orders.add_to_cart_path(purchasable_type: purchasable.class.name, purchasable_id: purchasable.id.to_i), options)
   end
 
   def link_to_remove_from_cart(cart_item, opts = {})

data/app/helpers/effective_orders_helper.rb

@@ -118,7 +118,7 @@ module EffectiveOrdersHelper
   end
   alias_method :link_to_order_history, :link_to_my_purchases
 
-  def render_orders_table(user_or_orders, opts = {})
+  def render_orders(user_or_orders, opts = {})
     if user_or_orders.kind_of?(User)
       orders = Effective::Order.purchased_by(user_or_orders)
     elsif user_or_orders.respond_to?(:to_a)
@@ -130,9 +130,9 @@ module EffectiveOrdersHelper
     render(partial: 'effective/orders/orders_table', locals: {orders: orders}.merge(opts))
   end
 
-  alias_method :render_purchases, :render_orders_table
-  alias_method :render_my_purchases, :render_orders_table
-  alias_method :render_order_history, :render_orders_table
+  alias_method :render_purchases, :render_orders
+  alias_method :render_my_purchases, :render_orders
+  alias_method :render_order_history, :render_orders
 
   # Used by the _payment_details partial
   def tableize_order_payment(hash, options = {class: 'table table-bordered'})

data/app/views/effective/carts/show.html.haml

@@ -11,8 +11,7 @@
 
 - if @pending_orders.present?
   %h3 Pending Orders
-  %p The following orders are ready for you to purchase:
-  = render_orders_table(@pending_orders)
+  = render_orders(@pending_orders)
 
 - if EffectiveOrders.show_order_history_button
   = link_to_my_purchases(label: 'Order History')

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

@@ -1,5 +1,5 @@
 %h3 Note
 - if EffectiveOrders.collect_note_message.present?
-  %p= EffectiveOrders.collect_note_message
+  %p= EffectiveOrders.collect_note_message.html_safe
 
 = form.input :note, required: (EffectiveOrders.collect_note_required == true)

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

@@ -0,0 +1,13 @@
+%h2.effective-orders-page-title= (@page_title || 'Orders')
+
+%h3 Pending Orders
+- if @pending_orders.present?
+  = render_orders(@pending_orders)
+- else
+  %p You have no pending orders.
+
+%h3 Purchased Orders
+- if @orders.present?
+  = render_orders(@orders)
+- else
+  %p You have no purchased orders.

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '2.1.3'.freeze
+  VERSION = '2.1.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-05 00:00:00.000000000 Z
+date: 2016-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -348,6 +348,7 @@ files:
 - app/views/effective/orders/cheque/_form.html.haml
 - app/views/effective/orders/cheque/pay_by_cheque.html.haml
 - app/views/effective/orders/declined.html.haml
+- app/views/effective/orders/index.html.haml
 - app/views/effective/orders/moneris/_form.html.haml
 - app/views/effective/orders/my_purchases.html.haml
 - app/views/effective/orders/my_sales.html.haml