solidus_backend 2.9.5 → 2.10.2

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

@@ -4,6 +4,11 @@
   <div id="preference-settings">
     <div class="field">
       <%= f.label(:calculator_type, Spree::Calculator.model_name.human) %>
+
+      <% if local_assigns.has_key? :hint %>
+        <%= admin_hint t("spree.#{hint}"), t(hint, scope: [:spree, :hints, "spree/calculator"]) %>
+      <% end %>
+
       <%= f.select(:calculator_type, @calculators.map { |c| [c.description, c.name] }, {}, {class: 'custom-select fullwidth js-calculator-type'}) %>
     </div>
 

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

@@ -3,6 +3,9 @@
   <div class="admin-nav-sticky">
     <%= render partial: 'spree/admin/shared/menu' %>
     <div class="admin-nav-footer">
+      <%= button_tag class: 'btn fa fa-chevron-circle-left', id: 'admin-nav-toggle', type: :button do %>
+        <span class="text"><%= t('spree.minimize_menu') %></span>
+      <% end %>
       <%= render partial: 'spree/admin/shared/locale_selection' %>
       <%= render partial: 'spree/admin/shared/navigation_footer' %>
     </div>

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

@@ -1,4 +1,4 @@
 <div class="form-buttons filter-actions actions" data-hook="buttons">
-  <%= button_tag t('spree.actions.create'), class: 'btn btn-primary' %>
+  <%= submit_tag t('spree.actions.create'), class: 'btn btn-primary' %>
   <%= link_to t('spree.actions.cancel'), collection_url, class: 'button' %>
 </div>

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

@@ -55,9 +55,9 @@
     <% end %>
 
     <% if can?(:manage, Spree::OrderCancellations) && @order.inventory_units.cancelable.present? %>
-      <%= content_tag('li', class: "#{'active' if current == 'Cancel Inventory'}", data: {hook: 'admin_order_tabs_cancel_inventory'}) do %>
+      <li class="<%= "active" if current == "Cancel Inventory" %>" data-hook='admin_order_tabs_cancel_inventory'>
         <%= link_to t('spree.cancel_inventory'), spree.admin_order_cancellations_path(@order) %>
-      <% end %>
+      </li>
     <% end %>
   </ul>
 </nav>

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

@@ -13,7 +13,7 @@
 
   <% if can?(:display, Spree::RefundReason) || can?(:display, Spree::ReimbursementType) ||
     can?(:display, Spree::ReturnReason) || can?(:display, Spree::AdjustmentReason) %>
-    <%= tab :checkout, url: spree.admin_refund_reasons_path, match_path: %r(refund_reasons|reimbursement_types|return_reasons|adjustment_reasons) %>
+    <%= tab :checkout, url: spree.admin_refund_reasons_path, match_path: %r(refund_reasons|reimbursement_types|return_reasons|adjustment_reasons|store_credit_reasons) %>
   <% end %>
 
   <% if can?(:display, Spree::ShippingMethod) || can?(:display, Spree::ShippingCategory) || can?(:display, Spree::StockLocation) %>

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

@@ -100,7 +100,7 @@
   </div>
   <div class="col-5">
     <div data-hook="admin_shipping_method_form_calculator_fields">
-      <%= render partial: 'spree/admin/shared/calculator_fields', locals: { f: f } %>
+      <%= render partial: 'spree/admin/shared/calculator_fields', locals: { f: f, hint: :shipping_methods } %>
     </div>
     <div>
       <fieldset class="tax_categories no-border-bottom">

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

@@ -28,7 +28,7 @@
       <tr data-hook="stock_locations_header">
         <th></th>
         <th><%= Spree::StockLocation.human_attribute_name(:name) %></th>
-        <th><%= Spree::StockLocation.human_attribute_name(:state_id) %></th>
+        <th><%= Spree::StockLocation.human_attribute_name(:state) %></th>
         <th><%= plural_resource_name(Spree::StockMovement) %></th>
         <th class="actions"></th>
       </tr>

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

@@ -7,7 +7,7 @@
 <% content_for :page_actions do %>
   <ul class='actions inline-menu'>
     <li>
-      <%= link_to t('spree.new_adjustment_reason'), new_object_url, id: 'admin_new_named_type', class: 'btn btn-primary' %>
+      <%= link_to t('spree.new_store_credit_reason'), new_object_url, id: 'admin_new_named_type', class: 'btn btn-primary' %>
     </li>
   </ul>
 <% end %>

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

@@ -6,7 +6,7 @@
 <%= render 'spree/admin/users/sidebar' %>
 <%= render 'spree/admin/users/tabs', current: :store_credits %>
 <% content_for :page_actions do %>
