spree_backend 2.0.0.rc1

data/app/views/spree/admin/images/_form.html.erb

@@ -0,0 +1,18 @@
+<div data-hook="admin_image_form_fields">
+  <div class="four columns alpha">
+    <div data-hook="file" class="field">
+      <%= f.label Spree.t(:filename) %><br>
+      <%= f.file_field :attachment %>
+    </div>
+    <div data-hook="variant" class="field">
+      <%= f.label Spree::Variant.model_name.human %><br>
+      <%= f.select :viewable_id, @variants, {}, {:class => 'select2 fullwidth'} %>
+    </div>
+  </div>
+  <div data-hook="alt_text" class="field omega five columns">
+    <%= f.label Spree.t(:alt_text) %><br>
+    <%= f.text_area :alt, :rows => 4, :class => 'fullwidth' %>
+  </div>
+</div>
+
+<div class="clear"></div>

data/app/views/spree/admin/images/edit.html.erb

@@ -0,0 +1,28 @@
+<%= render :partial => 'spree/admin/shared/product_sub_menu' %>
+
+<%= render :partial => 'spree/admin/shared/product_tabs', :locals => { :current => 'Images' } %>
+
+<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @image } %>
+
+<% content_for :page_actions do %>
+  <li><%= button_link_to Spree.t(:back_to_images_list), admin_product_images_url(@product), :icon => 'icon-arrow-left' %></li>
+<% end %>
+
+<%= form_for [:admin, @product, @image], :html => { :multipart => true } do |f| %>
+  <fieldset data-hook="edit_image">
+    <legend align="center"><%= @image.attachment_file_name%></legend>
+    <div data-hook="thumbnail" class="field alpha three columns align-center">
+      <%= f.label Spree.t(:thumbnail) %><br>
+      <%= link_to image_tag(@image.attachment.url(:small)), @image.attachment.url(:product) %>
+    </div>
+    <div class="nine columns omega">
+      <%= render :partial => 'form', :locals => { :f => f } %>  
+    </div>
+    <div class="clear"></div>
+    <div class="form-buttons filter-actions actions" data-hook="buttons">
+      <%= button Spree.t('actions.update'), 'icon-refresh' %>
+      <span class="or"><%= Spree.t(:or) %></span>
+      <%= link_to Spree.t('actions.cancel'), admin_product_images_url(@product), :id => 'cancel_link', :class => 'button icon-remove' %>
+    </div>
+  </fieldset>
+<% end %>

data/app/views/spree/admin/images/index.html.erb

@@ -0,0 +1,58 @@
+<%= render :partial => 'spree/admin/shared/product_sub_menu' %>
+
+<%= render :partial => 'spree/admin/shared/product_tabs', :locals => {:current => 'Images'} %>
+
+<% content_for :page_actions do %>
+  <li><%= link_to_with_icon('icon-plus', Spree.t(:new_image), new_admin_product_image_url(@product), :id => 'new_image_link', :class => 'button') %></li>
+<% end %>
+
+<div id="images" data-hook></div>
+
+<% unless @product.images.any? || @product.variant_images.any? %>
+  <div class="no-objects-found">
+    <%= Spree.t(:no_images_found) %>.
+  </div>
+<% else %>
+  <table class="index sortable" data-hook="images_table" data-sortable-link="<%= update_positions_admin_product_images_url(@product) %>">
+    <colgroup>
+      <col style="width: 5%">
+      <col style="width: 10%">
+      <% if @product.has_variants? %>
+        <col style="width: 25%">
+      <% end %>
+      <col style="width: 45%">
+      <col style="width: 15%">
+    </colgroup>
+    <thead>
+      <tr data-hook="images_header">
+        <th colspan="2"><%= Spree.t(:thumbnail) %></th>
+        <% if @product.has_variants? %>
+          <th><%= Spree::Variant.model_name.human %></th>
+        <% end %>
+        <th><%= Spree.t(:alt_text) %></th>
+        <th class="actions"></th>
+      </tr>
+    </thead>
+
+    <tbody>
+      <% (@product.variant_images).each do |image| %>
+        <tr id="<%= spree_dom_id image %>" data-hook="images_row" class="<%= cycle('odd', 'even')%>">
+          <td class="no-border">
+            <span class="handle"></span>
+          </td>
+          <td>
+            <%= link_to image_tag(image.attachment.url(:mini)), image.attachment.url(:product) %>
+          </td>
+          <% if @product.has_variants? %>
+            <td><%= options_text_for(image) %></td>
+          <% end %>
+          <td><%= image.alt %></td>
+          <td class="actions">
+            <%= link_to_with_icon 'icon-edit', Spree.t(:edit), edit_admin_product_image_url(@product, image), :no_text => true, :data => {:action => 'edit'} %>
+            <%= link_to_delete image, { :url => admin_product_image_url(@product, image), :no_text => true } %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% end %>

