solidus_backend 2.7.4 → 2.9.2

data/app/assets/stylesheets/spree/backend/sections/_style_guide.scss

@@ -48,7 +48,7 @@
 
       > a {
         font-size: 1.2rem;
-        font-weight: 300;
+        font-weight: $font-weight-normal;
       }
     }
 
@@ -64,7 +64,7 @@
   }
 
   &-intro,
-  &-section:not(:last-child) {
+  &-section {
     margin: 4rem 0;
   }
 
@@ -112,8 +112,8 @@
   table.with-actions-borders {
     th, td {
       &.actions {
-        border-right: 1px solid #cee1f4 !important;
-        border-bottom: 1px solid #cee1f4 !important;
+        border-right: 1px solid $color-style-guide-table-border !important;
+        border-bottom: 1px solid $color-style-guide-table-border !important;
       }
     }
   }

data/app/assets/stylesheets/spree/backend/sections/_taxonomies.scss

@@ -12,7 +12,7 @@
   }
 
   .taxon {
-    background-color: very-light($color-3);
+    background-color: $color-light;
     border: 1px solid $color-border;
     border-radius: $border-radius;
     color: $body-color;

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

@@ -0,0 +1,15 @@
+@font-face {
+  font-family: 'Inter';
+  font-style:  normal;
+  font-weight: $font-weight-normal;
+  src: font-url("inter/Inter-Regular.woff2") format("woff2"),
+       font-url("inter/Inter-Regular.woff") format("woff");
+}
+
+@font-face {
+  font-family: 'Inter';
+  font-style:  normal;
+  font-weight: $font-weight-bold;
+  src: font-url("inter/Inter-SemiBold.woff2") format("woff2"),
+       font-url("inter/Inter-SemiBold.woff") format("woff");
+}

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

@@ -41,6 +41,8 @@ textarea {
 }
 
 label {
+  font-size: inherit;
+  
   &.required:after {
     content: " *";
   }
@@ -64,7 +66,19 @@ button,
     // In order to avoid the clashing between using `:not(.btn)` and
     // `@extend .btn` we need to use an attribute selector of `[class*="btn"]`.
     @extend .btn;
-    @include button-variant(theme-color("primary"), theme-color("primary"));
+    background: linear-gradient($color-white, lighten($color-light-dark, 2%));
+    color: $color-dark;
+    border-color: $color-dark-accent;
+    
+    &:hover {
+      background: linear-gradient($color-white, $color-light-dark);
+      color: $color-primary;
+    }
+    
+    &.disabled,
+    &:disabled {
+      color: $color-disabled;
+    }
   }
 
   &:before {
@@ -106,6 +120,10 @@ span.info {
       margin-top: 2.25rem;
     }
   }
+  
+  label {
+    font-size: $label-font-size;
+  }
 
   ul {
     list-style: none;
@@ -131,21 +149,21 @@ span.info {
   &.withError {
     .field_with_errors {
       label {
-        color: very-light(theme-color("danger"), 30);
+        color: theme-color("danger");
       }
 
       input {
-        border-color: very-light(theme-color("danger"), 15);
+        border-color: theme-color("danger");
       }
     }
     .formError {
-      color: very-light(theme-color("danger"), 30);
+      color: lighten(theme-color("danger"), 15);
       font-style: italic;
       font-size: 85%;
     }
     .select2-container {
       border-radius: 4px;
-      border: 1px solid very-light(theme-color("danger"), 15);
+      border: 1px solid theme-color("danger");
     }
   }
 }
@@ -172,12 +190,14 @@ fieldset {
   }
 
   legend {
-    color: $color-2;
-    font-size: 16px;
+    color: $color-dark;
+    font-size: 14px;
     font-weight: $font-weight-bold;
     text-align: center;
     padding: 8px 15px;
     width: auto;
+    margin-left: auto;
+    margin-right: auto;
 
     -webkit-font-smoothing: antialiased;
     -moz-osx-font-smoothing: grayscale;

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

@@ -2,7 +2,7 @@
   display: flex;
   align-items: center;
   padding: 15px $grid-gutter-width;
-  background-color: very-light($color-3, 4);
+  background-color: $color-header-bg;
   border-bottom: 1px solid $color-border;
   height: $main-header-height;
 
@@ -17,7 +17,7 @@
   -moz-osx-font-smoothing: grayscale;
 
   i {
-    color: $color-2;
+    color: $color-primary;
   }
 }
 

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

@@ -14,6 +14,10 @@
   }
 }
 
