My-Commerce_core 1.0.0

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

@@ -0,0 +1,45 @@
+<% if @order.inventory_units.any? &:shipped? %>
+  <div class='toolbar'>
+    <ul class='actions'>
+      <li>
+        <%= button_link_to t("new_return_authorization"), new_admin_order_return_authorization_url(@order), :icon => 'add' %>
+      </li>
+    </ul>
+    <br class='clear' />
+  </div>
+<% end %>
+
+<%= render :partial => 'admin/shared/order_tabs', :locals => {:current => "Return Authorizations"} %>
+
+<table class="index">
+  <tr>
+    <th><%= t("rma_number") %></th>
+    <th><%= t("status") %></th>
+    <th><%= t("amount") %></th>
+    <th><%= "#{t('spree.date')}/#{t('spree.time')}" %></th>
+    <th></th>
+  </tr>
+  <% @return_authorizations.each do |return_authorization| %>
+    <tr id="<%= dom_id(return_authorization) %>">
+      <td><%= return_authorization.number %></td>
+      <td><%= t(return_authorization.state.downcase) %></td>
+      <td><%= number_to_currency(return_authorization.amount) %></td>
+      <td><%= return_authorization.created_at.to_s(:date_time24) %></td>
+      <td>
+        <%= link_to_edit return_authorization %>
+        <% unless return_authorization.received? %>
+          &nbsp;
+          <%= link_to_delete return_authorization %>
+        <% end %>
+      </td>
+
+    </tr>
+  <% end %>
+  <% unless @order.inventory_units.any? &:shipped? %>
+    <tr>
+      <td colspan="5"><%= t("cannot_create_returns") %></td>
+    </tr>
+  <% end %>
+</table>
+
+<%= button_link_to t('continue'), admin_orders_url %>

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

@@ -0,0 +1,13 @@
+<%= render :partial => 'admin/shared/order_tabs', :locals => {:current => "Return Authorizations"} %>
+
+<h2><%= t("new_return_authorization")%></h2>
+
+<%= render "shared/error_messages", :target => @return_authorization %>
+<%= form_for @return_authorization, :url => collection_url do |f| %>
+  <%= render :partial => "form", :locals => {:f => f} %>
+
+  <p class="form-buttons">
+    <%= button t('continue') %>
+    <%= t("or") %> <%= link_to t("actions.cancel"), admin_order_return_authorizations_url(@order) %>
+  </p>
+<% end %>

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

@@ -0,0 +1,5 @@
+<p>
+  <%= label controller.controller_name.singularize, field[:name], t("activerecord.attributes.variant." + field[:name].downcase, :default => field[:name].titleize)%><br />
+  <%= additional_field_for(controller, field) %>
+  <%= error_message_on controller.controller_name.singularize, attribute_name_for(field[:name]) %>
+</p>

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

@@ -0,0 +1,5 @@
+<p>
+  <%="#{address.firstname} #{address.lastname} (#{address.phone}" %><%= address.alternative_phone unless address.alternative_phone.blank? %>)<br />
+  <%= address.address1 %> <%= ", #{address.address2}" unless address.address2.blank? %>
+  <%= ", #{address.city}, #{address.state_text}, #{address.zipcode}, #{address.country.name}" %>
+</p>

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

