solidus_backend 2.4.2 → 2.5.0.beta1

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

@@ -9,16 +9,22 @@ body {
 }
 
 .admin-nav {
-  @include position(absolute, 0 null 0 0);
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
   width: $width-sidebar;
   @media print { display: none }
 }
 
 .content-wrapper {
-  @include padding(1rem $grid-gutter-width null);
+  padding-top: 1rem;
+  padding-left: $grid-gutter-width;
+  padding-right: $grid-gutter-width;
 
   &:not(.full-width) {
-    @include margin(null auto);
+    margin-left: auto;
+    margin-right: auto;
     max-width: map-get($container-max-widths, "xl");
   }
 }

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

@@ -3,7 +3,9 @@ table {
   @extend .table;
   border-spacing: 0;
 
-  &.sortable td {
+  &.sortable td,
+  tr.vertical-middle td,
+  tr.vertical-middle th {
     vertical-align: middle;
   }
 
@@ -115,32 +117,6 @@ table {
         background-color: very-light(theme-color("danger"), 6);
         border-color: very-light(theme-color("danger"), 15);
       }
-
-      &.ui-sortable-placeholder td {
-        border: 1px solid $color-2 !important;
-        visibility: visible !important;
-
-        &.actions {
-          background-color: transparent;
-          border-right: none !important;
-          border-top: none !important;
-          border-bottom: none !important;
-          border-left: 1px solid $color-2 !important;
-        }
-      }
-
-      &.ui-sortable-helper {
-        width: 100%;
-
-        td {
-          background-color: lighten($color-3, 33);
-          border-bottom: 1px solid $color-border;
-
-          &.actions {
-            display: none;
-          }
-        }
-      }
     }
 
     &.no-border-top tr:first-child td {

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

@@ -1,5 +1,3 @@
-@import 'bourbon';
-
 @import 'spree/backend/globals/functions';
 @import 'spree/backend/globals/deprecation';
 @import 'spree/backend/globals/variables_override';
@@ -23,7 +21,6 @@
 @import 'spree/backend/components/actions';
 @import 'spree/backend/components/breadcrumb';
 @import 'spree/backend/components/number_with_currency';
-@import 'spree/backend/components/date-picker';
 @import 'spree/backend/components/hint';
 @import 'spree/backend/components/image_placeholder';
 @import 'spree/backend/components/list_group';
@@ -32,7 +29,6 @@
 @import 'spree/backend/components/table-filter';
 @import 'spree/backend/components/navigation';
 @import 'spree/backend/components/sidebar';
-@import 'spree/backend/components/number_field_update';
 @import 'spree/backend/components/stock_table';
 @import 'spree/backend/components/editable_table';
 @import 'spree/backend/components/pills';
@@ -41,10 +37,12 @@
 @import 'font-awesome';
 @import 'spree/backend/plugins/select2';
 @import 'spree/backend/plugins/bootstrap_tooltip';
+@import 'spree/backend/plugins/sortable';
 
 @import 'spree/backend/sections/adjustments';
 @import 'spree/backend/sections/orders';
 @import 'spree/backend/sections/products';
+@import 'spree/backend/sections/variants';
 @import 'spree/backend/sections/promotions';
 @import 'spree/backend/sections/bulk_transfer';
 @import 'spree/backend/sections/return_authorizations';
@@ -54,6 +52,4 @@
 @import 'spree/backend/sections/users';
 @import 'spree/backend/sections/store_credits';
 @import 'spree/backend/sections/stock_management';
-@import 'spree/backend/sections/transfer_items';
-@import 'spree/backend/sections/stock_transfers';
 @import 'spree/backend/sections/style_guide';

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

@@ -2,7 +2,6 @@ module Spree
   module Admin
     class BaseController < Spree::BaseController
       helper 'spree/admin/navigation'
-      helper 'spree/admin/tables'
       layout '/spree/layouts/admin'
 
       before_action :authorize_admin
@@ -34,7 +33,7 @@ module Spree
       def flash_message_for(object, event_sym)
         resource_desc  = object.class.model_name.human
         resource_desc += " \"#{object.name}\"" if object.respond_to?(:name) && object.name.present?
-        Spree.t(event_sym, resource: resource_desc)
+        t(event_sym, resource: resource_desc, scope: 'spree')
       end
 
       def render_js_for_destroy
@@ -48,7 +47,7 @@ module Spree
       def lock_order
         Spree::OrderMutex.with_lock!(@order) { yield }
       rescue Spree::OrderMutex::LockFailed
-        flash[:error] = Spree.t(:order_mutex_admin_error)
+        flash[:error] = t('spree.order_mutex_admin_error')
         redirect_to order_mutex_redirect_path
       end
 

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

@@ -12,15 +12,15 @@ module Spree
         inventory_units = Spree::InventoryUnit.where(id: inventory_unit_ids)
 
         if inventory_units.size != inventory_unit_ids.size
-          flash[:error] = Spree.t(:unable_to_find_all_inventory_units)
+          flash[:error] = t('spree.unable_to_find_all_inventory_units')
           redirect_to admin_order_cancellations_path(@order)
         elsif inventory_units.empty?
-          flash[:error] = Spree.t(:no_inventory_selected)
+          flash[:error] = t('spree.no_inventory_selected')
           redirect_to admin_order_cancellations_path(@order)
         else
           @order.cancellations.short_ship(inventory_units, whodunnit: whodunnit)
 
-          flash[:success] = Spree.t(:inventory_canceled)
+          flash[:success] = t('spree.inventory_canceled')
           redirect_to edit_admin_order_url(@order)
         end
       end

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

@@ -21,7 +21,7 @@ module Spree
         @variants = @product.variants.collect do |variant|
           [variant.sku_and_options_text, variant.id]
         end
-        @variants.insert(0, [Spree.t(:all), @product.master.id])
+        @variants.insert(0, [t('spree.all'), @product.master.id])
       end
 
       def set_viewable

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

@@ -9,8 +9,7 @@ module Spree
         end
 
         respond_to do |format|
-          format.html { redirect_to admin_product_variants_url(params[:product_id]) }
-          format.js { render plain: 'Ok' }
+          format.js { head :no_content }
         end
       end
 

data/app/controllers/spree/admin/orders/customer_details_controller.rb

@@ -32,7 +32,7 @@ module Spree
               @order.refresh_shipment_rates
             end
 
-            flash[:success] = Spree.t('customer_details_updated')
+            flash[:success] = t('spree.customer_details_updated')
             redirect_to edit_admin_order_url(@order)
           else
             render action: :edit
@@ -63,7 +63,7 @@ module Spree
         end
 
         def insufficient_stock_error
-          flash[:error] = Spree.t(:insufficient_stock_for_order)
+          flash[:error] = t('spree.insufficient_stock_for_order')
           redirect_to edit_admin_order_customer_url(@order)
         end
       end

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

@@ -86,13 +86,13 @@ module Spree
 
       def advance
         if @order.completed?
-          flash[:notice] = Spree.t('order_already_completed')
+          flash[:notice] = t('spree.order_already_completed')
           redirect_to edit_admin_order_url(@order)
         else
           @order.contents.advance
 
           if @order.can_complete?
-            flash[:success] = Spree.t('order_ready_for_confirm')
+            flash[:success] = t('spree.order_ready_for_confirm')
           else
             flash[:error] = @order.errors.full_messages
           end
@@ -112,7 +112,7 @@ module Spree
       # PUT
       def complete
         @order.complete!
-        flash[:success] = Spree.t(:order_completed)
+        flash[:success] = t('spree.order_completed')
         redirect_to edit_admin_order_url(@order)
       rescue StateMachines::InvalidTransition => e
         flash[:error] = e.message
@@ -121,25 +121,25 @@ module Spree
 
       def cancel
         @order.canceled_by(try_spree_current_user)
-        flash[:success] = Spree.t(:order_canceled)
+        flash[:success] = t('spree.order_canceled')
         redirect_to(spree.edit_admin_order_path(@order))
       end
 
       def resume
         @order.resume!
-        flash[:success] = Spree.t(:order_resumed)
+        flash[:success] = t('spree.order_resumed')
         redirect_to(spree.edit_admin_order_path(@order))
       end
 
       def approve
         @order.contents.approve(user: try_spree_current_user)
-        flash[:success] = Spree.t(:order_approved)
+        flash[:success] = t('spree.order_approved')
         redirect_to(spree.edit_admin_order_path(@order))
       end
 
       def resend
         OrderMailer.confirm_email(@order, true).deliver_later
-        flash[:success] = Spree.t(:order_email_resent)
+        flash[:success] = t('spree.order_email_resent')
 
         redirect_to(spree.edit_admin_order_path(@order))
       end
@@ -147,7 +147,7 @@ module Spree
       def unfinalize_adjustments
         adjustments = @order.all_adjustments.finalized
         adjustments.each(&:unfinalize!)
-        flash[:success] = Spree.t(:all_adjustments_unfinalized)
+        flash[:success] = t('spree.all_adjustments_unfinalized')
 
         respond_with(@order) { |format| format.html { redirect_to(spree.admin_order_adjustments_path(@order)) } }
       end
@@ -155,7 +155,7 @@ module Spree
       def finalize_adjustments
         adjustments = @order.all_adjustments.not_finalized
         adjustments.each(&:finalize!)
-        flash[:success] = Spree.t(:all_adjustments_finalized)
+        flash[:success] = t('spree.all_adjustments_finalized')
 
         respond_with(@order) { |format| format.html { redirect_to(spree.admin_order_adjustments_path(@order)) } }
       end
@@ -185,13 +185,13 @@ module Spree
       end
 
       def insufficient_stock_error
-        flash[:error] = Spree.t(:insufficient_stock_for_order)
+        flash[:error] = t('spree.insufficient_stock_for_order')
         redirect_to cart_admin_order_url(@order)
       end
 
       def require_ship_address
         if @order.ship_address.nil?
-          flash[:notice] = Spree.t(:fill_in_customer_info)
+          flash[:notice] = t('spree.fill_in_customer_info')
           redirect_to edit_admin_order_customer_url(@order)
         end
       end

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

@@ -13,7 +13,7 @@ module Spree
         invoke_callbacks(:create, :before)
         if @payment_method.save
           invoke_callbacks(:create, :after)
-          flash[:success] = Spree.t(:successfully_created, resource: Spree.t(:payment_method))
+          flash[:success] = t('spree.successfully_created', resource: t('spree.payment_method'))
           redirect_to edit_admin_payment_method_path(@payment_method)
         else
           invoke_callbacks(:create, :fails)
@@ -34,7 +34,7 @@ module Spree
 
         if @payment_method.update_attributes(attributes)
           invoke_callbacks(:update, :after)
-          flash[:success] = Spree.t(:successfully_updated, resource: Spree.t(:payment_method))
+          flash[:success] = t('spree.successfully_updated', resource: t('spree.payment_method'))
           redirect_to edit_admin_payment_method_path(@payment_method)
         else
           invoke_callbacks(:update, :fails)
@@ -49,9 +49,9 @@ module Spree
       end
 
       def load_providers
+        Spree::Deprecation.warn('load_providers is deprecated. Please use load_payment_method_types instead.', caller)
         load_payment_method_types
       end
-      deprecate load_providers: :load_payment_method_types, deprecator: Spree::Deprecation
 
       def load_payment_method_types
         @payment_method_types = Rails.application.config.spree.payment_methods.sort_by(&:name)
@@ -60,10 +60,9 @@ module Spree
       end
 
       def validate_payment_provider
+        Spree::Deprecation.warn('validate_payment_provider is deprecated. Please use validate_payment_method_type instead.', caller)
         validate_payment_method_type
       end
-      deprecate validate_payment_provider: :validate_payment_method_type,
-        deprecator: Spree::Deprecation
 
       def validate_payment_method_type
         requested_type = params[:payment_method].delete(:type)
@@ -71,7 +70,7 @@ module Spree
           klass.name == requested_type
         end
         if !@payment_method_type
-          flash[:error] = Spree.t(:invalid_payment_method_type)
+          flash[:error] = t('spree.invalid_payment_method_type')
           redirect_to new_admin_payment_method_path
         end
       end

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

@@ -41,7 +41,7 @@ module Spree
             flash[:success] = flash_message_for(@payment, :successfully_created)
             redirect_to admin_order_payments_path(@order)
           else
-            flash[:error] = Spree.t(:payment_could_not_be_created)
+            flash[:error] = t('spree.payment_could_not_be_created')
             render :new
           end
         rescue Spree::Core::GatewayError => e
@@ -56,9 +56,9 @@ module Spree
         # Because we have a transition method also called void, we do this to avoid conflicts.
         event = "void_transaction" if event == "void"
         if @payment.send("#{event}!")
-          flash[:success] = Spree.t(:payment_updated)
+          flash[:success] = t('spree.payment_updated')
         else
-          flash[:error] = Spree.t(:cannot_perform_operation)
+          flash[:error] = t('spree.cannot_perform_operation')
         end
       rescue Spree::Core::GatewayError => ge
         flash[:error] = ge.message.to_s
@@ -107,13 +107,13 @@ module Spree
 
       def require_bill_address
         if Spree::Config[:order_bill_address_used] && @order.bill_address.nil?
-          flash[:notice] = Spree.t(:fill_in_customer_info)
+          flash[:notice] = t('spree.fill_in_customer_info')
           redirect_to edit_admin_order_customer_url(@order)
         end
       end
 
       def insufficient_stock_error
-        flash[:error] = Spree.t(:insufficient_stock_for_order)
+        flash[:error] = t('spree.insufficient_stock_for_order')
         redirect_to new_admin_order_payment_url(@order)
       end
     end

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

@@ -47,9 +47,9 @@ module Spree
 
       def destroy
         @product = Spree::Product.friendly.find(params[:id])
-        @product.destroy
+        @product.discard
 
-        flash[:success] = Spree.t('notice_messages.product_deleted')
+        flash[:success] = t('spree.notice_messages.product_deleted')
 
         respond_with(@product) do |format|
           format.html { redirect_to collection_url }
@@ -61,9 +61,9 @@ module Spree
         @new = @product.duplicate
 
         if @new.save
-          flash[:success] = Spree.t('notice_messages.product_cloned')
+          flash[:success] = t('spree.notice_messages.product_cloned')
         else
-          flash[:error] = Spree.t('notice_messages.product_not_cloned')
+          flash[:error] = t('spree.notice_messages.product_not_cloned')
         end
 
         redirect_to edit_admin_product_url(@new)
@@ -89,8 +89,6 @@ module Spree
       end
 
       def load_data
-        @taxons = Spree::Taxon.order(:name)
-        @option_types = Spree::OptionType.order(:name)
         @tax_categories = Spree::TaxCategory.order(:name)
         @shipping_categories = Spree::ShippingCategory.order(:name)
       end

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

@@ -7,7 +7,7 @@ class Spree::Admin::PromotionActionsController < Spree::Admin::BaseController
     @promotion_action = @promotion_action_type.new(params[:promotion_action])
     @promotion_action.promotion = @promotion
     if @promotion_action.save
-      flash[:success] = Spree.t(:successfully_created, resource: Spree.t(:promotion_action))
+      flash[:success] = t('spree.successfully_created', resource: t('spree.promotion_action'))
     end
     respond_to do |format|
       format.html { redirect_to spree.edit_admin_promotion_path(@promotion) }
@@ -17,8 +17,8 @@ class Spree::Admin::PromotionActionsController < Spree::Admin::BaseController
 
   def destroy
     @promotion_action = @promotion.promotion_actions.find(params[:id])
-    if @promotion_action.destroy
-      flash[:success] = Spree.t(:successfully_removed, resource: Spree.t(:promotion_action))
+    if @promotion_action.discard
+      flash[:success] = t('spree.successfully_removed', resource: t('spree.promotion_action'))
     end
     respond_to do |format|
       format.html { redirect_to spree.edit_admin_promotion_path(@promotion) }
@@ -39,7 +39,7 @@ class Spree::Admin::PromotionActionsController < Spree::Admin::BaseController
       klass.name == requested_type
     end
     if !@promotion_action_type
-      flash[:error] = Spree.t(:invalid_promotion_action)
+      flash[:error] = t('spree.invalid_promotion_action')
       respond_to do |format|
         format.html { redirect_to spree.edit_admin_promotion_path(@promotion) }
         format.js   { render layout: false }

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

@@ -8,7 +8,7 @@ class Spree::Admin::PromotionRulesController < Spree::Admin::BaseController
     @promotion_rule = @promotion_rule_type.new(promotion_rule_params)
     @promotion_rule.promotion = @promotion
     if @promotion_rule.save
-      flash[:success] = Spree.t(:successfully_created, resource: Spree.t(:promotion_rule))
+      flash[:success] = t('spree.successfully_created', resource: t('spree.promotion_rule'))
     end
     respond_to do |format|
       format.html { redirect_to spree.edit_admin_promotion_path(@promotion) }
@@ -19,7 +19,7 @@ class Spree::Admin::PromotionRulesController < Spree::Admin::BaseController
   def destroy
     @promotion_rule = @promotion.promotion_rules.find(params[:id])
     if @promotion_rule.destroy
-      flash[:success] = Spree.t(:successfully_removed, resource: Spree.t(:promotion_rule))
+      flash[:success] = t('spree.successfully_removed', resource: t('spree.promotion_rule'))
     end
     respond_to do |format|
       format.html { redirect_to spree.edit_admin_promotion_path(@promotion) }
@@ -40,7 +40,7 @@ class Spree::Admin::PromotionRulesController < Spree::Admin::BaseController
       klass.name == requested_type
     end
     if !@promotion_rule_type
-      flash[:error] = Spree.t(:invalid_promotion_rule)
+      flash[:error] = t('spree.invalid_promotion_rule')
       respond_to do |format|
         format.html { redirect_to spree.edit_admin_promotion_path(@promotion) }
         format.js   { render layout: false }