solidus_backend 2.8.2 → 2.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c93aa1f07a7b4f7f149247da80bbefd1aa8958ae69a858e52c8f73b318202479
-  data.tar.gz: 37ffc2de4b05c75fe687f58ed25866fab345ed6787b3da9f5b1da6e75d91c46a
+  metadata.gz: 6163ba6d77d3221cc770c66492bbfcd1558af588dbabf65ea1f16be1e226cad3
+  data.tar.gz: 2733f79263f19a150f18541efad616ca24f5500027982df8c5160b7cf26a7674
 SHA512:
-  metadata.gz: 16bf1f77c552ba76abb465b12da72f01f274ebb6abd4a18935148f00fcd78bdf797d2a1a72faf63357653e754c6906b54fb4930f3b317371c2ab764dc66b8de8
-  data.tar.gz: dcbf0c2727430cab241022fc139b0656d96f7a651fcc9d838429d6015a4d4a71862f47372de95f2d7f3c40216f25c3cedb2441716d3b11b3c050c267c3bacb5a
+  metadata.gz: d10ea54cc2aae32b27840529e8ef5b0ec7617542e1de479b977ab99383e6c673f2e4f779b7bcfe93962e1ecb45452c4de577ae9da4360793b6a64ce40ba33820
+  data.tar.gz: b827d361e91b68319dbef13ece7ded929114488efd412b0bcfafabe9d42d599a62266d2ac7fb858e4e85035470d493216b864ee561556f19aadb698dce05ce7d

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

@@ -1,4 +1,5 @@
 //= require solidus_admin/Sortable
