spree_backend 4.1.11 → 4.2.0.beta

data/app/assets/stylesheets/spree/backend/shared/_forms.scss

@@ -24,3 +24,41 @@ span.or {
     }
   }
 }
+
+// Hide number toggler
+  // Chrome, Safari, Edge, Opera
+input.hide-number-toggle::-webkit-outer-spin-button,
+input.hide-number-toggle::-webkit-inner-spin-button {
+  -webkit-appearance: none;
+  margin: 0;
+}
+  // Firefox
+input[type=number].hide-number-toggle {
+  -moz-appearance: textfield;
+}
+
+
+// Remove the default 5px outlines and box-shadows
+// from all inputs on focus.
+.form-control:focus {
+  box-shadow: none !important;
+}
+
+*:focus {
+    outline: none;
+}
+
+:-webkit-direct-focus {
+  outline-color: transparent;
+  outline-style: auto;
+  outline-width: 0;
+}
+
+.custom-select {
+  background: $input-bg url(asset-path("backend-chevron-down.svg")) no-repeat right 0.5rem center/8px 10px;
+  background-size: 0.7em;
+  &:focus{
+    outline: none;
+    box-shadow: none;
+  }
+}

data/app/assets/stylesheets/spree/backend/spree_admin.css.scss

@@ -20,6 +20,11 @@
 
 @import 'plugins/select2';
 @import 'plugins/jquery_ui';
+@import 'plugins/flatpickr';
 
 @import 'shared/base';
 @import 'shared/forms';
+
+@import 'views/order_payments';
+@import 'views/product_properties';
+@import 'views/prototypes';

data/app/assets/stylesheets/spree/backend/views/_order_payments.scss

@@ -0,0 +1,12 @@
+// Styling For Order Payments
+div.previous_cards {
+ ul {
+   li {
+    list-style: none;
+    margin: 5px 0;
+    input {
+      margin-right: 10px;
+    }
+  }
+ }
+}

data/app/assets/stylesheets/spree/backend/views/_product_properties.scss

@@ -0,0 +1,11 @@
+table#product_properties {
+  .show_property {
+    text-align: center;
+  }
+  .property_name input {
+    min-width: 140px;
+  }
+  .value input {
+    min-width: 180px;
+  }
+}

data/app/assets/stylesheets/spree/backend/views/prototypes.scss

@@ -0,0 +1,42 @@
+$color_size: 26px;
+
+.product-prototype-options {
+  .option-type-values {
+    &__color {
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      max-width: 350px;
+      input {
+        display: none;
+      }
+    }
+    li {
+      display: flex;
+      align-items: center;
+      margin: 0.25rem;
+      input {
+        margin-right: 0.5rem;
+      }
+    }
+  }
+  .option-value__color {
+    border-radius: 50%;
+    border: 2px solid #d3d3d3;
+    width: $color_size;
+    height: $color_size;
+    overflow: hidden;
+    padding: 1px;
+    &:after {
+      content: '';
+      display: inline-block;
+      width: 100%;
+      height: 100%;
+      background-color: var(--presentation);
+      border-radius: 50%;
+    }
+  }
+  input:checked + .option-value__color {
+    border-color: #565656;
+  }
+}

data/app/controllers/spree/admin/general_settings_controller.rb

@@ -3,6 +3,8 @@ module Spree
     class GeneralSettingsController < Spree::Admin::BaseController
       include Spree::Backend::Callbacks
 
+      before_action :update_currency_settings, only: :update
+
       def edit
         @preferences_security = []
       end
@@ -23,6 +25,31 @@ module Spree
         invoke_callbacks(:clear_cache, :after)
         head :no_content
       end
+
+      def render(*args)
+        @preferences_currency |= [:allow_currency_change, :show_currency_selector]
+        super
+      end
+
+      private
+
+      def update_currency_settings
+        params.each do |name, value|
+          next unless Spree::Config.has_preference?(name) && name.eql?('supported_currencies')
+
+          value = update_value(value)
+          Spree::Config[name] = value
+        end
+      end
+
+      def update_value(value)
+        value.split(',').
+          map { |curr| ::Money::Currency.find(curr.strip).try(:iso_code) }.
+          concat([Spree::Config[:currency]]).
+          uniq.
+          compact.
+          join(',')
+      end
     end
   end
 end

data/app/controllers/spree/admin/prices_controller.rb