-  <% if can?(:create, Spree::StoreCredit) %>
+  <% if can?(:create, @user.store_credits.new) %>
     <li><%= link_to t('spree.admin.store_credits.add'), new_admin_user_store_credit_path(@user), class: 'button btn btn-primary' %></li>
   <% end %>
 <% end %>

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

@@ -58,5 +58,5 @@
 
   <div class="clear"></div>
 
-  <%= render 'spree/admin/shared/calculator_fields', f: f %>
+  <%= render partial: 'spree/admin/shared/calculator_fields', locals: { f: f, hint: :tax_rates } %>
 </div>

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_tag t('spree.actions.create'), class: 'btn btn-primary' %>
+      <%= f.submit t('spree.actions.create'), class: 'btn btn-primary' %>
     </div>
   </fieldset>
 <% end %>

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

@@ -20,11 +20,7 @@
       </div>
     <% end %>
 
-    <%= f.field_container :icon do %>
-      <%= f.label :icon %><br />
-      <%= f.file_field :icon %>
-      <%= image_tag f.object.icon(:mini) if f.object.icon_present? %>
-    <% end %>
+    <%= render "spree/admin/taxons/attachment_forms/#{f.object.attachment_partial_name}", f: f %>
   </div>
 
   <div class="col-5">

data/app/views/spree/admin/taxons/attachment_forms/_paperclip.html.erb

@@ -0,0 +1,16 @@
+<% f.object.class.attachment_definitions.each do |attachment, definition| %>
+  <%= f.field_container attachment do %>
+    <%= f.label attachment %><br>
+    <%= f.file_field attachment %>
+    <% if f.object.send(attachment).exists? %>
+      <%= image_tag f.object.send(attachment, definition[:default_style]) %>
+      <%= link_to t('spree.actions.remove'),
+                  admin_taxonomy_taxon_attachment_path(@taxonomy,
+                                                       @taxon.id,
+                                                       attachment_definition: attachment,
+                                                       authenticity_token: form_authenticity_token),
+                  method: :delete,
+                  class: 'btn btn-sm btn-danger' %>
+    <% end %>
+  <% end %>
+<% end %>

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

@@ -60,18 +60,20 @@
   </div>
 
   <div data-hook="admin_user_form_password_fields" class="col-6">
-    <%= f.field_container :password do %>
-      <%= f.label :password %>
-      <%= f.password_field :password, class: 'fullwidth' %>
-      <%= f.error_message_on :password %>
-    <% end %>
+    <% if can? :update_password, @user %>
+      <%= f.field_container :password do %>
+        <%= f.label :password %>
+        <%= f.password_field :password, class: 'fullwidth' %>
+        <%= f.error_message_on :password %>
+      <% end %>
 
 
-    <% if f.object.respond_to?(:password_confirmation) %>
-      <%= f.field_container :password do %>
-        <%= f.label :password_confirmation %>
-        <%= f.password_field :password_confirmation, class: 'fullwidth' %>
-        <%= f.error_message_on :password_confirmation %>
+      <% if f.object.respond_to?(:password_confirmation) %>
+        <%= f.field_container :password do %>
+          <%= f.label :password_confirmation %>
+          <%= f.password_field :password_confirmation, class: 'fullwidth' %>
+          <%= f.error_message_on :password_confirmation %>
+        <% end %>
       <% end %>
     <% end %>
   </div>

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

@@ -19,7 +19,7 @@
           <%= link_to t("spree.admin.user.items"), spree.items_admin_user_path(@user) %>
         </li>
       <% end %>
-      <% if can?(:display, Spree::StoreCredit) %>
+      <% if can?(:display, @user.store_credits.new) %>
         <li<%== ' class="active"' if current == :store_credits %>>
           <%= link_to t("spree.admin.user.store_credit"), spree.admin_user_store_credits_path(@user) %>
         </li>

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

@@ -1,6 +1,5 @@
 <% admin_breadcrumb(link_to plural_resource_name(Spree::LegacyUser), spree.admin_users_path) %>
-<% admin_breadcrumb(@user.email) %>
-
+<% admin_breadcrumb(@user.valid? ? @user.email : @user.email_was) %>
 
 <%= render 'spree/admin/users/sidebar' %>
 <%= render 'spree/admin/users/tabs', current: :account %>

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

@@ -3,8 +3,7 @@
   <head data-hook="admin_inside_head">
     <%= render 'spree/admin/shared/head' %>
   </head>
-
-  <body class="admin">
+  <body class="admin <%= "admin-nav-hidden" if cookies[:admin_nav_hidden] == "true" %>">
     <%= render "spree/admin/shared/navigation" %>
     <%= render "spree/admin/shared/header" %>
     <%= render "spree/admin/shared/flash" %>

data/config/routes.rb

@@ -66,11 +66,7 @@ Spree::Core::Engine.routes.draw do
 
     delete '/option_values/:id', to: "option_values#destroy", as: :option_value
 
