trollied 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/app/controllers/line_items_controller.rb

@@ -92,7 +92,11 @@ class LineItemsController < ApplicationController
   # DELETE /line_items/1
   # DELETE /line_items/1.xml
   def destroy
-    return_to = if params[:return_to_purchasable_item].present? && params[:return_to_purchasable_item]
+    return_to = if @order && @order.line_items.size > 1
+                  url_for_order_or_trolley
+                elsif params[:return_to_purchasable_item].present? &&
+                    (params[:return_to_purchasable_item] == true.to_s ||
+                     params[:return_to_purchasable_item] == true)
                   url_for_purchasable_item
                 elsif params[:trolley_id].present?
                   @trolley = Trolley.find(params[:trolley_id])

data/app/controllers/orders_controller.rb

@@ -23,8 +23,9 @@ class OrdersController < ApplicationController
      @conditions = set_up_conditions_based_on_params
 
      options = { :page => params[:page],
-       :per_page => 5,
-       :conditions => @conditions }
+       :per_page => number_per_page,
+       :conditions => @conditions, 
+       :order => 'updated_at DESC'}
 
      @orders = Order.paginate(options)
 
@@ -114,10 +115,35 @@ class OrdersController < ApplicationController
      end
    end
 
+   # optional checkout form
+   # that can be used for simple per order settings or allowing the user to add a note
+   def checkout_form
+     set_defaults_for_order_checkout
+     @order.notes.build unless @order.notes.any?
+   end
+
+   def checkout
+     respond_to do |format|
+       if checkout_order_including_note
+         @trolley ||= @order.trolley
+         flash[:notice] = t("orders.controllers.change_to_checkout")
+         format.html { redirect_to url_for_trolley }
+       else
+         # display errors
+         format.html { render :action => "checkout_form" }
+       end
+     end
+   end
+
    # additional actions that correspond to order_status events
-   %w(checkout cancel fulfilled_without_acceptance finish).each do |event|
+   %w(cancel alteration_approve fulfilled_without_acceptance finish).each do |event|
      code = Proc.new { 
-       @order.send("#{event}!")
+       if event == 'cancel'
+         @order.send("#{event}!", current_user)
+       else
+         @order.send("#{event}!")
+       end
+
        @trolley ||= @order.trolley
 
        flash[:notice] = t("orders.controllers.change_to_#{event}")
@@ -170,7 +196,7 @@ class OrdersController < ApplicationController
          operator = ">="
          operator = "<=" if name == :until
 
-         clauses_array << "created_at #{operator} :#{name}"
+         clauses_array << "updated_at #{operator} :#{name}"
          clauses_hash[name] = value
        rescue
          instance_variable_set(var_name, nil)
@@ -207,4 +233,34 @@ class OrdersController < ApplicationController
                   end
      
    end
+
+   # override this if your additional attributes need calculation for defaults at checkout
+   def set_defaults_for_order_checkout
+   end
+
+   def checkout_order_including_note
+     # skip alerting the order (triggering a duplicate notification) that a new_note has been added
+     # assumes only one note in form
+     if params[:order][:notes_attributes].present?
+       params[:order][:notes_attributes]["0"][:do_not_alert_order] = true
+
+       if params[:order][:notes_attributes]["0"][:body].blank?
+         # don't add empty note
+         params[:order].delete(:notes_attributes)
+       end
+     end
+
+     # this will add note and any attributes you have in the checkout form for order
+     success = @order.update_attributes(params[:order])
+
+     if success
+       # we have to call checkout! separately to trigger event notifications
+       @order.checkout!
+     end
+     success
+   end
+
+   def number_per_page
+     15
+   end
 end

data/app/controllers/trolleys_controller.rb

@@ -9,7 +9,7 @@ class TrolleysController < ApplicationController
   # list orders
   def show
     respond_to do |format|
-      format.html # index.html.erb
+      format.html
     end
   end
   

data/app/helpers/orders_helper.rb

@@ -9,9 +9,10 @@ module OrdersHelper
   end
 
   def can_delete_line_item?(order)
-    (params[:controller] == 'orders' &&
-     order.workflow_state == 'in_process') ||
-      order.state_ok_to_delete_line_item?
+    order.state_ok_to_delete_line_item? &&
+      (order.user != current_user &&
+       order.in_process?) ||
+      order.current?
   end
 
   # override the method can_trigger_...? methods with your own security checks
@@ -23,16 +24,22 @@ module OrdersHelper
     params[:controller] == 'orders'
   end
 
-  def order_button_for(action, order)
-    options = { :confirm => t('orders.order.are_you_sure'),
-      :class => 'order-button' }
+  def order_button_for(action, order, options = {})
+    options = options.merge({ :confirm => t('orders.order.are_you_sure'),
+                              :class => "order-button button-#{action}" })
 
     options[:method] = 'delete' if action.to_s == 'destroy'
 
+    target_action = options.delete(:target_action) || action
+
+    url_for_options = { :controller => :orders,
+                :action => target_action,
+                :id => order }
+
+    url_for_options = url_for_options.merge(options.delete(:url_for_options)) if options[:url_for_options]
+
     button_to(t("orders.order.#{action}"),
-              { :controller => :orders,
-                :action => action,
-                :id => order },
+              url_for_options,
               options)
   end
 
@@ -64,6 +71,10 @@ module OrdersHelper
                            :until => @until)
   end
 
