spree_backend 2.1.12 → 2.2.0

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

@@ -6,12 +6,7 @@
         <%= f.label :name %>
         <%= f.text_field :name, :class => 'fullwidth' %>
       <% end %>
-
-      <%= f.field_container :event_name do %>
-        <%= f.label :event_name %>
-        <%= f.select :event_name, @event_names, {}, {:class => 'select2 fullwidth'} %>
-      <% end %>
-
+      
       <%= f.field_container :code do %>
         <%= f.label :code %>
         <%= f.text_field :code, :class => 'fullwidth' %>

data/app/views/spree/admin/promotions/actions/_create_item_adjustments.html.erb

@@ -0,0 +1,26 @@
+<div class="calculator-fields row">
+
+  <div class="field alpha four columns">
+    <% field_name = "#{param_prefix}[calculator_type]" %>
+    <%= label_tag field_name, Spree.t(:calculator) %>
+    <%= select_tag field_name,
+                   options_from_collection_for_select(Spree::Promotion::Actions::CreateItemAdjustments.calculators, :to_s, :description, promotion_action.calculator.type),
+                   :class => 'type-select select2 fullwidth' %>
+    <% if promotion_action.calculator.respond_to?(:preferences) %>
+      <span class="warning info"><%= Spree.t(:calculator_settings_warning) %></span>
+    <% end %>
+  </div>
+
+  <% unless promotion_action.new_record? %>
+    <div class="settings field omega four columns">
+      <% promotion_action.calculator.preferences.keys.map do |key| %>
+        <% field_name = "#{param_prefix}[calculator_attributes][preferred_#{key}]" %>
+        <%= label_tag field_name, Spree.t(key.to_s) %>
+        <%= preference_field_tag(field_name,
+                                 promotion_action.calculator.get_preference(key),
+                                 :type => promotion_action.calculator.preference_type(key)) %>
+      <% end %>
+      <%= hidden_field_tag "#{param_prefix}[calculator_attributes][id]", promotion_action.calculator.id %>
+    </div>
+  <% end %>
+</div>

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

@@ -13,9 +13,10 @@
     <colgroup>
       <col style="width: 20%">
       <col style="width: 10%">
-      <col style="width: 35%">
+      <col style="width: 30%">
+      <col style="width: 10%">
+      <col style="width: 10%">
       <col style="width: 10%">
-      <col style="width: 15%">
       <col style="width: 10%">
     </colgroup>
     <thead>
@@ -24,6 +25,7 @@
         <th><%= Spree.t(:code) %></th>
         <th><%= Spree.t(:description) %></th>
         <th><%= Spree.t(:usage_limit) %></th>
+        <th><%= Spree.t(:promotion_uses) %></th>
         <th><%= Spree.t(:expiration) %></th>
         <th class="actions"></th>
       </tr>
@@ -34,7 +36,8 @@
           <td><%= promotion.name %></td>
           <td class="align-center"><%= promotion.code %></td>
           <td><%= promotion.description %></td>
-          <td class="align-center"><%= promotion.usage_limit %></td>
+          <td class="align-center"><%= promotion.usage_limit.nil? ? "∞" : promotion.usage_limit  %></td>
+          <td class="align-center"><%= Spree.t(:current_promotion_usage, :count => promotion.credits_count) %></td>
           <td class="align-center"><%= promotion.expires_at.to_date.to_s(:short_date) if promotion.expires_at %></td>
           <td class="actions">
             <%= link_to_edit promotion, :no_text => true %>

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

@@ -11,7 +11,7 @@
     <div id='properties' data-hook>
       <%= f.field_container :property_ids do %>
         <%= f.label :property_ids, Spree.t(:properties) %><br>
-        <%= f.select :property_ids, Spree::Property.all.map { |p| ["#{p.presentation} (#{p.name})", p.id] }, {}, { :multiple => true, :class => "select2 fullwidth" } %>
+        <%= f.select :property_ids, Spree::Property.all.map { |p| [p.presentation, p.id] }, {}, { :multiple => true, :class => "select2 fullwidth" } %>
       <% end %>
     </div>
   </div>
