spree_backend 4.1.10 → 4.2.0.rc2

data/app/views/spree/admin/variants/_split.js.erb

@@ -23,10 +23,10 @@
     </td>
     <td class='actions text-center'>
       <a href='#' class='cancel-split with-tip btn btn-sm btn-outline-secondary' title='Cancel'>
-        <span class="icon icon-arrow-left"></span>
+        <%= svg_icon name: "cancel", classes: 'icon-cancel', width: '16', height: '16' %>
       </a>
       <a href='#' class='icon-save-split save-split with-tip btn btn-sm btn-success' title='Save'>
-        <span class="icon icon-save"></span>
+        <%= svg_icon name: "split", classes: 'icon-save', width: '16', height: '16' %>
       </a>
     </td>
   </tr>

data/app/views/spree/admin/variants/index.html.erb

@@ -4,6 +4,7 @@
 <div id="new_variant" data-hook></div>
 
 <% if @variants.any? %>
+<div class="table-responsive">
   <table class="table sortable" data-sortable-link="<%= update_positions_admin_product_variants_path(@product) %>">
     <thead data-hook="variants_header">
       <tr>
@@ -13,16 +14,16 @@
         <th class="actions"></th>
       </tr>
     </thead>
-    <tbody>
+    <tbody id="sortVert">
     <% @variants.each do |variant| %>
       <tr id="<%= spree_dom_id variant %>" <%= 'style="color:red;"' if variant.deleted? %> data-hook="variants_row">
         <td class="move-handle">
           <% if can? :edit, variant %>
-            <span class="icon icon-move handle"></span>
+            <%= svg_icon name: "sort.svg", width: '18', height: '18' %>
           <% end %>
         </td>
         <td><%= variant.options_text %></td>
-        <td><%= variant.display_price.to_html %></td>
+        <td><%= display_price(variant) %></td>
         <td><%= variant.sku %></td>
         <td class="actions actions-2 text-right">
           <%= link_to_edit(variant, no_text: true) if can?(:edit, variant) && !variant.deleted? %>
@@ -37,6 +38,7 @@
       <% end %>
     </tbody>
   </table>
+</div>
 <% else %>
   <div class="no-objects-found alert alert-info">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::Variant)) %>
@@ -60,7 +62,7 @@
 <% else %>
   <% content_for :page_actions do %>
     <%= product_preview_link(@product) %>
-    <%= button_link_to(Spree.t(:new_variant), spree.new_admin_product_variant_url(@product), { icon: 'add', :'data-update' => 'new_variant', class: 'btn-success', id: 'new_var_link' }) if can? :create, Spree::Variant %>
-    <%= button_link_to (@deleted.blank? ? Spree.t(:show_deleted) : Spree.t(:show_active)), spree.admin_product_variants_url(@product, deleted: @deleted.blank? ? "on" : "off"), { class: 'btn-outline-secondary', icon: 'filter' } %>
+    <%= button_link_to(Spree.t(:new_variant), spree.new_admin_product_variant_url(@product), { icon: 'add.svg', :'data-update' => 'new_variant', class: 'btn-success', id: 'new_var_link' }) if can? :create, Spree::Variant %>
+    <%= button_link_to (@deleted.blank? ? Spree.t(:show_deleted) : Spree.t(:show_active)), spree.admin_product_variants_url(@product, deleted: @deleted.blank? ? "on" : "off"), { class: 'btn-outline-secondary', icon: 'filter.svg' } %>
   <% end %>
 <% end %>

data/app/views/spree/admin/zones/index.html.erb

@@ -3,12 +3,11 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_zone), new_object_url, class: "btn-success", icon: 'add', id: 'admin_new_zone_link' %>
+  <%= button_link_to Spree.t(:new_zone), new_object_url, class: "btn-success", icon: 'add.svg', id: 'admin_new_zone_link' %>
 <% end if can? :create, Spree::Zone %>
 
-<%= paginate @zones, theme: 'twitter-bootstrap-4' %>
-
 <% if @zones.any? %>
+<div class="table-responsive">
   <table class="table" id='listing_zones' data-hook>
     <thead>
       <tr data-hook="zones_header">
@@ -34,6 +33,7 @@
       <% end %>
     </tbody>
   </table>
+</div>
 <% else %>
   <div class="alert alert-info no-objects-found">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::Zone)) %>,
@@ -41,4 +41,4 @@
   </div>
 <% end %>
 
-<%= paginate @zones, theme: 'twitter-bootstrap-4' %>
+<%= paginate @zones, theme: 'admin-twitter-bootstrap-4' %>