+  def sorted_state_names
+    Order.workflow_spec.state_names.sort_by { |s| I18n.t("orders.index.#{s.to_s}") }
+  end
+
   # returns a list of links to order states
   # that have orders in their state
   # with number of orders in a given state indicated
@@ -72,7 +83,7 @@ module OrdersHelper
 
     states_count = 1
 
-    states = Order.workflow_spec.state_names.sort_by { |s| I18n.t("orders.index.#{s.to_s}") }
+    states = sorted_state_names
 
     states.each do |state|
       adjusted_conditions = adjust_value_in_conditions_for(:workflow_state, state.to_s, @conditions)
@@ -181,4 +192,29 @@ module OrdersHelper
   def url_for_options_for_orders_index
     { :controller => 'orders', :action => 'index' }
   end
+
+  def meta_data_for(order)
+    html = '<div id="order-meta-data">'
+    html += '<h3>' + t('orders.helpers.order_number') + " #{order.id}</h3>"
+    html += '</div>'
+  end
+
+  # override this in your app to add your own fields at checkout
+  def order_checkout_fields(form)
+  end
+
+  # order number
+  # order user
+  # number of line_items
+  def link_to_as_summary_of(order, user = nil)
+    link_text = t('orders.helpers.order_number') + " #{order.id}"
+    link_text += " - #{user.trolley_user_display_name}" if user
+    link_text += " - (#{order.line_items.size} #{t 'orders.helpers.items'})" if order.line_items.size > 0
+
+    link_to(link_text, url_for_order(:order => order))
+  end
+  
+  def checkout_form_target_action_url_hash
+    {:action => 'checkout', :id => @order}
+  end
 end

data/app/models/line_item.rb

@@ -11,7 +11,8 @@ class LineItem < ActiveRecord::Base
   after_destroy { |record| record.order.line_item_destroyed }
 
   # needs to be unique to orders that are current (but not unique to orders generally)
-  # validates_uniqueness_of :order_id, :scope => [:purchasable_item_type, :purchasable_item_id]
+  validates_uniqueness_of :order_id, :scope => [:purchasable_item_type, :purchasable_item_id]
+
   def validate
     errors.add(:order, I18n.t('line_item.already_in_order')) if !order.current? && !order.in_process? && order.contains?(purchasable_item)
   end

data/app/models/note.rb

@@ -6,10 +6,12 @@ class Note < ActiveRecord::Base
 
   after_create :alert_order
 
+  attr_accessor :do_not_alert_order
+
   private
   
   def alert_order
-    order.new_note(self)
+    order.new_note(self) unless do_not_alert_order
   end
 end
 

data/app/models/order.rb

@@ -8,6 +8,8 @@ class Order < ActiveRecord::Base
 
   include OrderStatus
   
+  accepts_nested_attributes_for :notes, :allow_destroy => true
+
   # convenience method to add new line item based on item_to_order
   def add(purchasable_item)
     line_items.create!(:purchasable_item => purchasable_item)