@@ -19,7 +19,7 @@
   <div class="six columns omega">
     <%= f.field_container :option_type_ids do %>
       <%= f.label :option_type_ids, Spree.t(:option_types) %><br>
-      <%= f.select :option_type_ids, Spree::OptionType.all.map { |ot| ["#{ot.presentation} (#{ot.name})", ot.id] }, {}, { :multiple => true, :class => "select2 fullwidth" } %>
+      <%= f.select :option_type_ids, Spree::OptionType.all.map { |ot| [ot.presentation, ot.id] }, {}, { :multiple => true, :class => "select2 fullwidth" } %>
     <% end %>
   </div>
 </div>

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

@@ -25,7 +25,7 @@
     (function($){
 
       $("input.option-type").change(function() {
-        $(this).parents("li").find("input.option-value").attr("checked", this.checked);
+        $(this).parents("li").find("input.option-value").prop("checked", this.checked);
       });
 
       $("input.option-value").change(function() {
@@ -33,7 +33,7 @@
         $(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);
+        $(this).parents(".option-type-field").find("input.option-type").prop("checked", any_checked);
       });
 
     })(jQuery);

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

@@ -66,7 +66,7 @@
     $("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_", "");
+        var variant_id = $(input).prop('id').replace("return_quantity_", "");
          rma_amount += line_item_prices[variant_id] * $(input).val()
       });
 

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

@@ -9,7 +9,6 @@
       <% if Spree::Config[:override_actionmailer_config] %>
         <%= configurations_sidebar_menu_item Spree.t(:mail_method_settings), edit_admin_mail_method_path %>
       <% end %>
-      <%= configurations_sidebar_menu_item Spree.t(:image_settings), edit_admin_image_settings_path %>
       <%= configurations_sidebar_menu_item Spree.t(:tax_categories), admin_tax_categories_path %>
       <%= configurations_sidebar_menu_item Spree.t(:tax_rates), admin_tax_rates_path %>
       <%= configurations_sidebar_menu_item Spree.t(:tax_settings), edit_admin_tax_settings_path %>

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

@@ -14,9 +14,9 @@
 <!-- Get "Open Sans" font from Google -->
 <link href='//fonts.googleapis.com/css?family=Open+Sans:400italic,600italic,400,600&subset=latin,cyrillic,greek,vietnamese' rel='stylesheet' type='text/css'>
 
-<%= stylesheet_link_tag 'admin/all' %>
+<%= stylesheet_link_tag 'spree/backend/all' %>
 
-<%= javascript_include_tag 'admin/all' %>
+<%= javascript_include_tag 'spree/backend/all' %>
 
 <%= render "spree/admin/shared/translations" %>
 <%= render "spree/admin/shared/routes" %>

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

@@ -0,0 +1,35 @@
+<nav class="menu">
+  <ul data-hook="admin_order_tabs">
+    <% if can? :update, @order %>
+      <li<%== ' class="active"' if current == 'Order Details' %>>
+        <%= link_to_with_icon 'icon-edit', Spree.t(:order_details), edit_admin_order_url(@order) %>
+      </li>
+    <% end %>
+
+    <% if can?(:update, @order) && checkout_steps.include?("address") %>
+      <li<%== ' class="active"' if current == 'Customer Details' %>>
+        <%= link_to_with_icon 'icon-user', Spree.t(:customer_details), admin_order_customer_url(@order) %>
+      </li>
+    <% end %>
+
+    <% if can? :index, Spree::Adjustment %>
+      <li<%== ' class="active"' if current == 'Adjustments' %>>
+        <%= link_to_with_icon 'icon-cogs', Spree.t(:adjustments), admin_order_adjustments_url(@order) %>
+      </li>
+    <% end %>
+
+    <% if can?(:index, Spree::Payment) %>
+      <li<%== ' class="active"' if current == 'Payments' %>>
+        <%= link_to_with_icon 'icon-credit-card', Spree.t(:payments), admin_order_payments_url(@order) %>
+      </li>
+    <% end %>
+
+    <% if can? :index, Spree::ReturnAuthorization %>
+      <% if @order.completed? %>
+        <li<%== ' class="active"' if current == 'Return Authorizations' %>>
+          <%= link_to_with_icon 'icon-share-alt', Spree.t(:return_authorizations), admin_order_return_authorizations_url(@order) %>
+        </li>
+      <% end %>
+    <% end %>
+  </ul>
+</nav>

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

