solidus_backend 2.5.2 → 2.6.0.rc1

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

@@ -1,15 +1,16 @@
-<%= render 'spree/admin/shared/shipping_tabs' %>
-
-<% admin_breadcrumb(t('spree.stock_movements_for_stock_location', stock_location_name: @stock_location.name)) %>
-
-
-<% content_for :page_actions do %>
-  <% if can?(:display, Spree::StockLocation) %>
-    <li>
-      <%= link_to_with_icon 'arrow-left', t('spree.back_to_stock_locations_list'), admin_stock_locations_path, class: 'button' %>
-    </li>
-  <% end %>
+<% admin_breadcrumb(t('spree.settings')) %>
+<% admin_breadcrumb(t('spree.admin.tab.shipping')) %>
+<% if can?(:display, Spree::StockLocation) %>
+  <% admin_breadcrumb(link_to plural_resource_name(Spree::StockLocation), spree.admin_stock_locations_path) %>
+<% else %>
+  <% admin_breadcrumb(plural_resource_name(Spree::StockLocation)) %>
+<% end %>
+<% if can?(:update, @stock_location) %>
+  <% admin_breadcrumb(link_to(admin_stock_location_display_name(@stock_location), spree.edit_admin_stock_location_path(@stock_location.id))) %>
+<% else %>
+  <% admin_breadcrumb(admin_stock_location_display_name(@stock_location)) %>
 <% end %>
+<% admin_breadcrumb(plural_resource_name(Spree::StockMovement)) %>
 
 <% if @stock_movements.any? %>
 <table class="index" id='listing_stock_movements'>
@@ -20,9 +21,9 @@
   </colgroup>
   <thead>
     <tr data-hook="admin_stock_movements_index_headers">
-      <th><%= Spree::StockMovement.human_attribute_name(:stock_item) %>
+      <th><%= Spree::StockMovement.human_attribute_name(:variant) %>
       <th><%= Spree::StockMovement.human_attribute_name(:quantity) %></th>
-      <th><%= Spree::StockMovement.human_attribute_name(:action) %></th>
+      <th><%= Spree::StockMovement.human_attribute_name(:originated_by) %></th>
     </tr>
   </thead>
   <tbody>
@@ -40,8 +41,7 @@
 <% else %>
   <div class="no-objects-found">
     <%= render 'spree/admin/shared/no_objects_found',
-                 resource: Spree::StockMovement,
-                 new_resource_url: new_object_url %>
+                 resource: Spree::StockMovement %>
   </div>
 <% end %>
 

data/app/views/spree/admin/store_credits/edit_validity.html.erb

@@ -19,8 +19,8 @@
       </div>
     </div>
     <div class="form-buttons filter-actions actions" data-hook="buttons">
-      <%= button t('spree.store_credit.actions.invalidate') %>
-      <%= button_link_to t('spree.actions.cancel'), admin_user_store_credit_path(@user, @store_credit) %>
+      <%= button_tag t('spree.store_credit.actions.invalidate'), class: 'btn btn-primary' %>
+      <%= link_to t('spree.actions.cancel'), admin_user_store_credit_path(@user, @store_credit), class: 'btn btn-primary' %>
     </div>
   </fieldset>
 <% end %>

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

@@ -83,6 +83,7 @@
         <th><%= t('spree.admin.store_credits.amount_credited') %></th>
         <th><%= t('spree.admin.store_credits.created_by') %></th>
         <th><%= Spree::StoreCreditEvent.human_attribute_name(:user_total_amount) %></th>
+        <th><%= Spree::StoreCreditEvent.human_attribute_name(:amount_remaining) %></th>
         <th><%= Spree::StoreCreditUpdateReason.human_attribute_name(:name) %></th>
       </tr>
     </thead>
@@ -96,6 +97,7 @@
           <td><%= event.display_amount %></td>
           <td><%= store_credit_event_originator_link(event) %></td>
           <td><%= event.display_user_total_amount %></td>
+          <td><%= event.display_remaining_amount %></td>
           <td><%= event.update_reason.try!(:name) %></td>
         </tr>
       <% end %>

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

