spree_core 0.30.0.beta1 → 0.30.0

data/app/views/admin/mail_methods/edit.html.erb

@@ -0,0 +1,9 @@
+<%= render :partial => 'admin/shared/configuration_menu' %>
+
+<h1><%= t("editing_mail_method") %></h1>
+<%= render 'shared/error_messages', :target => @mail_method %>
+
+<%= form_for(:mail_method, :url => object_url, :html => { :method => :put }) do |f| %>
+  <%= render :partial => "form", :locals => { :f => f } %>
+  <p class="form-buttons"><%= button t("update") %></p>
+<% end %>

data/app/views/admin/mail_methods/index.html.erb

@@ -0,0 +1,41 @@
+<%= render :partial => 'admin/shared/configuration_menu' %>
+
+<div class='toolbar'>
+  <ul class='actions'>
+    <li>
+      <%= button_link_to t("new_mail_method"), new_object_url, :icon => 'add'  %>
+    </li>
+  </ul>
+  <br class='clear' />
+</div>
+
+<h1><%= t("mail_methods") %></h1>
+
+<table class="index">
+  <thead>
+    <%= hook :admin_mail_methods_index_headers do %>
+      <th><%= t("environment") %></th>
+      <th><%= t("active") %></th>
+    <% end %>
+    <th>
+      <%= hook :admin_mail_methods_index_header_actions %>
+    </th>
+  </thead>
+  <tbody>
+    <% @mail_methods.each do |method|%>
+      <tr id="<%= dom_id method %>">
+        <%- locals = {:method => method} %>
+        <%= hook :admin_mail_methods_index_rows, locals do %>
+          <td width="100px"><%= method.environment.to_s.titleize %></td>
+          <td width="60px"><%= method.active ? t(:yes) : t(:no) %></td>
+        <% end %>
+        <td width="140px">
+          <%= hook :admin_mail_methods_index_row_actions, locals do %>
+            <%= link_to_edit method %> &nbsp;
+            <%= link_to_delete method %>
+          <% end %>
+        </td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>

data/app/views/admin/mail_methods/new.html.erb

@@ -0,0 +1,9 @@
+<%= render :partial => 'admin/shared/configuration_menu' %>
+
+<h1><%= t("new_mail_method") %></h1>
+<%= render 'shared/error_messages', :target => @mail_method %>
+
+<%= form_for(:mail_method, :url => collection_url) do |f| %>
+  <%= render :partial => "form", :locals => { :f => f } %>
+  <p class="form-buttons"><%= button t("create") %></p>
+<% end %>

data/app/views/admin/orders/_form.html.erb

@@ -1,4 +1,4 @@
-<%= render 'shared/error_messages', :target => @line_item %>
+<%= render 'shared/error_messages', :target => @order %>
 
 <%= form_for(@order, :url => admin_order_url(@order), :html => { :method => :put}) do |f| %>
   <%= f.hidden_field :number %>
@@ -13,7 +13,7 @@
         <% end %>
         <th class="orders-actions"><%= hook :admin_order_form_line_items_header_actions %></th>
       </tr>
-      <% f.fields_for :line_items do |li_form| %>
+      <%= f.fields_for :line_items do |li_form| %>
         <%= render :partial => "admin/orders/line_item", :locals => { :f => li_form } %>
       <% end %>
     </tbody>
@@ -58,8 +58,7 @@
 <% end %>
 
 <script type="text/javascript">
-  $('#order_tab_summary h5#order_total').html('<%= "#{t('total')}: #{number_to_currency(@order.total)}" %>');
-  $('#order_tab_summary h5#order_status').html('<%= "#{t('status')}: #{t(@order.state)}" %>');
+  <%= render 'admin/shared/update_order_state.js' %>
 </script>
 
 <%= javascript_include_tag 'admin/orders/edit_form.js' %>

data/app/views/admin/{checkouts/_form.html.erb → orders/_user_form.html.erb}

@@ -10,18 +10,18 @@
       <td class="val-col" colspan="3"><%= f.text_field :email, :class => "fullwidth" %></td>
       <td class="lbl-col"><label><%= t('guest_checkout') %>:</label></td>
       <td class="val-col" colspan="3">