@@ -0,0 +1,79 @@
+<table class="index">
+  <thead>
+    <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>
+      <td class="val-col" colspan="3"><%= f.text_field :firstname %></td>
+      <td class="lbl-col">
+        <%= f.label :lastname, t(:last_name)+':' %>
+      </td>
+      <td class="val-col" colspan="3"><%= f.text_field :lastname %></td>
+    </tr>
+    <tr class="<%= name == t('shipping_address') ? "shipping-row" : "billing-row" %>">
+      <td class="lbl-col">
+        <%= f.label :address1, t(:street_address)+':' %>
+      </td>
+      <td colspan="3"><%= f.text_field :address1, :class => "fullwidth" %></td>
+      <td class="lbl-col">
+        <%= f.label :address2, t(:street_address_2)+':' %>
+      </td>
+      <td colspan="3"><%= f.text_field :address2, :class => "fullwidth" %></td>
+    </tr>
+    <tr class="<%= name == t('shipping_address') ? "shipping-row" : "billing-row" %>">
+      <td class="lbl-col">
+        <%= f.label :city, t(:city)+':' %>
+      </td>
+      <td colspan="3"><%= f.text_field :city %></td>
+      <td class="lbl-col">
+        <%= f.label :zipcode, t(:zip)+':' %>
+      </td>
+      <td colspan="3"><%= f.text_field :zipcode, :style => "width:100px;" %></td>
+    </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, 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, available_countries, :id, :name, {}, {:style => 'width:150px;'} %></span>
+      </td>
+    </tr>
+    <tr class="<%= name == t('shipping_address') ? "shipping-row" : "billing-row" %>">
+      <td class="lbl-col">
+        <%= f.label :phone, t(:phone)+':' %>
+      </td>
+      <td colspan="7"><%= f.text_field :phone %></td>
+    </tr>
+  </tbody>
+</table>
+
+<% content_for :head do %>
+  <%= javascript_include_tag '/states', 'admin/address_states' %>
+  <script type="text/javascript">
+    jQuery(document).ready(function(){
+      $('span#<%= name==t('shipping_address') ? "s" : "b" %>country select').change(function() { update_state('<%= name==t('shipping_address') ? "s" : "b" %>'); });
+    });
+  </script>
+<% end %>

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

@@ -0,0 +1,6 @@
+<div class="alert <%= alert.severity.downcase %>">
+  <%= alert.message %> <%= link_to alert.url_name, alert.url if alert.url %>
+  <%= link_to 'X', dismiss_alert_admin_general_settings_path(:alert_id => alert.id),
+              :remote => true, :method => :post, :class => 'dismiss' %>
+</div>
+

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

@@ -0,0 +1,19 @@
+<fieldset id="calculator_fields">
+  <legend><%= t('calculator') %></legend>
+  <div id="preference-settings">
+    <p>
+      <%= f.label(:calc_type, t("calculator"), :for => "calc-type") %>
+      <%= f.collection_select(:calculator_type, @calculators, :to_s, :description, {}, {:id => "calc-type"}) %>
+    </p>
+    <% if !@object.new_record? %>
+      <div class="calculator-settings">
+        <%= f.fields_for :calculator do |calculator_form| %>
+          <%= preference_fields(@object.calculator, calculator_form) %>
+        <% end %>
+      </div>
+      <% if @object.calculator.respond_to?(:preferences) %>
+        <div id="calculator-settings-warning"><%= t('calculator_settings_warning')%></div>
+      <% end %>
+    <% end %>
+  </div>
+</fieldset>

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

@@ -0,0 +1,22 @@
+<% content_for :sidebar do %>
+
+  <h3><%= t("configurations") %></h3>
+  <br class="clear" />
+
+  <ul class="sidebar">
+    <%= hook :admin_configurations_sidebar_menu do %>
+    <li<%== ' class="active"' if controller.controller_name == 'general_settings' %>><%= link_to t("general_settings"), admin_general_settings_path %></li>
+    <li<%== ' class="active"' if controller.controller_name == 'mail_methods' %>><%= link_to t("mail_methods"), admin_mail_methods_path %></li>
+    <li<%== ' class="active"' if controller.controller_name == 'tax_categories' %>><%= link_to t("tax_categories"), admin_tax_categories_path %></li>
+    <li<%== ' class="active"' if controller.controller_name == 'zones' %>><%= link_to t("zones"), admin_zones_path %></li>
+    <li<%== ' class="active"' if controller.controller_name == 'states' %>><%= link_to t("states"), admin_country_states_path(Spree::Config[:default_country_id]) %></li>
+    <li<%== ' class="active"' if controller.controller_name == 'payment_methods' %>><%= link_to t("payment_methods"), admin_payment_methods_path %></li>
+    <li<%== ' class="active"' if ['taxonomies', 'taxons'].include? controller.controller_name %>><%= link_to t("taxonomies"), admin_taxonomies_path %></li>
+    <li<%== ' class="active"' if controller.controller_name == 'shipping_methods' %>><%= link_to t("shipping_methods"), admin_shipping_methods_path %></li>
+    <li<%== ' class="active"' if controller.controller_name == 'inventory_settings' %>><%= link_to t("inventory_settings"), admin_inventory_settings_path %></li>
+    <li<%== ' class="active"' if controller.controller_name == 'trackers' %>><%= link_to t("analytics_trackers"), admin_trackers_path %></li>
+    <% end %>
+    <li<%== ' class="active"' if controller.controller_name == 'configurations' %>><%= link_to t("complete_list"), admin_configurations_path %></li>
+  </ul>
+
+<% end %>