data/app/views/spree/layouts/admin.html.erb

@@ -24,14 +24,17 @@
     <%#-------------------------------------------------%>
     <%# Main content                                    %>
     <%#-------------------------------------------------%>
-    <div id="wrapper" class="container-fluid <%= wrapper_classes %>">
+    <div id="wrapper" class="container-fluid
+                            <% if content_for?(:sidebar) || content_for?(:page_actions) %>
+                             mb-4 mb-lg-0
+                            <% end %>">
       <div class="row">
 
         <%#-------------------------------------------------%>
         <%# Sidebar                                         %>
         <%#-------------------------------------------------%>
         <aside
-          class="<%= main_sidebar_classes %> sidebar position-fixed d-flex justify-content-between flex-column px-0"
+          class="col-12 col-lg-3 col-xl-2 sidebar position-fixed d-flex justify-content-between flex-column px-0"
           id="main-sidebar"
           data-hook="admin_tabs">
           <%= render partial: 'spree/admin/shared/main_menu' %>
@@ -42,38 +45,34 @@
         <%#-------------------------------------------------%>
         <%# Content                                         %>
         <%#-------------------------------------------------%>
-        <main class="<%= main_part_classes %> main" id="main-part" role="main">
+        <main class="col-12 col-lg-9 col-xl-10 offset-lg-3 offset-xl-2 main" id="main-part">
+          <div class="container">
 
-          <%#-------------------------------------------------%>
-          <%# Content header (page title/actions)             %>
-          <%#-------------------------------------------------%>
-          <%= render partial: 'spree/admin/shared/content_header' %>
-
-          <div class="row">
             <%#-------------------------------------------------%>
-            <%# Alerts                                          %>
+            <%# Content header (page title/actions)             %>
             <%#-------------------------------------------------%>
-            <%= flash_alert(flash) %>
+            <%= render partial: 'spree/admin/shared/content_header' %>
 
-            <%#-------------------------------------------------%>
-            <%# Main content                                    %>
-            <%#-------------------------------------------------%>
-            <div class="<%= content_for?(:sidebar) ? 'with-sidebar col-8 col-md-9' : 'col-12'  %>" id="content" data-hook>
-              <%= render partial: 'spree/admin/shared/table_filter' if content_for?(:table_filter)%>
-              <%= yield %>
-            </div>
-
-            <%#-------------------------------------------------%>
-            <%# Inner aside                                     %>
-            <%#-------------------------------------------------%>
-            <% if content_for?(:sidebar) %>
-              <div class="col-4 col-md-3">
-                <%= render partial: 'spree/admin/shared/sidebar' %>
+            <div class="row">
+              <%#-------------------------------------------------%>
+              <%# Main content                                    %>
+              <%#-------------------------------------------------%>
+              <div class="<%= content_for?(:sidebar) ? 'with-sidebar col-12 col-lg-9' : 'col-12'  %>" id="content" data-hook>
+                <%= render partial: 'spree/admin/shared/table_filter' if content_for?(:table_filter)%>
+                <%= yield %>
               </div>
-            <% end %>
-          </div>
 
+              <%#-------------------------------------------------%>
+              <%# Inner aside                                     %>
+              <%#-------------------------------------------------%>
+              <% if content_for?(:sidebar) || content_for?(:page_actions) %>
+                <div class="col-12 col-lg-3 m-0 p-4 p-lg-0" id="contextualSideMenu">
+                  <%= render partial: 'spree/admin/shared/sidebar' %>
+                </div>
+              <% end %>
+            </div>
 
+          </div>
         </main>
       </div>
     </div>
@@ -81,6 +80,13 @@
     <%#-------------------------------------------------%>
     <%# Insert footer scripts here                      %>
     <%#-------------------------------------------------%>
+    <div id="multi-backdrop" class="modal-backdrop fade"></div>
     <div data-hook="admin_footer_scripts"></div>
+
+    <%#-------------------------------------------------%>
+    <%# Alerts                                          %>
+    <%#-------------------------------------------------%>
+    <%= flash_alert(flash) %>
+    
   </body>
 </html>

data/config/initializers/ransack.rb