data/app/views/spree/admin/images/new.html.erb

@@ -0,0 +1,15 @@
+<%= form_for [:admin, @product, @image], :html => { :multipart => true } do |f| %>
+  <fieldset data-hook="new_image">
+    <legend align="center"><%= Spree.t(:new_image) %></legend>
+
+      <%= render :partial => 'form', :locals => { :f => f } %>
+    
+      <div class="form-buttons filter-actions actions" data-hook="buttons">
+        <%= button Spree.t('actions.update'), 'icon-refresh' %>
+        <span class="or"><%= Spree.t(:or) %></span>
+        <%= link_to_with_icon 'icon-remove', Spree.t('actions.cancel'), admin_product_images_url(@product), :id => 'cancel_link', :class => 'button' %>
+      </div>
+  </fieldset>
+<% end %>
+
+<%= javascript_include_tag 'admin/images/new.js' %>

data/app/views/spree/admin/inventory_units/adjust.html.erb

@@ -0,0 +1,31 @@
+<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @level } %>
+
+<%= form_tag do %>
+<br /><br />
+
+<h1><%= Spree.t(:inventory_adjustment) %></h1>
+
+<table class="basic-table">
+  <thead data-hook="inventory_header">
+    <tr>
+      <th><%= Spree.t(:sku) %></th>
+      <th><%= Spree.t(:product) %></th>
+      <th><%= Spree.t(:options) %></th>
+      <th><%= Spree.t(:adjustment) %></th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr data-hook="inventory_row">
+      <td><%= @variant.sku %></td>
+      <td><%= @variant.product.name %></td>
+      <td><%= variant_options @variant %></td>
+      <td>
+        <%= text_field :level, :adjustment, :class => 'quantity' %>
+      </td>
+    </tr>
+  </tbody>
+</table>
+<%= submit_tag Spree.t('actions.update') %>
+<%= Spree.t(:or) %>
+<%= link_to Spree.t('actions.cancel'), :controller => 'overview', :action => :index %>
+<% end %>

data/app/views/spree/admin/line_items/create.js.erb

@@ -0,0 +1 @@
+$("#order-form-wrapper").html('<%= escape_javascript(render :partial => "spree/admin/orders/form") %>');

data/app/views/spree/admin/line_items/destroy.js.erb

@@ -0,0 +1 @@
+$("#order-form-wrapper").html('<%= escape_javascript(render :partial => "spree/admin/orders/form") %>');

data/app/views/spree/admin/mail_methods/_form.html.erb