data/app/views/admin/shared/_destroy.js.erb

@@ -0,0 +1,16 @@
+notice_div = $('.flash.notice');
+<% notice = flash.delete(:notice)
+if notice %>
+  if (notice_div.length > 0) {
+    notice_div.html("<%= notice %>");
+    notice_div.show();
+  } else {
+    if ($("#content .toolbar").length > 0) {
+      $("#content .toolbar").before('<div class="flash notice"><%= notice %></div>');
+    } else {
+      $("#content h1").before('<div class="flash notice"><%= notice %></div>');
+    }
+  } <%
+end %>
+
+<%= render(:partial => "/admin/shared/update_order_state") if @order %>

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

@@ -0,0 +1,4 @@
+<p class="form-buttons">
+  <%= button t("update") %>
+  <%= t("or") %> <%= link_to t("cancel"), collection_url %>
+</p>

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

@@ -0,0 +1,12 @@
+<% if products.any? %>
+  <% form_tag admin_product_groups_path do %>
+    <%= hidden_field_tag "product_group[product_scopes_attributes][][name]", 'with_ids' %>
+    <%= hidden_field_tag "product_group[product_scopes_attributes][][arguments][]", products.map(&:id).join(',') %>
+    <fieldset>
+      <legend><%= t('create_product_group_from_products') %></legend>
+      <label><%= t('name') %></label>
+      <%= text_field_tag "product_group[name]",  'New group' %>
+      <input type="submit" value="<%= t('create') %>">
+    </fieldset>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,8 @@
+<div class='toolbar'>
+  <ul class='actions'>
+    <li>
+      <%= button_link_to t("new_adjustment"), new_admin_order_adjustment_url(@order), :icon => 'add' %>
+    </li>
+  </ul>
+  <br class='clear' />
+</div>

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

@@ -0,0 +1,4 @@
+<p class="form-buttons">
+  <%= button t("actions.create") %>
+  <%= t("or") %> <%= link_to t("actions.cancel"), collection_url %>
+</p>

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

@@ -0,0 +1,3 @@
+<%# This redirection is present ONLY to simplify overloading of the admin order summary format %>
+<%= render :partial => 'shared/order_details', :locals => {:order => order} %>
+

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