+/* eslint no-unused-vars: "off" */
 
 Spree.ready(function() {
   var sortable_tables = document.querySelectorAll('table.sortable');

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

@@ -1,4 +1,5 @@
 /* global Tabs */
+/* eslint no-redeclare: "off" */
 
 Tabs = (function() {
   function Tabs(el) {

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

@@ -1,4 +1,5 @@
 // Shipments AJAX API
+/* eslint no-extra-semi: "off", no-unused-vars: "off" */
 
 var ShipmentAddVariantView = Backbone.View.extend({
   events: {

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

@@ -3,6 +3,7 @@ Spree.ready(function() {
     var $el = $(this);
     var model = new Spree.Models.StockItem($el.data('stock-item'));
     var trackInventory = $el.data('track-inventory');
+    var canEdit = $el.data('can-edit')
     new Spree.Views.Stock.EditStockItemRow({
       el: $el,
       stockLocationName: $el.data('stock-location-name'),
@@ -16,6 +17,14 @@ Spree.ready(function() {
         title: '"Track inventory" option disabled for this variant'
       });
     }
+
+    if (canEdit == false) {
+      $('.js-edit-stock-item input').attr({
+        disabled: true,
+        class: 'with-tip',
+        title: 'You do not have permission to manage stock'
+      });
+    }
   });
 
   $('.js-add-stock-item').each(function() {

data/app/assets/javascripts/spree/backend/templates/orders/line_item.hbs

@@ -20,7 +20,7 @@
 {{#if editing}}
   <td class="line-item-qty-edit">
     <form>
-      <input type="number" name="quantity" value="{{ line_item.quantity }}" min="0" class="line_item_quantity" size="5">
+      <input type="number" name="quantity" value="{{ line_item.quantity }}" min="1" class="line_item_quantity" size="5">
     </form>
   </td>
 {{else}}

data/app/assets/javascripts/spree/backend/views/stock/edit_stock_item_row.js

@@ -13,7 +13,8 @@ Spree.Views.Stock.EditStockItemRow = Backbone.View.extend({
     "click .submit": "onSubmit",
     "submit form": "onSubmit",
     "click .cancel": "onCancel",
-    'input [name="count_on_hand"]': "countOnHandChanged"
+    'input [name="count_on_hand"]': "countOnHandChanged",
+    'input [name="backorderable"]': "backorderableChanged"
   },
 
   template: HandlebarsTemplates['stock_items/stock_location_stock_item'],
@@ -43,6 +44,20 @@ Spree.Views.Stock.EditStockItemRow = Backbone.View.extend({
     this.render();
   },
 
+  onChange: function() {
+    var count_on_hand_changed = this.previousAttributes.count_on_hand != this.model.attributes.count_on_hand;
+    var backorderable_changed = this.previousAttributes.backorderable != this.model.attributes.backorderable;
+    var changed = count_on_hand_changed || backorderable_changed;
+
+    this.$el.toggleClass('changed', changed);
+  },
+
+  backorderableChanged: function(ev) {
+    this.model.set("backorderable", ev.target.checked);
+
+    this.onChange();
+  },
+
   countOnHandChanged: function(ev) {
     var diff = parseInt(ev.currentTarget.value), newCount;
     if (isNaN(diff)) diff = 0;
@@ -56,7 +71,8 @@ Spree.Views.Stock.EditStockItemRow = Backbone.View.extend({
       this.model.set("count_on_hand", newCount);
       this.$count_on_hand_display.text(newCount);
     }
-    this.$el.toggleClass('changed', diff !== 0);
+
+    this.onChange();
   },
 
   onSuccess: function() {

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

@@ -7,24 +7,27 @@
 //
 // Grayscale and brand colors for use across Bootstrap.
 
-$blue:   $color-3 !default;
-$red:    $color-5 !default;
-$orange: $color-6 !default;
-$green:  $color-2 !default;
+$primary:          $color-primary !default;
+$secondary:        $color-dark-accent !default;
+
+$blue:   $color-primary !default;
+$red:    $color-red !default;
+$orange: $color-yellow !default;
+$green:  $color-success !default;
 
 // Body
 //
 // Settings for the `<body>` element.
 
-$body-bg:       $color-1 !default;
-$body-color:    $color-4 !default;
+$body-bg:       $color-white !default;
+$body-color:    $color-dark !default;
 
 // Links
 //
 // Style anchor elements.
 
 $link-decoration:       none !default;
-$link-hover-color:      $color-2 !default;
+$link-hover-color:      $color-primary !default;
 $link-hover-decoration: none !default;
 
 // Grid columns
@@ -37,9 +40,9 @@ $grid-gutter-width-base:     1.875rem !default;
 //
 // Font, line-height, and color for body text, headings, and more.
 
-$font-family-sans-serif: "Helvetica Neue", Helvetica, Arial, sans-serif !default;
+$font-family-sans-serif: "Inter", "Helvetica Neue", "Helvetica", Helvetica, Arial, sans-serif !default;
 $font-family-monospace:  Menlo, Monaco, Consolas, "Courier New", monospace !default;
-$font-family-base:       "Open Sans", "Helvetica Neue", "Helvetica", Helvetica, Arial, sans-serif !default;
+$font-family-base:       "Inter", "Helvetica Neue", "Helvetica", Helvetica, Arial, sans-serif !default;
 
 $font-size-root: 13px !default;
 
@@ -54,7 +57,7 @@ $h5-font-size: $font-size-root + 4 !default;
 $h6-font-size: $font-size-root + 2 !default;
 
 $headings-font-weight:   $font-weight-bold !default;
-$headings-color:         $color-4 !default;
+$headings-color:         $color-dark !default;
 
 // Components
 //
@@ -64,9 +67,10 @@ $border-radius:          3px !default;
 
 // Forms
 
-$input-color:                    $color-3 !default;
-$input-border-color:             $color-border !default;
-$input-focus-border-color:       $color-2 !default;
+$input-color:                    $color-dark !default;
+$input-placeholder-color:        $color-dark-light !default;
+$input-border-color:             $color-light-accent !default;
+$input-focus-border-color:       $color-primary !default;
 
 $custom-select-focus-border-color: $input-focus-border-color !default;
 
@@ -74,10 +78,14 @@ $custom-select-focus-border-color: $input-focus-border-color !default;
 //
 // Dropdown menu container and contents.
 
-$dropdown-link-hover-color:      #fff !default;
-$dropdown-link-hover-bg:         $color-3 !default;
+$dropdown-link-hover-color:      $color-white !default;
+$dropdown-link-hover-bg:         $color-primary !default;
 
 // Breadcrumbs
 
 $breadcrumb-bg:                 transparent !default;
-$breadcrumb-active-color:       $color-4 !default;
+$breadcrumb-active-color:       $color-primary !default;
+
+// Popover
+
+$popover-header-bg:             $color-primary-light !default;

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

@@ -1,4 +1,16 @@
 .breadcrumb {
   font-size: 16px;
   margin-bottom: 0;
+  
+  a {
+    color: $breadcrumb-color;
+    
+    &:hover {
+      color: $breadcrumb-active-color;
+    }
+  }
+  
+  .active {
+    font-weight: $font-weight-bold;
+  }
 }

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

@@ -0,0 +1,18 @@
+.btn-default {
+  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);
+  }
+
+  &.disabled,
+  &:disabled {
+    color: $color-disabled;
+  }
+}
+
+.btn-primary {
+  border-color: darken($color-primary, 6%);
+}

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

@@ -14,8 +14,8 @@
   display: inline-block;
   margin: auto;
   text-align: center;
-  border: 1px solid #ddd;
-  color: #aaa;
+  border: 1px solid $color-light-dark;
+  color: $color-light-accent;
 
   &:before {
     font: normal normal normal 14px/1 FontAwesome;

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

@@ -8,7 +8,7 @@
   padding: 10px 15px;
   // Place the border on the list items and negative margin up for better styling
   margin-bottom: -1px;
-  border: 1px solid #cee1f4;
+  border: 1px solid $color-border;
 
   // Round the first and last items
   &:first-child {
@@ -22,5 +22,5 @@
 
 a.list-group-item:focus {
   text-decoration: none;
-  background-color: #eff5fc;
+  background-color: $color-light;
 }

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

@@ -1,14 +1,13 @@
 .errorExplanation {
-  padding: 5px;
-  border: 1px solid very-light(theme-color("danger"), 12);
-  background-color: very-light(theme-color("danger"), 6);
-  border-radius: 3px;
-  color: very-light(theme-color("danger"), 30);
+  padding: 10px 15px;
+  border-top: 3px solid theme-color("danger");
+  background-color: lighten(theme-color("danger"), 40);
+  border-radius: 0 0 $border-radius $border-radius;
+  color: $body-color;
   margin-bottom: 15px;
 
   h2 {
     font-size: 140%;
-    color: very-light(theme-color("danger"), 30);
     margin-bottom: 5px;
   }
 
@@ -34,15 +33,24 @@
 }
 
 .flash {
+  border-top: 3px solid;
   padding: 16px;
   text-align: center;
   font-size: 120%;
-  color: $color-1;
-  font-weight: $font-weight-bold;
+  color: $body-color;
 
-  &.notice  { background-color: rgba(theme-color("warning"),  0.8) }
-  &.success { background-color: rgba(theme-color("success"), 0.8) }
-  &.error   { background-color: rgba(theme-color("danger"),   0.8) }
+  &.notice {
+    background-color: rgba(lighten($color-notice, 15), .95);
+    border-top-color: $color-notice;
+  }
+  &.success {
+    background-color: rgba(lighten($color-success, 30), .95);
+    border-top-color: $color-success;
+  }
+  &.error {
+    background-color: rgba(lighten($color-error, 30), .95);
+    border-top-color: $color-error;
+  }
 }
 
 .alert {
@@ -53,5 +61,5 @@
     text-decoration: underline;
   }
 
-  &.error a { color: very-light(theme-color("danger"), 10) }
+  &.error a { color: lighten(theme-color("danger"), 8); }
 }

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

@@ -17,9 +17,9 @@ nav.menu {
       }
 
       &.active a {
-        color: $color-2;
+        color: $color-primary;
         border-left-width: 0;
-        border-bottom-color: $color-2;
+        border-bottom-color: $color-primary;
       }
     }
   }
@@ -32,9 +32,10 @@ nav.menu {
 }
 
 .admin-nav-header {
-  background-color: $color-1;
+  background-color: $color-white;
   border-bottom: 1px solid $color-border;
   text-align: center;
+  padding: 0 1.25em;
   // Using line height for proper vertical centering.
   // As line height does not take the border width into account we need to subtract it.
   line-height: $main-header-height - 1px;
@@ -42,7 +43,6 @@ nav.menu {
 
 .admin-nav-menu {
   ul {
-    margin: 0;
     padding: 0;
     list-style: none;
   }
@@ -53,7 +53,8 @@ nav.menu {
     &:hover {
       background: $color-navbar-active-bg;
 
-      > a {
+      > a,
+      > a:before {
         color: $color-navbar-active;
       }
     }
@@ -61,7 +62,8 @@ nav.menu {
     &.selected {
       background: $color-navbar-active-bg;
 
-      > a {
+      > a,
+      > a:before {
         color: $color-navbar-active;
       }
     }
@@ -84,15 +86,37 @@ nav.menu {
         left: 100%;
         width: $width-sidebar-flyout;
         margin-left: 0;
-        border: $border-sidebar;
-        background: $color-navbar-submenu-bg;
-        box-shadow: $box-shadow;
-        @include caret($direction: left, $color-caret: $color-navbar-submenu-bg);
+        background: $color-white;
+        box-shadow: 1px 0 4px 0 rgba(0, 0, 0, 0.1);
+        border-radius: 0 4px 4px 4px;
+        border: 1px solid $color-border;
+        @include caret($direction: left, $color-caret: $color-white);
 
       &:before {
         z-index: 1;
         top: 1.5em;
       }
+      
+      &:after {
+        content: '';
+        display: block;
+        position: absolute;
+        border-width: 1em 1em;
+        border-style: solid;
+        border-color: transparent;
+        border-right-color: $color-border;
+        left: -2.1em;
+        top: 1.5em;
+        margin-top: -1em;
+      }
+      
+      > li {
+        background: $color-white;
+        
+        a {
+          font-weight: $font-weight-bold;
+        }
+      }
      }
     }
   }
@@ -101,13 +125,15 @@ nav.menu {
     display: block;
     padding: $padding-y-navbar $padding-x-navbar;
     color: $color-navbar;
-    font-weight: normal;
+    font-weight: $font-weight-bold;
   }
 
   .icon_link {
     text-indent: 2em;
 
     &:before {
+      color: $color-icon-navbar;
+      font-weight: $font-weight-normal;
       position: absolute;
       left: 1em;
       transform: translateX(-50%);
@@ -123,6 +149,7 @@ nav.menu {
 
   .admin-subnav {
     background: $color-navbar-submenu-bg;
+    margin: 0;
     padding-top:    $padding-y-navbar - $padding-y-navbar-submenu;
     padding-bottom: $padding-y-navbar - $padding-y-navbar-submenu;
 
@@ -132,6 +159,7 @@ nav.menu {
 
     a {
       color: $color-navbar-submenu;
+      font-weight: $font-weight-normal;
       padding-top:    $padding-y-navbar-submenu;
       padding-bottom: $padding-y-navbar-submenu;
 
@@ -143,6 +171,7 @@ nav.menu {
     .selected {
       a {
         color: $color-navbar-submenu-active;
+        font-weight: $font-weight-bold;
       }
     }
   }
@@ -183,6 +212,7 @@ nav.menu {
 
   a {
     display: inline-block;
+    font-weight: $font-weight-bold;
     max-width: 100%;
     overflow: hidden;
     text-overflow: ellipsis;
@@ -193,3 +223,7 @@ nav.menu {
     margin-right: 0.5rem;
   }
 }
+
+.brand-link {
+  display: block;
+}