@@ -0,0 +1,80 @@
+<div data-hook="admin_mail_method_form_fields">
+  <div class="row">
+      
+    <div class="alpha six columns" data-hook="general">
+      <fieldset class="no-border-bottom">
+        <legend align="center"><%= Spree.t(:general) %></legend>
+
+        <div class="field">
+          <%= preference_field_tag("enable_mail_delivery", Spree::Config[:enable_mail_delivery], :type => :boolean) %>
+          <%= label_tag :enable_mail_delivery, Spree.t(:enable_mail_delivery) %>
+        </div>
+
+        <div class="field">
+          <%= label_tag :mails_from, Spree.t(:send_mails_as) %><br />
+          <%= text_field_tag :mails_from, Spree::Config[:mails_from], :maxlength => 256, :class => 'fullwidth' %>
+          <br />
+          <span class="info">
+            <%= Spree.t(:smtp_send_all_emails_as_from_following_address) %>
+          </span>
+        </div>
+
+        <div class="field">
+          <%= label_tag :mail_bcc, Spree.t(:send_copy_of_all_mails_to) %><br />
+          <%= text_field_tag :mail_bcc, Spree::Config[:mail_bcc], :maxlength => 256, :class => 'fullwidth' %>
+          <br />
+          <span class="info">
+            <%= Spree.t(:smtp_send_copy_to_this_addresses) %>
+          </span>
+        </div>
+
+        <div class="field">
+          <%= label_tag :intercept_email, Spree.t(:intercept_email_address) %><br />
+          <%= text_field_tag :intercept_email, Spree::Config[:intercept_email], :maxlength => 256, :class => 'fullwidth' %>
+          <br />
+          <span class="info">
+            <%= Spree.t(:intercept_email_instructions) %>
+          </span>
+        </div>
+      </fieldset>
+    </div>
+
+    <div class="six columns omega" data-hook="smtp">
+      <fieldset class="no-border-bottom">
+        <legend align="center"><%= Spree.t(:smtp) %></legend>
+        <div class="field">
+          <%= label_tag :mail_domain, Spree.t(:smtp_domain) %><br />
+          <%= text_field_tag :mail_domain, Spree::Config[:mail_domain], :class => 'fullwidth' %>
+        </div>
+        <div class="field">
+          <%= label_tag :mail_host, Spree.t(:smtp_mail_host) %><br />
+          <%= text_field_tag :mail_host, Spree::Config[:mail_host], :class => 'fullwidth' %>
+        </div>
+        <div class="field">
+          <%= label_tag :mail_port, Spree.t(:smtp_port) %><br />
+          <%= text_field_tag :mail_port, Spree::Config[:mail_port], :class => 'fullwidth' %>
+        </div>
+        <div class="field">
+          <%= label_tag :secure_connection_type, Spree.t(:secure_connection_type) %><br />
+          <%= select_tag(:secure_connection_type, 
+                         options_from_collection_for_select(Spree::Core::MailSettings::SECURE_CONNECTION_TYPES, :to_s, :to_s, Spree::Config[:secure_connection_type]),
+                         :class => 'select2 fullwidth') %>
+        </div>
+        <div class="field">
+          <%= label_tag :mail_auth_type, Spree.t(:smtp_authentication_type) %><br />
+          <%= select_tag(:mail_auth_type,
+                         options_from_collection_for_select(Spree::Core::MailSettings::MAIL_AUTH, :to_s, :to_s, Spree::Config[:mail_auth_type]),
+                         :class => 'select2 fullwidth') %>
+        </div>
+        <div class="field">
+          <%= label_tag :smtp_username, Spree.t(:smtp_username) %><br />
+          <%= text_field_tag :smtp_username, Spree::Config[:smtp_username], :class => 'fullwidth' %>
+        </div>
+        <div class="field">
+          <%= label_tag :preferred_smtp_password, Spree.t(:smtp_password) %><br />
+          <%= password_field_tag :smtp_password, Spree::Config[:smtp_password], :class => 'fullwidth' %>
+        </div>
+      </fieldset>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,21 @@
+<%= render :partial => 'spree/admin/shared/configuration_menu' %>
+
+<% content_for :page_title do %>
+  <%= Spree.t(:mail_method_settings) %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <li>
+    <%= link_to_with_icon 'icon-envelope-alt', Spree.t('admin.mail_methods.send_testmail'), testmail_admin_mail_method_path,
+      :method => :post, :title => Spree.t('admin.mail_methods.send_testmail'), :class => 'send_mail button no-text' %>
+  </li>
+<% end %>
+
+<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @mail_method } %>
+
+<%= form_tag admin_mail_method_path, :method => :put do |f| %>
+  <fieldset class="no-border-top">
+    <%= render :partial => 'form', :locals => { :f => f } %>
+    <div class="form-buttons filter-actions actions" data-hook="buttons"><%= button Spree.t('actions.update'), 'icon-refresh' %></div>
+  </fieldset>
+<% end %>

data/app/views/spree/admin/option_types/_form.html.erb