@@ -0,0 +1,31 @@
+Ransack.configure do |config|
+  config.custom_arrows = {
+    down_arrow: '<svg width="100%" height="100%" viewBox="0 0 2134 2134" version="1.1" xmlns="http://www.w3.org/2000/svg"
+                    xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve"
+                    style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+                    <path fill="currentColor" d="M1023.16,561.619l-923.077,923.077c-24.038,24.038 -24.038,62.98 0,87.019c24.039,
+                    24.038 62.981,24.038 87.019,0l879.568,-879.568l879.567,879.568c24.039,24.038 62.981,
+                    24.038 87.019,0c12.02,-12.019 18.029,-27.725 18.029,-43.51c0,-15.785 -6.009,-31.49 -18.029,
+                    -43.509l-923.077,-923.077c-24.038,-24.039 -62.98,-24.039 -87.019,
+                    0Z" style="fill-rule:nonzero;stroke:currentColor;stroke-width:75px;"/></svg>',
+
+    up_arrow: '<svg width="100%" height="100%" viewBox="0 0 2134 2134" version="1.1"
+                      xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+                      xml:space="preserve" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+                      <path fill="currentColor" d="M1110.18,
+                      1571.72l923.077,-923.077c24.039,-24.039 24.039,-62.981 0,-87.019c-24.038,
+                      -24.039 -62.98,-24.039 -87.019,0l-879.567,879.567l-879.568,-879.567c-24.038,
+                      -24.039 -62.98,-24.039 -87.019,0c-12.019,12.019 -18.029,27.724 -18.029,43.509c0,
+                      15.785 6.01,31.491 18.029,43.51l923.077,923.077c24.039,24.038 62.981,24.038 87.019,
+                      0Z" style="fill-rule:nonzero;stroke:currentColor;stroke-width:75px;"/></svg>',
+
+    default_arrow: '<svg class="default-filter-arrow" width="100%" height="100%" viewBox="0 0 2134 2134" version="1.1"
+                         xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve"
+                         style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+                        <path fill="currentColor" d="M1110.18,1571.72l923.077,-923.077c24.039,-24.039 24.039,-62.981 0,
+                        -87.019c-24.038,-24.039 -62.98,-24.039 -87.019,0l-879.567,879.567l-879.568,-879.567c-24.038,
+                        -24.039 -62.98,-24.039 -87.019,0c-12.019,12.019 -18.029,27.724 -18.029,43.509c0,15.785 6.01,
+                        31.491 18.029,43.51l923.077,923.077c24.039,24.038 62.981,24.038 87.019,0Z"
+                        style="fill-rule:nonzero;stroke:currentColor;stroke-width:75px;"/></svg>'
+  }
+end

data/config/routes.rb

@@ -45,6 +45,7 @@ Spree::Core::Engine.add_routes do
         end
       end
       resources :variants_including_master, only: [:update]
+      resources :prices, only: [:index, :create]
     end
 
     resources :option_types do

data/lib/spree/backend.rb

@@ -2,9 +2,11 @@ require 'rails/all'
 require 'jquery-rails'
 require 'jquery-ui-rails'
 require 'select2-rails'
+require 'flatpickr'
 require 'bootstrap'
 require 'glyphicons'
 require 'popper_js'
+require 'inline_svg'
 
 require 'spree_core'
 require 'spree_api'

data/lib/spree_backend.rb

@@ -1,4 +1,3 @@
 require 'spree/backend'
 require 'sprockets/rails'
 require 'bootstrap'
-require 'glyphicons'

data/spree_backend.gemspec

@@ -5,11 +5,11 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_backend'
   s.version     = Spree.version
-  s.author      = 'Sean Schofield'
-  s.email       = 'sean@spreecommerce.com'
+  s.authors     = ['Sean Schofield', 'Spark Solutions']
+  s.email       = 'hello@spreecommerce.org'
   s.summary     = 'backend e-commerce functionality for the Spree project.'
   s.description = 'Required dependency for Spree'