@@ -0,0 +1,41 @@
+<header id="order_tab_summary" data-hook>
+  <dl class="additional-info">
+    <dt id="order_status" data-hook><%= Spree.t(:status) %>:</dt>
+    <dd><span class="state <%= @order.state %>"><%= Spree.t(@order.state, :scope => :order_state) %></span></dd>
+    <dt data-hook><%= Spree.t(:subtotal) %>:</dt>
+    <dd id='item_total'><%= @order.display_item_total.to_html %></dd>
+    <% if checkout_steps.include?("delivery") && @order.ship_total > 0 %>
+      <dt data-hook><%= Spree.t(:ship_total) %>:</dt>
+      <dd id='item_total'><%= @order.display_ship_total.to_html %></dd>
+    <% end %>
+
+    <% if @order.included_tax_total != 0 %>
+      <dt data-hook><%= Spree.t(:tax_included) %>:</dt>
+      <dd id='included_tax_total'><%= @order.display_included_tax_total.to_html %></dd>
+    <% end %>
+
+    <% if @order.additional_tax_total != 0 %>
+      <dt data-hook><%= Spree.t(:tax) %>:</dt>
+      <dd id='item_total'><%= @order.display_additional_tax_total.to_html %></dd>
+    <% end %>
+
+    <dt data-hook><%= Spree.t(:total) %>:</dt>
+    <dd id='order_total'><%= @order.display_total.to_html %></dd>
+
+    <% if @order.completed? %>
+      <dt><%= Spree.t(:shipment) %>: </dt>
+      <dd id='shipment_status'><span class="state <%= @order.shipment_state %>"><%= Spree.t(@order.shipment_state, :scope => :shipment_states, :default => [:missing, "none"]) %></span></dd>
+      <dt><%= Spree.t(:payment) %>: </dt>
+      <dd id='payment_status'><span class="state <%= @order.payment_state %>"><%= Spree.t(@order.payment_state, :scope => :payment_states, :default => [:missing, "none"]) %></span></dd>
+      <dt data-hook><%= Spree.t(:date_completed) %>:</dt>
+      <dd id='date_complete'><%= pretty_time(@order.completed_at) %></dd>
+    <% end %>
+
+    <% if @order.approved? %>
+      <dt><%= Spree.t(:approver) %></dt>
+      <dd><%= @order.approver.email %></dd>
+      <dt><%= Spree.t(:approved_at) %></dt>
+      <dd><%= pretty_time(@order.approved_at) %></dd>
+    <% end %>
+  </dl>
+</header>

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

@@ -7,69 +7,6 @@
 <% end %>
 
 <% content_for :sidebar do %>
