spree_backend 4.1.12 → 4.2.0.rc3

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

@@ -2,10 +2,19 @@
   padding: 0 0 15px 0;
 }
 
+.card {
+  overflow: hidden;
+}
+
 .is-hidden {
   display: none;
 }
 
+.tooltip{
+  pointer-events: none;
+  z-index: $zindex-dropdown;
+}
+
 // No-margin and no-padding helper classes
 @each $side in top bottom left right {
   .no-margin-#{$side}  { margin-#{side}: 0; }
@@ -15,3 +24,34 @@
 .alert-error {
   @extend .alert-danger;
 }
+
+.js-remove-promo-rule-option-value {
+  color: $primary !important;
+  &:hover {
+    color: darken($primary, 10) !important;
+  }
+}
+
+.flash-alert {
+  z-index: 0;
+  opacity: 0;
+  bottom: -50px;
+  left:0;
+  right:0;
+
+  .alert {
+    z-index: 500;
+    opacity: 0.98;
+    border-width: 3px;
+    margin-bottom: 0;
+  }
+}
+
+.flash-alert.animate__animated {
+  opacity: 1;
+  bottom: 30px;
+}
+
+.resize-animation-stopper * {
+  transition: none !important;
+}

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

@@ -18,8 +18,14 @@
 @import 'components/progress';
 @import 'components/spinner';
 
-@import 'plugins/select2';
 @import 'plugins/jquery_ui';
+@import 'plugins/flatpickr';
+@import 'plugins/select2_bootstrap4';
+@import 'plugins/select2_custom';
 
 @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/adjustments_controller.rb

@@ -11,6 +11,8 @@ module Spree
 
       before_action :find_adjustment, only: [:destroy, :edit, :update]
 
+      after_action :delete_promotion_from_order, only: [:destroy], if: -> { @adjustment.destroyed? && @adjustment.promotion? }
+
       def index
         @adjustments = @order.all_adjustments.eligible.order(created_at: :asc)
       end
@@ -31,6 +33,12 @@ module Spree
       def build_resource
         parent.adjustments.build(order: parent)
       end
+
+      def delete_promotion_from_order
+        return if @adjustment.source.nil?
+
+        @order.promotions.delete(@adjustment.source.promotion)
+      end
     end
   end
 end

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 |= [:show_store_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/orders_controller.rb

@@ -2,7 +2,10 @@ module Spree
   module Admin
     class OrdersController < Spree::Admin::BaseController
       before_action :initialize_order_events
-      before_action :load_order, only: [:edit, :update, :cancel, :resume, :approve, :resend, :open_adjustments, :close_adjustments, :cart, :store, :set_store]
+      before_action :load_order, only: %i[
+        edit update cancel resume approve resend open_adjustments
+        close_adjustments cart store set_store channel set_channel
+      ]
 
       respond_to :html
 
@@ -144,11 +147,21 @@ module Spree
         redirect_to store_admin_order_url(@order)
       end
 
+      def set_channel
+        if @order.update(order_params)
+          flash[:success] = flash_message_for(@order, :successfully_updated)
+        else
+          flash[:error] = @order.errors.full_messages.join(', ')
+        end
+
+        redirect_to channel_admin_order_url(@order)
+      end
+
       private
 
       def order_params
         params[:created_by_id] = try_spree_current_user.try(:id)
-        params.permit(:created_by_id, :user_id, :store_id)
+        params.permit(:created_by_id, :user_id, :store_id, :channel)
       end
 
       def load_order

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/products_controller.rb

@@ -20,10 +20,10 @@ module Spree
 
       def update
         if params[:product][:taxon_ids].present?
-          params[:product][:taxon_ids] = params[:product][:taxon_ids].split(',')
+          params[:product][:taxon_ids] = params[:product][:taxon_ids].reject(&:empty?)
         end
         if params[:product][:option_type_ids].present?
-          params[:product][:option_type_ids] = params[:product][:option_type_ids].split(',')
+          params[:product][:option_type_ids] = params[:product][:option_type_ids].reject(&:empty?)
         end
         invoke_callbacks(:update, :before)
         if @object.update(permitted_resource_params)

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

@@ -22,7 +22,7 @@ module Spree
       end
 
       def load_data
-        @countries = Country.order(:name)
+        @countries = Spree::Country.where(states_required: true).order(:name)
       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,44 @@ 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]
+      before_action :load_all_zones, only: %i[new edit]
+
+      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 +111,39 @@ module Spree
         @store = Spree::Store.find_by(id: params[:id]) || Spree::Store.new
       end
 
+      def load_all_countries
+        @countries = Spree::Country.all
+      end
+
+      def load_all_zones
+        @zones = Spree::Zone.pluck(:name, :id)
+      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