solidus_backend 2.1.1 → 2.2.0.beta1

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

@@ -2,15 +2,15 @@
 <% admin_breadcrumb(Spree.t(:new_user)) %>
 
 <div data-hook="admin_user_new_form_header">
-  <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @user } %>
+  <%= render partial: 'spree/shared/error_messages', locals: { target: @user } %>
 </div>
 
 <div data-hook="admin_user_new_form">
   <%= form_for [:admin, @user], url: admin_users_url, method: :post do |f| %>
-    <%= render :partial => 'form', :locals => { :f => f } %>
+    <%= render partial: 'form', locals: { f: f } %>
 
     <div data-hook="admin_user_new_form_buttons">
-      <%= render :partial => 'spree/admin/shared/new_resource_links' %>
+      <%= render partial: 'spree/admin/shared/new_resource_links' %>
     </div>
   <% end %>
 </div>

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

@@ -5,9 +5,9 @@
 
 <%= render 'spree/admin/users/sidebar' %>
 <%= render 'spree/admin/users/tabs', current: :orders %>
-<%= render :partial => 'spree/admin/users/user_page_actions' %>
+<%= render partial: 'spree/admin/users/user_page_actions' %>
 
-<fieldset data-hook="admin_user_order_history" class="col-xs-9">
+<fieldset data-hook="admin_user_order_history">
   <legend><%= Spree.t(:"admin.user.order_history") %></legend>
 
   <%= paginate @orders, theme: "solidus_admin" %>
@@ -23,10 +23,10 @@
       </colgroup>
       <thead>
         <tr data-hook="admin_orders_index_headers">
-          <th><%= sort_link @search, :completed_at,   Spree::Order.human_attribute_name(:completed_at), {}, {:title => 'orders_completed_at_title'} %></th>
-          <th><%= sort_link @search, :number,         Spree::Order.human_attribute_name(:number), {}, {:title => 'orders_number_title'} %></th>
-          <th><%= sort_link @search, :state,          Spree::Order.human_attribute_name(:state), {}, {:title => 'orders_state_title'} %></th>
-          <th><%= sort_link @search, :total,          Spree::Order.human_attribute_name(:total), {}, {:title => 'orders_total_title'} %></th>
+          <th><%= sort_link @search, :completed_at,   Spree::Order.human_attribute_name(:completed_at), {}, {title: 'orders_completed_at_title'} %></th>
+          <th><%= sort_link @search, :number,         Spree::Order.human_attribute_name(:number), {}, {title: 'orders_number_title'} %></th>
+          <th><%= sort_link @search, :state,          Spree::Order.human_attribute_name(:state), {}, {title: 'orders_state_title'} %></th>
+          <th><%= sort_link @search, :total,          Spree::Order.human_attribute_name(:total), {}, {title: 'orders_total_title'} %></th>
         </tr>
       </thead>
       <tbody>
@@ -55,7 +55,7 @@
       </tbody>
     </table>
   <% else %>
-    <div class="col-xs-9 no-objects-found">
+    <div class="col-9 no-objects-found">
       <%= render 'spree/admin/shared/no_objects_found',
                    resource: Spree::Order,
                    new_resource_url: spree.new_admin_order_path %>

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

@@ -1,13 +1,13 @@
 <div data-hook="variants">
   <fieldset class="no-border-top no-border-bottom">
     <div class="row">
-      <div class="col-xs-3">
+      <div class="col-3">
         <div class="field" data-hook="sku">
           <%= f.label :sku %>
-          <%= f.text_field :sku, :class => 'fullwidth' %>
+          <%= f.text_field :sku, class: 'fullwidth' %>
         </div>
       </div>
-      <div class="col-xs-3">
+      <div class="col-3">
         <div class="field checkbox" data-hook="track_inventory">
           <%= f.label :track_inventory do %>
             <%= f.check_box :track_inventory %>
@@ -21,7 +21,7 @@
     <fieldset class="no-border-top no-border-bottom">
       <div class="row">
       <% @product.option_types.each_with_index do |option_type, index| %>
-          <div class="col-xs-3">
+          <div class="col-3">
             <div class="field" data-hook="presentation">
               <%= label :new_variant, option_type.presentation %>
               <%= f.collection_select 'option_value_ids',