data/app/models/trolley.rb

@@ -10,7 +10,6 @@ class Trolley < ActiveRecord::Base
     orders[index] || orders.create!
   end
 
-  # TODO: STUB: implement way to determine
   # correct order given an purchasable_item
   def correct_order(purchasable_item)
     orders.with_state_current.first || orders.create!
@@ -25,7 +24,6 @@ class Trolley < ActiveRecord::Base
   end
 
   # do any of this trolley's orders contain the purchasable_item?
-  # TODO: when status is added to orders, limit by option for checking status
   def contains?(purchasable_item, state = nil)
     within_orders = state ? orders.send("with_state_#{state}") : orders
 

data/app/views/line_items/_line_item.html.erb

@@ -1,12 +1,13 @@
 <tr>
-  <td><%= link_to_purchasable_in(line_item) -%></td>
-  <%  if can_delete_line_item?(order) -%>
+  <%  if can_delete_line_item?(order) && !params[:action].include?('checkout') -%>
   <td>
-    <%= link_to t('line_items.line_item.delete'), { :controller => :line_items,
+    <%= button_to t('line_items.line_item.delete'), { :controller => :line_items,
     :action => :destroy,
     :id => line_item,
     :order_id => order,
-    :trolley_id => trolley },
-    :confirm => t('line_items.line_item.are_you_sure'), :method => :delete %></td>
+    :trolley_id => trolley,
+    :confirm => t('line_items.line_item.are_you_sure') }, :method => :delete %>
+  </td>
   <% end -%>
+  <td><%= link_to_purchasable_in(line_item) -%></td>
 </tr>

data/app/views/orders/_order.html.erb

@@ -2,44 +2,63 @@
 
 <fieldset class="order">
 
-<% if params[:controller] == 'orders' && !(params[:action] == 'show' && current_user == order.user) -%>
+<%= meta_data_for(order) -%>
+
+<% if current_user != order.user && params[:controller] == 'orders'  -%>
   <h3><%= t '.user' -%> <%= link_to_orders_for(order.user) -%></h3>
 <% end -%>
 
 <table class="order">
   <tr>
+    <% if (order.current? && params[:action] != 'checkout_form') || (order.in_process? && current_user != order.user) -%>
+      <th abbr="Actions for Line Item"><%= t '.purchasable_item_actions' %></th>
+    <% end -%>
     <th abbr="Line Item"><%= t '.purchasable_item_description' %></th>
   </tr>
 
   <%= render :partial => 'line_items/line_item', :collection => order.line_items, :locals => { :order => order, :trolley => trolley } -%>
 
-  <% if order.current? -%>
-  <tr>
-    <td><%= button_to_checkout order -%></td>
-    <td><%= button_to_clear order -%></td>
-  </tr>
+
+  <% show_order_buttons = params[:action] != 'checkout_form' &&
+     (order.current? ||
+     order.in_process? ||
+     (order.ready? && can_trigger_finish?) ||
+     (order.user_review? && current_user == order.user)) -%>
+
+  <% if show_order_buttons -%>
+    <tr class="order-buttons">
+      <td><%= t '.order_controls_preface' -%></td>
+  <% end -%>
+
+  <% if order.current? && params[:action] != 'checkout_form' -%>
+    <td><%= button_to_checkout order -%><%= button_to_clear order -%></td>
   <% end -%>
 
   <% if order.in_process? -%>
-  <tr>
-    <td><%= button_to_cancel order -%></td>
-  
-    <% if can_trigger_fulfilled_without_acceptance? -%>
-      <td><%= button_to_fulfilled_without_acceptance order -%></td>
-    <% end -%>
-  </tr>
+    <td><% if can_trigger_fulfilled_without_acceptance? -%>
+      <%= button_to_fulfilled_without_acceptance order -%>
+      <% end -%>
+      <%= button_to_cancel order -%>
+    </td>
   <% end -%>
 
   <% if order.ready? && can_trigger_finish? -%>
-  <tr>
       <td><%= button_to_finish order -%></td>
