spree_backend 2.0.0.rc1

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

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

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

@@ -0,0 +1,5 @@
+$("#new_prototype").html('<%= escape_javascript(render :template => "spree/admin/prototypes/new", :formats=>[:html], :handlers=>[:erb]) %>');
+<% unless Rails.env.test? %>
+  $('.select2').select2();
+<% end %>
+$("#new_prototype_link").parent().hide();

data/app/views/spree/admin/prototypes/select.js.erb

@@ -0,0 +1,4 @@
+<% @prototype_properties.sort_by{ |prop| -prop[:id] }.each do |prop| %>
+  $("a.spree_add_fields").click();
+  $(".product_property.fields:first input[type=text]:first").val("<%= prop.name %>");
+<% end %>

data/app/views/spree/admin/prototypes/show.html.erb

@@ -0,0 +1,42 @@
+<% if @prototype.option_types.present? %>
+  <h2>Variants</h2>
+
+  <ul class="product-prototype-options">
+    <% @prototype.option_types.each do |ot| %>
+      <li class="option-type-field">
+        <b>
+          <%= check_box_tag "option_types[]", ot.id, (params[:option_types] || []).include?(ot.id.to_s), :id => "option_type_#{ot.id}", :class => "option-type" %>
+          <%= label_tag "option_type_#{ot.id}", ot.presentation %>
+        </b>      
+        <ul class="option-type-values">
+        <% ot.option_values.each do |ov| %>
+          <li>
+            <%= check_box_tag "product[option_values_hash[#{ot.id}]][]", ov.id, params[:product] && (params[:product][:option_values_hash] || {}).values.flatten.include?(ov.id.to_s), :id => "option_value_#{ov.id}", :class => "option-value" %>
+            <%= label_tag "option_value_#{ov.id}", ov.presentation %>
+          </li>
+        <% end %>
+        </ul>
+      </li>
+    <% end %>
+  </ul>
+
+  <script type="text/javascript">
+  //<![CDATA[
+    (function($){
+
+      $("input.option-type").change(function() {
+        $(this).parents("li").find("input.option-value").attr("checked", this.checked);
+      });
+
+      $("input.option-value").change(function() {
+        var any_checked = false;
+        $(this).parents(".option-type-values").find("input.option-value").each(function(i, el) {
+          any_checked = any_checked || el.checked;
+        });
+        $(this).parents(".option-type-field").find("input.option-type").attr("checked", any_checked);
+      });
+
+    })(jQuery);
+  //]]>
+  </script>
+<% end %>

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

@@ -0,0 +1,21 @@
+<% content_for :page_title do %>
+  <%= Spree.t(:listing_reports) %>
+<% end %>
+
+<table class="index">
+  <thead>
+    <tr data-hook="reports_header">
+      <th><%= Spree.t(:name) %></th>
+      <th><%= Spree.t(:description) %></th>
+    </tr>
+  </thead>
+  <tbody>
+    <% @reports.each do |key, value| %>
+    <tr data-hook="reports_row">
+      <td><%= link_to value[:name], send("#{key}_admin_reports_url".to_sym) %></td>
+      <td><%= value[:description] %></td>
+    </tr>
+    <% end %>
+  </tbody>
+</table>
+

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

@@ -0,0 +1,37 @@
+<% content_for :page_title do %>
+  <%= Spree.t(:sales_totals) %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <li><%= link_to_with_icon 'icon-arrow-left', Spree.t(:back_to_reports_list), spree.admin_reports_url, :class => 'button' %></li>
+<% end %>
+
+
+<% content_for :table_filter_title do %>
+  <%= Spree.t(:date_range) %>
+<% end %>
+
+<% content_for :table_filter do %>
+  <%= render :partial => 'spree/admin/shared/report_criteria', :locals => {} %>
+<% end %>
+
+<table class="admin-report" data-hook="sales_total">
+  <thead>
+    <tr>
+      <th><%= Spree.t(:currency) %></th>
+      <th><%= Spree.t(:item_total) %></th>
+      <th><%= Spree.t(:adjustment_total) %></th>
+      <th><%= Spree.t(:sales_total) %></th>
+    </tr>
+  </thead>
+  <tbody>
+    <% @totals.each do |key, row| %>
+      <tr class="align-center">
+        <td><%= key %></td>
+        <td><%= row[:item_total].format %></td>
+        <td><%= row[:adjustment_total].format %></td>
+        <td><%= row[:sales_total].format %></td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>

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