-        <% if @order.state == "in_progress" %>
+        <% if @order.completed? %>
+          <%= @order.user.nil? ? "Yes" : "No" %>
+        <% else %>
           <label class="sub">
-            <%= radio_button_tag :guest_checkout, true, @checkout.order.user.nil? %>
+            <%= radio_button_tag :guest_checkout, true, @order.user.nil? %>
             <%= t("yes") %>
           </label> &nbsp;
           <label class="sub">
-            <%= radio_button_tag :guest_checkout, false, !@checkout.order.user.nil?, :disabled => @checkout.order.state == "in_progress" %>
+            <%= radio_button_tag :guest_checkout, false, !@order.user.nil?, :disabled => @order.cart? %>
             <%= t("no") %>
           </label>
-          <%= hidden_field_tag :user_id, @checkout.order.user_id %>
-        <% else %>
-          <%= @checkout.order.user.nil? ? "Yes" : "No" %>
+          <%= hidden_field_tag :user_id, @order.user_id %>
         <% end %>
       </td>
     </tr>
@@ -29,14 +29,14 @@
 </table>
 
 <h3><%= Address.human_name(:count => 2) %></h3>
-<%= f.fields_for 'bill_address' do |ba_form|  %>
+<%= f.fields_for :bill_address do |ba_form|  %>
   <%= render :partial => "admin/shared/address_form", :locals => {:f => ba_form, :name => t('billing_address'), :use_billing => false} %>
 <% end %>
 
-<%= f.fields_for 'ship_address' do |sa_form|  %>
+<%= f.fields_for :ship_address do |sa_form|  %>
   <%= render :partial => "admin/shared/address_form", :locals => {:f => sa_form, :name => t('shipping_address'), :use_billing => true} %>
 <% end %>
 
 <p class="form-buttons">
-  <%= button @order.in_progress? ? t('continue') : t('update') %>
-</p>
+  <%= button @order.cart? ? t('continue') : t('update') %>
+</p>

data/app/views/admin/orders/edit.html.erb

@@ -1,3 +1,4 @@
+<%= csrf_meta_tag %>
 <div class='order-links'>
   <%= hook :admin_order_edit_buttons do %>
     <div class='toolbar'>

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

@@ -10,10 +10,12 @@
   <thead>
     <tr>
       <%= hook :admin_orders_index_headers do %>
-        <th><%= order @search, :by => :created_at,       :as => t("order_date") %></th>
+        <th><%= order @search, :by => :completed_at,     :as => t("order_date") %></th>
         <th><%= order @search, :by => :number,           :as => t("order_number") %></th>
         <th><%= order @search, :by => :state,            :as => t("status") %></th>
-        <th><%= order @search, :by => :checkout_email,   :as => t("customer") %></th>
+        <th><%= order @search, :by => :payment_state,    :as => t("payment_state") %></th>
+        <th><%= order @search, :by => :shipment_state,   :as => t("shipment_state") %></th>
+        <th><%= order @search, :by => :email,            :as => t("customer") %></th>
         <th><%= order @search, :by => :total,            :as => t("total") %></th>
       <% end %>
       <th>
@@ -26,9 +28,11 @@
     <tr>
       <%- locals = {:order => order} %>
       <%= hook :admin_orders_index_rows, locals do %>
-        <td><%= order.created_at.to_date%></td>
+        <td><%= order.completed_at.to_date if order.completed_at %></td>
         <td><%= link_to order.number, object_url(order) %></td>
-        <td><%= t(order.state.downcase) %></td>
+        <td><%= t("order_state.#{order.state.downcase}") %></td>
+        <td><%= link_to t("payment_states.#{order.payment_state}"), admin_order_payments_path(order) if order.payment_state %></td>
+        <td><%= link_to t("shipment_states.#{order.shipment_state}"), admin_order_shipments_path(order) if order.shipment_state %></td>
         <td><%= order.email %></td>
         <td><%= number_to_currency order.total %></td>
       <% end %>
@@ -64,14 +68,14 @@
       </div>
 
       <p><label><%= t("status") %></label><br />
