solidus_backend 2.9.5 → 2.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eca987b7ea7a9be0e07d92cc8bc31679a31c0d8aed33be591994115b2532476f
-  data.tar.gz: 0d334617893cb6e022c3c9edc6bb84a6f89687fe2505c2500c6539f4f9545112
+  metadata.gz: a09acbd6ce6806f5fb9a87ff962539770a7dc7f2f5a9fd4a7b58be1d3b66e0e3
+  data.tar.gz: 65cc0bee30dce620cb75020035dffbb94c06a3b05d1b83131dacccbe635416b6
 SHA512:
-  metadata.gz: 62a87d30798c57a68159c339fd97549684d57d29fa2abd49f6938918b13de4b98c1d803b2f78e658f210160d9669472e07cdfb2e80cdb4313f0bb738dc90459f
-  data.tar.gz: 919d469c326ae9f9cadb644b448c104f0c89d99978f6b612c232842df81377b246fa2690919e13715cfdbdd53fc6c6098059a6135ca278a49bf7465872cb0b71
+  metadata.gz: 63967d408b975dcbc6b20f540aa670d200e554bef9647fb110c5bf72a35113cda728090edb66f8705d513af7c1388dc58ecf933e3046b2761e1b40c46ccc0541
+  data.tar.gz: '068216e34e1c219f5090a3e7e56b2296bfbbeb7ca6eb1630897535bdcf2db3ed26003bad3e2433acdb061037b42a05cdfe55dd80392ea6c0e4080edfbcb666fb'

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

@@ -30,6 +30,7 @@
 //= require spree/backend/components/tooltips
 //= require spree/backend/components/editable_table
 //= require spree/backend/components/sortable_table
+//= require spree/backend/components/admin_nav
 //= require spree/backend/datepicker
 //= require spree/backend/flash
 //= require spree/backend/gateway

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

@@ -0,0 +1,24 @@
+Spree.ready(function() {
+  if (window.screen.width <= 1024 && !document.cookie.includes("admin_nav_hidden")) {
+    // Set default nav to collapse on small screens - but don't override user preference
+    document.body.classList.add("admin-nav-hidden");
+    document.cookie = "admin_nav_hidden=true; expires=Fri, 31 Dec 9999 23:59:59 GMT";
+  }
+
+  var adminNavToggle = document.querySelector("#admin-nav-toggle");
+
+  if (adminNavToggle) {
+    adminNavToggle.addEventListener("click", function(e) {
+      e.preventDefault();
+      document.body.classList.toggle("admin-nav-hidden");
+      $(document.body).trigger("sticky_kit:recalc");
+      adminNavToggle.classList.toggle("fa-chevron-circle-left");
+      adminNavToggle.classList.toggle("fa-chevron-circle-right");
+      document.cookie = "admin_nav_hidden=" + document.body.classList.contains("admin-nav-hidden") + "; expires=Fri, 31 Dec 9999 23:59:59 GMT";
+    });
+  }
+
+  if (document.body.classList.contains('admin-nav-hidden')) {
+    $(adminNavToggle).removeClass('fa-chevron-circle-left').addClass('fa-chevron-circle-right');
+  }
+});

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

@@ -22,7 +22,7 @@ Tabs = (function() {
     });
     this.totalTabsWidth = this.tabWidths.reduce(function(previousValue, currentValue) {
       return previousValue + currentValue;
-    });
+    }, 0);
 
     window.addEventListener("resize", this.overflowTabs);
     this.overflowTabs();

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

@@ -21,6 +21,15 @@ Spree.Models.Order = Backbone.Model.extend({
     };
     _.extend(options, opts);
     return this.fetch(options)
+  },
+
+  empty: function (opts) {
+    var options = {
+      url: Spree.routes.orders_api + "/" + this.id + "/empty",
+      type: 'PUT',
+    };
+    _.extend(options, opts);
+    return this.fetch(options)
   }
 });
 

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

@@ -19,6 +19,12 @@ Spree.Order.initCartPage = function(order_number) {
     collection: collection
   });
 