-  </tr>
+  <% end -%>
+
+  <% if order.user_review? && current_user == order.user -%>
+      <td><%= button_to_alteration_approve order -%></td>
+  <% end -%>
+
+  <% if show_order_buttons -%>
+    </tr>
   <% end -%>
 
 </table>
 
 </fieldset>
 
+<% if params[:action] != 'checkout_form' -%>
 <% if  order.notes.size != 0 -%>
 <h3><%= t('.order_notes')  -%></h3>
  <% end -%>
@@ -51,3 +70,5 @@
 </ul>
 
 <%= render :partial => 'notes/new', :locals => { :order => order,  :user => current_user } if order.may_note? -%>
+
+<% end -%>

data/app/views/orders/_order_summary.html.erb

@@ -0,0 +1,3 @@
+<% trolley ||= order_summary.trolley -%>
+<li class="order-summary" id="order-summary-<%= order_summary.id -%>"><%= link_to_as_summary_of(order_summary, trolley.user) -%></li>
+

data/app/views/orders/checkout_form.html.erb

@@ -0,0 +1,35 @@
+<% @button_text = t(".confirm") 
+   @title = t(".confirm_order")
+-%>
+
+<h1><%= @title -%></h1>
+
+<%= render @order -%>
+
+<% form_for(@order, :url => checkout_form_target_action_url_hash, :html => {:method => 'post'} ) do |f| %>
+
+<%= f.error_messages %>
+
+<fieldset>
+
+<%# overridable helper method that will set up fields appropriately -%>
+
+<%= order_checkout_fields(f) -%>
+
+<% if @order.notes.size == 1 -%>
+  <% f.fields_for :notes do |note_form| -%>
+
+    <label><%= t '.additional_info_for_order' -%></label>
+
+    <%= note_form.hidden_field :user_id, :value => current_user.id  -%>
+
+    <%= note_form.text_area :body, { :cols => 90, :rows => 5 } %>
+
+  <% end -%>
+<% end -%>
+
+</fieldset>
+
+<%= f.submit @button_text %>
+<% end %>
+

data/app/views/orders/index.html.erb

@@ -12,9 +12,9 @@
 <% if @orders.size > 0 -%>
 
   <h2><%= orders_state_headline -%><%= clear_extra_params -%></h2>
-
-  <%= render :partial => 'orders/order', :collection => @orders, :locals => { :trolley => @trolley, :status => @state } -%>
-  
+  <ul id="order-summaries-list">
+    <%= render :partial => 'orders/order_summary', :collection => @orders, :locals => { :trolley => @trolley, :status => @state } -%>
+  </ul>
   <div id="prev-next"><%= will_paginate @orders, :params => params %></div>
 <% else -%>
   <p><%= t("orders.index.no_orders") %></p>

data/app/views/trolleys/_orders.html.erb

@@ -2,10 +2,15 @@
 
   <h2><%= t("trolleys.orders.#{status}") -%></h2>
 
-  <%= render :partial => 'orders/order',
-  :collection => @trolley.orders.send("with_state_#{status}"),
-  :locals => { :trolley => trolley, :status => status } -%>
-
+  <% if status == 'current' -%>
+    <%= render :partial => 'orders/order',
+    :collection => @trolley.orders.send("with_state_#{status}"),
+    :locals => { :trolley => trolley, :status => status } -%>
+  <% else -%>
+    <ul id="order-summaries-list">
+      <%= render :partial => 'orders/order_summary', :collection => @trolley.orders.send("with_state_#{status}"), :locals => { :trolley => @trolley, :status => status } -%>
+    </ul>
+  <% end -%>
 <% elsif status == 'current' -%>
   <h2><%= t("trolleys.orders.current") -%></h2>
   <p><%= t("trolleys.orders.none_pending") %></p>

data/app/views/trolleys/show.html.erb

@@ -2,7 +2,6 @@
    if current_user == @trollied_user
      @title = t(".your_title")
    else
-   # TODO: interpolate user name
    # (means name method has to be implemented for user model)
      @title = t(".for_user_title", :name => @trollied_user.trolley_user_display_name)
    end

data/config/locales/en.yml