@@ -0,0 +1,39 @@
+module Spree
+  module Admin
+    class PricesController < ResourceController
+      belongs_to 'spree/product', find_by: :slug
+
+      helper_method :supported_currencies_for_all_stores
+
+      def create
+        params.require(:vp).permit!
+        params[:vp].each do |variant_id, prices|
+          next unless variant_id
+
+          variant = Spree::Variant.find(variant_id)
+          next unless variant
+
+          supported_currencies_for_all_stores.each do |currency|
+            price = variant.price_in(currency.iso_code)
+            price.price = (prices[currency.iso_code]['price'].blank? ? nil : prices[currency.iso_code]['price'])
+            price.compare_at_price = (prices[currency.iso_code]['compare_at_price'].blank? ? nil : prices[currency.iso_code]['compare_at_price'])
+            price.save! if price.new_record? && price.price || !price.new_record? && price.changed?
+          end
+        end
+        flash[:success] = Spree.t('notice_messages.prices_saved')
+        redirect_to admin_product_path(parent)
+      end
+
+      private
+
+      def supported_currencies_for_all_stores
+        @supported_currencies_for_all_stores = begin
+          (
+            Spree::Store.pluck(:supported_currencies).map { |c| c&.split(',') }.flatten + Spree::Store.pluck(:default_currency)
+          ).
+            compact.uniq.map { |code| ::Money::Currency.find(code.strip) }
+        end
+      end
+    end
+  end
+end

data/app/controllers/spree/admin/stock_transfers_controller.rb

@@ -20,7 +20,10 @@ module Spree
 
       def create
         if params[:variant].nil?
-          flash[:error] = Spree.t('stock_transfer.errors.must_have_variant')
+          flash.now[:error] = Spree.t('stock_transfer.errors.must_have_variant')
+          render :new
+        elsif any_missing_variants?(params[:variant])
+          flash.now[:error] = Spree.t('stock_transfer.errors.variants_unavailable', stock: source_location.name)
           render :new
         else
           variants = Hash.new(0)
@@ -51,6 +54,10 @@ module Spree
       def destination_location
         @destination_location ||= StockLocation.find(params[:transfer_destination_location_id])
       end
+
+      def any_missing_variants?(variant_ids)
+        source_location&.stock_items&.where(variant_id: variant_ids, count_on_hand: 0)&.any?
+      end
     end
   end
 end

data/app/controllers/spree/admin/stores_controller.rb

@@ -3,9 +3,43 @@ module Spree
     class StoresController < Spree::Admin::BaseController
       before_action :load_store, only: [:new, :edit, :update]
       before_action :set_default_currency, only: :new
+      before_action :set_default_locale, only: :new
+      before_action :normalize_supported_currencies, only: [:create, :update]
+      before_action :set_default_country_id, only: :new
+      before_action :load_all_countries, only: [:new, :edit, :update, :create]
+
+      if defined?(SpreeI18n)
+        include SpreeI18n::LocaleHelper
+      end
+
+      helper_method :all_locales_options
 
       def index
-        @stores = Spree::Store.all
+        if params[:ids]
+          load_stores_by_ids
+        elsif params[:q]
+          load_stores_by_query
+        else
+          @stores = Spree::Store.all
+        end
+
+        respond_with(@stores) do |format|
+          format.json { render layout: false }
+        end
+      end
+
+      def load_stores_by_ids
+        ids = params[:ids].split(',')
+        @stores = Spree::Store.where(id: ids)
+      end
+
+      def load_stores_by_query
+        @stores = if defined?(SpreeGlobalize)
+                    Spree::Store.joins(:translations).where("LOWER(#{Store::Translation.table_name}.name) LIKE LOWER(:query)",
+                                                            query: "%#{params[:q]}%")
+                  else
+                    Spree::Store.where('LOWER(name) LIKE LOWER(:query)', query: "%#{params[:q]}%")
+                  end
       end
 
       def create
@@ -76,9 +110,35 @@ module Spree
         @store = Spree::Store.find_by(id: params[:id]) || Spree::Store.new
       end
 
+      def load_all_countries
+        @countries = Spree::Country.all
+      end
+
       def set_default_currency
         @store.default_currency = Spree::Config[:currency]
       end