-    resources :properties do
-      collection do
-        get :filtered
-      end
-    end
+    resources :properties
 
     delete '/product_properties/:id', to: "product_properties#destroy", as: :product_property
 
@@ -132,7 +128,9 @@ Spree::Core::Engine.routes.draw do
       collection do
         post :update_positions
       end
-      resources :taxons
+      resources :taxons do
+        resource :attachment, controller: 'taxons/attachment', only: [:destroy]
+      end
     end
 
     resources :taxons, only: [:index, :show] do

data/lib/spree/backend.rb

@@ -9,6 +9,7 @@ require 'font-awesome-rails'
 require 'autoprefixer-rails'
 require 'jbuilder'
 require 'kaminari'
+require 'responders'
 
 require 'spree_core'
 require 'spree_api'

data/lib/spree/backend/config.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'spree/backend_configuration'
+
+module Spree
+  module Backend
+    Config = Spree::BackendConfiguration.new
+  end
+end

data/lib/spree/backend/engine.rb

@@ -1,13 +1,15 @@
 # frozen_string_literal: true
 
+require 'spree/backend/config'
+
 module Spree
   module Backend
     class Engine < ::Rails::Engine
       config.middleware.use "Spree::Backend::Middleware::SeoAssist"
 
-      initializer "spree.backend.environment", before: :load_config_initializers do |_app|
-        Spree::Backend::Config = Spree::BackendConfiguration.new
-      end
+      # Leave initializer empty for backwards-compatability. Other apps
+      # might still rely on this event.
+      initializer "spree.backend.environment", before: :load_config_initializers do; end
     end
   end
 end

data/{app/models → lib}/spree/backend_configuration.rb

@@ -1,8 +1,10 @@
 # frozen_string_literal: true
 
+require 'spree/preferences/configuration'
+
 module Spree
   class BackendConfiguration < Preferences::Configuration
-    preference :locale, :string, default: Rails.application.config.i18n.default_locale
+    preference :locale, :string, default: I18n.default_locale
 
     ORDER_TABS         ||= [:orders, :payments, :creditcard_payments,
                             :shipments, :credit_cards, :return_authorizations,
@@ -15,7 +17,8 @@ module Spree
                             :payment_methods, :shipping_methods,
                             :shipping_categories, :stock_locations,
                             :refund_reasons, :reimbursement_types,
-                            :return_reasons, :adjustment_reasons]
+                            :return_reasons, :adjustment_reasons,
+                            :store_credit_reasons]
     PROMOTION_TABS     ||= [:promotions, :promotion_categories]
     STOCK_TABS         ||= [:stock_items]
     USER_TABS          ||= [:users, :store_credits]

data/solidus_backend.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.requirements << 'none'
 
-  s.required_ruby_version = '>= 2.2.2'
+  s.required_ruby_version = '>= 2.4.0'
   s.required_rubygems_version = '>= 1.8.23'
 
   s.add_dependency 'solidus_api', s.version
@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'jbuilder', '~> 2.8'
   s.add_dependency 'jquery-rails'
   s.add_dependency 'kaminari', '~> 1.1'
+  s.add_dependency 'responders'
   s.add_dependency 'sassc-rails'
 
   s.add_dependency 'autoprefixer-rails'

data/spec/controllers/spree/admin/customer_returns_controller_spec.rb

@@ -173,7 +173,7 @@ module Spree
 
         context "a return item has an inactive return authorization reason" do
           before(:each) do
-            accepted_return_item.update_attributes(return_reason_id: inactive_rma_reason.id)
+            accepted_return_item.update(return_reason_id: inactive_rma_reason.id)
           end
 
           it "includes the inactive return authorization reason" do

data/spec/controllers/spree/admin/orders/customer_details_controller_spec.rb

@@ -61,7 +61,7 @@ describe Spree::Admin::Orders::CustomerDetailsController, type: :controller do
       before { allow(Spree::Order).to receive_message_chain(:includes, :find_by!) { order } }
 
       it "updates + progresses the order" do
-        expect(order).to receive(:update_attributes) { true }
+        expect(order).to receive(:update) { true }
         expect(order).to receive(:next) { false }
         attributes = { order_id: order.number, order: { email: "" } }
         put :update, params: attributes
@@ -109,7 +109,7 @@ describe Spree::Admin::Orders::CustomerDetailsController, type: :controller do
 
       context "not false guest checkout param" do
         it "does not attempt to associate the user" do
