spree_backend 3.7.14.1 → 4.0.0.beta

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

@@ -1,60 +1,62 @@
-function handle_ajax_error(last_rollback) {
-  $.jstree.rollback(last_rollback);
-  show_flash('error', '<strong>' + Spree.translations.server_error + '</strong><br />' + Spree.translations.taxonomy_tree_error);
+/* globals show_flash, base_url, taxon_tree_menu */
+
+function handleAjaxError (lastRollback) {
+  $.jstree.rollback(lastRollback)
+  show_flash('error', '<strong>' + Spree.translations.server_error + '</strong><br />' + Spree.translations.taxonomy_tree_error)
 }
 
-function handle_move(e, data) {
-  var last_rollback = data.rlbk;
-  var position = data.rslt.cp;
-  var node = data.rslt.o;
-  var new_parent = data.rslt.np;
-  var url = Spree.url(base_url).clone();
-  url.setPath(url.path() + '/' + node.prop('id'));
+function handleMove (e, data) {
+  var lastRollback = data.rlbk
+  var position = data.rslt.cp
+  var node = data.rslt.o
+  var newParent = data.rslt.np
+  var url = Spree.url(base_url).clone()
+  url.setPath(url.path() + '/' + node.prop('id'))
   $.ajax({
     type: 'POST',
     dataType: 'json',
     url: url.toString(),
     data: {
       _method: 'put',
-      'taxon[parent_id]': new_parent.prop('id'),
+      'taxon[parent_id]': newParent.prop('id'),
       'taxon[child_index]': position,
       token: Spree.api_key
-    },
+    }
   }).fail(function () {
-    handle_ajax_error(last_rollback);
-  });
-  return true;
+    handleAjaxError(lastRollback)
+  })
+  return true
 }
 
-function handle_create(e, data) {
-  var last_rollback = data.rlbk;
-  var node = data.rslt.obj;
-  var name = data.rslt.name;
-  var position = data.rslt.position;
-  var new_parent = data.rslt.parent;
+function handleCreate (e, data) {
+  var lastRollback = data.rlbk
+  var node = data.rslt.obj
+  var name = data.rslt.name
+  var position = data.rslt.position
+  var newParent = data.rslt.parent
   return $.ajax({
     type: 'POST',
     dataType: 'json',
     url: base_url.toString(),
     data: {
       'taxon[name]': name,
-      'taxon[parent_id]': new_parent.prop('id'),
+      'taxon[parent_id]': newParent.prop('id'),
       'taxon[child_index]': position,
       token: Spree.api_key
     }
   }).done(function (data) {
-    node.prop('id', data.id);
+    node.prop('id', data.id)
   }).fail(function () {
-    return handle_ajax_error(last_rollback);
-  });
+    return handleAjaxError(lastRollback)
+  })
 }
 
-function handle_rename(e, data) {
-  var last_rollback = data.rlbk;
-  var node = data.rslt.obj;
-  var name = data.rslt.new_name;
-  var url = Spree.url(base_url).clone();
-  url.setPath(url.path() + '/' + node.prop('id'));
+function handleRename (e, data) {
+  var lastRollback = data.rlbk
+  var node = data.rslt.obj
+  var name = data.rslt.new_name
+  var url = Spree.url(base_url).clone()
+  url.setPath(url.path() + '/' + node.prop('id'))
   return $.ajax({
     type: 'POST',
     dataType: 'json',
@@ -65,53 +67,54 @@ function handle_rename(e, data) {
       token: Spree.api_key
     }
   }).fail(function () {
-    handle_ajax_error(last_rollback);
-  });
+    handleAjaxError(lastRollback)
+  })
 }
 
-function handle_delete(e, data) {
-  var last_rollback = data.rlbk;
-  var node = data.rslt.obj;
-  var delete_url = base_url.clone();
-  delete_url.setPath(delete_url.path() + '/' + node.prop('id'));
+function handleDelete (e, data) {
+  var lastRollback = data.rlbk
+  var node = data.rslt.obj
+  var deleteUrl = base_url.clone()
+  deleteUrl.setPath(deleteUrl.path() + '/' + node.prop('id'))
   if (confirm(Spree.translations.are_you_sure_delete)) {
     $.ajax({
       type: 'POST',
       dataType: 'json',
-      url: delete_url.toString(),
+      url: deleteUrl.toString(),
       data: {
         _method: 'delete',
         token: Spree.api_key
       }
     }).fail(function () {
-      handle_ajax_error(last_rollback);
-    });
+      handleAjaxError(lastRollback)
+    })
   } else {
-    $.jstree.rollback(last_rollback);
-    last_rollback = null;
+    $.jstree.rollback(lastRollback)
+    lastRollback = null
   }
 }
 