@@ -0,0 +1,64 @@
+<h1><%= t(:order) + " #{@order.number}" %></h1>
+
+<% content_for :sidebar do %>
+  <div id="order_tab_summary">
+    <h3 id="order_number"><%= "#{t(:order)} ##{@order.number} " %></h3>
+    <h5 id="order_status"><%= "#{t(:status)}: #{t("order_state.#{@order.state}")}" %></h5>
+    <h5 id="order_total"><%= "#{t(:total)}: #{number_to_currency(@order.total)}" %></h5>
+    <% if @order.completed? %>
+      <h5 id="shipment_status"><%= "#{t(:shipment)}: #{t("shipment_states.#{@order.shipment_state}")}"  %></h5>
+      <h5 id="payment_status"><%= "#{t(:payment)}: #{t("payment_states.#{@order.payment_state}")}" %></h5>
+    <% end %>
+    <br class="clear" />
+  </div>
+  <br class="clear" />
+
+  <ul class="sidebar">
+    <%= hook :admin_order_tabs, {:current => current} do %>
+      <% unless @order.completed? %>
+        <li<%== ' class="active"' if current == "Order Details" %>>
+          <%= link_to t("order_details"), edit_admin_order_url(@order) %>
+        </li>
+        <li<%== ' class="active"' if current == "Customer Details" %>>
+            <%= link_to t("customer_details"), user_admin_order_url(@order) %>
+        </li>
+        <li<%== ' class="active"' if current == "Shipments" %>>
+           <%= link_to t("shipment"), @order.line_items.empty? || !@order.completed? ? "javascript:$('form').submit();" : edit_admin_order_shipment_url(@order, @order.shipment) %>
+        </li>
+        <li<%== ' class="active"' if current == "Adjustments" %>>
+           <%= link_to t("adjustments"), @order.line_items.empty? || !@order.completed? ? "javascript:$('form').submit();" : admin_order_adjustments_url(@order) %>
+        </li>
+        <li<%== ' class="active"' if current == "Payments" %>>
+           <%= link_to t("payment"), @order.line_items.empty? || !@order.completed? ? "javascript:$('form').submit();" : new_admin_order_payment_url(@order) %>
+        </li>
+
+      <% else %>
+        <li<%== ' class="active"' if current == "Order Details" %>>
+          <%= link_to t("order_details"), admin_order_url(@order) %>
+        </li>
+        <li<%== ' class="active"' if current == "Customer Details" %>>
+          <%= link_to t("customer_details"), user_admin_order_url(@order) %>
+        </li>
+        <li<%== ' class="active"' if current == "Adjustments" %>>
+           <%= link_to t("adjustments"), admin_order_adjustments_url(@order) %>
+        </li>
+        <li<%== ' class="active"' if current == "Payments" %>>
+           <%= link_to t("payments"), admin_order_payments_url(@order) %>
+        </li>
+        <li<%== ' class="active"' if current == "Shipments" %>>
+           <%= link_to t("shipments"), admin_order_shipments_url(@order) %>
+        </li>
+        <li<%== ' class="active"' if current == "Return Authorizations" %>>
+           <%= link_to t("return_authorizations"), admin_order_return_authorizations_url(@order) %>
+        </li>
+        <li<%== ' class="active"' if current == "History" %>>
+           <%= link_to t("history"), history_admin_order_url(@order) %>
+        </li>
+      <% end %>
+
+
+
+    <% end %>
+  </ul>
+
+<% end %>

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

@@ -0,0 +1,11 @@
+<% content_for :sub_menu do %>
+  <ul id="sub_nav">
+    <%= hook :admin_product_sub_tabs do %>
+      <%= tab :products, :match_path => '/products' %>
+      <%= tab :option_types, :match_path => '/option_types' %>
+      <%= tab :properties %>
+      <%= tab :prototypes %>
+      <%= tab :product_groups, :match_path => '/product_groups', :css_class => 'last' %>
+    <% end %>
+  </ul>
+<% end %>

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

@@ -0,0 +1,34 @@
+<h1><%== t("editing_product") + " &ldquo;#{@product.name}&rdquo;" %></h1>
+
+<% content_for :sidebar do %>
+
+  <h3><%= @product.name %><span class='sku'><%= @product.sku %></span></h3>
+  <br class="clear" />
+
+  <ul class="sidebar product-menu">
+    <%= hook :admin_product_tabs, {:current => current} do %>
+
+      <li<%== ' class="active"' if current == "Product Details" %>>
+        <%= link_to t("product_details"), edit_admin_product_url(@product) %>
+      </li>
+      <li<%== ' class="active"' if current == "Images" %>>
+        <%= link_to t("images"), admin_product_images_url(@product) %>
+      </li>
+      <li<%== ' class="active"' if current == "Variants" %>>
+        <%= link_to t("variants"),  admin_product_variants_url(@product)  %>
+      </li>
+      <li<%== ' class="active"' if current == "Option Types" %>>
+        <%= link_to t("option_types"), selected_admin_product_option_types_url(@product) %>
+      </li>
+      <li<%== ' class="active"' if current == "Product Properties" %>>
+        <%= link_to t("product_properties"), admin_product_product_properties_url(@product) %>
+      </li>
+      <li<%== ' class="active"' if current == "Taxons" %>>
+        <%= link_to t("taxons"), selected_admin_product_taxons_url(@product) %>
+      </li>
+
+    <% end %>
+  </ul>
+  <br class="clear" />
+
+<% end %>

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