-      <%= f.select :state_equals, Order.state_machines[:state].states.collect {|s| [t(s.name), s.value]}, {:include_blank => true} %></p>
+      <%= f.select :state_equals, Order.state_machines[:state].states.collect {|s| [t("order_state.#{s.name}"), s.value]}, {:include_blank => true} %></p>
 
       <p><label><%= t 'order_number' %></label><br />
       <%= f.text_field :number_like, :size=>25 %></p>
 
       <p>
         <label><%= t 'email' %></label><br />
-        <%= f.text_field :user_email_like, :size=>25 %>
+        <%= f.text_field :email_like, :size=>25 %>
       </p>
       <p>
       <label><%= t 'first_name_begins_with' %></label><br />

data/app/views/admin/orders/new.html.erb

@@ -1,4 +1,5 @@
 <%= render :partial => 'admin/shared/order_tabs', :locals => {:current => "Order Details"} %>
+<%= csrf_meta_tag %>
 
 <%= hook :admin_order_new_header do %>
   <h2><%= t("new_order")%></h2>

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

@@ -1,5 +1,6 @@
 <div class='toolbar order-links'>
   <%= hook :admin_order_show_buttons do %>
+    <%= button_link_to t("cancel"), fire_admin_order_url(@order.number, {:e => "cancel"}), :icon => 'delete'  if @order.can_cancel? %>
     <%= button_link_to t("edit"), edit_admin_order_url(@order.number), :icon => 'edit' %>
   <% end %>
 </div>
@@ -10,7 +11,7 @@
   <% if @order.bill_address %>
     <div class='adr'>
       <h4>
-        <%= link_to t("bill_address"), (@current_action=="edit" ? edit_admin_order_checkout_url(@order) : admin_order_checkout_url(@order)) %>
+        <%= link_to t("bill_address"), (@current_action=="edit" ? edit_admin_checkout_url(@order.number) : admin_orders_checkout_url(@order.number)) %>
       </h4>
       <%= render :partial => 'admin/shared/address', :locals => {:address => @order.bill_address} %>
     </div>
@@ -18,7 +19,7 @@
   <% if @order.ship_address %>
     <div class='adr'>
       <h4>
-        <%= link_to t("ship_address"), (@current_action=="edit" ? edit_admin_order_checkout_url(@order) : admin_order_checkout_url(@order)) %>
+        <%= link_to t("ship_address"), (@current_action=="edit" ? edit_admin_checkout_url(@order.number) : admin_orders_checkout_url(@order.number)) %>
         <%= t("ship_address") if @order.shipments.empty? %>
       </h4>
       <%= render :partial => 'admin/shared/address', :locals => {:address => @order.ship_address} %>

data/app/views/admin/{checkouts/edit.html.erb → orders/user.html.erb}

@@ -1,6 +1,7 @@
 <%= render :partial => 'admin/shared/order_tabs', :locals => {:current => "Customer Details"} %>
+<%= csrf_meta_tag %>
 
-<% if @order.state == "in_progress" %>
+<% if @order.cart? %>
   <div id="add-line-item">
     <fieldset>
       <legend><%= t('customer_search') %></legend>
@@ -10,12 +11,14 @@
   </div>
 <% end %>
 
-<%= render "shared/error_messages", :target => @checkout %>
-<%= form_for(@checkout, :url => admin_order_checkout_url(@order), :html => { :method => :put}) do |f| %>
-  <%= render :partial => "form", :locals => {:f => f} %>
+<%= render "shared/error_messages", :target => @order %>
+
+<%= form_for(@order, :url => admin_order_url(@order), :html => { :method => :put}) do |f| %>
+  <%= f.hidden_field :number %>
+  <%= render :partial => "user_form", :locals => {:f => f} %>
 <% end %>
 
 <% content_for :head do %>
   <%= javascript_include_tag 'admin/checkouts/edit.js' %>
-  <%= stylesheet_link_tag 'admin/edit_checkouts.css' %>
+
 <% end %>

data/app/views/admin/payments/_list.html.erb

@@ -3,20 +3,18 @@
     <th><%= "#{t('spree.date')}/#{t('spree.time')}" %></th>
     <th><%= t("amount") %></th>
     <th><%= t("payment_method") %></th>
-    <th></th>
+    <th><%= t("state") %></th>
+    <th>Actions</th>
   </tr>
   <% payments.each do |payment| %>
     <tr>
       <td><%= payment.created_at.to_s(:date_time24) %></td>
       <td><%= number_to_currency(payment.amount) %></td>