-var root = typeof exports !== 'undefined' && exports !== null ? exports : this;
+var root = typeof exports !== 'undefined' && exports !== null ? exports : this
 
-root.setup_taxonomy_tree = function (taxonomy_id) {
-  var $taxonomy_tree = $('#taxonomy_tree');
-  if (taxonomy_id !== void 0) {
+root.setup_taxonomy_tree = function (taxonomyId) {
+  var $taxonomyTree = $('#taxonomy_tree')
+  if (taxonomyId !== void 0) {
     // this is defined within admin/taxonomies/edit
-    root.base_url = Spree.url(Spree.routes.taxonomy_taxons_path);
+    root.base_url = Spree.url(Spree.routes.taxonomy_taxons_path)
     $.ajax({
       url: Spree.url(base_url.path().replace('/taxons', '/jstree')).toString(),
       data: {
         token: Spree.api_key
       }
     }).done(function (taxonomy) {
-      var last_rollback = null;
+      // eslint-disable-next-line no-unused-vars
+      var lastRollback = null
       var conf = {
         json_data: {
           data: taxonomy,
           ajax: {
             url: function (e) {
-              return Spree.url(base_url.path() + '/' + e.prop('id') + '/jstree' + '?token=' + Spree.api_key).toString();
+              return Spree.url(base_url.path() + '/' + e.prop('id') + '/jstree' + '?token=' + Spree.api_key).toString()
             }
           }
         },
@@ -126,40 +129,40 @@ root.setup_taxonomy_tree = function (taxonomy_id) {
         crrm: {
           move: {
             check_move: function (m) {
-              var new_parent, node, position;
-              position = m.cp;
-              node = m.o;
-              new_parent = m.np;
-              if (!new_parent || node.prop('rel') === 'root') {
-                return false;
+              var newParent, node, position
+              position = m.cp
+              node = m.o
+              newParent = m.np
+              if (!newParent || node.prop('rel') === 'root') {
+                return false
               }
               // can't drop before root
-              if (new_parent.prop('id') === 'taxonomy_tree' && position === 0) {
-                return false;
+              if (newParent.prop('id') === 'taxonomy_tree' && position === 0) {
+                return false
               }
-              return true;
+              return true
             }
           }
         },
         contextmenu: {
           items: function (obj) {
-            return taxon_tree_menu(obj, this);
+            return taxon_tree_menu(obj, this)
           }
         },
         plugins: ['themes', 'json_data', 'dnd', 'crrm', 'contextmenu']
-      };
-      return $taxonomy_tree.jstree(conf).bind('move_node.jstree', handle_move).bind('remove.jstree', handle_delete).bind('create.jstree', handle_create).bind('rename.jstree', handle_rename).bind('loaded.jstree', function () {
-        return $(this).jstree('core').toggle_node($('.jstree-icon').first());
-      });
-    });
-    $taxonomy_tree.on('dblclick', 'a', function () {
-      $taxonomy_tree.jstree('rename', this);
-    });
-    // surpress form submit on enter/return
+      }
+      return $taxonomyTree.jstree(conf).bind('move_node.jstree', handleMove).bind('remove.jstree', handleDelete).bind('create.jstree', handleCreate).bind('rename.jstree', handleRename).bind('loaded.jstree', function () {
+        return $(this).jstree('core').toggle_node($('.jstree-icon').first())
+      })
+    })
+    $taxonomyTree.on('dblclick', 'a', function () {
+      $taxonomyTree.jstree('rename', this)
+    })
+    // suppress form submit on enter/return
     $(document).keypress(function (event) {
       if (event.keyCode === 13) {
-        event.preventDefault();
+        event.preventDefault()
       }
-    });
+    })
   }
-};
+}

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