@@ -0,0 +1,15 @@
+<%= form_for @search, :url => sales_total_admin_reports_path  do |s| %>
+    <label><%= t("date_range") %></label><br />
+    <div class="yui-g date-range-filter">
+      <div class="yui-u sub-field first">
+        <%= s.spree_date_picker :created_at_greater_than %><br />
+        <label class="sub"><%= t("start") %></label>
+      </div>
+      <div class="yui-u sub-field">
+        <%= s.spree_date_picker :created_at_less_than %><br />
+        <label><%= t("stop") %></label>
+      </div>
+    </div>
+
+    <p><%= button t("search") %></p>
+<% end %>

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

@@ -0,0 +1,5 @@
+<p class="actions">
+<%= link_to t("edit"), edit_object_url %> |
+<%= link_to t("back"), collection_url %> |
+<%= link_to t("delete"), object_url, :confirm => t('are_you_sure_you_want_to_delete_this_record'), :method => :delete %>
+</p>

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

@@ -0,0 +1,6 @@
+<%= tab :overview, :route => :admin %>
+<%= tab :orders, :payments, :creditcard_payments, :shipments, :creditcards, :return_authorizations %>
+<%= tab :products , :option_types, :properties, :prototypes, :variants, :product_properties, :taxons %>
+<%= tab :reports %>
+<%= tab :configurations, :general_settings, :mail_methods, :tax_categories, :zones, :states, :payment_methods, :inventory_settings, :taxonomies, :shipping_methods, :trackers, :label => 'configuration' %>
+<%= tab :users %>

data/app/views/admin/shared/_update_order_state.js

@@ -0,0 +1,6 @@
+$('#order_tab_summary h5#order_status').html('<%= "#{t('status')}: #{t("order_state.#{@order.state}")}" %>');
+$('#order_tab_summary h5#order_total').html('<%= "#{t('total')}: #{number_to_currency(@order.total)}" %>');
+<% if @order.completed? %>
+$('#order_tab_summary h5#payment_status').html('<%= "#{t('payment')}: #{t("payment_states.#{@order.payment_state}")}"  %>');
+$('#order_tab_summary h5#shipment_status').html('<%= "#{t('shipment')}: #{t("shipment_states.#{@order.shipment_state}")}"  %>');
+<% end %>

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