+
+      def set_default_locale
+        @store.default_locale = I18n.locale
+      end
+
+      def normalize_supported_currencies
+        if params[:store][:supported_currencies]&.is_a?(Array)
+          params[:store][:supported_currencies] = params[:store][:supported_currencies].compact.uniq.reject(&:blank?).join(',')
+        end
+      end
+
+      def set_default_country_id
+        @store.default_country_id = Spree::Config[:default_country_id]
+      end
+
+      # this method is overriten by spree_i18n to add support for more locales
+      # in https://github.com/spree-contrib/spree_i18n/blob/master/app/helpers/spree_i18n/locale_helper.rb#L17
+      unless defined?(SpreeI18n)
+        def all_locales_options
+          [['English (EN)', :en]]
+        end
+      end
     end
   end
 end

data/app/controllers/spree/admin/taxons_controller.rb

@@ -77,7 +77,11 @@ module Spree
       end
 
       def load_taxonomy
-        @taxonomy = Taxonomy.find(params[:taxonomy_id])
+        @taxonomy = if defined?(SpreeGlobalize)
+                      Taxonomy.includes(:translations, taxons: [:translations]).find(params[:taxonomy_id])
+                    else
+                      Taxonomy.find(params[:taxonomy_id])
+                    end
       end
 
       def set_position

data/app/helpers/spree/admin/base_helper.rb

@@ -3,15 +3,13 @@ module Spree
     module BaseHelper
       def flash_alert(flash)
         if flash.present?
-          close_button = button_tag(class: 'close', 'data-dismiss' => 'alert', 'aria-label' => Spree.t(:close)) do
-            content_tag('span', '×'.html_safe, 'aria-hidden' => true)
-          end
           message = flash[:error] || flash[:notice] || flash[:success]
           flash_class = 'danger' if flash[:error]
           flash_class = 'info' if flash[:notice]
           flash_class = 'success' if flash[:success]
-          flash_div = content_tag(:div, (close_button + message), class: "alert alert-#{flash_class} alert-auto-disappear")
-          content_tag(:div, flash_div, class: 'col-12')
+          flash_div = content_tag(:div, message, class: "alert alert-#{flash_class} mx-2")
+          content_tag(:div, flash_div,
+                      class: 'd-flex justify-content-center position-fixed flash-alert ')
         end
       end
 
@@ -37,6 +35,15 @@ module Spree
         end
       end
 
+      def svg_icon(name:, classes: '', width:, height:)
+        if name.ends_with?('.svg')
+          icon_name = File.basename(name, File.extname(name))
+          inline_svg_tag "backend-#{icon_name}.svg", class: "icon-#{icon_name} #{classes}", size: "#{width}px*#{height}px"
+        else
+          inline_svg_tag "backend-#{name}.svg", class: "icon-#{name} #{classes}", size: "#{width}px*#{height}px"
+        end
+      end
+
       def datepicker_field_value(date)
         unless date.blank?
           l(date, format: Spree.t('date_picker.format', default: '%Y/%m/%d'))
@@ -130,7 +137,7 @@ module Spree
       # renders hidden field and link to remove record using nested_attributes
       def link_to_icon_remove_fields(form)
         url = form.object.persisted? ? [:admin, form.object] : '#'