@@ -1,60 +1,77 @@
-<%= f.field_container :name do %>
-  <%= f.label :name, class: 'required' %>
-  <%= f.text_field :name, required: true, class: 'fullwidth' %>
-  <%= f.error_message_on :name %>
-<% end %>
-
-<%= f.field_container :code do %>
-  <%= f.label :code, class: 'required' %>
-  <%= f.text_field :code, required: true, class: 'fullwidth' %>
-  <%= f.error_message_on :code %>
-<% end %>
-
-<%= f.field_container :seo_title do %>
-  <%= f.label :seo_title %>
-  <%= f.text_field :seo_title, class: 'fullwidth'  %>
-  <%= f.error_message_on :seo_title %>
-<% end %>
-
-<%= f.field_container :meta_keywords do %>
-  <%= f.label :meta_keywords %>
-  <%= f.text_field :meta_keywords, class: 'fullwidth'  %>
-  <%= f.error_message_on :meta_keywords %>
-<% end %>
-
-<%= f.field_container :meta_description do %>
-  <%= f.label :meta_description %>
-  <%= f.text_field :meta_description, class: 'fullwidth'  %>
-  <%= f.error_message_on :meta_description %>
-<% end %>
-
-<%= f.field_container :url do %>
-  <%= f.label :url, class: 'required' %>
-  <%= f.text_field :url, required: true, class: 'fullwidth'  %>
-  <%= f.error_message_on :url %>
-<% end %>
-
-<%= f.field_container :mail_from_address do %>
-  <%= f.label :mail_from_address, class: 'required' %>
-  <%= f.text_field :mail_from_address, required: true, class: 'fullwidth'  %>
-  <%= f.error_message_on :mail_from_address %>
-<% end %>
-
-<%= f.field_container :default_currency do %>
-  <%= f.label :default_currency %>
-  <%= f.select :default_currency,
-    Spree::Config.available_currencies.map(&:iso_code),
-    { include_blank: true },
-    { class: 'select2 fullwidth' } %>
-  <%= f.error_message_on :default_currency %>
-<% end %>
-
-<%= f.field_container :cart_tax_country_iso do %>
-  <%= f.label :cart_tax_country_iso %>
-  <%= f.field_hint :cart_tax_country_iso %>
-  <%= f.select :cart_tax_country_iso,
-    Spree::Country.all.map { |c| [c.name, c.iso] },
-    { include_blank: t(".no_cart_tax_country") },
-    { class: "custom-select fullwidth" } %>
-  <%= f.error_message_on :cart_tax_country_iso %>
-<% end %>
+<div class="row">
+  <div class="col-12 col-md-6">
+    <%= f.field_container :name do %>
+      <%= f.label :name, class: 'required' %>
+      <%= f.text_field :name, required: true, class: 'fullwidth' %>
+      <%= f.error_message_on :name %>
+    <% end %>
+
+    <%= f.field_container :code do %>
+      <%= f.label :code, class: 'required' %>
+      <%= f.text_field :code, required: true, class: 'fullwidth' %>
+      <%= f.error_message_on :code %>
+    <% end %>
+
+    <%= f.field_container :seo_title do %>
+      <%= f.label :seo_title %>
+      <%= f.text_field :seo_title, class: 'fullwidth'  %>
+      <%= f.error_message_on :seo_title %>
+    <% end %>
+
+    <%= f.field_container :meta_keywords do %>
+      <%= f.label :meta_keywords %>
+      <%= f.text_field :meta_keywords, class: 'fullwidth'  %>
+      <%= f.error_message_on :meta_keywords %>
+    <% end %>
+
+    <%= f.field_container :meta_description do %>
+      <%= f.label :meta_description %>
+      <%= f.text_area :meta_description, class: 'fullwidth'  %>
+      <%= f.error_message_on :meta_description %>
+    <% end %>
+  </div>
+  <div class="col-12 col-md-6">
+    <%= f.field_container :url do %>
+      <%= f.label :url, class: 'required' %>
+      <%= f.text_field :url, required: true, class: 'fullwidth'  %>
+      <%= f.error_message_on :url %>
+    <% end %>
+
+    <%= f.field_container :mail_from_address do %>
+      <%= f.label :mail_from_address, class: 'required' %>
+      <%= f.text_field :mail_from_address, required: true, class: 'fullwidth'  %>
+      <%= f.error_message_on :mail_from_address %>
+    <% end %>
+
+    <%= f.field_container :default_currency do %>
+      <%= f.label :default_currency %>
+      <%= f.select :default_currency,
+        Spree::Config.available_currencies.map(&:iso_code),
+        { include_blank: true },
+        { class: 'custom-select fullwidth' } %>
+      <%= f.error_message_on :default_currency %>
+    <% end %>
+
+    <%= f.field_container :cart_tax_country_iso do %>
+      <%= f.label :cart_tax_country_iso %>
+      <%= f.field_hint :cart_tax_country_iso %>
+      <%= f.select :cart_tax_country_iso,
+        Spree::Country.all.map { |c| [c.name, c.iso] },
+        { include_blank: t(".no_cart_tax_country") },
+        { class: "custom-select fullwidth" } %>
+      <%= f.error_message_on :cart_tax_country_iso %>
+    <% end %>
+
+    <%= f.field_container :available_locales do %>
+      <%= f.label :available_locales %>
+      <%= f.field_hint :available_locales %>
+      <%= f.select :available_locales,
+        Spree.i18n_available_locales.map { |locale|
+          [I18n.t('spree.i18n.this_file_language', locale: locale, default: locale.to_s, fallback: false), locale]
+        }.sort,
+        { },
+        { class: 'select2 fullwidth', multiple: true } %>
+      <%= f.error_message_on :default_currency %>
+    <% end %>
+  </div>
+</div>

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