-  <% checkout_steps = @order.checkout_steps %>
-  <header id="order_tab_summary" data-hook>
-    <dl class="additional-info">
-      <dt id="order_status" data-hook><%= Spree.t(:status) %>:</dt>
-      <dd><span class="state <%= @order.state %>"><%= Spree.t(@order.state, :scope => :order_state) %></span></dd>
-      <dt data-hook><%= Spree.t(:item_total) %>:</dt>
-      <dd id='item_total'><%= @order.display_item_total.to_html %></dd>
-      <% if checkout_steps.include?("delivery") && @order.ship_total > 0 %>
-        <dt data-hook><%= Spree.t(:ship_total) %>:</dt>
-        <dd id='item_total'><%= @order.display_ship_total.to_html %></dd>
-      <% end %>
-
-      <% if @order.tax_total > 0 %>
-        <dt data-hook><%= Spree.t(:tax_total) %>:</dt>
-        <dd id='item_total'><%= @order.display_tax_total.to_html %></dd>
-      <% end %>
-
-      <dt data-hook><%= Spree.t(:total) %>:</dt>
-      <dd id='order_total'><%= @order.display_total.to_html %></dd>
-
-
-      <% if @order.completed? %>
-        <dt><%= Spree.t(:shipment) %>: </dt>
-        <dd id='shipment_status'><span class="state <%= @order.shipment_state %>"><%= Spree.t(@order.shipment_state, :scope => :shipment_states, :default => [:missing, "none"]) %></span></dd>
-        <dt><%= Spree.t(:payment) %>: </dt>
-        <dd id='payment_status'><span class="state <%= @order.payment_state %>"><%= Spree.t(@order.payment_state, :scope => :payment_states, :default => [:missing, "none"]) %></span></dd>
-        <dt data-hook><%= Spree.t(:date_completed) %>:</dt>
-        <dd id='date_complete'><%= pretty_time(@order.completed_at) %></dd>
-      <% end %>
-    </dl>
-  </header>
-
-  <nav class="menu">
-    <ul data-hook="admin_order_tabs">
-
-      <% if can? :update, @order %>
-        <li<%== ' class="active"' if current == 'Order Details' %>>
-          <%= link_to_with_icon 'icon-edit', Spree.t(:order_details), edit_admin_order_url(@order) %>
-        </li>
-      <% end %>
-      <% if can? :update, @order && checkout_steps.include?("address") %>
-        <li<%== ' class="active"' if current == 'Customer Details' %>>
-          <%= link_to_with_icon 'icon-user', Spree.t(:customer_details), admin_order_customer_url(@order) %>
-        </li>
-      <% end %>
-      <% if can? :index, Spree::Adjustment %>
-        <li<%== ' class="active"' if current == 'Adjustments' %>>
-          <%= link_to_with_icon 'icon-cogs', Spree.t(:adjustments), admin_order_adjustments_url(@order) %>
-        </li>
-      <% end %>
-      <% if can? :index, Spree::Payment && @payment_required %>
-        <li<%== ' class="active"' if current == 'Payments' %>>
-          <%= link_to_with_icon 'icon-credit-card', Spree.t(:payments), admin_order_payments_url(@order) %>
-        </li>
-      <% end %>
-      <% if can? :index, Spree::ReturnAuthorization %>
-        <% if @order.completed? %>
-          <li<%== ' class="active"' if current == 'Return Authorizations' %>>
-            <%= link_to_with_icon 'icon-share-alt', Spree.t(:return_authorizations), admin_order_return_authorizations_url(@order) %>
-          </li>
-        <% end %>
-      <% end %>
-    </ul>
-  </nav>
-
+  <%= render "spree/admin/shared/order_summary", checkout_steps: @order.checkout_steps %>
+  <%= render "spree/admin/shared/order_submenu", current: current, checkout_steps: @order.checkout_steps %>
 <% end %>

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

@@ -4,5 +4,7 @@
     <%= tab :option_types, :match_path => '/option_types' %>
     <%= tab :properties %>
     <%= tab :prototypes %>
+    <%= tab :taxonomies %>
+    <%= tab :taxons %>
   </ul>
 <% end %>

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

@@ -9,6 +9,8 @@
   Spree.routes.checkouts_api = "<%= spree.api_checkouts_url(:format => 'json') %>";
   Spree.routes.stock_locations_api = "<%= spree.api_stock_locations_url(:format => 'json') %>";
   Spree.routes.variants_api = "<%= spree.api_variants_url(:format => 'json') %>";