@@ -0,0 +1,17 @@
+<div data-hook="admin_option_type_form_fields" class="align-center row">
+  <div class="alpha eight columns">
+    <%= f.field_container :name do %>
+      <%= f.label :name, Spree.t(:name) %> <span class="required">*</span><br />
+      <%= f.text_field :name, :class => "fullwidth" %>
+      <%= f.error_message_on :name %>
+    <% end %>
+  </div>
+
+  <div class="omega eight columns">
+    <%= f.field_container :presentation do %>
+      <%= f.label :presentation, Spree.t(:presentation) %> <span class="required">*</span><br />
+      <%= f.text_field :presentation, :class => "fullwidth" %>
+      <%= f.error_message_on :presentation %>
+    <% end %>
+  </div>
+</div>

data/app/views/spree/admin/option_types/_option_value_fields.html.erb

@@ -0,0 +1,9 @@
+<tr class="option_value fields" id="spree_<%= dom_id(f.object) %>"  data-hook="option_value" class="<%= cycle('odd', 'even')%>">
+  <td class="no-border">
+    <span class="handle"></span>
+    <%= f.hidden_field :id %>
+  </td>
+  <td class="name"><%= f.text_field :name %></td>
+  <td class="presentation"><%= f.text_field :presentation %></td>
+  <td class="actions"><%= link_to_remove_fields Spree.t(:remove), f, :no_text => true %></td>
+</tr>

data/app/views/spree/admin/option_types/edit.html.erb

@@ -0,0 +1,50 @@
+<%= render :partial => 'spree/admin/shared/product_sub_menu' %>
+
+<% content_for :page_title do %>
+  <%= Spree.t(:editing_option_type) %> <span class="green">"<%= @option_type.name %>"</span>
+<% end %>
+
+<% content_for :page_actions do %>
+  <li>
+    <span id="new_add_option_value" data-hook>
+      <%= link_to_add_fields Spree.t(:add_option_value), "tbody#option_values", :class => 'button icon-plus' %>
+    </span>      
+  </li>
+  <li>
+    <%= button_link_to Spree.t(:back_to_option_types_list), spree.admin_option_types_path, :icon => 'icon-arrow-left' %>
+  </li>
+<% end %>
+
+<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @option_type } %>
+
+<%= form_for [:admin, @option_type] do |f| %>
+  <fieldset>
+    <legend align="center"><%= Spree.t(:option_values) %></legend>
+    
+    <%= render :partial => 'form', :locals => { :f => f } %>
+
+    <table class="index sortable" data-hook data-sortable-link="<%= update_values_positions_admin_option_types_url %>">
+      <thead data-hook="option_header">
+        <tr>
+          <th colspan="2"><%= Spree.t(:name) %></th>
+          <th><%= Spree.t(:display) %></th>
+          <th class="actions"></th>
+        </tr>
+      </thead>
+      <tbody id="option_values">
+        <% if @option_type.option_values.empty? %>
+          <tr id="none" data-hook="option_none" class="<%= cycle('odd', 'even')%>">
+            <td colspan="2"><%= Spree.t(:none) %></td>
+            <td class="actions"></td>
+          </tr>
+        <% else %>
+          <%= f.fields_for :option_values do |option_value_form| %>
+            <%= render :partial => 'option_value_fields', :locals => { :f => option_value_form } %>
+          <% end %>
+        <% end %>
+      </tbody>
+    </table>
+
+    <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
+  </fieldset>
+<% end %>

data/app/views/spree/admin/option_types/index.html.erb

@@ -0,0 +1,40 @@
+<% content_for :page_title do %>
+  <%= Spree.t(:option_types) %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <li id="new_ot_link">
+    <%= button_link_to Spree.t(:new_option_type), new_admin_option_type_url, { :remote => true, :icon => 'icon-plus', :id => 'new_option_type_link' } %>
+  </li>
+<% end %>
+
+<%= render :partial => 'spree/admin/shared/product_sub_menu' %>
+
+<div id="new_option_type"></div>
+
+<table class="index sortable" id="listing_option_types" data-hook data-sortable-link="<%= update_positions_admin_option_types_url %>">
+  <colgroup>
+    <col style="width: 44%">
+    <col style="width: 44%">
+    <col style="width: 12%">
+  </colgroup>
+  <thead>
+    <tr data-hook="option_header">
+      <th><%= Spree.t(:name) %></th>
+      <th><%= Spree.t(:presentation) %></th>
+      <th class="actions"></th>
+    </tr>
+  </thead>
+  <tbody>
+    <% @option_types.each do |option_type| %>
+      <tr class="spree_option_type <%= cycle('odd', 'even')%>" id="<%= spree_dom_id option_type %>" data-hook="option_row">
+        <td><span class="handle"></span> <%= option_type.name %></td>
+        <td class="presentation"><%= option_type.presentation %></td>
+        <td class="actions">
+          <%= link_to_edit(option_type, :class => 'admin_edit_option_type', :no_text => true) %>
+          <%= link_to_delete(option_type, :no_text => true) %>
+        </td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>

