spree_backend 4.4.1 → 4.5.0

data/app/assets/javascripts/spree/backend/global/tinymce.es6

@@ -9,4 +9,13 @@ document.addEventListener("spree:load", function() {
     menubar: false,
     toolbar: 'undo redo | styleselect | bold italic link forecolor backcolor | alignleft aligncenter alignright alignjustify | table | bullist numlist outdent indent | code '
   });
+
+  tinymce.init({
+    selector: '.spree-rte-simple',
+    menubar: false,
+    plugins: [
+      'image table paste link table'
+    ],
+    toolbar: 'undo redo | styleselect | bold italic link forecolor backcolor | alignleft aligncenter alignright alignjustify | table | bullist numlist outdent indent'
+  });
 })

data/app/assets/javascripts/spree/backend/payments/edit.js

@@ -103,7 +103,7 @@ document.addEventListener("spree:load", function() {
 
     PaymentView.prototype.$new_button = function (action) {
       return $('<a><i class="icon icon-' + action + '"></i></a>').attr({
-        'class': 'payment-action-' + action + ' btn btn-outline-secondary btn-sm no-filter',
+        'class': 'payment-action-' + action + ' btn btn-light btn-sm no-filter',
         title: Spree.translations[action]
       }).data({
         action: action

data/app/assets/javascripts/spree/backend/states.js

@@ -5,8 +5,8 @@ document.addEventListener("spree:load", function() {
     $('#country').on('change', function () {
       var newStateLinkHref = $('#new_state_link').prop('href')
       var selectedCountryId = $('#country option:selected').prop('value')
-      var newLink = newStateLinkHref.replace(/countries\/(\d+)/,
-        'countries/' + selectedCountryId)
+      var newLink = newStateLinkHref.replace(/countries\/(.+)\/states\/new/,
+        'countries/' + selectedCountryId + '/states/new')
       $('#new_state_link').attr('href', newLink)
     })
   };

data/app/assets/javascripts/spree/backend.js

@@ -21,7 +21,6 @@
 //= require spree/backend/calculator
 //= require spree/backend/checkouts/edit
 //= require spree/backend/gateway
-//= require spree/backend/general_settings
 //= require spree/backend/handlebar_extensions
 //= require spree/backend/line_items
 //= require spree/backend/line_items_on_order_edit
@@ -52,8 +51,6 @@
 //= require spree/backend/variant_management
 //= require spree/backend/zone
 
-Spree.routes.clear_cache = Spree.adminPathFor('general_settings/clear_cache')
-
 Spree.routes.edit_product = function (productId) {
   return Spree.adminPathFor('products/' + productId + '/edit')
 }

data/app/assets/stylesheets/spree/backend/components/_badges.scss

@@ -1,3 +1,8 @@
+.badge {
+  font-weight: 400;
+  text-transform: capitalize;
+}
+
 // Green
 .badge-completed,
 .badge-complete,
@@ -10,8 +15,11 @@
 .badge-success,
 .badge-sold,
 .badge-open,
-.badge-authorized {
-  @include badge-variant($success);
+.badge-authorized,
+.badge-published,
+.badge-live,
+.badge-approved {
+  @include badge-variant(theme-color('success'));
 }
 
 // Red
@@ -19,8 +27,9 @@
 .badge-considered_risky,
 .badge-error,
 .badge-invalid,
+.badge-rejected,
 .badge-closed {
-  @include badge-variant($danger);
+  @include badge-variant(theme-color('danger'));
 }
 
 // Orange
@@ -41,6 +50,18 @@
 .badge-void,
 .badge-inactive,
 .badge-notice,
+.badge-suspended,
 .badge-partial {
-  @include badge-variant($light);
+  @include badge-variant(theme-color('warning'));
+}
+
+// light
+.badge-disabled,
+.badge-invited {
+  @include badge-variant(theme-color('light'));
+}
+
+// Info
+.badge-onboarding {
+  @include badge-variant(theme-color('info'));
 }

data/app/assets/stylesheets/spree/backend/components/_buttons.scss

@@ -1,5 +1,5 @@
 .payment-action-save {
-  @include button-variant($success, $success, $success );
+  @include button-variant(theme-color('success'), theme-color('success'), theme-color('success') );
 }
 
 .btn,
@@ -16,7 +16,11 @@
   }
   svg,
   i.icon {
-   margin-bottom: 3px;
+    margin-right: 0.5rem;
+    margin-bottom: 3px;
+  }
+  &.icon-link svg{
+    margin-right: 0;
   }
 }
 

data/app/assets/stylesheets/spree/backend/components/_filters.scss

@@ -1,6 +1,5 @@
 #table-filter {
   display: none;
-  margin-top: 7.5px;
 }
 
 .index-filter-button .icon-chevron-right {
@@ -22,43 +21,15 @@ i.js-delete-filter {
   margin-bottom: 0;
 }
 
-.index-filter-button {
-  font-size: $font-size-sm;
-
-  button {
-    height: 100%;
-    text-transform: uppercase;
-    letter-spacing: 2px;
-    font-weight: bold;
-    font-size: $small-font-size;
-    border-color: $input-border-color;
-    border-right: none;
-    border-top-right-radius: 0;
-    border-bottom-right-radius: 0;
-    background-color: $white;
-
-    &:hover, &:focus {
-      background-color: $gray-100;
-    }
-  }
-
-  .js-quick-search {
-    font-size: $font-size-sm;
-    border-top-left-radius: 0;
-    border-bottom-left-radius: 0;
-  }
-}
-
 .sort_link {
   .icon, svg {
     margin-left: 5px;
     margin-bottom: 2px;
     width: 0.8rem;
     height: 0.8rem;
-
   }
-  
+
   svg.default-filter-arrow {
-    opacity: 0.1;
+    opacity: 0.5;
   }
 }

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

@@ -281,7 +281,7 @@ i.icon-cancel,
 i.icon-delete,
 i.icon-void          { background-image: url(asset-path("backend-cancel.svg")); }
 i.icon-save          { background-image: url(asset-path("backend-save.svg")); }
-i.icon-add           { background-image: url(asset-path("backend-add.svg")); }
+i.icon-add           { background-image: url(asset-path("backend-plus-circle.svg")); }
 i.icon-search        { background-image: url(asset-path("backend-search.svg")); }
 i.icon-settings      { background-image: url(asset-path("backend-settings.svg")); }
 i.icon-delete        { background-image: url(asset-path("backend-delete.svg")); }

data/app/assets/stylesheets/spree/backend/components/_main.scss

@@ -1,5 +1,5 @@
 #main-part {
-  margin-top: 50px;
+  margin-top: $navbar-brand-height + 1.5rem;
 }
 
 #logo {
@@ -44,3 +44,15 @@ body.modal-open #multi-backdrop {
 .rounded-top-only {
   border-radius: $border-radius $border-radius 0 0;
 }
+
+.alert {
+  border: 0 none !important;
+}
+
+.card-header, .card-footer {
+  background-color: transparent !important;
+  padding-left: 0 !important;
+  padding-right: 0 !important;
+  margin-left: 0.75rem !important;
+  margin-right: 0.75rem !important;
+}

data/app/assets/stylesheets/spree/backend/components/_navbar.scss

@@ -1,8 +1,6 @@
 .header {
   .navbar {
-    background-color: $navbar-inverse-bg;
-    padding: 0;
-    height: 50px;
+    min-height:54px;
 
     a:hover {
       text-decoration: none;
@@ -27,16 +25,15 @@
 
     #storeSwitcherDropdown {
       .dropdown-menu.show {
-        min-width:250px;
+        min-width: 250px;
         width: fit-content;
         max-width: 90vw;
         max-height: 70vh;
-        overflow-y: scroll !important;
-        top:110%;
+        overflow-y: hidden !important;
+        top: $navbar-brand-height + 1.5rem;
         left: 50%;
         right: 50%;
         transform: translate(-50%, 0%);
-        box-shadow: 0 1rem 2.5rem rgba(18,38,63,.1),0 .5rem 1rem -.75rem rgba(18,38,63,.1);
 
         @include media-breakpoint-up(lg) {
           left: 0%;
@@ -55,7 +52,7 @@
           }
 
           &.disabled svg {
-            color: $success;
+            color: theme-color('success');
           }
         }
       }

data/app/assets/stylesheets/spree/backend/components/_navigation.scss

@@ -8,9 +8,6 @@
 ul#spreePageTabs {
   li.nav-item {
     margin-left: 0.2em;
-    a {
-      padding: 0.3rem 1rem;
-    }
 
     &:first-child {
       margin-left: 0;

data/app/assets/stylesheets/spree/backend/components/_sidebar.scss

@@ -1,6 +1,5 @@
 aside#main-sidebar {
   overflow-y: auto; /* Scrollable contents if viewport is shorter than content. */
-  background-color: $gray-100;
   border-right: 1px solid $gray-200;
   width: 100%;
   left: -100%;
@@ -8,6 +7,11 @@ aside#main-sidebar {
   height: 100%;
   transition: 0.3s ease;
   z-index: 1041;
+  background: white;
+
+  .text-muted {
+    color: #5C5F62 !important;
+  }
 }
 
 body.sidebar-open {
@@ -20,17 +24,20 @@ body.sidebar-open {
     z-index: 1040 !important;
   }
 }
-
-a.sidebar-submenu-item:hover {
+.sidebar-submenu-item.pl-5 {
+  padding-left: 2.6rem !important;
+}
+a.sidebar-submenu-item:hover, a.sidebar-submenu-item:focus {
     text-decoration: none;
-    background-color: $gray-200;
-    cursor: pointer
+    color: theme-color('primary') !important;
+    cursor: pointer;
 }
 
 ul.active-option {
-  background-color: $gray-200;
+  background-color: $gray-100;
+  border-radius: $border-radius;
   .drop-menu-indicator {
-    transform: rotate(-90deg);
+    transform: rotate(90deg);
   }
 }
 
@@ -50,7 +57,7 @@ ul.nav-sidebar {
 
       &[aria-expanded="true"] {
         .drop-menu-indicator {
-          transform: rotate(-90deg);
+          transform: rotate(90deg);
           transition: .3s ease-in-out;
         }
       }
@@ -131,7 +138,7 @@ body.contextualSideMenu-open #contextual-menu-toggle {
   aside#main-sidebar {
     left: 0;
     z-index: 999;
-    margin-top: 50px;
+    margin-top: $navbar-brand-height + 1.5rem;
     height: calc(100% - 50px);
     transition: none;
     body.sidebar-open {

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

@@ -1,8 +1,9 @@
 table.table {
-  font-size: $font-size-sm;
+  margin-bottom: 0;
 
   th {
-    padding: 0.5rem;
+    padding: 0.75rem !important;
+    border-bottom: 0;
 
     &.handel-head {
       width: 50px;
@@ -12,18 +13,10 @@ table.table {
     }
   }
 
-  td {
-    padding: 0.5rem;
-  }
-
   td.move-handle {
     width:45px;
   }
 
-  .badge {
-    text-transform: uppercase;
-  }
-
   thead {
     th {
       text-transform: uppercase;
@@ -38,7 +31,6 @@ table.table {
 
   tbody {
     tr {
-      background: white;
       td {
         vertical-align: middle;
         .filterable {
@@ -119,12 +111,8 @@ table.table {
 	}
 }
 
-div.table-responsive table.table-bordered {
-  border-top: 1px solid $input-border-color !important;
-}
-
 .sortable-drag-v {
-  border: 1px solid $info;
+  border: 1px solid theme-color('info');
   border-radius: $border-radius;
   width:100%;
   text-align: right;

data/app/assets/stylesheets/spree/backend/components/_taxon_products_view.scss

@@ -30,6 +30,6 @@ ul#taxon_products {
   }
 
   li.moving-this div.card {
-    border-color: $info;
+    border-color: theme-color('info');
   }
 }

data/app/assets/stylesheets/spree/backend/global/_variables.scss

@@ -1,38 +1,11 @@
-/*------------------------------------------
-  Colors
-  -----------------------------------------*/
-  $primary: darken(#478DC1, 10);
-  $success: darken(#7DB942, 2);
-  $info:    #48B0F7;
-  $warning: #F8D053;
-  $danger:  #F55753;
-  $input-border-color:  darken(#EDEDED, 5);
+$theme-colors: (
+  "primary": #4C75BA,
+);
 
-/*------------------------------------------
-  Components
-  -----------------------------------------*/
-  $border-radius: 5px;
+$enable-shadows: true;
 
-/*------------------------------------------
-  Fonts
-  -----------------------------------------*/
-  $headings-font-weight: 300;
-
-/*------------------------------------------
-  Buttons
-  -----------------------------------------*/
-
-/*------------------------------------------
-  Navbar
-  -----------------------------------------*/
-  $navbar-inverse-bg: darken($primary, 15);
-
-/*------------------------------------------
-  Forms
-  -----------------------------------------*/
-  $label-margin-bottom: 0;
-
-/*------------------------------------------
-  Plugins
-  -----------------------------------------*/
-  $select2-icon-size: 0.7rem;
+// https://github.com/twbs/bootstrap/issues/32019
+// we need this hotfix for sassc
+$custom-control-indicator-checked-box-shadow:   none !default;
+$custom-control-indicator-active-box-shadow:    none !default;
+$custom-checkbox-indicator-indeterminate-box-shadow:   none !default;

data/app/assets/stylesheets/spree/backend/plugins/_flatpickr.scss

@@ -37,7 +37,7 @@
 
   .flatpickr-months .flatpickr-prev-month:hover svg,
   .flatpickr-months .flatpickr-next-month:hover svg {
-    fill: $primary;
+    fill: theme-color('primary');
   }
 
   .flatpickr-time {

data/app/assets/stylesheets/spree/backend/plugins/_select2_bootstrap4.scss

@@ -4,7 +4,7 @@ $s2bs-border-radius-base: $border-radius !default;
 $s2bs-border-radius-large: $border-radius-lg !default;
 $s2bs-border-radius-small: $border-radius-sm !default;
 $s2bs-btn-default-bg: transparent !default;
-$s2bs-btn-default-border: $dark !default;
+$s2bs-btn-default-border: $border-color !default;
 $s2bs-btn-default-color: $dark !default;
 $s2bs-caret-padding: $custom-select-indicator-padding !default;
 $s2bs-caret-width-base: 0.25rem !default;
@@ -31,7 +31,7 @@ $s2bs-input-bg: $input-bg !default;
 $s2bs-input-bg-disabled: $input-disabled-bg !default;
 $s2bs-input-color: $input-color !default;
 $s2bs-input-color-placeholder: $input-placeholder-color !default;
-$s2bs-input-border: $input-border-color !default;
+$s2bs-input-border: $border-color !default;
 $s2bs-input-border-width: $input-border-width !default;
 $s2bs-input-border-focus: $input-focus-border-color !default;
 $s2bs-input-border-radius: $input-border-radius !default;
@@ -557,15 +557,15 @@ $s2bs-form-control-transition: border-color ease-in-out .15s, box-shadow ease-in
 }
 
 .has-warning {
-  @include validation-state-focus($warning);
+  @include validation-state-focus(theme-color('warning'));
 }
 
 .has-error {
-  @include validation-state-focus($danger);
+  @include validation-state-focus(theme-color('danger'));
 }
 
 .has-success {
-  @include validation-state-focus($success);
+  @include validation-state-focus(theme-color('success'));
 }
 
 .input-group > .select2-container--bootstrap4 {

data/app/assets/stylesheets/spree/backend/plugins/_sweetalert2_custom.scss

@@ -42,7 +42,7 @@ body.swal2-toast-shown .swal2-container.swal2-bottom {
   max-width: 500px;
 
   .swal2-popup.swal2-toast {
-    border-width: 3px;
+    border-width: 1px;
     border-style: solid;
     box-shadow: none !important;
     margin-bottom: 50px;

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

@@ -81,9 +81,9 @@ div.admin-product-image-container {
 }
 
 .js-remove-promo-rule-option-value {
-  color: $primary !important;
+  color: theme-color('primary') !important;
   &:hover {
-    color: darken($primary, 10) !important;
+    color: darken(theme-color('primary'), 10) !important;
   }
 }
 

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

@@ -15,12 +15,12 @@ span.or {
 .form-group {
   &.withError {
     label, .formError, .required {
-      color: $danger;
+      color: theme-color('danger');
     }
 
     input,
     .select2-choice {
-      border-color: $danger;
+      border-color: theme-color('danger');
     }
   }
 }
@@ -45,28 +45,7 @@ input[type="file"] {
   text-overflow: ellipsis;
 }
 
-
-// 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

@@ -1,40 +1,39 @@
-@import 'global/variables';
-@import 'global/mixins';
+@import 'spree/backend/global/variables';
+@import 'spree/backend/global/mixins';
 
 @import 'bootstrap';
 @import 'glyphicons';
-@import 'shared/glyphicons_urls_fix';
+@import 'spree/backend/shared/glyphicons_urls_fix';
+@import 'flag-icon';
 
-@import 'components/navbar';
-@import 'components/sidebar';
-@import 'components/tables';
-@import 'components/badges';
-@import 'components/main';
-@import 'components/page_header';
-@import 'components/icons';
-@import 'components/buttons';
-@import 'components/filters';
-@import 'components/navigation';
-@import 'components/taxon_products_view';
-@import 'components/progress';
-@import 'components/spinner';
+@import 'spree/backend/components/navbar';
+@import 'spree/backend/components/sidebar';
+@import 'spree/backend/components/tables';
+@import 'spree/backend/components/badges';
+@import 'spree/backend/components/main';
+@import 'spree/backend/components/page_header';
+@import 'spree/backend/components/icons';
+@import 'spree/backend/components/buttons';
+@import 'spree/backend/components/filters';
+@import 'spree/backend/components/navigation';
+@import 'spree/backend/components/taxon_products_view';
 
-@import 'plugins/sweetalert2_custom';
-@import 'plugins/jquery_ui';
-@import 'plugins/flatpickr';
-@import 'plugins/select2_bootstrap4';
-@import 'plugins/select2_custom';
-@import 'plugins/tinymce_custom';
-@import 'plugins/nav_x';
+@import 'spree/backend/plugins/sweetalert2_custom';
+@import 'spree/backend/plugins/jquery_ui';
+@import 'spree/backend/plugins/flatpickr';
+@import 'spree/backend/plugins/select2_bootstrap4';
+@import 'spree/backend/plugins/select2_custom';
+@import 'spree/backend/plugins/tinymce_custom';
+@import 'spree/backend/plugins/nav_x';
 
-@import 'shared/base';
-@import 'shared/forms';
-@import 'shared/sortable_tree';
+@import 'spree/backend/shared/base';
+@import 'spree/backend/shared/forms';
+@import 'spree/backend/shared/sortable_tree';
 
-@import 'views/menus';
-@import 'views/cms_pages';
-@import 'views/digitals';
-@import 'views/order_payments';
-@import 'views/product_properties';
-@import 'views/prototypes';
-@import 'views/taxonomies'
+@import 'spree/backend/views/menus';
+@import 'spree/backend/views/cms_pages';
+@import 'spree/backend/views/digitals';
+@import 'spree/backend/views/order_payments';
+@import 'spree/backend/views/product_properties';
+@import 'spree/backend/views/prototypes';
+@import 'spree/backend/views/taxonomies'

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

@@ -0,0 +1,26 @@
+module Spree
+  module Admin
+    class DashboardController < BaseController
+      def show
+        @products_added = current_store.products.any?
+        @shipping_methods_added = Spree::ShippingMethod.any?
+        @payment_methods_added = current_store.payment_methods.any?
+        @taxes_added = Spree::TaxRate.any?
+
+        @onboarding_complete = @products_added && @shipping_methods_added && @payment_methods_added && @taxes_added
+
+        @shippable_countries = Spree::ShippingMethod.all.collect(&:zones).flatten.uniq.compact.collect(&:countries).flatten.uniq.sort_by(&:name)
+
+        @active_tab = if !@products_added
+                        'products'
+                      elsif !@shipping_methods_added
+                        'shipping'
+                      elsif !@payment_methods_added
+                        'payment'
+                      else
+                        'taxes'
+                      end
+      end
+    end
+  end
+end

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

@@ -5,7 +5,7 @@ module Spree
 
       private
 
-      def turbo_enabled?
+      def create_turbo_stream_enabled?
         true
       end
 

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

@@ -19,11 +19,7 @@ module Spree
       protected
 
       def location_after_save
-        if @option_type.created_at == @option_type.updated_at
-          edit_admin_option_type_url(@option_type)
-        else
-          admin_option_types_url
-        end
+        edit_admin_option_type_url(@option_type)
       end
 
       private