-      <td><%= payment_method_name payment %></td>
+      <td><%= link_to payment_method_name(payment), admin_order_payment_path(@order, payment) %></td>
+      <td><%= payment.state.capitalize %></td>
       <td>
-        <%= link_to t('show'), admin_order_payment_path(@order, payment) %>
         <% payment.actions.each do |action| %>
-          <%= link_to t(action), fire_admin_order_payment_path(@order, payment, :e => action), :method => :put, :confirm => t('are_you_sure') %>
-        <% end %>
-        <% if payment.actions.empty? and !payment.finalized? %>
-          <%= link_to t(:finalize), finalize_admin_order_payment_path(@order, payment), :method => :put, :confirm => t('are_you_sure') %>
+          <%= button_to t(action), fire_admin_order_payment_path(@order, payment, :e => action), :method => :put %>
         <% end %>
       </td>
     </tr>

data/app/views/admin/payments/index.html.erb

@@ -11,17 +11,12 @@
 
 <%= render 'admin/shared/order_tabs', :current => "Payments" %>
 
-<% if @order.outstanding_credit? %>
-  <p><%= t('credit_owed') %> <strong><%= number_to_currency @order.outstanding_credit %></strong></p>
-<% end %>
 <% if @order.outstanding_balance? %>
-  <p><%= t('balance_due') %> <strong><%= number_to_currency @order.outstanding_balance %></strong></p>
+  <p><%= @order.outstanding_balance < 0 ? t('credit_owed') : t('balance_due') %> <strong><%= number_to_currency @order.outstanding_balance %></strong></p>
 <% end %>
 
-<h2><%= t("finalized_payments") %></h2>
+<h2><%= t("payments") %></h2>
 <%= render 'list', :payments => @payments %>
 
-<h2><%= t("pending_payments") %></h2>
-<%= render 'list', :payments => @order.checkout.payments %>
 
-<%= button_link_to t('continue'), admin_orders_url %>
+<%= button_link_to t('continue'), admin_orders_url %>

data/app/views/admin/payments/new.html.erb

@@ -9,7 +9,7 @@
   <%= render "form", :f => f %>
 
   <p class="form-buttons">
-    <%= button @order.in_progress? ? t('continue') : t('update') %>
+    <%= button @order.cart? ? t('continue') : t('update') %>
   </p>
 
 <% end %>

data/app/views/admin/payments/source_views/_gateway.html.erb

@@ -32,4 +32,3 @@
   </table>
 </fieldset>
 
-<%= render 'transaction_list', :txns => payment.txns %>

data/app/views/admin/reports/sales_total.html.erb

@@ -7,12 +7,8 @@
       <td align="right"><%=number_to_currency @item_total%></td>
     </tr>
     <tr>
-      <th scope="row"><%= t("charge_total") %>:</th>
-      <td align="right"><%=number_to_currency @charge_total%></td>
-    </tr>
-    <tr>
-      <th scope="row"><%= t("credit_total") %>:</th>
-      <td align="right"><%=number_to_currency @credit_total%></td>
+      <th scope="row"><%= t("adjustment_total") %>:</th>
+      <td align="right"><%=number_to_currency @adjustment_total%></td>
     </tr>
     <tr>
       <th scope="row"><%= t("sales_total") %>:</th>

data/app/views/admin/return_authorizations/_form.html.erb

@@ -2,19 +2,27 @@
   <tr>
     <th><%= t("product") %></th>
     <th><%= t("quantity_shipped") %></th>
+    <th><%= t("quantity_returned") %></th>
     <th><%= t("return_quantity") %></th>
   </tr>
-  <% @return_authorization.order.shipped_units.each do |shipped_unit| %>
-    <tr id="<%= dom_id(shipped_unit[0]) %>">
+  <% @return_authorization.order.inventory_units.group_by(&:variant).each do | variant, units| %>
+    <tr id="<%= dom_id(variant) %>">
       <td>
-        <h4 style="margin-bottom:0px;"><%= shipped_unit[0].name %></h4>
-        <%= shipped_unit[0].options_text %>
+        <h4 style="margin-bottom:0px;"><%= variant.name %></h4>
+        <%= variant.options_text %>
       </td>