@@ -45,11 +45,11 @@
   <fieldset class="no-border-top no-border-bottom">
     <div class="row">
       <% [:weight, :height, :width, :depth].each_with_index do |field, index| %>
-        <div class="col-xs-3">
+        <div class="col-3">
           <div class="field" data-hook="<%= field %>">
             <%= f.label field %>
             <%= f.text_field field,
-                            value: number_with_precision(@variant.send(field), :precision => 2),
+                            value: number_with_precision(@variant.send(field), precision: 2),
                             class: 'fullwidth' %>
           </div>
         </div>
@@ -63,27 +63,27 @@
     <p> <%== t('.pricing_hint') %> </p>
 
     <div class="row">
-      <div class="col-xs-3">
+      <div class="col-3">
         <div class="field" data-hook="price">
           <%= f.label :price %>
-          <%= f.text_field :price, :value => number_to_currency(@variant.price, :unit => ''), :class => 'fullwidth' %>
+          <%= render "spree/admin/shared/number_with_currency", f: f, amount_attr: :price, currency: @variant.default_price.currency %>
         </div>
       </div>
 
       <% if show_rebuild_vat_checkbox? %>
-        <div class="col-xs-3">
+        <div class="col-3">
           <%= render "spree/admin/shared/rebuild_vat_prices_checkbox", form: f, model_name: "variant", wrapper_class: "field" %>
         </div>
       <% end %>
 
-      <div class="col-xs-3">
+      <div class="col-3">
         <div class="field" data-hook="cost_price">
           <%= f.label :cost_price %>
-          <%= f.text_field :cost_price, :value => number_to_currency(@variant.cost_price, :unit => ''), :class => 'fullwidth' %>
+          <%= render "spree/admin/shared/number_with_currency", f: f, amount_attr: :cost_price, currency_attr: :cost_currency %>
         </div>
       </div>
 
-      <div class="col-xs-3">
+      <div class="col-3">
         <div class="field" data-hook="tax_category">
           <%= f.label :tax_category %>
           <%= f.field_hint :tax_category %>
@@ -91,8 +91,8 @@
                                   @tax_categories,
                                   :id,
                                   :name,
-                                  { :include_blank => t('.use_product_tax_category') },
-                                  { :class => 'select2 fullwidth' } %>
+                                  { include_blank: t('.use_product_tax_category') },
+                                  { class: 'select2 fullwidth' } %>
         </div>
       </div>
     </div>

data/app/views/spree/admin/variants/_table.html.erb

@@ -30,11 +30,11 @@
       <td class="align-center"><%= variant.sku %></td>
       <td class="actions">
         <% if can?(:update, variant) %>
-          <%= link_to_edit(variant, :no_text => true) unless variant.deleted? %>
+          <%= link_to_edit(variant, no_text: true) unless variant.deleted? %>
         <% end %>
         <% if can?(:destroy, variant) %>
           &nbsp;
-          <%= link_to_delete(variant, :no_text => true) unless variant.deleted? %>
+          <%= link_to_delete(variant, no_text: true) unless variant.deleted? %>
         <% end %>
       </td>
     </tr>

data/app/views/spree/admin/variants/_table_filter.html.erb

@@ -4,15 +4,15 @@
 
 <% content_for :table_filter do %>
   <%= form_for :variant_search, url: spree.admin_product_variants_path(product), method: :get do |f| %>
-    <div class="col-xs-10">
+    <div class="col-10">
       <div data-hook="admin_variants_index_search" class="field">
         <%= f.label :variant_search_term, Spree.t(:variant_search_placeholder) %>
-        <%= text_field_tag :variant_search_term, params[:variant_search_term], :class => "fullwidth", :placeholder => Spree.t(:variant_search_placeholder) %>
+        <%= text_field_tag :variant_search_term, params[:variant_search_term], class: "fullwidth", placeholder: Spree.t(:variant_search_placeholder) %>
       </div>
     </div>
 
     <% if product.variants.only_deleted.any? %>
-      <div class="col-xs-2">
+      <div class="col-2">
         <div class="field checkbox">
           <%= label_tag :deleted do %>
             <%= check_box_tag :deleted, "on", params[:deleted] == "on" %>

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