-  s.homepage    = 'http://spreecommerce.org'
+  s.homepage    = 'https://spreecommerce.org'
   s.license     = 'BSD-3-Clause'
 
   s.metadata = {
@@ -28,8 +28,10 @@ Gem::Specification.new do |s|
   s.add_dependency 'spree_api', s.version
   s.add_dependency 'spree_core', s.version
 
-  s.add_dependency 'bootstrap',       '~> 4.3.1'
+  s.add_dependency 'bootstrap',       '>= 4.3.1', '< 4.6.0'
   s.add_dependency 'glyphicons',      '~> 1.0.2'
+  s.add_dependency 'flatpickr',       '~> 4.6.0'
+  s.add_dependency 'inline_svg',      '~> 1.5'
   s.add_dependency 'jquery-rails',    '~> 4.3'
   s.add_dependency 'jquery-ui-rails', '~> 6.0.1'
   s.add_dependency 'select2-rails',   '~> 3.5.0'

data/vendor/assets/javascripts/js.cookie.js

@@ -1,165 +1,163 @@
 /*!
- * JavaScript Cookie v2.2.0
+ * JavaScript Cookie v2.2.1
  * https://github.com/js-cookie/js-cookie
  *
  * Copyright 2006, 2015 Klaus Hartl & Fagner Brack
  * Released under the MIT license
  */
 ;(function (factory) {
-  var registeredInModuleLoader = false;
-  if (typeof define === 'function' && define.amd) {
-    define(factory);
-    registeredInModuleLoader = true;
-  }
-  if (typeof exports === 'object') {
-    module.exports = factory();
-    registeredInModuleLoader = true;
-  }
-  if (!registeredInModuleLoader) {
-    var OldCookies = window.Cookies;
-    var api = window.Cookies = factory();
-    api.noConflict = function () {
-      window.Cookies = OldCookies;
-      return api;
-    };
-  }
+	var registeredInModuleLoader;
+	if (typeof define === 'function' && define.amd) {
+		define(factory);
+		registeredInModuleLoader = true;
+	}
+	if (typeof exports === 'object') {
+		module.exports = factory();
+		registeredInModuleLoader = true;
+	}
+	if (!registeredInModuleLoader) {
+		var OldCookies = window.Cookies;
+		var api = window.Cookies = factory();
+		api.noConflict = function () {
+			window.Cookies = OldCookies;
+			return api;
+		};
+	}
 }(function () {
-  function extend () {
-    var i = 0;
-    var result = {};
-    for (; i < arguments.length; i++) {
-      var attributes = arguments[ i ];
-      for (var key in attributes) {
-        result[key] = attributes[key];
-      }
-    }
-    return result;
-  }
-
-  function init (converter) {
-    function api (key, value, attributes) {
-      var result;
-      if (typeof document === 'undefined') {
-        return;
-      }
-
-      // Write
-
-      if (arguments.length > 1) {
-        attributes = extend({
-          path: '/'
-        }, api.defaults, attributes);
-
-        if (typeof attributes.expires === 'number') {
-          var expires = new Date();
-          expires.setMilliseconds(expires.getMilliseconds() + attributes.expires * 864e+5);
-          attributes.expires = expires;
-        }
-
-        // We're using "expires" because "max-age" is not supported by IE
-        attributes.expires = attributes.expires ? attributes.expires.toUTCString() : '';
-
-        try {
-          result = JSON.stringify(value);
-          if (/^[\{\[]/.test(result)) {
-            value = result;
-          }
-        } catch (e) {}
-
-        if (!converter.write) {
-          value = encodeURIComponent(String(value))
-            .replace(/%(23|24|26|2B|3A|3C|3E|3D|2F|3F|40|5B|5D|5E|60|7B|7D|7C)/g, decodeURIComponent);
-        } else {
-          value = converter.write(value, key);
-        }
-
-        key = encodeURIComponent(String(key));
-        key = key.replace(/%(23|24|26|2B|5E|60|7C)/g, decodeURIComponent);
-        key = key.replace(/[\(\)]/g, escape);
-
-        var stringifiedAttributes = '';
-
-        for (var attributeName in attributes) {
-          if (!attributes[attributeName]) {
-            continue;
-          }
-          stringifiedAttributes += '; ' + attributeName;
-          if (attributes[attributeName] === true) {
-            continue;
-          }
-          stringifiedAttributes += '=' + attributes[attributeName];
-        }
-        return (document.cookie = key + '=' + value + stringifiedAttributes);
-      }
-
-      // Read
-
-      if (!key) {
-        result = {};
-      }
-
-      // To prevent the for loop in the first place assign an empty array
-      // in case there are no cookies at all. Also prevents odd result when
-      // calling "get()"
-      var cookies = document.cookie ? document.cookie.split('; ') : [];
-      var rdecode = /(%[0-9A-Z]{2})+/g;
-      var i = 0;
-
-      for (; i < cookies.length; i++) {
-        var parts = cookies[i].split('=');
-        var cookie = parts.slice(1).join('=');
-
-        if (!this.json && cookie.charAt(0) === '"') {
-          cookie = cookie.slice(1, -1);
-        }
-
-        try {
-          var name = parts[0].replace(rdecode, decodeURIComponent);
-          cookie = converter.read ?
-            converter.read(cookie, name) : converter(cookie, name) ||
-            cookie.replace(rdecode, decodeURIComponent);
-
-          if (this.json) {
-            try {
-              cookie = JSON.parse(cookie);
-            } catch (e) {}
-          }
-
-          if (key === name) {
-            result = cookie;
-            break;
-          }
-
-          if (!key) {
-            result[name] = cookie;
-          }
-        } catch (e) {}
-      }
-
-      return result;
-    }
-
-    api.set = api;
-    api.get = function (key) {
-      return api.call(api, key);
-    };
-    api.getJSON = function () {
-      return api.apply({
-        json: true
-      }, [].slice.call(arguments));
-    };
-    api.defaults = {};
-
-    api.remove = function (key, attributes) {
-      api(key, '', extend(attributes, {
-        expires: -1
-      }));
-    };
-
-    api.withConverter = init;
-
-    return api;
-  }
-
-  return init(function () {});
+	function extend () {
+		var i = 0;
+		var result = {};
+		for (; i < arguments.length; i++) {
+			var attributes = arguments[ i ];
+			for (var key in attributes) {
+				result[key] = attributes[key];
+			}
+		}
+		return result;
+	}
+
+	function decode (s) {
+		return s.replace(/(%[0-9A-Z]{2})+/g, decodeURIComponent);
+	}
+
+	function init (converter) {
+		function api() {}
+
+		function set (key, value, attributes) {
+			if (typeof document === 'undefined') {
+				return;
+			}
+
+			attributes = extend({
+				path: '/'
+			}, api.defaults, attributes);
+
+			if (typeof attributes.expires === 'number') {
+				attributes.expires = new Date(new Date() * 1 + attributes.expires * 864e+5);
+			}
+
+			// We're using "expires" because "max-age" is not supported by IE
+			attributes.expires = attributes.expires ? attributes.expires.toUTCString() : '';
+
+			try {
+				var result = JSON.stringify(value);
+				if (/^[\{\[]/.test(result)) {
+					value = result;
+				}
+			} catch (e) {}
+
+			value = converter.write ?
+				converter.write(value, key) :
+				encodeURIComponent(String(value))
+					.replace(/%(23|24|26|2B|3A|3C|3E|3D|2F|3F|40|5B|5D|5E|60|7B|7D|7C)/g, decodeURIComponent);
+
+			key = encodeURIComponent(String(key))
+				.replace(/%(23|24|26|2B|5E|60|7C)/g, decodeURIComponent)
+				.replace(/[\(\)]/g, escape);
+
+			var stringifiedAttributes = '';
+			for (var attributeName in attributes) {
+				if (!attributes[attributeName]) {
+					continue;
+				}
+				stringifiedAttributes += '; ' + attributeName;
+				if (attributes[attributeName] === true) {
+					continue;
+				}
+
+				// Considers RFC 6265 section 5.2:
+				// ...
+				// 3.  If the remaining unparsed-attributes contains a %x3B (";")
+				//     character:
+				// Consume the characters of the unparsed-attributes up to,
+				// not including, the first %x3B (";") character.
+				// ...
+				stringifiedAttributes += '=' + attributes[attributeName].split(';')[0];
+			}
+
+			return (document.cookie = key + '=' + value + stringifiedAttributes);
+		}
+
+		function get (key, json) {
+			if (typeof document === 'undefined') {
+				return;
+			}
+
+			var jar = {};
+			// To prevent the for loop in the first place assign an empty array
+			// in case there are no cookies at all.
+			var cookies = document.cookie ? document.cookie.split('; ') : [];
+			var i = 0;
+
+			for (; i < cookies.length; i++) {
+				var parts = cookies[i].split('=');
+				var cookie = parts.slice(1).join('=');
+
+				if (!json && cookie.charAt(0) === '"') {
+					cookie = cookie.slice(1, -1);
+				}
+
+				try {
+					var name = decode(parts[0]);
+					cookie = (converter.read || converter)(cookie, name) ||
+						decode(cookie);
+
+					if (json) {
+						try {
+							cookie = JSON.parse(cookie);
+						} catch (e) {}
+					}
+
+					jar[name] = cookie;
+
+					if (key === name) {
+						break;
+					}
+				} catch (e) {}
+			}
+
+			return key ? jar[key] : jar;
+		}
+
+		api.set = set;
+		api.get = function (key) {
+			return get(key, false /* read as raw */);
+		};
+		api.getJSON = function (key) {
+			return get(key, true /* read as json */);
+		};
+		api.remove = function (key, attributes) {
+			set(key, '', extend(attributes, {
+				expires: -1
+			}));
+		};
+
+		api.defaults = {};
+
+		api.withConverter = init;
+
+		return api;
+	}
+
+	return init(function () {});
 }));