@@ -5,7 +5,7 @@
 
 <% content_for :page_actions do %>
   <li>
-    <%= button_link_to t('spree.new_store'), new_admin_store_url %>
+    <%= link_to t('spree.new_store'), new_admin_store_url, class: 'btn btn-primary' %>
   </li>
 <% end %>
 

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

@@ -15,8 +15,8 @@
 <table class="index">
   <thead>
     <tr>
-      <th>Name</th>
-      <th>Url</th>
+      <th><%= Spree::Store.human_attribute_name(:name) %></th>
+      <th><%= Spree::Store.human_attribute_name(:url) %></th>
       <th class="actions"></th>
     </tr>
   </thead>
@@ -26,7 +26,7 @@
         <td>
           <%= store.name %>
           <% if store.default? %>
-            <span class="label label-default">default</span>
+            <span class="label label-default"><%= Spree::Store.human_attribute_name(:default) %></span>
           <% end %>
         </td>
         <td><%= store.url %></td>

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

@@ -9,7 +9,7 @@
   <ul class="actions inline-menu">
     <% if can?(:create, Spree::TaxCategory) %>
       <li>
-        <%= button_link_to t('spree.new_tax_category'), new_object_url, id: 'admin_new_tax_categories_link' %>
+        <%= link_to t('spree.new_tax_category'), new_object_url, id: 'admin_new_tax_categories_link', class: 'btn btn-primary' %>
       </li>
     <% end %>
   </ul>

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

@@ -8,7 +8,7 @@
 <% content_for :page_actions do %>
   <% if can?(:create, Spree::TaxRate) %>
     <li>
-      <%= button_link_to t('spree.new_tax_rate'), new_object_url %>
+      <%= link_to t('spree.new_tax_rate'), new_object_url, class: 'btn btn-primary' %>
     </li>
   <% end %>
 <% end %>

data/app/views/spree/admin/taxonomies/{edit.erb → edit.html.erb}

@@ -5,7 +5,7 @@
 
 <% content_for :page_actions do %>
   <li>
-    <%= button_link_to t('spree.add_taxon'), spree.admin_taxonomies_path, { class: 'add-taxon-button' } %>
+    <%= link_to t('spree.add_taxon'), spree.admin_taxonomies_path, class: 'add-taxon-button btn btn-primary' %>
   </li>
 <% end %>
 
@@ -13,8 +13,8 @@
   <fieldset class="no-border-top">
     <%= render partial: 'form', locals: { f: f } %>
     <div class="filter-actions actions">
-      <%= button t('spree.actions.update') %>
-      <%= button_link_to t('spree.actions.cancel'), admin_taxonomies_path %>
+      <%= button_tag t('spree.actions.update'), class: 'btn btn-primary' %>
+      <%= link_to t('spree.actions.cancel'), admin_taxonomies_path, class: 'btn btn-primary' %>
     </div>
   </fieldset>
 

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

@@ -5,7 +5,7 @@
 <% content_for :page_actions do %>
   <% if can?(:create, Spree::Taxonomy) %>
     <li>
-      <%= button_link_to t('spree.new_taxonomy'), spree.new_admin_taxonomy_url, id: 'admin_new_taxonomy_link' %>
+      <%= link_to t('spree.new_taxonomy'), spree.new_admin_taxonomy_url, id: 'admin_new_taxonomy_link', class: 'btn btn-primary' %>
     </li>
   <% end %>
 <% end %>

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

@@ -12,7 +12,7 @@
   <fieldset class="no-border-top">
     <br>
     <div class="filter-actions actions" data-hook="buttons">
-      <%= button t('spree.actions.create') %>
+      <%= button_tag t('spree.actions.create'), class: 'btn btn-primary' %>
     </div>
   </fieldset>
 <% end %>

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

@@ -3,7 +3,7 @@
 
 <% content_for :page_actions do %>
   <li>
-    <%= button_link_to t('spree.back_to_taxonomies_list'), spree.admin_taxonomies_path %>
+    <%= link_to t('spree.back_to_taxonomies_list'), spree.admin_taxonomies_path, class: 'btn btn-primary' %>
   </li>
 <% end %>
 
@@ -13,7 +13,7 @@
   <%= render 'form', f: f %>
 
   <div class="form-buttons filter-actions" data-hook="buttons">