@@ -1,21 +1,21 @@
-<%= render :partial => 'spree/admin/shared/product_tabs', :locals => { :current => 'Variants' } %>
+<%= render partial: 'spree/admin/shared/product_tabs', locals: { current: 'Variants' } %>
 
 <% admin_breadcrumb(link_to plural_resource_name(Spree::Variant), admin_product_variants_path(@product)) %>
 <% admin_breadcrumb(@variant.options_text) %>
 
 
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @variant } %>
+<%= render partial: 'spree/shared/error_messages', locals: { target: @variant } %>
 
 
 <%= form_for [:admin, @product, @variant] do |f| %>
   <fieldset>
     <legend><%= t('.edit_variant') %></legend>
     <div data-hook="admin_variant_edit_form">
-      <%= render :partial => 'form', :locals => { :f => f } %>
+      <%= render partial: 'form', locals: { f: f } %>
     </div>
 
     <% if can?(:update, @variant) %>
-      <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
+      <%= render partial: 'spree/admin/shared/edit_resource_links' %>
     <% end %>
   </fieldset>
 <% end %>

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

@@ -17,12 +17,12 @@
       <% end %>
     </p>
   <% elsif @product.empty_option_values? %>
-    <div class="col-xs-9 no-objects-found">
+    <div class="col-9 no-objects-found">
       <%= Spree.t :no_option_values_on_product_html,
                   link: link_to(Spree.t(:product_details), [:edit, :admin, @product]) %>
     </div>
   <% else %>
-    <div class="col-xs-9 no-objects-found">
+    <div class="col-9 no-objects-found">
       <%= Spree.t(:no_resource, resource: plural_resource_name(Spree::Variant)) %>
       <% if can? :create, Spree::Variant %>
         <%= link_to Spree.t(:create_one), new_object_url, remote: true %>

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

@@ -1,5 +1,5 @@
-<%= render :partial => 'spree/admin/shared/product_tabs', :locals => { :current => 'Variants' } %>
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @variant } %>
+<%= render partial: 'spree/admin/shared/product_tabs', locals: { current: 'Variants' } %>
+<%= render partial: 'spree/shared/error_messages', locals: { target: @variant } %>
 
 <% admin_breadcrumb(link_to plural_resource_name(Spree::Variant), admin_product_variants_path(@product)) %>
 <% admin_breadcrumb(Spree.t(:new_variant)) %>
@@ -8,7 +8,7 @@
 <%= form_for [:admin, @product, @variant] do |f| %>
   <fieldset data-hook="admin_variant_new_form">
     <legend><%= t('.new_variant') %></legend>
-    <%= render :partial => 'form', :locals => { :f => f } %>
-    <%= render :partial => 'spree/admin/shared/new_resource_links' %>
+    <%= render partial: 'form', locals: { f: f } %>
+    <%= render partial: 'spree/admin/shared/new_resource_links' %>
   </fieldset>
 <% end %>

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

@@ -1,2 +1,2 @@
-$(".js-content-below-tabs").html('<%= escape_javascript(render :template => 'spree/admin/variants/new', :formats => [:html], :handlers => [:erb]) %>');
+$(".js-content-below-tabs").html('<%= escape_javascript(render template: 'spree/admin/variants/new', formats: [:html], handlers: [:erb]) %>');
 $(".js-content-below-tabs .select2").select2();

data/app/views/spree/admin/zones/_country_members.html.erb

@@ -4,7 +4,7 @@
 
     <%= zone_form.field_container :country_ids do %>
       <%= zone_form.label :country_ids, plural_resource_name(Spree::Country) %><br>
-      <%= zone_form.collection_select :country_ids, @countries, :id, :name, {}, { :multiple => true, :class => "select2 fullwidth" } %>
+      <%= zone_form.collection_select :country_ids, @countries, :id, :name, {}, { multiple: true, class: "select2 fullwidth" } %>
     <% end %>
   </fieldset>
 </div>

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

@@ -1,5 +1,5 @@
-<div class="row">
-  <div class="col-xs-5">
+<div class="row js-zones-form">
+  <div class="col-5">
 
     <div data-hook="admin_zone_form_fields">
       <fieldset class="no-border-bottom">