-        link_to_with_icon('delete', '', url,
+        link_to_with_icon('delete.svg', '', url,
                           class: 'spree_remove_fields btn btn-sm btn-danger',
                           data: {
                             action: 'remove'
@@ -152,7 +159,7 @@ module Spree
       def order_time(time)
         return '' if time.blank?
 
-        [I18n.l(time.to_date), time.strftime('%l:%M %p').strip].join(' ')
+        [I18n.l(time.to_date), time.strftime('%l:%M %p %Z').strip].join(' ')
       end
 
       def required_span_tag
@@ -165,7 +172,17 @@ module Spree
         button_link_to(
           Spree.t(:preview_product),
           spree.product_url(product),
-          class: 'btn-outline-secondary', icon: 'eye-open', id: 'admin_preview_product', target: :blank
+          class: 'btn-outline-secondary', icon: 'view.svg', id: 'admin_preview_product', target: :blank
+        )
+      end
+
+      def taxon_preview_link(taxon)
+        return unless frontend_available?
+
+        button_link_to(
+          Spree.t(:preview_taxon),
+          seo_url(taxon),
+          class: 'btn-outline-secondary', icon: 'view.svg', id: 'admin_preview_taxon', target: :blank
         )
       end
     end

data/app/helpers/spree/admin/navigation_helper.rb

@@ -15,6 +15,9 @@ module Spree
       # Example:
       #   # Link to /admin/orders, also highlight tab for ProductsController and ShipmentsController
       #   tab :orders, :products, :shipments
+
+      ICON_SIZE = 16
+
       def tab(*args)
         options = { label: args.first.to_s }
 
@@ -48,7 +51,7 @@ module Spree
                  link_to(
                    titleized_label,
                    destination_url,
-                   class: "sidebar-submenu-item w-100 py-1 px-3 d-block #{'text-success' if selected}"
+                   class: "sidebar-submenu-item w-100 py-2 py-md-1 pl-3 d-block #{'text-success' if selected}"
                  )
                end
 
@@ -61,9 +64,15 @@ module Spree
       # Single main menu item
       def main_menu_item(text, url: nil, icon: nil)
         link_to url, 'data-toggle': 'collapse', class: 'd-flex w-100 p-3 position-relative align-items-center' do
-          content_tag(:span, nil, class: "icon icon-#{icon} mr-2") +
-            content_tag(:span, " #{text}", class: 'text') +
-            content_tag(:span, nil, class: 'icon icon-chevron-left position-absolute')
+          if icon.ends_with?('.svg')
+            svg_icon(name: icon, classes: 'mr-2', width: ICON_SIZE, height: ICON_SIZE) +
+              content_tag(:span, " #{text}", class: 'text') +
+              svg_icon(name: 'chevron-left.svg', classes: 'drop-menu-indicator position-absolute', width: (ICON_SIZE - 4), height: (ICON_SIZE - 4))
+          else
+            content_tag(:span, nil, class: "icon icon-#{icon} mr-2") +
+              content_tag(:span, " #{text}", class: 'text') +
+              svg_icon(name: 'chevron-left.svg', classes: 'drop-menu-indicator position-absolute', width: (ICON_SIZE - 4), height: (ICON_SIZE - 4))
+          end
         end
       end
 
@@ -86,17 +95,17 @@ module Spree
           end
         else
           per_page_default = Spree::Config.admin_orders_per_page
-          per_page_options = %w{15 30 45 60}
+          per_page_options = %w{25 50 75}
         end
 
         selected_option = params[:per_page].try(:to_i) || per_page_default
 
         select_tag(:per_page,
                    options_for_select(per_page_options, selected_option),
-                   class: "form-control pull-right js-per-page-select per-page-selected-#{selected_option}")
+                   class: "w-auto form-control js-per-page-select per-page-selected-#{selected_option} custom-select")
       end
 
-      # helper method to create proper url to apply per page filtering
+      # helper method to create proper url to apply per page ing
       # fixes https://github.com/spree/spree/issues/6888
       def per_page_dropdown_params(args = nil)
         args = params.permit!.to_h.clone
@@ -123,7 +132,7 @@ module Spree
         options[:data] = { action: 'clone', 'original-title': Spree.t(:clone) }
         options[:class] = 'btn btn-primary btn-sm with-tip'
         options[:method] = :post
-        options[:icon] = :clone
+        options[:icon] = 'clone.svg'
         button_link_to '', clone_object_url(resource), options
       end
 
@@ -131,7 +140,7 @@ module Spree
         options[:data] = { action: 'clone', 'original-title': Spree.t(:clone) }
         options[:class] = 'btn btn-warning btn-sm with-tip'
         options[:method] = :post
-        options[:icon] = :clone
+        options[:icon] = 'clone.svg'
         button_link_to '', clone_admin_promotion_path(promotion), options
       end
 
@@ -139,13 +148,13 @@ module Spree
         url = options[:url] || edit_object_url(resource)
         options[:data] = { action: 'edit' }
         options[:class] = 'btn btn-primary btn-sm'
-        link_to_with_icon('edit', Spree.t(:edit), url, options)
+        link_to_with_icon('edit.svg', Spree.t(:edit), url, options)
       end
 
       def link_to_edit_url(url, options = {})
         options[:data] = { action: 'edit' }
         options[:class] = 'btn btn-primary btn-sm'
-        link_to_with_icon('edit', Spree.t(:edit), url, options)
+        link_to_with_icon('edit.svg', Spree.t(:edit), url, options)
       end
 
       def link_to_delete(resource, options = {})
@@ -153,7 +162,7 @@ module Spree
         name = options[:name] || Spree.t(:delete)
         options[:class] = 'btn btn-danger btn-sm delete-resource'
         options[:data] = { confirm: Spree.t(:are_you_sure), action: 'remove' }
-        link_to_with_icon 'delete', name, url, options
+        link_to_with_icon 'delete.svg', name, url, options
       end
 
       def link_to_with_icon(icon_name, text, url, options = {})
@@ -162,20 +171,32 @@ module Spree
         text = options[:no_text] ? '' : content_tag(:span, text, class: 'text')
         options.delete(:no_text)
         if icon_name
-          icon = content_tag(:span, '', class: "#{'mr-2' unless text.empty?} icon icon-#{icon_name}")
+          icon = if icon_name.ends_with?('.svg')
+                   svg_icon(name: icon_name, classes: "#{'mr-2' unless text.empty?} icon icon-#{icon_name}", width: ICON_SIZE, height: ICON_SIZE)
+                 else
+                   content_tag(:span, '', class: "#{'mr-2' unless text.empty?} icon icon-#{icon_name}")
+                 end
           text = "#{icon} #{text}"
         end
         link_to(text.html_safe, url, options)
       end
 
       def spree_icon(icon_name)
-        icon_name ? content_tag(:i, '', class: icon_name) : ''
+        if icon_name.ends_with?('.svg')
+          icon_name ? svg_icon(name: icon_name, classes: icon_name, width: ICON_SIZE, height: ICON_SIZE) : ''
+        else
+          icon_name ? content_tag(:span, '', class: icon_name) : ''
+        end
       end
 
       # Override: Add disable_with option to prevent multiple request on consecutive clicks
       def button(text, icon_name = nil, button_type = 'submit', options = {})
         if icon_name
-          icon = content_tag(:span, '', class: "icon icon-#{icon_name}")
+          icon = if icon_name.ends_with?('.svg')
+                   svg_icon(name: icon_name, classes: "icon icon-#{icon_name}", width: ICON_SIZE, height: ICON_SIZE)
+                 else
+                   content_tag(:span, '', class: "icon icon-#{icon_name}")
+                 end
           text = "#{icon} #{text}"
         end
         button_tag(
@@ -192,7 +213,7 @@ module Spree
         if html_options[:method] &&
             !html_options[:method].to_s.casecmp('get').zero? &&
             !html_options[:remote]
-          form_tag(url, method: html_options.delete(:method), class: 'd-inline') do
+          form_tag(url, method: html_options.delete(:method)) do
             button(text, html_options.delete(:icon), nil, html_options)
           end
         else
@@ -206,11 +227,15 @@ module Spree
           html_options[:class] = html_options[:class] ? "btn #{html_options[:class]}" : 'btn btn-outline-secondary'
 
           if html_options[:icon]
-            icon = content_tag(:span, '', class: "icon icon-#{html_options[:icon]}")
+            icon = if html_options[:icon].ends_with?('.svg')
+                     svg_icon(name: html_options[:icon], classes: "icon icon-#{html_options[:icon]}", width: ICON_SIZE, height: ICON_SIZE)
+                   else
+                     content_tag(:span, '', class: "icon icon-#{html_options[:icon]}")
+                   end
             text = "#{icon} #{text}"
           end
 
-          link_to(text.html_safe, url, html_options)
+          link_to(text.html_safe, url, html_options.except(:icon))
         end
       end
 
@@ -222,7 +247,7 @@ module Spree
         options[:class] = 'sidebar-menu-item d-block w-100'
         options[:class] << ' selected' if is_selected
         content_tag(:li, options) do
-          link_to(link_text, url, class: "#{'text-success' if is_selected} py-1 px-3 d-block sidebar-submenu-item")
+          link_to(link_text, url, class: "#{'text-success' if is_selected} sidebar-submenu-item w-100 py-2 py-md-1 pl-3 d-block")
         end
       end
 
@@ -235,6 +260,9 @@ module Spree
       end
 
       def main_sidebar_classes
+        ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+          Admin::NavigationsHelper#main_sidebar_classes is deprecated and will be removed in Spree 5.0.
+        DEPRECATION
         if cookies['sidebar-minimized'] == 'true'
           'col-3 col-md-2 sidebar'
         else
@@ -243,6 +271,9 @@ module Spree
       end
 
       def wrapper_classes
+        ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+          Admin::NavigationsHelper#wrapper_classes is deprecated and will be removed in Spree 5.0.
+        DEPRECATION
         'sidebar-minimized' if cookies['sidebar-minimized'] == 'true'
       end
     end