@@ -0,0 +1,78 @@
+<div data-hook="admin_return_authorization_form_fields">
+  <table class="index">
+    <thead>
+      <tr data-hook="rma_header">
+        <th><%= Spree.t(:product) %></th>
+        <th><%= Spree.t(:quantity_shipped) %></th>
+        <th><%= Spree.t(:quantity_returned) %></th>
+        <th><%= Spree.t(:return_quantity) %></th>
+      </tr>
+    </thead>
+    <tbody>
+      <% @return_authorization.order.shipments.shipped.collect{|s| s.inventory_units.all}.flatten.group_by(&:variant).each do | variant, units| %>
+        <tr id="<%= dom_id(variant) %>" data-hook="rma_row" class="<%= cycle('odd', 'even')%>">
+          <td>
+            <div class="variant-name"><%= variant.name %></div>
+            <div class="variant-options"><%= variant.options_text %></div>
+          </td>
+          <td class="align-center"><%= units.select(&:shipped?).size %></td>
+          <td class="align-center"><%= units.select(&:returned?).size %></td>
+          <td class="return_quantity align-center">
+            <% if @return_authorization.received? %>
+              <%= @return_authorization.inventory_units.group_by(&:variant)[variant].try(:size) || 0 %>
+            <% elsif units.select(&:shipped?).empty? %>
+              0
+            <% else %>
+              <%= number_field_tag "return_quantity[#{variant.id}]",
+                @return_authorization.inventory_units.group_by(&:variant)[variant].try(:size) || 0, {:style => 'width:100px;', :min => 0} %>
+            <% end %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+
+  <%= f.field_container :amount do %>
+    <%= f.label :amount, Spree.t(:amount) %> <span class="required">*</span><br />
+    <% if @return_authorization.received? %>
+      <%= @return_authorization.display_amount %>
+    <% else %>
+      <%= f.text_field :amount, {:style => 'width:80px;'} %> <%= Spree.t(:rma_value) %>: <span id="rma_value">0.00</span>
+      <%= f.error_message_on :amount %>
+    <% end %>
+  <% end %>
+
+  <%= f.field_container :reason do %>
+    <%= f.label :reason, Spree.t(:reason) %>
+    <%= f.text_area :reason, {:style => 'height:100px;', :class => 'fullwidth'} %>
+    <%= f.error_message_on :reason %>
+  <% end %>
+
+  <%= f.field_container :stock_location do %>
+    <%= f.label :stock_location, Spree.t(:stock_location) %>
+    <%= f.select :stock_location_id, Spree::StockLocation.active.all.collect{|l|[l.name, l.id]}, {:style => 'height:100px;', :class => 'fullwidth'} %>
+    <%= f.error_message_on :reason %>
+  <% end %>
+</div>
+
+<script>
+  var line_item_prices = {};
+  <% @return_authorization.order.line_items.group_by(&:variant).each do | variant, items| %>
+    line_item_prices[<%= variant.id.to_s %>] = <%= items.first.price %>;
+  <% end %>
+
+  $(document).ready(function(){
+    var rma_amount = 0;
+    $("td.return_quantity input").on('change', function() {
+      var rma_amount = 0;
+      $.each($("td.return_quantity input"), function(i, input) {
+        var variant_id = $(input).attr('id').replace("return_quantity_", "");
+         rma_amount += line_item_prices[variant_id] * $(input).val()
+      });
+
+      if(!isNaN(rma_amount)){
+        $("span#rma_value").html(rma_amount.toFixed(2));
+      }
+    })
+  });
+</script>

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

@@ -0,0 +1,32 @@
+<% content_for :page_actions do %>
+  <li>
+    <% if @return_authorization.can_receive? %>
+      <%= button_link_to Spree.t(:receive), fire_admin_order_return_authorization_url(@order, @return_authorization, :e => 'receive'), :method => :put, :data => { :confirm => Spree.t(:are_you_sure) }, :icon => 'icon-download-alt' %>
+    <% end %>
+  </li>
+  <li>
+    <% if @return_authorization.can_cancel? %>
+      <%= button_link_to Spree.t('actions.cancel'), fire_admin_order_return_authorization_url(@order, @return_authorization, :e => 'cancel'), :method => :put, :data => { :confirm => Spree.t(:are_you_sure) }, :icon => 'icon-remove' %>
+    <% end %>
+  </li>
+<% end %>
+
+<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Return Authorizations' } %>
+
+<% content_for :page_title do %>
+  <i class="icon-arrow-right"></i> <%= Spree.t(:return_authorization) %> <%= @return_authorization.number %> (<%= Spree.t(@return_authorization.state.downcase) %>)
+<% end %>
+
+
+<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @return_authorization } %>
+<%= form_for [:admin, @order, @return_authorization] 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-repeat' %>
+      <span class="or"><%= Spree.t(:or) %></span>
+      <%= button_link_to Spree.t('actions.cancel'), admin_order_return_authorizations_url(@order), :icon => 'icon-remove' %>
+    </div>
+  </fieldset>
+<% end %>

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

