spree_backend 4.2.7 → 4.3.0.rc1

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

@@ -5,7 +5,7 @@ $.fn.userAutocomplete = function () {
     return values.map(function (obj) {
       return {
         id: obj.id,
-        text: obj.email
+        text: obj.attributes.email
       }
     })
   }
@@ -14,24 +14,21 @@ $.fn.userAutocomplete = function () {
     multiple: true,
     minimumInputLength: 1,
     ajax: {
-      url: Spree.routes.users_api,
+      url: Spree.routes.users_api_v2,
       dataType: 'json',
+      headers: Spree.apiV2Authentication(),
       data: function (params) {
         return {
-          q: {
-            email_start: params.term
-          },
-          token: Spree.api_key
+          filter: {
+            email_i_cont: params.term
+          }
         }
       },
       processResults: function(data) {
         return {
-          results: formatUserList(data.users)
+          results: formatUserList(data.data)
         }
       }
-    },
-    templateSelection: function (data) {
-      return data.text
     }
   })
 }

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

@@ -12,7 +12,14 @@
 //= require jquery_ujs
 //= require jquery-ui/widgets/autocomplete
 //= require select2-full
+//= require sweetalert2
+//= require tinymce
+//= require spree/backend/global/tinymce
+
 //= require underscore-min.js
+//= require jsonapi-serializer.min
+
+//= require spree/backend/global/_index
 
 //= require spree
 //= require spree/backend/spree-select2
@@ -35,6 +42,8 @@
 //= require spree/backend/product_picker
 //= require spree/backend/progress
 //= require spree/backend/promotions
+//= require spree/backend/cms/_index
+//= require spree/backend/menus/_index
 //= require spree/backend/returns/expedited_exchanges_warning
 //= require spree/backend/returns/return_item_selection
 //= require spree/backend/shipments
@@ -67,7 +76,6 @@ Spree.routes.stock_locations_api = Spree.pathFor('api/v1/stock_locations')
 Spree.routes.taxon_products_api = Spree.pathFor('api/v1/taxons/products')
 Spree.routes.taxons_api = Spree.pathFor('api/v1/taxons')
 Spree.routes.users_api = Spree.pathFor('api/v1/users')