@@ -7,23 +7,23 @@
 
         <%= zone_form.field_container :name do %>
           <%= zone_form.label :name %><br />
-          <%= zone_form.text_field :name, :class => 'fullwidth' %>
+          <%= zone_form.text_field :name, class: 'fullwidth' %>
         <% end %>
 
         <%= zone_form.field_container :description do %>
           <%= zone_form.label :description %><br />
-          <%= zone_form.text_field :description, :class => 'fullwidth' %>
+          <%= zone_form.text_field :description, class: 'fullwidth' %>
         <% end %>
 
         <div data-hook="type" class="field">
           <%= label_tag Spree.t(:type) %>
           <ul>
             <li>
-              <%= zone_form.radio_button('kind', 'country', { :id => 'country_based' }) %>
+              <%= zone_form.radio_button('kind', 'country', { id: 'country_based' }) %>
               <%= label_tag :country_based, Spree.t(:country_based) %>
             </li>
             <li>
-              <%= zone_form.radio_button('kind', 'state', { :id => 'state_based' }) %>
+              <%= zone_form.radio_button('kind', 'state', { id: 'state_based' }) %>
               <%= label_tag :state_based, Spree.t(:state_based) %>
             </li>
           </ul>
@@ -31,10 +31,10 @@
       </fieldset>
     </div>
   </div>
-  <div class="col-xs-5">
+  <div class="col-5">
 
-    <%= render :partial => 'state_members', :locals => { :zone_form => zone_form }%>
-    <%= render :partial => 'country_members', :locals => { :zone_form => zone_form } %>
+    <%= render partial: 'state_members', locals: { zone_form: zone_form }%>
+    <%= render partial: 'country_members', locals: { zone_form: zone_form } %>
   </div>
 
 </div>

data/app/views/spree/admin/zones/_state_members.html.erb

@@ -4,7 +4,7 @@
 
     <%= zone_form.field_container :state_ids do %>
       <%= zone_form.label :state_ids, plural_resource_name(Spree::State) %><br>
-      <%= zone_form.collection_select :state_ids, @states, :id, :name, {}, { :multiple => true, :class => "select2 fullwidth" } %>
+      <%= zone_form.collection_select :state_ids, @states, :id, :name, {}, { multiple: true, class: "select2 fullwidth" } %>
     <% end %>
   </fieldset>
 </div>

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

@@ -9,10 +9,10 @@
 <% content_for :page_actions do %>
 <% end %>
 
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @zone } %>
+<%= render partial: 'spree/shared/error_messages', locals: { target: @zone } %>
 
 <%= form_for [:admin, @zone] do |zone_form| %>
-  <%= render :partial => 'form', :locals => { :zone_form => zone_form } %>
+  <%= render partial: 'form', locals: { zone_form: zone_form } %>
   <div class="clear"></div>
-  <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
+  <%= render partial: 'spree/admin/shared/edit_resource_links' %>
 <% end %>

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

@@ -8,7 +8,7 @@
 <% content_for :page_actions do %>
   <% if can?(:create, Spree::Zone) %>
     <li>
-      <%= button_link_to Spree.t(:new_zone), new_object_url, :id => 'admin_new_zone_link' %>
+      <%= button_link_to Spree.t(:new_zone), new_object_url, id: 'admin_new_zone_link' %>
     </li>
   <% end %>
 <% end %>
@@ -25,9 +25,9 @@
     </colgroup>
     <thead>
       <tr data-hook="zones_header">
-        <th><%= sort_link @search,:name, Spree::Zone.human_attribute_name(:name), :title => 'zones_order_by_name_title' %></th>
+        <th><%= sort_link @search,:name, Spree::Zone.human_attribute_name(:name), title: 'zones_order_by_name_title' %></th>
         <th>
-          <%= sort_link @search,:description, Spree::Zone.human_attribute_name(:description), {}, {:title => 'zones_order_by_description_title'} %>
+          <%= sort_link @search,:description, Spree::Zone.human_attribute_name(:description), {}, {title: 'zones_order_by_description_title'} %>
         </th>
         <th class="actions"></th>
       </tr>