@@ -0,0 +1,52 @@
+<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Return Authorizations' } %>
+
+<% content_for :page_actions do %>
+  <% if @order.shipments.any? &:shipped? %>
+    <li>
+      <%= button_link_to Spree.t(:new_return_authorization), new_admin_order_return_authorization_url(@order), :icon => 'icon-plus' %>
+    </li>
+  <% end %>
+  <li><%= button_link_to Spree.t(:back_to_orders_list), spree.admin_orders_path, :icon => 'icon-arrow-left' %></li>
+<% end %>
+
+<% content_for :page_title do %>
+  <i class="icon-arrow-right"></i> <%= Spree.t(:return_authorizations) %>
+<% end %>
+
+<% if @order.shipments.any?(&:shipped?) || @order.return_authorizations.any? %>
+  <table class="index">
+    <thead data-hook="rma_header">
+      <tr>
+        <th><%= Spree.t(:rma_number) %></th>
+        <th><%= Spree.t(:status) %></th>
+        <th><%= Spree.t(:amount) %></th>
+        <th><%= "#{Spree.t('date')}/#{Spree.t('time')}" %></th>
+        <th class="actions"></th>
+      </tr>
+    </thead>
+    <tbody>
+      <% @return_authorizations.each do |return_authorization| %>
+        <tr id="<%= spree_dom_id(return_authorization) %>" data-hook="rma_row" class="<%= cycle('odd', 'even')%>">
+          <td><%= return_authorization.number %></td>
+          <td><%= Spree.t(return_authorization.state.downcase) %></td>
+          <td><%= return_authorization.display_amount.to_html %></td>
+          <td><%= pretty_time(return_authorization.created_at) %></td>
+          <td class="actions">
+            <%= link_to_edit return_authorization, :no_text => true, :class => 'edit' %>
+            <% unless return_authorization.received? %>
+              &nbsp;
+              <%= link_to_delete return_authorization, :no_text => true %>
+            <% end %>
+          </td>
+
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% else %>
+  <div data-hook="rma_cannont_create" class="no-objects-found">
+    <%= Spree.t(:cannot_create_returns) %>
+  </div>
+<% end %>
+
+<%= button_link_to Spree.t(:continue), admin_orders_url, :icon => 'icon-arrow-right' %>

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

@@ -0,0 +1,22 @@
+<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Return Authorizations' } %>
+
+<% content_for :page_title do %>
+  <i class="icon-arrow-right"></i> <%= Spree.t(:new_return_authorization) %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <li><%= button_link_to Spree.t(:back_to_return_authorizations_list), spree.admin_order_return_authorizations_url, :icon => 'icon-arrow-left' %></li>
+<% end %>
+
+<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @return_authorization } %>
+<%= form_for [:admin, @order, @return_authorization] 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(:continue), 'icon-arrow-right' %>
+      <span class="or"><%= Spree.t(:or) %></span>
+      <%= button_link_to Spree.t('actions.cancel'), admin_order_return_authorizations_url(@order), :icon => 'icon-remove' %>
+    </div>
+  </fieldset>
+<% end %>

data/app/views/spree/admin/search/users.rabl

@@ -0,0 +1,30 @@
+collection(@users)
+attributes :email, :id
+address_fields = [:firstname, :lastname,
+                  :address1, :address2,
+                  :city, :zipcode,
+                  :phone, :state_name,
+                  :state_id, :country_id,
+                  :company]
+
+child :ship_address => :ship_address do
+  attributes *address_fields
+  child :state do
+    attributes :name
+  end
+
+  child :country do
+    attributes :name
+  end
+end
+
+child :bill_address => :bill_address do
+  attributes *address_fields
+  child :state do
+    attributes :name
+  end
+
+  child :country do
+    attributes :name
+  end
+end

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

@@ -0,0 +1,6 @@
+<div data-hook="address">
+  <%="#{address.firstname} #{address.lastname} "%><%= address.company unless address.company.blank? %>
+  <%="(#{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}" %>
+</div>

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