+  Spree.routes.classifications_api = "<%= spree.api_classifications_url(:format => 'json') %>";
+  Spree.routes.taxon_products_api = "<%= spree.api_taxon_products_url(:format => 'json') %>";
   Spree.routes.payments_api = "<%= spree.api_order_payments_url(:format => 'json') if params[:order_id] %>";
   Spree.routes.stock_items_api = "<%= spree.api_stock_location_stock_items_url(:format => 'json') if params[:stock_location_id] %>";
 </script>

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

@@ -2,12 +2,12 @@
   <%= tab :orders, :payments, :creditcard_payments, :shipments, :credit_cards, :return_authorizations, :icon => 'icon-shopping-cart' %>
 <% end %>
 <% if can? :admin, Spree::Product %>
-  <%= tab :products, :option_types, :properties, :prototypes, :variants, :product_properties, :icon => 'icon-th-large' %>
+  <%= tab :products, :option_types, :properties, :prototypes, :variants, :product_properties, :taxonomies, :icon => 'icon-th-large' %>
 <% end %>
 <% if can? :admin, Spree::Admin::ReportsController %>
   <%= tab :reports, :icon => 'icon-file'  %>
 <% end %>
-<%= tab :configurations, :general_settings, :mail_methods, :image_settings, :tax_categories, :tax_rates, :tax_settings, :zones, :countries, :states, :payment_methods, :taxonomies, :shipping_methods, :shipping_categories, :stock_transfers, :stock_locations, :trackers, :label => 'configuration', :icon => 'icon-wrench', :url => spree.edit_admin_general_settings_path %>
+<%= tab :configurations, :general_settings, :mail_methods, :tax_categories, :tax_rates, :tax_settings, :zones, :countries, :states, :payment_methods, :shipping_methods, :shipping_categories, :stock_transfers, :stock_locations, :trackers, :label => 'configuration', :icon => 'icon-wrench', :url => spree.edit_admin_general_settings_path %>
 <% if can? :admin, Spree::Promotion %>
   <%= tab(:promotions, :url => spree.admin_promotions_path, :icon => 'icon-bullhorn') %>
-<% end %>
+<% end %>

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

@@ -17,6 +17,7 @@
     :first_day                => Spree.t(:first_day,
                                          :scope => 'date_picker',
                                          :default => 0).to_i,
+    :find_a_taxon             => Spree.t(:find_a_taxon),
     :loading                  => Spree.t(:loading),
     :month_names              => I18n.t(:month_names, :scope => :date).reject(&:blank?),
     :more                     => Spree.t(:more),
@@ -35,6 +36,7 @@
     :variant_placeholder      => Spree.t(:variant_placeholder),
     :value                    => Spree.t(:value),
     :currency_separator       => I18n.t('number.currency.format.separator'),
+
   }.to_json
 %>
 </script>

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

@@ -1,5 +1,5 @@
 <div data-hook="admin_shipping_method_form_fields" class="alpha twelve columns">
-  <div data-hook="admin_shipping_method_form_name_field" class="alpha six columns">
+  <div class="alpha six columns">
     <%= f.field_container :name do %>
       <%= f.label :name, Spree.t(:name) %><br />
       <%= f.text_field :name, :class => 'fullwidth' %>
@@ -7,7 +7,7 @@
     <% end %>
   </div>
 
-  <div data-hook="admin_shipping_method_form_display_field" class="omega six columns">
+  <div class="omega six columns">
     <%= f.field_container :display_on do %>
       <%= f.label :display_on, Spree.t(:display) %><br />
       <%= select(:shipping_method, :display_on, Spree::ShippingMethod::DISPLAY.collect { |display| [Spree.t(display), display == :both ? nil : display.to_s] }, {}, {:class => 'select2 fullwidth'}) %>
@@ -16,7 +16,7 @@
   </div>
 
   <div class="alpha omega twelve columns">