-          allow(order).to receive_messages(update_attributes: true,
+          allow(order).to receive_messages(update: true,
                                            next: false,
                                            refresh_shipment_rates: true)
 

data/spec/controllers/spree/admin/resource_controller_spec.rb

@@ -37,6 +37,7 @@ describe Spree::Admin::WidgetsController, type: :controller do
       def check_destroy_constraints
         return unless name == 'undestroyable'
         errors.add :base, "You can't destroy undestroyable things!"
+        errors.add :base, "Terrible things might happen."
         throw(:abort)
       end
     end
@@ -164,7 +165,17 @@ describe Spree::Admin::WidgetsController, type: :controller do
         it 'responds with error message' do
           subject
           expect(response).to be_unprocessable
-          expect(response.body).to eq assigns(:widget).errors.full_messages.join(', ')
+          expect(response.body).to eq assigns(:widget).errors.full_messages.to_sentence
+        end
+      end
+
+      context 'html format' do
+        subject { delete :destroy, params: params }
+
+        it 'responds with error message' do
+          subject
+          expect(response).to be_redirect
+          expect(flash[:error]).to eq assigns(:widget).errors.full_messages.to_sentence
         end
       end
     end

data/spec/controllers/spree/admin/store_credits_controller_spec.rb

@@ -193,7 +193,7 @@ describe Spree::Admin::StoreCreditsController do
       let(:updated_amount) { 300.0 }
 
       context "the store credit has been partially used" do
-        before { store_credit.update_attributes(amount_used: 10.0) }
+        before { store_credit.update(amount_used: 10.0) }
 
         context "the new amount is greater than the used amount" do
           let(:updated_amount) { 11.0 }

data/spec/controllers/spree/admin/users_controller_spec.rb

@@ -202,6 +202,29 @@ describe Spree::Admin::UsersController, type: :controller do
       end
     end
 
+    context "allowed to update passwords" do
+      it "can change password of a user" do
+        expect {
+          put :update, params: { id: user.id, user: { password: "diff123", password_confirmation: "diff123" } }
+        }.to_not raise_error
+      end
+    end
+
+    context "not allowed to update passwords" do
+      stub_authorization! do |_user|
+        can [:admin, :update], Spree.user_class
+      end
+
+      it "cannot change password of a user" do
+        allow(ActionController::Parameters).
+          to receive(:action_on_unpermitted_parameters).and_return(:raise)
+
+        expect {
+          put :update, params: { id: user.id, user: { password: "diff123", password_confirmation: "diff123" } }
+        }.to raise_error(ActionController::UnpermittedParameters)
+      end
+    end
+
     it "can update ship_address attributes" do
       post :update, params: { id: user.id, user: { ship_address_attributes: valid_address_attributes } }
       expect(user.reload.ship_address.city).to eq('New York')

data/spec/features/admin/configuration/payment_methods_spec.rb

@@ -32,8 +32,8 @@ describe "Payment Methods", type: :feature do
     end
   end
 
-  context "admin creating a new payment method" do
-    it "should be able to create a new payment method" do
+  context "admin creating a new payment method", :js do
+    it "creates a new payment method and disables the form" do
       click_link "Payments"
       expect(page).to have_link 'Payment Methods'
       click_link "admin_new_payment_methods_link"
@@ -43,6 +43,15 @@ describe "Payment Methods", type: :feature do
       select Spree::PaymentMethod::Check.model_name.human, from: "Type"
       click_button "Create"
       expect(page).to have_content("successfully created!")
+
+      visit spree.new_admin_payment_method_path
+      page.execute_script "$('form').submit(function(e) { e.preventDefault()})"
+      fill_in "payment_method_name", with: "check90"
+      fill_in "payment_method_description", with: "check90 desc"
+      select Spree::PaymentMethod::Check.model_name.human, from: "Type"
+      click_button "Create"
+
+      expect(page).to have_button("Create", disabled: true)
     end
   end
 

data/spec/features/admin/configuration/shipping_methods_spec.rb

@@ -25,7 +25,7 @@ describe "Shipping Methods", type: :feature do
   end
 
   context "create", js: true do
-    it "should be able to create a new shipping method" do
+    it "creates a new shipping method and disables the submit button", :js do
       click_link "New Shipping Method"
 
       fill_in "shipping_method_name", with: "bullock cart"
@@ -36,6 +36,18 @@ describe "Shipping Methods", type: :feature do
 
       click_on "Create"
       expect(current_path).to eql(spree.edit_admin_shipping_method_path(Spree::ShippingMethod.last))
+
+      visit spree.new_admin_shipping_method_path
+      page.execute_script "$('form').submit(function(e) { e.preventDefault()})"
+      fill_in "shipping_method_name", with: "bullock cart"
+
+      within("#shipping_method_categories_field") do
+        check first("input[type='checkbox']")["name"]
+      end
+
+      click_on "Create"
+
+      expect(page).to have_button("Create", disabled: true)
     end
 
     context 'with shipping method having a calculator with array or hash preference type' do