+  new Spree.Views.Cart.EmptyCartButton({
+    el: $('.js-empty-cart'),
+    collection: collection,
+    model: order
+  });
+
   new Spree.Views.Order.DetailsTotal({
     el: $('#order-total'),
     model: order

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

@@ -1,42 +1,6 @@
 // Shipments AJAX API
 /* eslint no-extra-semi: "off", no-unused-vars: "off" */
 
-var ShipmentAddVariantView = Backbone.View.extend({
-  events: {
-    "change #add_variant_id": "onSelect",
-    "click .add_variant": "onAdd",
-    "submit form": "onAdd"
-  },
-  onSelect: function(e) {
-    var variant_id = this.$("#add_variant_id").val();
-    var template = HandlebarsTemplates["variants/autocomplete_stock"];
-    var $stock_details = this.$('#stock_details');
-    Spree.ajax({
-      url: Spree.routes.variants_api + "/" + variant_id,
-      success: function(variant){
-        $stock_details.html(template({variant: variant})).show()
-      }
-    });
-  },
-  onAdd: function(e){
-    e.preventDefault();
-
-    this.$('#stock_details').hide();
-
-    var variant_id = this.$('input.variant_autocomplete').val();
-    var stock_location_id = $(e.target).data('stock-location-id');
-    var quantity = this.$("input.quantity[data-stock-location-id='" + stock_location_id + "']").val();
-
-    addVariantFromStockLocation(stock_location_id, variant_id, quantity)
-  }
-});
-
-Spree.ready(function(){
-  $(".js-shipment-add-variant").each(function(){
-    new ShipmentAddVariantView({el: this});
-  });
-});
-
 var ShipShipmentView = Backbone.View.extend({
   initialize: function(options){
     this.shipment_number = options.shipment_number;
@@ -97,32 +61,6 @@ adjustShipmentItems = function(shipment_number, variant_id, quantity){
   }
 };
 
-addVariantFromStockLocation = function(stock_location_id, variant_id, quantity) {
-  var shipment = _.find(shipments, function(shipment){
-    return shipment.stock_location_id == stock_location_id && (shipment.state == 'ready' || shipment.state == 'pending');
-  });
-
-  if(shipment==undefined){
-    Spree.ajax({
-      type: "POST",
-      url: Spree.routes.shipments_api,
-      data: {
-        shipment: {
-          order_id: window.order_number
-        },
-        variant_id: variant_id,
-        quantity: quantity,
-        stock_location_id: stock_location_id,
-      }
-    }).done(function(){
-      window.location.reload();
-    });
-  }else{
-    //add to existing shipment
-    adjustShipmentItems(shipment.number, variant_id, quantity);
-  }
-};
-
 var ShipmentSplitItemView = Backbone.View.extend({
   tagName: 'tr',
   className: 'stock-item-split',

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

@@ -13,6 +13,5 @@
 //= require spree/backend/templates/taxons/_tree
 //= require spree/backend/templates/taxons/tree
 //= require spree/backend/templates/variants/autocomplete
-//= require spree/backend/templates/variants/autocomplete_stock
 //= require spree/backend/templates/variants/line_items_autocomplete_stock
 //= require spree/backend/templates/variants/split

data/app/assets/javascripts/spree/backend/views/cart/empty_cart_button.js

@@ -0,0 +1,29 @@
+Spree.Views.Cart.EmptyCartButton = Backbone.View.extend({
+  initialize: function() {
+    this.listenTo(this.collection, 'update', this.render);
+    this.render();
+  },
+
+  events: {
+    "click": "onClick"
+  },
+
+  onClick: function(e) {
+    e.preventDefault()
+    if (!confirm(Spree.translations.are_you_sure_delete)) {
+      return;
+    }
+
+    this.model.empty({
+      success: () => {
+        this.collection.reset()
+        this.collection.push({})
+      }
+    })
+  },
+
+  render: function() {
+    var isNew = function (item) { return item.isNew() };
+    this.$el.prop("disabled", !this.collection.length || this.collection.some(isNew));
+  }
+});

data/app/assets/javascripts/spree/backend/views/cart/line_item_table.js

@@ -1,11 +1,16 @@
 Spree.Views.Cart.LineItemTable = Backbone.View.extend({
   initialize: function() {
     this.listenTo(this.collection, 'add', this.add);
+    this.listenTo(this.collection, 'reset', this.reset);
   },
 
   add: function(line_item) {
     var view = new Spree.Views.Cart.LineItemRow({model: line_item});
     view.render();
     this.$el.append(view.el);
+  },
+
+  reset: function() {
+    this.$el.empty();
   }
 });

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

@@ -1,5 +1,6 @@
 //= require 'spree/backend/views/calculators/tiered'
 //= require 'spree/backend/views/cart/add_line_item_button'
+//= require 'spree/backend/views/cart/empty_cart_button'
 //= require 'spree/backend/views/cart/line_item_row'
 //= require 'spree/backend/views/cart/line_item_table'
 //= require 'spree/backend/views/images/upload_zone'

data/app/assets/javascripts/spree/backend/views/order/address.js

@@ -3,14 +3,14 @@ Spree.Views.Order.Address = Backbone.View.extend({
     // read initial values from page
     this.onChange();
 
-    this.render();
-    this.listenTo(this.model, "change", this.render);
-
     this.stateSelect =
       new Spree.Views.StateSelect({
         model: this.model,
         el: this.$el
       });
+
+    this.render();
+    this.listenTo(this.model, "change", this.render);
   },
 
   events: {
@@ -24,7 +24,7 @@ Spree.Views.Order.Address = Backbone.View.extend({
   eachField: function(callback){
     var view = this;
     var fields = ["firstname", "lastname", "company", "address1", "address2",
-      "city", "zipcode", "phone", "country_id"];
+      "city", "zipcode", "phone", "country_id", "state_name"];
     _.each(fields, function(field) {
       var el = view.$('[name$="[' + field + ']"]');
       if (el.length) callback(field, el);
@@ -43,6 +43,8 @@ Spree.Views.Order.Address = Backbone.View.extend({
     var model = this.model;
     this.eachField(function(name, el) {
       el.val(model.get(name))
-    })
+    });
+
+    this.stateSelect.render();
   }
 });

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

@@ -85,6 +85,8 @@ $dropdown-link-hover-bg:         $color-primary !default;
 
 $breadcrumb-bg:                 transparent !default;
 $breadcrumb-active-color:       $color-primary !default;
+$breadcrumb-padding-y:          .75rem !default;
+$breadcrumb-padding-x:          0 !default;
 
 // Popover
 

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

@@ -1,15 +1,15 @@
 .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/_messages.scss

@@ -30,6 +30,10 @@
   left: $width-sidebar;
   right: 0;
   z-index: 1000;
+
+  .admin-nav-hidden & {
+    left: $width-sidebar-collapsed;
+  }
 }
 
 .flash {

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

@@ -2,6 +2,91 @@ $padding-x-navbar: 26px;
 $padding-y-navbar: 13px;
 $padding-y-navbar-submenu: 9px;
 
+#admin-nav-toggle {
+  border-bottom: $border-sidebar;
+  padding: ($padding-y-navbar/ 2) $padding-x-navbar;
+  width: 100%;
+  text-align: left;
+  color: $color-navbar;
+  font-weight: $font-weight-bold;
+  position: relative;
+  overflow: hidden;
+  display: block;
+  height: 39px;
+  z-index: 1;
+
+  span {
+    font-size: $font-size-sm;
+    font-weight: $font-weight-bold;
+  }
+
+  &.btn {
+    background-color: transparent;
+  }
+
+  &.fa {
+    text-indent: 2em;
+
+    &:before {
+      color: $color-icon-navbar;
+      font-weight: $font-weight-normal;
+      position: absolute;
+      left: 1em;
+      top: 0;
+      line-height: 39px;
+      transform: translateX(-50%);
+      transition: transform .5s ease-in-out;
+    }
+
+    &:focus {
+      outline: 0;
+      box-shadow: none;
+    }
+  }
+}
+
+.admin-nav-hidden {
+  padding-left: $width-sidebar-collapsed;
+
+  .admin-nav,
+  .admin-nav-footer {
+    width: $width-sidebar-collapsed;
+  }
+
+  .text {
+    transform: translateX(-50px);
+    display: none;
+  }
+
+  .admin-login-nav a {
+    text-overflow: clip;
+  }
+
+  .brand-link {
+    overflow: hidden;
+
+    img {
+      max-width: 125px;
+    }
+  }
+
+  .admin-nav-menu {
+    li {
+      &.selected:not(:hover) > ul  {
+        visibility: hidden;
+      }
+
+      &.selected:not(:hover) .admin-subnav {
+        display: none;
+      }
+    }
+  }
+
+  .admin-nav-menu .selected li {
+    padding-left: 0;
+  }
+}
+
 nav.menu {
   ul {
     list-style: none;
@@ -26,16 +111,27 @@ nav.menu {
 }
 
 .admin-nav {
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  z-index: $zindex-sticky;
+  width: $width-sidebar;
   border-right: $border-sidebar;
   background: $color-sidebar-bg;
-  z-index: $zindex-sticky;
+
+  @media print {
+    display: none
+  }
 }
 
 .admin-nav-header {
   background-color: $color-white;
   border-bottom: 1px solid $color-border;
+  border-right: 1px solid $color-border;
   text-align: center;
   padding: 0 1.25em;
+  width: $width-sidebar;
   // 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;
@@ -73,56 +169,13 @@ nav.menu {
     }
 
     &:not(.selected):not(:hover) > ul {
-      display: none;
-    }
-
-    &:not(.selected) {
-      position: relative;
-
-      // flyout nav
-      > ul {
-        position: absolute;
-        top: 0;
-        left: 100%;
-        width: $width-sidebar-flyout;
-        margin-left: 0;
-        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;
-        }
-      }
-     }
+      visibility: hidden;
     }
   }
 
   a {
     display: block;
+    min-height: 39px;
     padding: $padding-y-navbar $padding-x-navbar;
     color: $color-navbar;
     font-weight: $font-weight-bold;
@@ -177,8 +230,58 @@ nav.menu {
   }
 }
 
+.admin-nav-menu li:not(.selected),
+.admin-nav-hidden .admin-nav-menu li.selected:hover {
+  position: relative;
+
+  // flyout nav
+  > ul {
+    position: absolute;
+    top: 0;
+    left: 100%;
+    width: $width-sidebar-flyout;
+    margin-left: 0;
+    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;
+    pointer-events: none;
+  }
+
+  &: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;
+    pointer-events: none;
+  }
+
+  > li {
+    background: $color-white;
+
+    a {
+      font-weight: $font-weight-bold;
+    }
+  }
+ }
+}
+
 .admin-nav-footer {
+  width: $width-sidebar;
   background-color: $color-navbar-footer-bg;
+  border-top: $border-sidebar;
+  border-right: $border-sidebar;
 
   a {
     color: $color-navbar-footer;
@@ -191,14 +294,40 @@ nav.menu {
 
 .admin-locale-selection {
   margin: 1em;
+  position: relative;
+
+  &::after {
+    content: "\f0ac";
+    font-family: "FontAwesome";
+    position: absolute;
+    top: 0;
+    left: 0;
+    padding: .5rem 0 .5rem .25rem;
+    z-index: -1;
+  }
+
+  .admin-nav-hidden & {
+    .js-locale-selection.custom-select {
+      background-color: transparent;
+      background-position: 1.5rem center;
+      background-size: 8px 9px;
+      border: 0;
+      opacity: .6;
+      position: relative;
+      overflow: hidden;
+      text-indent: 1rem;
+      z-index: 1;
+
+      &:focus {
+        box-shadow: none;
+      }
+    }
+  }
 }
 
 .admin-nav.fits .admin-nav-footer {
   position: fixed;
   bottom: 0;
-  width: $width-sidebar;
-  border-top: $border-sidebar;
-  border-right: $border-sidebar;
 }
 
 .admin-login-nav {
@@ -226,4 +355,8 @@ nav.menu {
 
 .brand-link {
   display: block;
+
+  img {
+    max-width: 125px;
+  }
 }