@@ -39,10 +39,10 @@
           <td><%= zone.description %></td>
           <td class="actions">
             <% if can?(:update, zone) %>
-              <%= link_to_edit zone, :no_text => true %>
+              <%= link_to_edit zone, no_text: true %>
             <% end %>
             <% if can?(:destroy, zone) %>
-              <%= link_to_delete zone, :no_text => true %>
+              <%= link_to_delete zone, no_text: true %>
             <% end %>
           </td>
         </tr>
@@ -50,7 +50,7 @@
     </tbody>
   </table>
 <% else %>
-  <div class="col-xs-9 no-objects-found">
+  <div class="col-9 no-objects-found">
     <%= render 'spree/admin/shared/no_objects_found',
                  resource: Spree::Zone,
                  new_resource_url: new_object_url %>

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

@@ -9,12 +9,12 @@
 <% content_for :page_actions do %>
 <% end %>
 
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @zone } %>
+<%= render partial: 'spree/shared/error_messages', locals: { target: @zone } %>
 
 <%= form_for [:admin, @zone] do |zone_form| %>
-  <%= render :partial => 'form', :locals => { :zone_form => zone_form } %>
+  <%= render partial: 'form', locals: { zone_form: zone_form } %>
 
   <div class="clear"></div>
 
-  <%= render :partial => 'spree/admin/shared/new_resource_links' %>
+  <%= render partial: 'spree/admin/shared/new_resource_links' %>
 <% end %>

data/app/views/spree/layouts/admin.html.erb

@@ -27,12 +27,12 @@
           <div class="<%= 'with-sidebar ' if content_for?(:sidebar) %>" id="content" data-hook>
             <div class="row">
               <% if content_for?(:tabs) %>
-                <div class="col-xs-12">
+                <div class="col-12">
                   <%= yield :tabs %>
                 </div>
               <% end %>
-              <div class="js-content-below-tabs <%= if content_for?(:sidebar) then 'col-xs-9' else 'col-xs-12' end %>">
-                <%= render :partial => 'spree/admin/shared/table_filter' %>
+              <div class="js-content-below-tabs <%= if content_for?(:sidebar) then 'col-9' else 'col-12' end %>">
+                <%= render partial: 'spree/admin/shared/table_filter' %>
                 <%= yield %>
               </div>
 

data/app/views/spree/layouts/admin_style_guide.html.erb

@@ -6,7 +6,7 @@
 
     <%= stylesheet_link_tag "spree/backend/all" %>
     <%= javascript_include_tag "spree/backend/all" %>
-    <%= render "spree/admin/shared/translations" %>
+    <%= render "spree/admin/shared/js_locale_data" %>
   </head>
 
   <body class="admin style-guide">

data/config/initializers/assets.rb

@@ -1,7 +1 @@
-Rails.application.config.assets.precompile += %w[
-  spree/backend/all*
-  fontawesome-webfont*
-  select2_locale*
-  jquery-ui/*.png
-  solidus-style-guide-logo.png
-]
+Rails.application.config.assets.precompile << 'solidus_backend_manifest.js'

data/config/routes.rb

@@ -13,6 +13,9 @@ Spree::Core::Engine.routes.draw do
       resources :promotion_rules
       resources :promotion_actions
       resources :promotion_codes, only: [:index]
+      resources :promotion_code_batches, only: [:index, :new, :create] do
+        get '/download', to: "promotion_code_batches#download", defaults: { format: "csv" }
+      end
     end
 
     resources :promotion_categories, except: [:show]
@@ -120,7 +123,8 @@ Spree::Core::Engine.routes.draw do
       end
     end
 
-    resource :general_settings, only: [:edit, :update]
+    resource :general_settings, only: :edit
+    resources :stores, only: [:index, :new, :create, :edit, :update]
 
     resources :return_items, only: [:update]
 
@@ -163,7 +167,7 @@ Spree::Core::Engine.routes.draw do
     end
 
     resources :stock_locations do
-      resources :stock_movements, except: [:edit, :update, :destroy]
+      resources :stock_movements, only: [:index]
       collection do
         post :transfer_stock
         post :update_positions