-Spree.routes.tags_api = Spree.pathFor('api/v1/tags')
 Spree.routes.variants_api = Spree.pathFor('api/v1/variants')
 
 Spree.routes.edit_product = function (productId) {
@@ -81,3 +89,22 @@ Spree.routes.payments_api = function (orderId) {
 Spree.routes.stock_items_api = function (stockLocationId) {
   return Spree.pathFor('api/v1/stock_locations/' + stockLocationId + '/stock_items')
 }
+
+// API v2
+Spree.routes.countries_api_v2 = Spree.pathFor('api/v2/platform/countries')
+Spree.routes.classifications_api_v2 = Spree.pathFor('api/v2/platform/classifications')
+Spree.routes.menus_api_v2 = Spree.pathFor('api/v2/platform/menus')
+Spree.routes.menus_items_api_v2 = Spree.pathFor('api/v2/platform/menu_items')
+Spree.routes.option_types_api_v2 = Spree.pathFor('api/v2/platform/option_types')
+Spree.routes.option_values_api_v2 = Spree.pathFor('api/v2/platform/option_values')
+Spree.routes.pages_api_v2 = Spree.pathFor('api/v2/platform/cms_pages')
+Spree.routes.products_api_v2 = Spree.pathFor('/api/v2/platform/products')
+Spree.routes.sections_api_v2 = Spree.pathFor('/api/v2/platform/cms_sections')
+Spree.routes.taxons_api_v2 = Spree.pathFor('/api/v2/platform/taxons')
+Spree.routes.users_api_v2 = Spree.pathFor('api/v2/platform/users')
+
+Spree.apiV2Authentication = function() {
+  return {
+    'Authorization': 'Bearer ' + OAUTH_TOKEN
+  }
+}

data/app/assets/javascripts/spree.js

@@ -0,0 +1,78 @@
+//= require jsuri
+function Spree () {}
+
+Spree.ready = function (callback) {
+  return jQuery(document).on('page:load turbolinks:load', function () {
+    return callback(jQuery)
+  })
+}
+
+Spree.mountedAt = function () {
+  return window.SpreePaths.mounted_at
+}
+
+Spree.adminPath = function () {
+  return window.SpreePaths.admin
+}
+
+Spree.pathFor = function (path) {
+  var locationOrigin = (window.location.protocol + '//' + window.location.hostname) + (window.location.port ? ':' + window.location.port : '')
+
+  return this.url('' + locationOrigin + (this.mountedAt()) + path, this.url_params).toString()
+}
+
+Spree.localizedPathFor = function(path) {
+  if (typeof (SPREE_LOCALE) !== 'undefined' && typeof (SPREE_CURRENCY) !== 'undefined') {
+    var fullUrl = new URL(Spree.pathFor(path))
+    var params = fullUrl.searchParams
+    var pathName = fullUrl.pathname
+
+    params.set('currency', SPREE_CURRENCY)
+
+    if (pathName.match(/api\/v/)) {
+      params.set('locale', SPREE_LOCALE)
+    } else {
+      pathName = (this.mountedAt()) + SPREE_LOCALE + '/' + path
+    }
+    return fullUrl.origin + pathName + '?' + params.toString()
+  }
+  return Spree.pathFor(path)
+}
+
+Spree.adminPathFor = function (path) {
+  return this.pathFor('' + (this.adminPath()) + path)
+}
+
+Spree.url = function (uri, query) {
+  if (uri.path === void 0) {
+    // eslint-disable-next-line no-undef
+    uri = new Uri(uri)
+  }
+  if (query) {
+    $.each(query, function (key, value) {
+      return uri.addQueryParam(key, value)
+    })
+  }
+  return uri
+}
+
+Spree.ajax = function (urlOrSettings, settings) {
+  var url
+  if (typeof urlOrSettings === 'string') {
+    return $.ajax(Spree.url(urlOrSettings).toString(), settings)
+  } else {
+    url = urlOrSettings['url']
+    delete urlOrSettings['url']
+    return $.ajax(Spree.url(url).toString(), urlOrSettings)
+  }
+}
+
+Spree.routes = {
+  states_search: Spree.pathFor('api/v1/states'),
+  apply_coupon_code: function (orderId) {
+    return Spree.pathFor('api/v1/orders/' + orderId + '/apply_coupon_code')
+  },
+  cart: Spree.pathFor('cart')
+}
+
+Spree.url_params = {}

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

@@ -1,6 +1,6 @@
 #table-filter {
   display: none;
-  margin-top: 20px;
+  margin-top: 7.5px;
 }
 
 .index-filter-button .icon-chevron-right {
@@ -19,8 +19,6 @@
 }
 
 i.js-delete-filter {
-  width: $select2-icon-size;
-  height: $select2-icon-size;
   margin-bottom: 0;
 }
 

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

@@ -1,5 +1,4 @@
 #main-part {
-  padding: $spacer ($spacer * 0.5) 0 ($spacer * 0.5);
   margin-top: 50px;
 }
 

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

@@ -25,5 +25,40 @@
       }
     }
 
+    #storeSwitcherDropdown {
+      .dropdown-menu.show {
+        min-width:250px;
+        width: fit-content;
+        max-width: 90vw;
+        max-height: 70vh;
+        overflow-y: scroll !important;
+        top:110%;
+        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%;
+          right: 0%;
+          transform: translate(0%, 0%);
+        }
+
+        a {
+          white-space: nowrap;
+          overflow-x: hidden;
+          text-overflow: ellipsis;
+
+          svg {
+            vertical-align: text-top;
+            margin-right: 1em;
+          }
+
+          &.disabled svg {
+            color: $success;
+          }
+        }
+      }
+    }
   }
 }

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

@@ -4,3 +4,16 @@
   top: 0;
   cursor: pointer;
 }
+
+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,4 +1,3 @@
-
 aside#main-sidebar {
   overflow-y: auto; /* Scrollable contents if viewport is shorter than content. */
   background-color: $gray-100;

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