@@ -0,0 +1,72 @@
+<% if use_billing %>
+  <div class="field" style="position: absolute;margin-top: -15px;right: 0;">
+    <span data-hook="use_billing">
+      <%= check_box_tag 'order[use_billing]', '1', (!(@order.bill_address.empty? && @order.ship_address.empty?) && @order.bill_address.same_as?(@order.ship_address)) %>
+      <%= label_tag 'order[use_billing]', Spree.t(:use_billing_address) %>
+    </span>
+  </div>
+<% end %>
+
+<% is_shipping_address = name == Spree.t(:shipping_address) %>
+<% shipping_or_billing = is_shipping_address ? 'shipping' : 'billing' %>
+<% s_or_b = is_shipping_address ? 's' : 'b' %>
+
+<div id="<%= is_shipping_address ? 'shipping' : 'billing' %>" style="display: <%= (use_billing && (!(@order.bill_address.empty? && @order.ship_address.empty?) && @order.bill_address.eql?(@order.ship_address))) ? 'none' : 'block' %>" data-hook="address_fields">
+  <div class="field <%= "#{shipping_or_billing}-row" %>">
+    <%= f.label :firstname, Spree.t(:first_name) + ':' %>
+    <%= f.text_field :firstname, :class => 'fullwidth' %>
+  </div>
+  <div class="field <%= "#{shipping_or_billing}-row" %>">
+    <%= f.label :lastname, Spree.t(:last_name) + ':' %>
+    <%= f.text_field :lastname, :class => 'fullwidth' %>
+  </div>
+  <% if Spree::Config[:company] %>
+    <div class="field <%= "#{shipping_or_billing}-row" %>">
+      <%= f.label :company, Spree.t(:company) + ':' %>
+      <%= f.text_field :company, :class => 'fullwidth' %>
+    </div>
+  <% end %>
+  <div class="field <%= "#{shipping_or_billing}-row" %>">
+    <%= f.label :address1, Spree.t(:street_address) + ':' %>
+    <%= f.text_field :address1, :class => 'fullwidth' %>
+  </div>
+  <div class="field <%= "#{shipping_or_billing}-row" %>">
+    <%= f.label :address2, Spree.t(:street_address_2) + ':' %>
+    <%= f.text_field :address2, :class => 'fullwidth' %>
+  </div>
+  <div class="field <%= "#{shipping_or_billing}-row" %>">
+    <%= f.label :city, Spree.t(:city) + ':' %>
+    <%= f.text_field :city, :class => 'fullwidth' %>
+  </div>
+  <div class="field <%= "#{shipping_or_billing}-row" %>">
+    <%= f.label :zipcode, Spree.t(:zip) + ':' %>
+    <%= f.text_field :zipcode, :class => 'fullwidth' %>
+  </div>
+  <div class="field <%= "#{shipping_or_billing}-row" %>">
+    <%= f.label :country_id, Spree.t(:country) + ':' %>
+    <span id="<%= s_or_b %>country">
+      <%= f.collection_select :country_id, available_countries, :id, :name, {}, {:class => 'select2 fullwidth'} %>
+    </span>
+  </div>
+  <div class="field <%= "#{shipping_or_billing}-row" %>">
+    <%= f.label :state_id, Spree.t(:state) + ':' %>
+    <span id="<%= s_or_b %>state">
+      <%= f.text_field :state_name, 
+            :style => "display: #{f.object.country.states.empty? ? 'block' : 'none' };",
+           :disabled => !f.object.country.states.empty?, :class => 'fullwidth state_name' %>
+      <%= f.collection_select :state_id, f.object.country.states.sort, :id, :name, {:include_blank => true}, {:class => 'select2 fullwidth', :style => "display: #{f.object.country.states.empty? ? 'none' : 'block' };", :disabled => f.object.country.states.empty?} %>
+    </span>
+  </div>
+  <div class="field <%= "#{shipping_or_billing}-row" %>">
+    <%= f.label :phone, Spree.t(:phone) + ':' %>
+    <%= f.phone_field :phone, :class => 'fullwidth' %>
+  </div>
+</div>
+
+<% content_for :head do %>
+  <%= javascript_tag do -%>
+    $(document).ready(function(){
+      $('span#<%= s_or_b %>country .select2').on('change', function() { update_state('<%= s_or_b %>'); });
+    });
+  <% end -%>
+<% end %>

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

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

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

@@ -0,0 +1,22 @@
+<fieldset id="calculator_fields" data-hook class="no-border-bottom">
+  <legend align="center"><%= Spree.t(:calculator) %></legend>
+
+  <div id="preference-settings" data-hook>
+    <div class="field">
+      <%= f.label(:calculator_type, Spree.t(:calculator), :for => 'calc_type') %>
+      <%= f.select(:calculator_type, @calculators.map { |c| [c.description, c.name] }, {}, {:id => 'calc_type', :class => 'select2 fullwidth'}) %>
+    </div>
+    <% if !@object.new_record? %>
+      <div class="field">
+        <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) %>
+          <span class="calculator-settings-warning info warning"><%= Spree.t(:calculator_settings_warning) %></span>
+        <% end %>
+      </div>
+    <% end %>
+  </div>
+</fieldset>