-      <td><%= shipped_unit[1] %></td>
+      <td><%= units.select(&:shipped?).size %></td>
+      <td><%= units.select(&:returned?).size %></td>
       <td class="return_quantity">
-        <%= text_field_tag "return_quantity[#{shipped_unit[0].id}]",
-              @returned_units.empty? ? 0 : (@returned_units[shipped_unit[0].id].nil? ? 0 : @returned_units[shipped_unit[0].id].size),
+        <% if @return_authorization.received? %>
+          <%= @return_authorization.inventory_units.group_by(&:variant)[variant].try(:size) || 0 %>
+        <% elsif units.select(&:shipped?).empty? %>
+          0
+        <% else %>
+          <%= text_field_tag "return_quantity[#{variant.id}]",
+              @return_authorization.inventory_units.group_by(&:variant)[variant].try(:size) || 0,
               {:style => "width:30px;"} %>
+        <% end %>
       </td>
     </tr>
   <% end %>
@@ -22,8 +30,12 @@
 
 <%= f.field_container :amount do %>
   <%= f.label :amount, t("amount")%> <span class="required">*</span><br />
-  <%= f.text_field :amount, {:style => "width:80px;"} %> <%= t("rma_value") %>: <span id="rma_value"></span>
-  <%= f.error_message_on :amount %>
+  <% if @return_authorization.received? %>
+    <%= number_to_currency(@return_authorization.amount) %>
+  <% else %>
+    <%= f.text_field :amount, {:style => "width:80px;"} %> <%= t("rma_value") %>: <span id="rma_value"></span>
+    <%= f.error_message_on :amount %>
+  <% end %>
 <% end %>
 
 <%= f.field_container :reason do %>
@@ -36,8 +48,8 @@
 <% content_for :head do %>
   <script type="text/javascript">
     var variant_prices = new Array();
-    <% @return_authorization.order.shipped_units.each do |shipped_unit| %>
-      variant_prices[<%= shipped_unit[0].id.to_s %>] = <%= shipped_unit[0].price %>;
+    <% @return_authorization.order.inventory_units.group_by(&:variant).each do | variant, units| %>
+      variant_prices[<%= variant.id.to_s %>] = <%= variant.price %>;
     <% end %>
 
     function calculate_rma_price(object, value){
@@ -61,4 +73,4 @@
       calculate_rma_price();
     });
   </script>
-<% end %>
+<% end %>

data/app/views/admin/return_authorizations/edit.html.erb

@@ -21,7 +21,7 @@
   <%= render :partial => "form", :locals => {:f => f} %>
 
   <p class="form-buttons">
-    <%= button t('continue') %>
+    <%= button t('update') %>
     <%= t("or") %> <%= link_to t("actions.cancel"), admin_order_return_authorizations_url(@order) %>
   </p>
 <% end %>

data/app/views/admin/return_authorizations/index.html.erb

@@ -1,4 +1,4 @@
-<% unless @order.returnable_units.nil? %>
+<% if @order.inventory_units.any? &:shipped? %>
   <div class='toolbar'>
     <ul class='actions'>
       <li>
@@ -27,13 +27,15 @@
       <td><%= return_authorization.created_at.to_s(:date_time24) %></td>
       <td>
         <%= link_to_edit return_authorization %>
-        &nbsp;
-        <%= link_to_delete return_authorization %>
+        <% unless return_authorization.received? %>
+          &nbsp;
+          <%= link_to_delete return_authorization %>
+        <% end %>
       </td>
 
     </tr>
   <% end %>
-  <% if @order.shipped_units.nil? %>
+  <% unless @order.inventory_units.any? &:shipped? %>
     <tr>
       <td colspan="5"><%= t("cannot_create_returns") %></td>
     </tr>

data/app/views/admin/shared/_address_form.html.erb

@@ -1,16 +1,18 @@
 <table class="index">
   <thead>