@@ -39,6 +39,10 @@ en:
       add_note_to_order_for_admin: "Add a note about this order for staff."
       add_note_to_order_for_user: "Add a note about this order for the owner."
   orders:
+    checkout_form:
+      confirm: "Confirm Checkout"
+      confirm_order: "Confirm order details"
+      additional_info_for_order: "Anything else you would like to tell us about this order?"
     edit:
       update: "Update"
     date_pickers:
@@ -54,6 +58,8 @@ en:
       current_orders: "Current Orders"
       from: "from"
       in_process_orders: "Orders Awaiting processing"
+      items: "items"
+      order_number: "Order:"
       ready_orders: "Ready Orders"
       until: "until"
       user_review_orders: "Orders needing user attention"
@@ -75,13 +81,16 @@ en:
     new:
       create: "Create"
     order:
+      alteration_approve: "Approve changes"
       are_you_sure: "Are you sure?"
       cancel: "Cancel"
       checkout: "Checkout"
       destroy: "Clear all"
       finish: "Mark as completed"
       fulfilled_without_acceptance: "Mark as ready"
+      order_controls_preface: "Order actions:"
       order_notes: "Notes for this order:"
+      purchasable_item_actions: "Actions"
       purchasable_item_description: "Item"
       user: "User:"
     show:
@@ -92,6 +101,7 @@ en:
       change_to_checkout: "Order Checked Out"
       change_to_finish: "Order Completed"
       change_to_fulfilled_without_acceptance: "Order Ready"
+      change_to_alteration_approve: "You approved the changes to the order. It is now back in process."
       created: "Created order"
       updated: "Updated order"
       deleted: "Deleted order"

data/config/routes.rb

@@ -3,6 +3,8 @@ members = Order.workflow_event_names.inject(Hash.new) do |hash, event_name|
   hash
 end
 
+members[:checkout_form] = :get
+
 ActionController::Routing::Routes.draw do |map|
   map.resources :orders, :member => members, :except => [:new, :create], :has_many => :line_items, :has_many => :notes
 end

data/lib/has_trolley_controller_helpers.rb

@@ -1,6 +1,6 @@
 module HasTrolleyControllerHelpers
   def self.included(klass)
-    klass.send :helper_method, :url_for_trolley
+    klass.send :helper_method, :url_for_trolley, :url_for_order
     klass.send :include, UrlFor
   end
   
@@ -30,7 +30,8 @@ module HasTrolleyControllerHelpers
       trolley = @order.trolley if @order && trolley.blank?
 
       order = options[:order] || @order || trolley.selected_order
-      
+      trolley = order.trolley
+
       url_for [trolley.user, trolley, order]
     end
 

data/lib/order_status.rb

@@ -62,7 +62,7 @@ module OrderStatus
       # create a named_scope for each of our declared states
       workflow_spec.state_names.each do |name|
         scope_name = "with_state_#{name}".to_sym
-        named_scope scope_name, :conditions => { :workflow_state => name.to_s }
+        named_scope scope_name, :conditions => { :workflow_state => name.to_s }, :order => 'updated_at DESC'
       end
 
       # in(state_name)

data/rails/init.rb

@@ -7,4 +7,4 @@ ActionController::Base.send(:helper, OrdersHelper)
 ActionController::Base.send(:helper, LineItemsHelper)
 
 # load our locales
-I18n.load_path += Dir[ File.join(File.dirname(__FILE__), '..', 'config', 'locales', '*.{rb,yml}') ]
+# I18n.load_path += Dir[ File.join(File.dirname(__FILE__), '..', 'config', 'locales', '*.{rb,yml}') ]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: trollied
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Walter McGinnis
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-29 00:00:00 +12:00
+date: 2011-09-29 00:00:00 +13:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -135,6 +135,8 @@ files:
 - app/views/notes/new.html.erb
 - app/views/orders/_date_pickers.html.erb
 - app/views/orders/_order.html.erb
+- app/views/orders/_order_summary.html.erb
+- app/views/orders/checkout_form.html.erb
 - app/views/orders/index.html.erb
 - app/views/orders/show.html.erb
 - app/views/trolleys/_orders.html.erb