@@ -1,10 +1,6 @@
 table.table {
   font-size: $font-size-sm;
 
-  .move-handle {
-    cursor: grab;
-  }
-
   th {
     padding: 0.5rem;
 
@@ -20,6 +16,10 @@ table.table {
     padding: 0.5rem;
   }
 
+  td.move-handle {
+    width:45px;
+  }
+
   .badge {
     text-transform: uppercase;
   }
@@ -58,7 +58,6 @@ table.table {
 
 .table-active-filters {
   display: none;
-  margin: -.5em 0 .9em;
 
   .js-filter {
     .icon {

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

@@ -17,3 +17,62 @@
     #{$property}: $value;
   }
 }
+
+
+@mixin switch($res: 'sm') {
+    $index: 1rem;
+    $mainVal: 1rem;
+    $baseVal: 1rem;
+
+    @if $res == 'md' {
+        $index: 2rem;
+        $mainVal: 1.5rem;
+        $baseVal: 1rem;
+        min-height: $index;
+    } @else if $res == 'lg' {
+        $index: 3rem;
+        $mainVal: 2rem;
+        $baseVal: 1rem;
+    } @else if $res == 'xl' {
+        $index: 4rem;
+        $mainVal: 2.5rem;
+        $baseVal: 1rem;
+    }
+
+    .custom-control-label {
+        padding-left: #{$baseVal};
+        padding-bottom: #{$mainVal};
+    }
+
+    .custom-control-label::before {
+        height: $mainVal;
+        width: calc(#{$index} + 0.75rem);
+        border-radius: $mainVal * 2;
+    }
+
+    .custom-control-label::after {
+        width: calc(#{$mainVal} - 4px);
+        height: calc(#{$mainVal} - 4px);
+        border-radius: calc(#{$index} - (#{$mainVal} / 2));
+    }
+
+    .custom-control-input:checked ~ .custom-control-label::after {
+        transform: translateX(calc(#{$mainVal} - 0.25rem));
+    }
+}
+
+.custom-switch.custom-switch-sm {
+    @include switch();
+}
+
+.custom-switch.custom-switch-md {
+    @include switch('md');
+}
+
+.custom-switch.custom-switch-lg {
+    @include switch('lg');
+}
+
+.custom-switch.custom-switch-xl {
+    @include switch('xl');
+}

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

@@ -0,0 +1,95 @@
+[data-nav-x-wrapper] {
+  position: relative;
+  padding: 0;
+  overflow: hidden;
+}
+
+[data-nav-x-container] {
+  overflow-x: auto;
+  overflow-y: hidden;
+  white-space: nowrap;
+  position: relative;
+  -ms-overflow-style: none;
+  scrollbar-width: none;
+
+  &::-webkit-scrollbar {
+    display: none;
+  }
+}
+
+[data-nav-x-content] {
+  float: left;
+  transition: transform .2s ease-in-out;
+  position: relative;
+
+  & > * {
+    z-index: 200;
+  }
+
+  // Bug fix for iOS jittery elastic scroll from Bootstrap
+  // transaition on pills and buttons.
+  & > li > a {
+    transition: none !important;
+  }
+}
+
+.nav-x_Transition_None {
+  transition: none;
+}
+
+.nav-x_Advancer {
+  appearance: none;
+  background: transparent;
+  border: 0;
+  position: absolute;
+  padding: 5px;
+  height: 100%;
+  width: fit-content;
+  top: 0;
+  bottom: 0;
+  opacity: 0;
+  transition: linear 0.01s 0.6s, opacity 0.4s;
+  z-index:300;
+
+  &:focus {
+    outline: 0;
+  }
+
+  &:hover {
+    cursor: pointer;
+  }
+
+  svg {
+    height: 1.5em;
+    width: 1.5em;
+    color: rgba(128, 128, 128, 0.56);
+  }
+}
+
+.nav-x_Advancer_Left {
+  border-right: 2px solid rgba(128, 128, 128, 0.56);
+  background: linear-gradient(90deg, rgba(255,255,255,1) 0%, rgba(255,255,255,1) 65%, rgba(255,255,255,0.8533788515406162) 100%);
+  left: -46px;
+  padding-right: 0;
+}
+
+[data-overflowing="both"] ~ .nav-x_Advancer_Left,
+[data-overflowing="left"] ~ .nav-x_Advancer_Left {
+  opacity: 1;
+  left: -1px;
+  transition: linear 0.01s, opacity 0.4s 0.02s;
+}
+
+.nav-x_Advancer_Right {
+  border-left: 2px solid rgba(128, 128, 128, 0.56);
+  background: linear-gradient(90deg, rgba(255,255,255,0.850577731092437) 0%, rgba(255,255,255,1) 35%, rgba(255,255,255,1) 100%);
+  right: -46px;
+  padding-left: 0;
+}
+
+[data-overflowing="both"] ~ .nav-x_Advancer_Right,
+[data-overflowing="right"] ~ .nav-x_Advancer_Right {
+  opacity: 1;
+  right: -1px;
+  transition: linear 0.01s, opacity 0.4s 0.02s;
+}

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

@@ -0,0 +1,100 @@
+// Custom SCSS Standard SweetAlerts
+body.swal2-shown {
+  .swal2-popup {
+    border-radius:$border-radius;
+  }
+  .swal2-html-container {
+    text-align: left;
+    font-size: 0.9em;
+
+    .alert-link {
+      font-weight: 400;
+    }
+  }
+    .swal2-content {
+      padding: 0 !important;
+    }
+  .swal2-header {
+    .swal2-icon {
+      width: 2.5em;
+      height: 2.5em;
+
+      .swal2-icon-content {
+        font-size: 2.15em;
+      }
+    }
+
+    .swal2-close {
+      top: 3px;
+      right: 3px;
+      padding-bottom: 3px;
+
+      &:hover {
+        color:grey;
+      }
+    }
+  }
+}
+
+// Custom SCSS Toast SweetAlerts
+body.swal2-toast-shown .swal2-container.swal2-bottom {
+  right: -50% !important;
+  max-width: 500px;
+
+  .swal2-popup.swal2-toast {
+    border-width: 3px;
+    border-style: solid;
+    box-shadow: none !important;
+    margin-bottom: 50px;
+
+    .swal2-icon {
+      display: none !important;
+    }
+
+    button.swal2-close {
+        min-width: .8em;
+        padding-bottom: 0.1em;
+        &:hover {
+        opacity: 0.75;
+      }
+    }
+  }
+}
+
+@include media-breakpoint-down(sm) {
+  body.swal2-toast-shown .swal2-container.swal2-bottom {
+    .swal2-popup.swal2-toast {
+      button.swal2-close {
+        padding-bottom: 0;
+      }
+    }
+  }
+}
+
+.swal2-popup.swal2-toast.swal2-icon-success {
+  @extend .alert-success;
+  h2, button {
+    @extend .alert-success;
+  }
+}
+
+.swal2-popup.swal2-toast.swal2-icon-error {
+  @extend .alert-danger;
+  h2, button {
+    @extend .alert-danger;
+  }
+}
+
+.swal2-popup.swal2-toast.swal2-icon-info {
+  @extend .alert-info;
+  h2, button {
+    @extend .alert-info;
+  }
+}
+
+.swal2-popup.swal2-toast.swal2-icon-question {
+  @extend .alert-warning;
+  h2, button {
+    @extend .alert-warning;
+  }
+}

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

@@ -0,0 +1,4 @@
+// Removes Tiny MCE branding
+.tox-statusbar__branding {
+  display: none;
+}

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

@@ -15,14 +15,17 @@
   z-index: $zindex-dropdown;
 }
 
-// No-margin and no-padding helper classes
-@each $side in top bottom left right {
-  .no-margin-#{$side}  { margin-#{side}: 0; }
-  .no-padding-#{$side} { padding-#{side}: 0; }
-}
+figure.admin-img-holder {
+  max-width: 275px;
+  border: 2px dashed grey;
+  border-radius: $border-radius;
+  overflow: hidden;
+  display: inline-block;
 
-.alert-error {
-  @extend .alert-danger;
+  img {
+    max-width: 100%;
+    height: auto;
+  }
 }
 
 .js-remove-promo-rule-option-value {
@@ -32,30 +35,29 @@
   }
 }
 
-.flash-alert {
-  z-index: 0;
-  opacity: 0;
-  bottom: -50px;
-  left:0;
-  right:0;
+.button_to {
+  display: inline-block;
+}
 
-  .alert {
-    z-index: 500;
-    opacity: 0.98;
-    border-width: 3px;
-    margin-bottom: 0;
-  }
+.move-handle {
+  cursor: grab;
 }
 
-.flash-alert.animate__animated {
-  opacity: 1;
-  bottom: 30px;
+.badge-light-muted-text {
+  color: rgba(0, 0, 0, 0.50);
 }
 
-.resize-animation-stopper * {
-  transition: none !important;
+.truncate {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
 
-.button_to {
-  display: inline-block;
+[data-show-info] {
+  color:  $primary;
+  cursor: pointer;
+}
+
+#contentHeaderRow {
+  min-height: 51px;
 }

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

@@ -37,6 +37,14 @@ input[type=number].hide-number-toggle {
   -moz-appearance: textfield;
 }
 
+input[type="file"] {
+  width: fit-content;
+  max-width: 100%;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
 
 // Remove the default 5px outlines and box-shadows
 // from all inputs on focus.

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

@@ -19,14 +19,19 @@
 @import 'components/progress';
 @import 'components/spinner';
 
+@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 'shared/base';
 @import 'shared/forms';
 
+@import 'views/menus';
+@import 'views/cms_pages';
 @import 'views/order_payments';
 @import 'views/product_properties';
 @import 'views/prototypes';