-    <div data-hook="admin_shipping_method_form_internal_name_field" class="alpha six columns">
+    <div class="alpha six columns">
       <%= f.field_container :admin_name do %>
         <%= f.label :admin_name, Spree.t(:internal_name) %><br />
         <%= f.text_field :admin_name, :class => 'fullwidth', :label => false  %>
@@ -25,7 +25,7 @@
     </div>
   </div>
 
-  <div data-hook="admin_shipping_method_form_tracking_url_field" class="alpha twelve columns">
+  <div class="alpha twelve columns">
     <%= f.field_container :tracking_url do %>
       <%= f.label :tracking_url, Spree.t(:tracking_url) %><br />
       <%= f.text_field :tracking_url, :class => 'fullwidth', :placeholder => Spree.t(:tracking_url_placeholder) %>
@@ -37,7 +37,7 @@
 <div class="alpha six columns">
   <div data-hook="admin_shipping_method_form_availability_fields" class="alpha six columns">
     <fieldset class="categories no-border-bottom">
-      <legend align="center"><%= Spree.t(:categories) %></legend>
+      <legend align="center"><%= Spree.t(:shipping_categories) %></legend>
           <%= f.field_container :categories do %>
         <% Spree::ShippingCategory.all.each do |category| %>
           <%= label_tag do %>
@@ -54,10 +54,9 @@
     <fieldset class="no-border-bottom">
       <legend align="center"><%= Spree.t(:zones) %></legend>
       <%= f.field_container :zones do %>
-        <% shipping_method_zones = @shipping_method.zones.to_a %>
         <% Spree::Zone.all.each do |zone| %>
           <%= label_tag do %>
-            <%= check_box_tag('shipping_method[zones][]', zone.id, shipping_method_zones.include?(zone)) %>
+            <%= check_box_tag('shipping_method[zones][]', zone.id, @shipping_method.zones.include?(zone)) %>
             <%= zone.name %>
           <% end %>
           <br>
@@ -72,3 +71,15 @@
   <%= render :partial => 'spree/admin/shared/calculator_fields', :locals => { :f => f } %>
 </div>
 
+<div class="alpha six columns">
+  <div class="alpha six columns">
+    <fieldset class="tax_categories no-border-bottom">
+      <legend align="center"><%= Spree.t(:tax_category) %></legend>
+        <%= f.field_container :categories do %>
+          <%= f.select :tax_category_id, @tax_categories.map { |tc| [tc.name, tc.id] }, {}, :class => "select2 fullwidth" %>
+          <%= error_message_on :shipping_method, :tax_category_id %>
+        <% end %>
+    </fieldset>
+  </div>
+</div>
+

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

@@ -29,7 +29,7 @@
       </tr>
     </thead>
     <tbody>
-      <% @shipping_methods.includes(:zones, :calculator).each do |shipping_method|%>
+      <% @shipping_methods.each do |shipping_method|%>
         <tr id="<%= spree_dom_id shipping_method %>" data-hook="admin_shipping_methods_index_rows" class="<%= cycle('odd', 'even')%>">
           <td class="align-center"><%= shipping_method.admin_name + ' / ' if shipping_method.admin_name.present? %><%= shipping_method.name %></td>
           <td class="align-center"><%= shipping_method.zones.collect(&:name).join(", ") if shipping_method.zones %></td>

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

@@ -90,7 +90,7 @@
 </div>
 
 <% content_for :head do %>
-  <%= javascript_include_tag 'admin/address_states.js' %>
+  <%= javascript_include_tag 'spree/backend/address_states.js' %>
   <%= javascript_tag do -%>
     $(document).ready(function(){
       $('span#country .select2').on('change', function() { update_state(''); });

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

@@ -42,7 +42,7 @@
 <% else %>
   <div class="alpha twelve columns no-objects-found">
     <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/stock_movement')) %>,
-    <%= link_to Spree.t(:add_one), spree.new_admin_stock_location_stock_movement_path(@stock_location) %>!
+    <%= link_to Spree.t(:add_one), spree.new_admin_stock_movement_path %>!
   </div>
 <% end %>