spree_backend 4.1.15 → 4.2.0.beta

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

@@ -6,26 +6,26 @@ root.taxon_tree_menu = function (obj, context) {
   editUrl.setPath(editUrl.path() + '/' + obj.attr('id') + '/edit')
   return {
     create: {
-      label: '<span class="icon icon-plus"></span> ' + Spree.translations.add,
+      label: '<i class="icon icon-add"></i>' + Spree.translations.add,
       action: function (obj) {
         return context.create(obj)
       }
     },
     rename: {
-      label: '<span class="icon icon-pencil"></span> ' + Spree.translations.rename,
+      label: '<i class="icon icon-edit"></i> ' + Spree.translations.rename,
       action: function (obj) {
         return context.rename(obj)
       }
     },
     remove: {
-      label: '<span class="icon icon-trash"></span> ' + Spree.translations.remove,
+      label: '<i class="icon icon-delete"></i> ' + Spree.translations.remove,
       action: function (obj) {
         return context.remove(obj)
       }
     },
     edit: {
       separator_before: true,
-      label: '<span class="icon icon-cog"></span> ' + Spree.translations.edit,
+      label: '<i class="icon icon-settings"></i> ' + Spree.translations.edit,
       action: function () {
         window.location = editUrl.toString()
         return window.location

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

@@ -158,9 +158,16 @@ root.setup_taxonomy_tree = function (taxonomyId) {
         return $(this).jstree('core').toggle_node($('.jstree-icon').first())
       })
     })
+
     $taxonomyTree.on('dblclick', 'a', function () {
-      $taxonomyTree.jstree('rename', this)
+      var iOS = /iPad|iPhone|iPod/.test(navigator.platform || '')
+      if (iOS) {
+        $taxonomyTree.jstree('show_contextmenu', this)
+      } else {
+        $taxonomyTree.jstree('rename', this)
+      }
     })
+
     // suppress form submit on enter/return
     $(document).keypress(function (event) {
       if (event.keyCode === 13) {

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

@@ -1,26 +1,35 @@
-/* global productTemplate */
+/* global productTemplate, Sortable */
 $(function () {
   window.productTemplate = Handlebars.compile($('#product_template').text())
   var taxonProducts = $('#taxon_products')
   var taxonId = $('#taxon_id')
 
-  taxonProducts.sortable({
-    handle: '.js-sort-handle'
-  })
-
-  taxonProducts.on('sortstop', function (event, ui) {
-    return $.ajax({
-      url: Spree.routes.classifications_api,
-      method: 'PUT',
-      dataType: 'json',
-      data: {
-        token: Spree.api_key,
-        product_id: ui.item.data('product-id'),
-        taxon_id: $('#taxon_id').val(),
-        position: ui.item.index()
+  var el = document.getElementById('taxon_products')
+  if (el) {
+    Sortable.create(el, {
+      handle: '.sort-handle',
+      ghostClass: 'moving-this',
+      animation: 550,
+      easing: 'cubic-bezier(1, 0, 0, 1)',
+      swapThreshold: 0.9,
+      forceFallback: true,
+      onEnd: function (evt) {
+        var itemEl = evt.item.getAttribute('data-product-id')
+        var newin = evt.newIndex
+        return $.ajax({
+          url: Spree.routes.classifications_api,
+          method: 'PUT',
+          dataType: 'json',
+          data: {
+            token: Spree.api_key,
+            product_id: itemEl,
+            taxon_id: $('#taxon_id').val(),
+            position: newin
+          }
+        })
       }
     })
-  })
+  }
 
   if (taxonId.length > 0) {
     taxonId.select2({

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

@@ -22,7 +22,7 @@ $.fn.userAutocomplete = function () {
       data: function (term) {
         return {
           q: {
-            email_cont: term
+            email_start: term
           },
           token: Spree.api_key
         }

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

@@ -36,7 +36,7 @@ $.fn.variantAutocomplete = function () {
       data: function (term) {
         return {
           q: {
-            product_name_or_sku_cont: term
+            search_by_product_name_or_sku: term
           },
           token: Spree.api_key
         }

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

@@ -7,7 +7,8 @@ $(function () {
     $.ajax({
       type: this.method,
       url: this.action,
-      data: $(this).serialize()
+      data: $(this).serialize(),
+      dataType: 'json'
     })
     return false
   })

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

@@ -1,13 +1,15 @@
 //= require modernizr
+//= require purify
+//= require sortable
+//= require flatpickr
 //= require jquery3
 //= require popper
 //= require bootstrap-sprockets
 //= require handlebars
+//= require cleave
 //= require js.cookie
 //= require jquery.jstree/jquery.jstree
 //= require jquery_ujs
-//= require jquery-ui/widgets/datepicker
-//= require jquery-ui/widgets/sortable
 //= require jquery-ui/widgets/autocomplete
 //= require select2
 //= require underscore-min.js
@@ -24,6 +26,7 @@
 //= require spree/backend/handlebar_extensions
 //= require spree/backend/line_items
 //= require spree/backend/line_items_on_order_edit
+//= require spree/backend/multi_currency
 //= require spree/backend/option_type_autocomplete
 //= require spree/backend/option_value_picker
 //= require spree/backend/orders/edit

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

@@ -1,3 +1,7 @@
+.payment-action-save {
+  @include button-variant($success, $success, $success );
+}
+
 .btn,
 .nav-pills > li > a {
   vertical-align: middle;
@@ -7,19 +11,31 @@
 .btn {
   text-align: center;
 
-  .glyphicon {
-    padding-right: 3px;
+  .ship {
+    color: #fff;
+  }
+  svg,
+  i.icon {
+   margin-bottom: 3px;
   }
-
-  .ship { color: #fff; }
 }
 
-.btn-sm .glyphicon { padding: 0; }
-
-.btn.action-void { @extend .btn-danger; }
-.btn.action-capture { @extend .btn-success; }
-.btn.payment-action-edit {
-  @extend .btn-primary;
+input#image_attachment >
+input[type="button"],
+input[type="file"]::-webkit-file-upload-button {
+  @include border-radius();
+  border: 1px solid;
+  background-color: white;
+  color: $secondary;
+  border-color: $secondary;
+  padding: 0.375rem 0.75rem;
+  &:hover {
+    color: white;
+    background-color: $secondary;
+  }
+}
 
-  color: $white !important;
+.actions .btn,
+.page-actions .btn {
+  margin: 2px;
 }

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

@@ -1,15 +1,31 @@
 #table-filter {
   display: none;
-  border-top-left-radius: 0;
-  border-top-right-radius: 0;
   margin-top: 20px;
 }
 
+.index-filter-button .icon-chevron-right {
+  transform: rotate(0);
+  transition: .3s ease-in-out;
+  margin-bottom: 0;
+}
+
+.collapsed .icon-chevron-right {
+  transform: rotate(90deg);
+  transition: .3s ease-in-out;
+}
+
+.default-filter-icon {
+  opacity: 0.1;
+}
+
+i.js-delete-filter {
+  width: $select2-icon-size;
+  height: $select2-icon-size;
+  margin-bottom: 0;
+}
+
 .index-filter-button {
   font-size: $font-size-sm;
-  .glyphicon {
-    color: $gray-800;
-  }
 
   button {
     height: 100%;
@@ -34,3 +50,17 @@
     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;
+  }
+}

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

@@ -1,5 +1,4 @@
-// TODO: Switch everything to use glyphicons
-.icon, .glyphicon {
+span.icon, span.glyphicon {
   vertical-align: text-top;
 }
 
@@ -240,8 +239,9 @@ $alias_icons: (plus add)
               (globe translate)
               (ok approve);
 
-.icon {
+span.icon {
   @extend .glyphicon;
+  top:2px;
 
   // Map defaults.
   @each $icon in $default_icons {
@@ -254,4 +254,39 @@ $alias_icons: (plus add)
     $alias: nth($map, 2);
     &.icon-#{$alias} { @extend .glyphicon-#{$icon}; }
   }
-}
+}
+
+// Spree SVG Icon Defaults
+i.icon {
+  display: inline-block;
+  width: 1rem;
+  height: 1rem;
+  overflow: hidden;
+  vertical-align: middle;
+  background-repeat: no-repeat;
+  background-size: 100%;
+  background-position: center;
+}
+
+
+// Spree SVG Icons in JS
+
+// The icons listed below are used by javascript generated content
+// If you wish to use an existing SVG icon in javascript generated content
+// use <i> tags like this -> <i class="icon icon-close"></i>
+// Using <span> tags will fall back to legacy glyphicon font based icons
+
+i.icon-close,
+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-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")); }
+i.icon-edit          { background-image: url(asset-path("backend-edit.svg")); }
+i.icon-chevron-down  { background-image: url(asset-path("backend-chevron-down.svg")); }
+i.icon-chevron-left  { background-image: url(asset-path("backend-chevron-left.svg")); }
+i.icon-chevron-right { background-image: url(asset-path("backend-chevron-right.svg")); }
+i.icon-chevron-up    { background-image: url(asset-path("backend-chevron-up.svg")); }

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

@@ -1,13 +1,39 @@
 #main-part {
-  padding: $spacer ($spacer * 2) 0 ($spacer * 2);
+  padding: $spacer ($spacer * 0.5) 0 ($spacer * 0.5);
   margin-top: 50px;
 }
 
-.sidebar-minimized #main-part {
-  padding: $spacer ($spacer * 2) 0 ($spacer * 5);
-}
-
 #logo {
   width: auto;
-  height: 40px;
+  height: 36px;
+}
+
+#multi-backdrop {
+  z-index: 0;
+  height: 0;
+  width: 0;
+}
+
+body.modal-open #multi-backdrop {
+  z-index: 1040;
+  width: 100vw;
+  height: 100vh;
+}
+
+.sort-handle {
+  cursor: grab;
+}
+
+.no-wrap {
+  white-space: nowrap;
+}
+
+.card-body {
+  padding: 0.75rem;
+}
+
+@include media-breakpoint-up(sm) {
+  .card-body {
+    padding: 1.25rem;
+  }
 }

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

@@ -2,20 +2,28 @@
   .navbar {
     background-color: $navbar-inverse-bg;
     padding: 0;
+    height: 50px;
 
     a:hover {
       text-decoration: none;
     }
-  }
-
-  .dropdown-toggle {
-    &[aria-expanded="true"] {
-      background-color: $gray-900;
+    .btn {
+      &:hover,
+      &:focus {
+        text-decoration: none;
+        outline: 0;
+        outline: none;
+        -webkit-box-shadow: none;
+        box-shadow: none;
+      }
     }
 
-    &:hover,
-    &:focus {
-      text-decoration: none;
+    #accountNav {
+      i {
+        font-size: 1.3em;
+        line-height: 1rem;
+      }
     }
+
   }
 }

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

@@ -1,85 +1,149 @@
-.sidebar {
+
+aside#main-sidebar {
   overflow-y: auto; /* Scrollable contents if viewport is shorter than content. */
   background-color: $gray-100;
   border-right: 1px solid $gray-200;
-  margin-top: 50px;
-  height: calc(100% - 50px);
-  z-index: 999;
+  width: 100%;
+  left: -100%;
+  margin-top: 0;
+  height: 100%;
+  transition: 0.3s ease;
+  z-index: 1041;
+}
+
+body.sidebar-open {
+  overflow-x: hidden;
+  aside#main-sidebar {
+    left:0;
+    transition: 0.3s ease;
+  }
+  .disable-when-main-menu-is-open {
+    z-index: 1040 !important;
+  }
+}
 
-  a.sidebar-submenu-item:hover {
+a.sidebar-submenu-item:hover {
     text-decoration: none;
     background-color: $gray-200;
     cursor: pointer
+}
+
+ul.active-option {
+  background-color: $gray-200;
+  .drop-menu-indicator {
+    transform: rotate(-90deg);
   }
+}
 
-  ul.nav-sidebar {
-    > li {
-      > a {
-        color: $gray-700;
+ul.nav-sidebar {
+  > li {
+    > a {
+      color: $gray-700;
 
-        &:hover,
-        &[aria-expanded="true"] {
-          text-decoration: none;
-          background-color: $gray-200;
+      &:hover,
+      &[aria-expanded="true"] {
+        text-decoration: none;
+      }
+
+      .drop-menu-indicator {
+        right: 1rem;
+      }
+
+      &[aria-expanded="true"] {
+        .drop-menu-indicator {
+          transform: rotate(-90deg);
+          transition: .3s ease-in-out;
         }
+      }
 
-        .icon-chevron-left,
-        .icon-chevron-down {
-          font-size: .5rem;
-          line-height: 2;
-          right: 1rem;
-          top: 50%;
-          margin-top: -.5rem;
+      &[aria-expanded="false"] {
+        .drop-menu-indicator {
+          transform: rotate(0deg);
+          transition: .3s ease-in-out;
         }
       }
     }
   }
 }
 
-#wrapper.sidebar-minimized #main-sidebar {
-  width: 50px;
-  overflow: visible;
+#contextualSideMenu {
+  max-height: 85vh;
+  overflow-x: auto;
+  background-color: white;
+  position: fixed;
+  left:0;
+  top: -100%;
+  z-index: 1041;
+  transition: .3s ease-in-out;
+  .page-actions__close {
+    margin: -1.5rem -1.5rem 1.5rem;
+  }
+}
 
-  li {
-    &:hover, &.menu-active {
-      background-color: $gray-100;
-    }
+#contextual-menu-toggle {
+  & svg {
+    transform:rotate(0deg);
+    transition: transform .3s ease-in-out;
   }
+}
 
-  .icon-link, [data-toggle="collapse"] {
-    text-align: center;
+#sidebar a svg {
+  margin-bottom: 3px;
+}
 
-    .icon {
-      padding: 0;
-    }
+body.contextualSideMenu-open #contextualSideMenu {
+  top: 0;
+  transition: .3s ease-in-out;
+}
 
-    .text, .icon-chevron-left, .icon-chevron-down {
-      display: none;
-    }
+body.contextualSideMenu-open #contextual-menu-toggle {
+  svg {
+    transform:rotate(180deg);
+    transition: transform .3s ease-in-out;
   }
+}
 
-  ul.collapse.in {
-    display: none;
+.contextual-title {
+  font-size:1.25rem;
+}
+
+@include media-breakpoint-up(sm) {
+  aside#main-sidebar {
+    width: 50%;
   }
+}
 
-  .submenu-active {
-    display: block !important;
-    height: auto !important;
-    position: fixed;
-    top: 50px;
-    bottom: 0;
-    left: 0;
-    padding: 0;
+@include media-breakpoint-up(md) {
+  aside#main-sidebar {
+    width: 30%;
+  }
+}
+
+@include media-breakpoint-up(lg) {
+
+  #contextualSideMenu {
+    border: none;
+    height: max-content;
     z-index: 1000;
-    display: block;
-    overflow-x: hidden;
-    overflow-y: auto; /* Scrollable contents if viewport is shorter than content. */
-    left: 50px;
-    min-width: 180px;
-    visibility: visible;
-    background-color: $gray-100;
-    border-top: none;
-    border-right: 1px solid $gray-200;
-    padding-top: 5px;
+    position: sticky;
+    top: 75px;
+    transition: none;
+  }
+  aside#main-sidebar {
+    left: 0;
+    z-index: 999;
+    margin-top: 50px;
+    height: calc(100% - 50px);
+    transition: none;
+    body.sidebar-open {
+      aside#main-sidebar {
+        left:0;
+        transition: none;
+      }
+    }
+  }
+
+  .contextual-title {
+    font-size:1.5rem;
   }
 }