@@ -0,0 +1,46 @@
+// Green
+.badge-completed,
+.badge-complete,
+.badge-resumed,
+.badge-considered_safe,
+.badge-paid,
+.badge-shipped,
+.badge-ready,
+.badge-active,
+.badge-success,
+.badge-sold,
+.badge-open,
+.badge-authorized {
+  @include badge-variant($success);
+}
+
+// Red
+.badge-failed,
+.badge-considered_risky,
+.badge-error,
+.badge-invalid,
+.badge-closed {
+  @include badge-variant($danger);
+}
+
+// Orange
+.badge-processing,
+.badge-pending,
+.badge-awaiting_return,
+.badge-returned,
+.badge-credit_owed,
+.badge-balance_due,
+.badge-backorder,
+.badge-checkout,
+.badge-cart,
+.badge-address,
+.badge-delivery,
+.badge-payment,
+.badge-confirm,
+.badge-canceled,
+.badge-void,
+.badge-inactive,
+.badge-notice,
+.badge-partial {
+  @include badge-variant($warning);
+}

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

@@ -1,41 +1,25 @@
 .btn,
 .nav-pills > li > a {
-  letter-spacing: 1px;
   vertical-align: middle;
-  transition: color 0.1s linear 0s,background-color 0.1s linear 0s,opacity 0.2s linear 0s !important;
-
-  -webkit-font-smoothing: antialiased;
-  -webkit-text-size-adjust: 100%;
-  -ms-text-size-adjust: 100%;
-  -webkit-font-feature-settings: "kern" 1;
-  -moz-font-feature-settings: "kern" 1;
+  transition: color 0.1s linear 0s, background-color 0.1s linear 0s, opacity 0.2s linear 0s !important;
 }
 
 .btn {
   text-align: center;
 
-  &:focus {
-    outline: 0 !important;
-  }
-
-  &:hover,
-  &:focus,
-  &:active,
-  &.active,
-  &.disabled,
-  &[disabled] {
-    box-shadow: none;
-  }
-
   .glyphicon {
     padding-right: 3px;
   }
 
-  .ship { color: $btn-success-color; }
+  .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; }
+.btn.payment-action-edit {
+  @extend .btn-primary;
+
+  color: $white !important;
+}

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

@@ -6,21 +6,31 @@
 }
 
 .index-filter-button {
+  font-size: $font-size-sm;
   .glyphicon {
-    color: $gray-light;
+    color: $gray-800;
   }
 
   button {
+    height: 100%;
     text-transform: uppercase;
     letter-spacing: 2px;
     font-weight: bold;
-    font-size: $font-size-base - 3;
-    padding: ($padding-base-vertical + 3) $padding-base-horizontal ($padding-base-vertical + 2);
+    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;
 
-    &:focus {
-      background-color: $gray-lighter;
-      border-color: $input-border;
+    &:hover, &:focus {
+      background-color: $gray-100;
     }
   }
+
+  .js-quick-search {
+    font-size: $font-size-sm;
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
+  }
 }

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

@@ -1,12 +1,10 @@
 #main-part {
-  padding: 15px 35px 0;
-  &.sidebar-collapsed {
-    padding-left: 85px;
-  }
+  padding: $spacer ($spacer * 2) 0 ($spacer * 2);
+  margin-top: 50px;
 }
 
-.logo.navbar-brand {
-  padding: 5px 15px;
+.sidebar-minimized #main-part {
+  padding: $spacer ($spacer * 2) 0 ($spacer * 5);
 }
 
 #logo {

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

@@ -0,0 +1,21 @@
+.header {
+  .navbar {
+    background-color: $navbar-inverse-bg;
+    padding: 0;
+
+    a:hover {
+      text-decoration: none;
+    }
+  }
+
+  .dropdown-toggle {
+    &[aria-expanded="true"] {
+      background-color: $gray-900;
+    }
+
+    &:hover,
+    &:focus {
+      text-decoration: none;
+    }
+  }
+}

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

@@ -1,14 +1,6 @@
-#sidebar-toggle {
-  display: block;
+.navbar-toggler {
   border: none;
-  padding: 0;
-  margin: 0;
-  position: absolute;
   right: 0;
-  margin-top: 17px;
+  top: 0;
   cursor: pointer;
 }
-
-.navbar .row {
-  padding-bottom: 0;
-}

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

@@ -1,27 +1,4 @@
 .content-header.page-header {
-  margin-top: 15px;
-
-  h1 {
-    font-size: $font-size-h1 / 1.5;
-    margin: 0;
-    line-height: 38px;
-  }
-
-  &.with-page-tabs {
-    border-bottom: 0;
-    margin-bottom: 6px;
-    padding-bottom: 0;
-
-    h1 {
-      margin-bottom: 8px;
-    }
-
-    .nav-tabs {
-      padding-left: 15px;
-      padding-top: 15px;
-    }
-  }
-
   .page-actions {
     text-align: right;