-    <%= button t('spree.actions.update') %>
-    <%= button_link_to t('spree.actions.cancel'), edit_admin_taxonomy_url(@taxonomy) %>
+    <%= button_tag t('spree.actions.update'), class: 'btn btn-primary' %>
+    <%= link_to t('spree.actions.cancel'), edit_admin_taxonomy_url(@taxonomy), class: 'btn btn-primary' %>
   </div>
 <% end %>

data/app/views/spree/admin/taxons/search.json.jbuilder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 json.taxons(@taxons) do |taxon|
   json.id taxon.id
   json.name taxon.name

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

@@ -1,7 +1,7 @@
 <% content_for :page_actions do %>
   <% if can?([:admin, :create], Spree::Order) %>
     <li>
-      <%= button_link_to t(".create_order"), spree.new_admin_order_path(user_id: @user.id) %>
+      <%= link_to t(".create_order"), spree.new_admin_order_path(user_id: @user.id), class: 'btn btn-primary' %>
     </li>
   <% end %>
 <% end %>

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

@@ -41,8 +41,8 @@
 
       </div>
       <div class="filter-actions actions">
-        <%= button_link_to t('.clear_key'), spree.clear_api_key_admin_user_path(@user), method: :put, data: { confirm: t('.confirm_clear_key') }, class: 'btn btn-primary' %>
-        <%= button_link_to t('.regenerate_key'), spree.generate_api_key_admin_user_path(@user), method: :put, data: { confirm: t('.confirm_regenerate_key') }, class: 'btn btn-primary' %>
+        <%= button_to t('.clear_key'), spree.clear_api_key_admin_user_path(@user), method: :put, data: { confirm: t('.confirm_clear_key') }, class: 'btn btn-primary' %>
+        <%= button_to t('.regenerate_key'), spree.generate_api_key_admin_user_path(@user), method: :put, data: { confirm: t('.confirm_regenerate_key') }, class: 'btn btn-primary' %>
       </div>
 
     <% else %>
@@ -50,7 +50,7 @@
       <div class="no-objects-found"><%= t('.no_key') %></div>
 
       <div class="filter-actions actions">
-        <%= button_link_to t('.generate_key'), spree.generate_api_key_admin_user_path(@user), method: :put, class: 'btn btn-primary' %>
+        <%= button_to t('.generate_key'), spree.generate_api_key_admin_user_path(@user), method: :put, class: 'btn btn-primary' %>
       </div>
     <% end %>
   </fieldset>

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

@@ -3,7 +3,7 @@
 <% content_for :page_actions do %>
   <% if can?(:admin, Spree.user_class) && can?(:create, Spree.user_class) %>
     <li>
-      <%= button_link_to t('spree.new_user'), new_admin_user_url, id: 'admin_new_user_link' %>
+      <%= link_to t('spree.new_user'), new_admin_user_url, id: 'admin_new_user_link', class: 'btn btn-primary' %>
     </li>
   <% end %>
 <% end %>
@@ -50,7 +50,7 @@
       </div>
 
       <div class="actions filter-actions" data-hook="admin_users_index_search_buttons">
-        <%= button t('spree.search') %>
+        <%= button_tag t('spree.search'), class: 'btn btn-primary' %>
       </div>
     <% end %>
   </div>

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

@@ -4,7 +4,7 @@
 <% content_for :page_actions do %>
   <% if can?(:create, Spree::Zone) %>
     <li>
-      <%= button_link_to t('spree.new_zone'), new_object_url, id: 'admin_new_zone_link' %>
+      <%= link_to t('spree.new_zone'), new_object_url, id: 'admin_new_zone_link', class: 'btn btn-primary' %>
     </li>
   <% end %>
 <% end %>

data/config/initializers/assets.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 Rails.application.config.assets.precompile << 'solidus_backend_manifest.js'

data/config/initializers/form_builder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #
 # Allow some application_helper methods to be used in the scoped form_for manner
 #

data/config/routes.rb

@@ -1,8 +1,12 @@
+# frozen_string_literal: true
+
 Spree::Core::Engine.routes.draw do
   namespace :admin do
     get '/search/users', to: "search#users", as: :search_users
     get '/search/products', to: "search#products", as: :search_products
 
+    put '/locale/set', to: 'locale#set', defaults: { format: :json }, as: :set_locale
+
     resources :dashboards, only: [] do
       collection do
         get :home

data/lib/solidus_backend.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require 'spree_backend'

data/lib/spree/backend.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails/all'
 require 'jquery-rails'
 require 'coffee-rails'

data/lib/spree/backend/action_callbacks.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   class ActionCallbacks
     attr_reader :before_methods

data/lib/spree/backend/callbacks.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Backend
     module Callbacks