+.btn.fa {
+  font: normal normal $btn-font-weight #{$font-size-base}/#{$btn-line-height} "FontAwesome";
+}
+
 .fa-email     { @extend .fa-envelope }
 .fa-resume    { @extend .fa-refresh  }
 .fa-approve   { @extend .fa-check    }
@@ -26,7 +30,7 @@
 
 .fa-trash     { @extend .fa-trash-o  }
 
-.fa-capture   { @extend .fa-check    }
+.fa-capture   { @extend .fa-thumbs-up }
 .fa-credit    { @extend .fa-check    }
 .fa-approve   { @extend .fa-check    }
 .fa-icon-cogs { @extend .fa-cogs     }

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

@@ -8,6 +8,10 @@ body {
   padding-left: $width-sidebar;
 }
 
+.admin {
+  background-color: $admin-body-bg;
+}
+
 .admin-nav {
   position: absolute;
   top: 0;
@@ -18,6 +22,7 @@ body {
 }
 
 .content-wrapper {
+  background-color: $content-wrapper-bg;
   padding-top: 1rem;
   padding-left: $grid-gutter-width;
   padding-right: $grid-gutter-width;
@@ -29,10 +34,6 @@ body {
   }
 }
 
-.content-main {
-  overflow-x: hidden; // makes sure that the tabs are able to resize
-}
-
 #content {
   position: relative;
   padding: 0;

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

@@ -47,12 +47,12 @@ table {
 
       button[class*='fa-'] {
         color: $link-color;
-        background-color: transparent;
+        background: transparent;
         border: 0 none;
         padding: 0 !important;
 
         &:hover {
-          background-color: transparent;
+          background: transparent;
         }
       }
 
@@ -61,7 +61,7 @@ table {
         padding-left: 0px;
 
         &:hover {
-          color: $color-3;
+          color: $color-dark-light;
         }
       }
 
@@ -108,14 +108,14 @@ table {
   }
 
   th a {
-    color: $color-4;
+    color: $color-dark;
   }
 
   tbody {
     tr {
       &.deleted td {
-        background-color: very-light(theme-color("danger"), 6);
-        border-color: very-light(theme-color("danger"), 15);
+        background-color: lighten(theme-color("danger"), 6);
+        border-color: lighten(theme-color("danger"), 15);
       }
     }
 
@@ -123,4 +123,9 @@ table {
       border-top: none;
     }
   }
+
+  pre {
+    font-size: 100%;
+    margin-bottom: 0;
+  }
 }

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

@@ -7,7 +7,7 @@ html {
 
 body {
   padding: 0;
-  font-weight: 400;
+  font-weight: $font-weight-normal;
   text-rendering: optimizeLegibility;
 }
 
@@ -17,6 +17,11 @@ hr {
   border-left: none;
 }
 
+strong,
+b {
+  font-weight: $font-weight-bold;
+}
+
 // Headings
 //--------------------------------------------------------------
 
@@ -68,7 +73,6 @@ dl {
     width: 40%;
     font-weight: $font-weight-bold;
     padding-left: 0;
-    font-size: 85%;
     clear: left;
   }
 
@@ -93,10 +97,10 @@ dl {
 
 .uppercase     { text-transform: uppercase }
 
-.green  { color: $color-2 }
-.blue   { color: $color-3 }
-.red    { color: $color-5 }
-.yellow { color: $color-6 }
+.green  { color: $color-green }
+.blue   { color: $color-primary }
+.red    { color: $color-red }
+.yellow { color: $color-yellow }
 
 .negative { color: $red }
 input[type="number"].negative { color: $red } // needed to override blue style that is more specific than '.negative'

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

@@ -2,12 +2,14 @@
 @import 'spree/backend/globals/deprecation';
 @import 'spree/backend/globals/variables_override';
 @import 'spree/backend/globals/variables';
+@import 'spree/backend/globals/deprecated_variables';
 
 @import 'bootstrap_custom';
 @import 'solidus_admin/bootstrap/bootstrap';
 
 @import 'spree/backend/globals/mixins';
 
+@import 'spree/backend/shared/fonts';
 @import 'spree/backend/shared/typography';
 @import 'spree/backend/shared/images';
 @import 'spree/backend/shared/tables';
@@ -20,6 +22,7 @@
 @import 'spree/backend/components/states';
 @import 'spree/backend/components/actions';
 @import 'spree/backend/components/breadcrumb';
+@import 'spree/backend/components/buttons';
 @import 'spree/backend/components/number_with_currency';
 @import 'spree/backend/components/hint';
 @import 'spree/backend/components/image_placeholder';
@@ -29,7 +32,6 @@
 @import 'spree/backend/components/table-filter';
 @import 'spree/backend/components/navigation';
 @import 'spree/backend/components/sidebar';
-@import 'spree/backend/components/stock_table';
 @import 'spree/backend/components/editable_table';
 @import 'spree/backend/components/pills';
 @import 'spree/backend/components/tabs';

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

@@ -20,7 +20,7 @@ module Spree
           flash[:error] = t('spree.no_inventory_selected')
           redirect_to admin_order_cancellations_path(@order)
         else
-          @order.cancellations.short_ship(inventory_units, whodunnit: whodunnit)
+          @order.cancellations.short_ship(inventory_units, created_by: created_by)
 
           flash[:success] = t('spree.inventory_canceled')
           redirect_to edit_admin_order_url(@order)
@@ -29,7 +29,7 @@ module Spree
 
       private
 
-      def whodunnit
+      def created_by
         try_spree_current_user.try(:email)
       end
 

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

@@ -10,6 +10,7 @@ module Spree
       before_action :load_form_data, only: [:new, :edit]
       before_action :build_return_items_from_params, only: [:create]
       create.fails  :load_form_data
+      create.after :order_process_return
 
       def edit
         @pending_return_items = @customer_return.return_items.select(&:pending?)
@@ -23,6 +24,10 @@ module Spree
 
       private
 
+      def order_process_return
+        @customer_return.process_return!
+      end
+
       def location_after_save
         url_for([:edit, :admin, @order, @customer_return])
       end
@@ -60,11 +65,13 @@ module Spree
 
       def build_return_items_from_params
         return_items_params = permitted_resource_params.delete(:return_items_attributes).values
-
         @customer_return.return_items = return_items_params.map do |item_params|
           next unless item_params.delete('returned') == '1'
           return_item = item_params[:id] ? Spree::ReturnItem.find(item_params[:id]) : Spree::ReturnItem.new
           return_item.assign_attributes(item_params)
+
+          return_item.skip_customer_return_processing = true
+
           if item_params[:reception_status_event].blank?
             return redirect_to(new_object_url, flash: { error: 'Reception status choice required' })
           end

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

@@ -8,7 +8,7 @@ module Spree
 
         if locale && I18n.available_locales.include?(locale.to_sym)
           I18n.locale = locale
-          session[:locale] = locale
+          session[set_user_language_locale_key] = locale
 
           respond_to do |format|
             format.json { render json: { locale: locale, location: spree.admin_url } }

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

@@ -6,6 +6,9 @@ module Spree
       before_action :find_order_and_payment
 
       def index
+        Spree::Deprecation.warn 'Using a dedicated route for payment log entries ' \
+          'has been deprecated in favor of displaying the log entries on ' \
+          'the payment screen itself.', caller_locations(0)
         @log_entries = @payment.log_entries
       end
 

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

@@ -13,7 +13,8 @@ module Spree
         end
 
         def edit
-          country_id = Spree::Country.default.id
+          country_id = default_country_id
+
           @order.build_bill_address(country_id: country_id) if @order.bill_address.nil?
           @order.build_ship_address(country_id: country_id) if @order.ship_address.nil?
 
@@ -43,6 +44,12 @@ module Spree
 
         private
 
+        def default_country_id
+          country_id = Spree::Country.default.id
+
+          country_id if Spree::Country.available.pluck(:id).include?(country_id)
+        end
+
         def order_params
           params.require(:order).permit(
             :email,

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

@@ -14,7 +14,6 @@ module Spree
       respond_to :html
 
       def index
-        query_present = params[:q]
         params[:q] ||= {}
         params[:q][:completed_at_not_null] ||= '1' if Spree::Config[:show_only_complete_orders_by_default]
         @show_only_completed = params[:q][:completed_at_not_null] == '1'
@@ -51,17 +50,7 @@ module Spree
         end
 
         @search = Spree::Order.accessible_by(current_ability, :index).ransack(params[:q])
-
-        # lazy loading other models here (via includes) may result in an invalid query
-        # e.g. SELECT  DISTINCT DISTINCT "spree_orders".id, "spree_orders"."created_at" AS alias_0 FROM "spree_orders"
-        # see https://github.com/spree/spree/pull/3919
-        @orders = if query_present
-          @search.result(distinct: true)
-        else
-          @search.result
-        end
-
-        @orders = @orders.
+        @orders = @search.result.includes([:user]).
           page(params[:page]).
           per(params[:per_page] || Spree::Config[:orders_per_page])