-    <th colspan="8">
-      <%= name %>
-      <span class="right">
-        <% if use_billing %>
-          <%= check_box_tag 'checkout[use_billing]', '1', (!(@checkout.bill_address.empty? && @checkout.ship_address.empty?) && @checkout.bill_address.eql?(@checkout.ship_address)) %> <%= t("use_billing_address") %>
-        <% end %>
-      </span>
-    </th>
-  </thead>
-  <tbody id="<%= name == t('shipping_address') ? "shipping" : "billing" %>" style="display:<%= (use_billing && (!(@checkout.bill_address.empty? && @checkout.ship_address.empty?) && @checkout.bill_address.eql?(@checkout.ship_address))) ? "none" : "" %>">
     <tr>
+      <th colspan="8">
+        <%= name %>
+        <span class="right">
+          <% if use_billing %>
+            <%= check_box_tag 'order[use_billing]', '1', (!(@order.bill_address.empty? && @order.ship_address.empty?) && @order.bill_address.eql?(@order.ship_address)) %> <%= t("use_billing_address") %>
+          <% end %>
+        </span>
+      </th>
+    </tr>
+  </thead>
+  <tbody id="<%= name == t('shipping_address') ? "shipping" : "billing" %>" style="display:<%= (use_billing && (!(@order.bill_address.empty? && @order.ship_address.empty?) && @order.bill_address.eql?(@order.ship_address))) ? "none" : "" %>">
+    <tr class="<%= name == t('shipping_address') ? "shipping-row" : "billing-row" %>">
       <td class="lbl-col">
         <%= f.label :firstname, t(:first_name)+':' %>
       </td>
@@ -20,7 +22,7 @@
       </td>
       <td class="val-col" colspan="3"><%= f.text_field :lastname %></td>
     </tr>
-    <tr>
+    <tr class="<%= name == t('shipping_address') ? "shipping-row" : "billing-row" %>">
       <td class="lbl-col">
         <%= f.label :address1, t(:street_address)+':' %>
       </td>
@@ -30,7 +32,7 @@
       </td>
       <td colspan="3"><%= f.text_field :address2, :class => "fullwidth" %></td>
     </tr>
-    <tr>
+    <tr class="<%= name == t('shipping_address') ? "shipping-row" : "billing-row" %>">
       <td class="lbl-col">
         <%= f.label :city, t(:city)+':' %>
       </td>
@@ -40,24 +42,25 @@
       </td>
       <td colspan="3"><%= f.text_field :zipcode, :style => "width:100px;" %></td>
     </tr>
-    <tr>
+    <tr class="<%= name == t('shipping_address') ? "shipping-row" : "billing-row" %>">
       <td class="lbl-col">
         <%= f.label :state_id, t(:state)+':' %>
       </td>
       <td colspan="3">
         <span id="<%= name==t('shipping_address') ? "s" : "b" %>state">
+
           <%= f.text_field :state_name, :style => "width:150px;display:#{f.object.country.states.empty? ? 'block' : 'none' };", :disabled => !f.object.country.states.empty? %>
-          <%= f.collection_select :state_id, @states, :id, :name, {:include_blank => true}, {:style=> "width:150px;display:#{f.object.country.states.empty? ? 'none' : 'block' };", :disabled => f.object.country.states.empty?} %>
+          <%= f.collection_select :state_id, f.object.country.states.sort, :id, :name, {:include_blank => true}, {:style=> "width:150px;display:#{f.object.country.states.empty? ? 'none' : 'block' };", :disabled => f.object.country.states.empty?} %>
         </span>
       </td>
       <td class="lbl-col">
         <%= f.label :country_id, t(:country)+':' %>
       </td>
       <td colspan="3">
-        <span id="<%= name==t('shipping_address') ? "s" : "b" %>country"><%= f.collection_select :country_id, @countries, :id, :name, {}, {:style => 'width:150px;'} %></span>
+        <span id="<%= name==t('shipping_address') ? "s" : "b" %>country"><%= f.collection_select :country_id, available_countries, :id, :name, {}, {:style => 'width:150px;'} %></span>
       </td>
     </tr>
-    <tr>
+    <tr class="<%= name == t('shipping_address') ? "shipping-row" : "billing-row" %>">
       <td class="lbl-col">
         <%= f.label :phone, t(:phone)+':' %>
       </td>
@@ -73,4 +76,4 @@
       $('span#<%= name==t('shipping_address') ? "s" : "b" %>country select').change(function() { update_state('<%= name==t('shipping_address') ? "s" : "b" %>'); });
     });
   </script>
-<% end %>
+<% end %>