@@ -0,0 +1,77 @@
+<%- locals = {:shipment_form => shipment_form} %>
+
+<% unless @shipment.order.cart? %>
+  <%= hook :admin_shipment_form_inventory_units, locals do %>
+    <table class="index" style="width:100%;">
+      <tr>
+        <th width="130px"><%= t('include_in_shipment') %></th>
+        <th><%= t('sku') %></th>
+        <th><%= t('item_description') %></th>
+        <th><%= t('status') %></th>
+        <th><%= t('note') %></th>
+      </tr>
+
+      <% @shipment.order.inventory_units.each do |inventory_unit| %>
+        <tr>
+          <td style="text-align:center;">
+            <%= check_box_tag "inventory_units[#{inventory_unit.id}]",
+                              :true,
+                              (inventory_unit.shipment == @shipment),
+                              { :disabled => %w(shipped backordered returned).include?(inventory_unit.state),
+                                :class => 'inventory_unit'} %>
+          </td>
+          <td valign="top" width="120px;"><%= inventory_unit.variant.sku %></td>
+          <td width="300">
+            <%=inventory_unit.variant.product.name %>
+            <%= "(" + variant_options(inventory_unit.variant) + ")" unless inventory_unit.variant.option_values.empty? %>
+          </td>
+          <td><%= t(inventory_unit.state) %></td>
+          <td>
+            <% if inventory_unit.shipment == @shipment %>
+              <%= t('included_in_this_shipment') %>
+            <% elsif !inventory_unit.shipment_id.nil? %>
+              <%= t('included_in_other_shipment') %> - <%= link_to inventory_unit.shipment.number, edit_admin_order_shipment_url(inventory_unit.order, inventory_unit.shipment) %>
+            <% end %>
+          </td>
+        </tr>
+      <% end %>
+    </table>
+  <% end %>
+<% end %>
+
+<%= hook :admin_shipment_form_address, locals do %>
+  <% shipment_form.fields_for 'address' do |sa_form|  %>
+    <%= render :partial => 'admin/shared/address_form', :locals => {:f => sa_form, :name => t("shipping_address"), :use_billing => false} %>
+  <% end %>
+<% end %>
+
+<%= hook :admin_shipment_form_details, locals do %>
+  <table class="index">
+    <tr>
+      <th colspan="8"><%= t("shipment_details") %></th>
+    </tr>
+    <tr>
+      <td>
+        <%= shipment_form.label :shipping_method_id, t('shipping_method') + ":" %>
+      </td>
+      <td>
+        <%= shipment_form.select :shipping_method_id,
+                                        @shipping_methods.map {|sm| ["#{sm.name} - #{sm.zone.name}", sm.id] } %>
+      </td>
+      <td>
+        <%= shipment_form.label :tracking, t('tracking') + ":" %>
+      </td>
+      <td><%= shipment_form.text_field :tracking %></td>
+    </tr>
+    <% if Spree::Config[:shipping_instructions] %>
+      <tr>
+        <td>
+          <%= shipment_form.label :special_instructions, t('special_instructions') + ":" %>
+        </td>
+        <td colspan="3">
+            <%= shipment_form.text_area :special_instructions %>
+        </td>
+      </tr>
+    <% end %>
+  </table>
+<% end %>

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