data/app/views/spree/admin/option_types/new.html.erb

@@ -0,0 +1,11 @@
+<%= render :partial => 'spree/admin/shared/product_sub_menu' %>
+
+<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @option_type } %>
+
+<%= form_for [:admin, @option_type] do |f| %>
+  <fieldset>
+    <legend align="center"><%= Spree.t(:new_option_type) %></legend>
+    <%= render :partial => 'form', :locals => { :f => f } %>
+    <%= render :partial => 'spree/admin/shared/new_resource_links' %>
+  </fieldset>
+<% end %>

data/app/views/spree/admin/option_types/new.js.erb

@@ -0,0 +1,2 @@
+$("#new_option_type").html('<%= escape_javascript(render :template => "spree/admin/option_types/new", :formats => [:html], :handlers => [:erb]) %>');
+$("#new_option_type_link").parent().hide();

data/app/views/spree/admin/orders/_add_product.html.erb

@@ -0,0 +1,15 @@
+<%= render :partial => "spree/admin/variants/autocomplete", :formats => :js %>
+
+<div id="add-line-item" data-hook>
+  <fieldset class="no-border-bottom">
+    <legend align="center"><%= Spree.t(:add_product) %></legend>
+
+    <div data-hook="add_product_name" class="field twelve columns alpha">
+      <%= label_tag :add_variant_id, Spree.t(:name_or_sku) %>
+      <%= hidden_field_tag :add_variant_id, "", :class => "variant_autocomplete fullwidth" %>
+    </div>
+
+  </fieldset>
+
+  <div id="stock_details"></div>
+</div>

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

@@ -0,0 +1,45 @@
+ <div data-hook="admin_order_form_fields">
+  <% if @line_item.try(:errors).present? %>
+    <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @line_item } %>
+  <% end %>
+
+  <%= render :partial => "spree/admin/orders/shipment", :collection => @order.shipments, :locals => { :order => order } %>
+  <% if order.adjustments.eligible.exists? %>
+    <fieldset class="no-border-bottom">
+      <legend><%= Spree.t('adjustments') %></legend>
+      <table>
+        <thead>
+          <th><%= Spree.t('name')%></th>
+          <th><%= Spree.t('amount')%></th>
+        </thead>
+        <tbody id="order-charges" data-hook="order_details_adjustments"  class="with-border">
+          <% order.adjustments.eligible.each do |adjustment| %>
+            <% next if ((adjustment.originator_type == 'Spree::TaxRate') and (adjustment.amount == 0)) || adjustment.originator_type == 'Spree::ShippingMethod' %>
+            <tr class="total">
+              <td><strong><%= adjustment.label %>:</strong></td>
+              <td class="total align-center"><span><%= adjustment.display_amount %></span></td>
+            </tr>
+          <% end %>
+        </tbody>
+      </table>
+    </fieldset>
+  <% end %>
+
+  <% if order.line_items.exists? %>
+    <fieldset class="no-border-bottom" id="order-total" data-hook="order_details_total">
+      <legend><%= Spree.t(:order_total) %></legend>
+      <span class="order-total"><%= order.display_total %></span>
+    </fieldset>
+  <% end %>
+
+  <%= javascript_tag do -%>
+    var order_number = '<%= @order.number %>';
+    var shipments = [];
+
+    <% @order.shipments.each do |shipment| %>
+      shipments.push(<%== shipment.to_json(:root => false, :include => :inventory_units) %>);
+    <% end %>
+
+    <%= render :partial => 'spree/admin/shared/update_order_state', :handlers => [:js] %>
+  <% end -%>
+</div>