@@ -0,0 +1,40 @@
+<div class='toolbar'>
+  <ul class='actions'>
+    <%= hook :admin_shipment_edit_buttons do %>
+      <li>
+        <% if @shipment.can_ship? %>
+          <%= button_link_to(t('ship'), fire_admin_order_shipment_path(@order, @shipment, :e => 'ship'), :method => :put, :confirm => t("are_you_sure")) %>
+        <% end %>
+      </li>
+    <% end %>
+  </ul>
+  <br class='clear' />
+</div>
+
+<%= render :partial => 'admin/shared/order_tabs', :locals => {:current => "Shipments"} %>
+
+<%= hook :admin_shipment_edit_header do %>
+  <h2><%= t('shipment') %> #<%= @shipment.number%> (<%= t(@shipment.state.to_sym, :scope => :state_names, :default => @shipment.state.to_s.humanize) %>)</h2>
+  <% if @shipment.cost %>
+    <h3><%= t('charges') %> <%= number_to_currency @shipment.cost %></h3>
+  <% end %>
+
+  <%= render "shared/error_messages", :target => @shipment %>
+<% end %>
+
+<%= hook :admin_shipment_edit_form do %>
+  <%= form_for(@shipment, :url => admin_order_shipment_path(@order, @shipment), :html => { :method => :put }) do |shipment_form| %>
+      <%= render :partial => "form", :locals => { :shipment_form => shipment_form } %>
+
+      <%= hook :admin_shipment_edit_form_buttons do %>
+        <p class="form-buttons">
+          <% if self.respond_to?(:current_user) && @shipment.editable_by?(current_user) %>
+            <%= button @order.cart? ? t('continue') : t('update') %>
+            <%= t("or") %> <%= link_to t("cancel"), admin_order_shipments_path(@order) %>
+          <% else %>
+            <%= link_to raw("&laquo; #{t("back")}"), edit_admin_order_shipment_path(@order) %>
+          <% end %>
+        </p>
+      <% end %>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,47 @@
+<div class='toolbar'>
+  <ul class='actions'>
+    <li id='new_shipment_section'>
+      <%= button_link_to t("new_shipment"), new_admin_order_shipment_url(@order), :icon => 'add'  %>
+    </li>
+  </ul>
+  <br class='clear' />
+</div>
+<%= render :partial => 'admin/shared/order_tabs', :locals => {:current => "Shipments"} %>
+<table class="index">
+  <tr>
+    <%= hook :admin_shipments_index_headers do %>
+      <th><%= t("shipment_number") %></th>
+      <th><%= t("shipping_method") %></th>
+      <th><%= t("shipping_cost") %></th>
+      <th><%= t("tracking") %></th>
+      <th><%= t("status") %></th>
+      <th><%= "#{t('spree.date')}/#{t('spree.time')}" %></th>
+    <% end %>
+    <th>
+      <%= hook :admin_shipments_index_header_actions do %>
+        <%= t("action") %>
+      <% end %>
+    </th>
+  </tr>
+  <% @shipments.each do |shipment| %>
+    <tr id="<%= dom_id shipment %>">
+      <%- locals = {:shipment => shipment} %>
+      <%= hook :admin_shipments_index_rows, locals do %>
+        <td><%= shipment.number %></td>
+        <td><%= shipment.shipping_method.name if shipment.shipping_method %></td>
+        <td><%= number_to_currency shipment.cost %></td>
+        <td><%= shipment.tracking %></td>
+        <td><%= t(shipment.state.to_sym, :scope => :state_names, :default => shipment.state.to_s.humanize) %></td>
+        <td><%= shipment.shipped_at.to_s(:date_time24) if shipment.shipped_at %></td>
+      <% end %>
+      <td class="actions">
+        <%= hook :admin_shipments_index_row_actions, locals do %>
+          <%= link_to_with_icon 'edit', t('edit'), edit_admin_order_shipment_url(@order, shipment) %>
+          <%= link_to_delete shipment, :url => admin_order_shipment_url(@order, shipment) %>
+        <% end %>
+      </td>
+    </tr>
+  <% end %>
+</table>
+
+<%= button_link_to t('continue'), admin_orders_url %>

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

@@ -0,0 +1,18 @@
+<%= render :partial => 'admin/shared/order_tabs', :locals => {:current => "Shipments"} %>
+
+<%= hook :admin_shipment_new_header do %>
+  <h1><%= t('new_shipment')%></h1>
+  <%= render "shared/error_messages", :target => @shipment %>
+<% end %>
+
+<%= hook :admin_shipment_new_form do %>
+  <%= form_for(@shipment, :url => admin_order_shipments_path(@order)) do |shipment_form| %>
+    <%= render :partial => "form", :locals => { :shipment_form => shipment_form } %>
+
+    <%= hook :admin_shipment_new_form_buttons do %>
+      <p class="form-buttons">
+        <%= button t('create') %>
+      </p>
+    <% end %>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,6 @@
+<table>
+	<tr>
+    <td><%=t("name")%>:</td>
+    <td><%= f.text_field :name, {"style" => "width:200px"} %></td>
+  </tr>
+</table>

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

@@ -0,0 +1,6 @@
+<h1><%= t("editing_shipping_category") %></h1>
+<%= render 'shared/error_messages', :target => @shipping_category %>
+<%= form_for(:shipping_category, :url => object_url, :html => { :method => :put }) do |f| %>
+  <%= render :partial => "form", :locals => { :f => f } %>
+  <%= render :partial => "admin/shared/edit_resource_links" %>
+<% end %>