solidus_backend 2.0.3 → 2.1.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55510f03148db2e09cdb1aaa0523baeec5bbae9d
-  data.tar.gz: eb123f0ad9a9e839c463596375c3b20a5644b193
+  metadata.gz: 843448fe45669bd2d5c20177528681a86678af12
+  data.tar.gz: 07bc2239dacdc468b0f0b3b5de5524b1cbf46d17
 SHA512:
-  metadata.gz: 710b34f8c86cb2c27a473742ba065bc970ea305a91e426d3983b384d3b97e0641283ff1f957f05ec0fc7d18f40561e608f515fdb0fe4735151ecfa1d7c1fd7e9
-  data.tar.gz: f81f091d59880d78d158dbd49348c0a8e1d9176231b1d239c50021651142acfd1312870884ab809d52473640c6520055b9ad327910996f2995a7d949bb85ff3b
+  metadata.gz: ac0d850fe4e077c868e6f695a5d69f8f8c467f64bfc72eaa6f7d57a6ca569ffa8a2d99610de334e0e562a0c3962b477ab2baa73205ff418dd97c9ac74eae03f7
+  data.tar.gz: 475ea49cd2c1f70ee7599dcb87980969cd95f744bd46f7e4554c57b71f3ff3a14f53e1b2954cac648a0a9ab8f71a7644184c5e106f9de1175bab193bcd4c9c3c

data/app/assets/javascripts/spree/backend/handlebars_extensions.coffee

@@ -1,11 +1,19 @@
 #= require handlebars
 
-Handlebars.registerHelper "t", (key)->
-  if Spree.translations[key]
-    Spree.translations[key]
-  else
-    console.error "No translation found for #{key}."
-    key
+# Resolves string keys with dots in a deeply nested object
+# http://stackoverflow.com/a/22129960/4405214
+resolveObject = (path, obj) ->
+  path.split('.').reduce ((prev, curr) ->
+    if prev then prev[curr] else undefined
+  ), obj || self
+
+
+Handlebars.registerHelper "t", (key) ->
+  translation = resolveObject key, Spree.translations
+  return translation if translation
+
+  console.error "No translation found for #{key}."
+  key
 
 Handlebars.registerHelper "admin_url", ->
   Spree.pathFor("admin")

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

@@ -0,0 +1,203 @@
+// Inspired by: http://html5demos.com/dnd-upload
+Spree.prepareImageUploader = function () {
+  var uploadZone = document.getElementById('upload-zone');
+  if(!uploadZone) return;
+
+  var UploadZone = Backbone.View.extend({
+    el: uploadZone,
+
+    events: {
+      "dragover" : "onDragOver",
+      "dragleave" : "onDragLeave",
+      "drop" : "onDrop",
+      'change input[type="file"]' : "onFileBrowserSelect"
+    },
+
+    progressZone: document.getElementById('progress-zone'),
+
+    // Hide or highlight supported browser features
+    initialize: function() {
+      "filereader formdata progress".split(' ').forEach(function (api) {
+        this.support[api].className = (this.tests[api] === false) ? 'red' : 'hidden'
+      }, this);
+    },
+
+    upload: function(file) {
+      if (!FormData) return;
+
+      var progressModel = new ProgressModel({file: file});
+      progressModel.previewFile();
+      progressModel.uploadFile();
+
+      var progressView = new ProgressView({model: progressModel});
+      this.progressZone.appendChild(progressView.render().el);
+    },
+
+    dragClass: 'with-images',
+
+    onDragOver: function(e) {
+      this.el.classList.add(this.dragClass);
+      e.preventDefault();
+    },
+
+    onDragLeave: function() {
+      this.el.classList.remove(this.dragClass);
+    },
+
+    onDrop: function(e) {
+      this.el.classList.remove(this.dragClass);
+      e.preventDefault();
+
+      _.each(e.originalEvent.dataTransfer.files, this.upload, this);
+    },
+
+    onFileBrowserSelect: function(e) {
+      _.each(e.target.files, this.upload, this);
+    },
+
+    tests: {
+      filereader: typeof FileReader != 'undefined',
+      dnd: 'draggable' in document.createElement('span'),
+      formdata: !!window.FormData,
+      progress: "upload" in new XMLHttpRequest
+    },
+
+    support: {
+      filereader: document.getElementById('filereader'),
+      formdata:   document.getElementById('formdata'),
+      progress:   document.getElementById('progress')
+    }
+  });
+
+  var ProgressModel = Backbone.Model.extend({
+    initialize: function() {
+      this.set({summary: this.get("file").name});
+    },
+
+    defaults: function() {
+      return {
+        file: null,
+        imgSrc: '',
+        progress: 0,
+        serverError: false,
+        summary: ''
+      }
+    },
+
+    acceptedTypes: {
+      'image/png': true,
+      'image/jpeg': true,
+      'image/gif': true
+    },
+
+    variantId: document.querySelector('input[name="image[viewable_id]"]').value,
+
+    previewFile: function () {
+      var file = this.get('file'),
+          that = this;
+
+      if (FileReader && this.acceptedTypes[file.type] === true) {
+        var reader = new FileReader();
+        reader.onload = function (event) {
+          that.set({imgSrc: event.target.result});
+        };
+
+        reader.readAsDataURL(file);
+      } else {
+        var summary = 'Uploading ' + file.name + ' ' + (file.size ? (file.size/1024|0) + 'K' : '');
+        this.set({summary: summary});
+      }
+    },
+
+    uploadFile: function () {
+      var formData = new FormData(),
+          that = this;
+
+      formData.append('image[attachment]', this.get('file'));
+      formData.append('image[viewable_id]', this.variantId);
+      formData.append('upload_id', this.cid);
+
+      // send the image to the server
+      Spree.ajax({
+        url: window.location.pathname,
+        type: "POST",
+        dataType: 'script',
+        data: formData,
+        processData: false,  // tell jQuery not to process the data
+        contentType: false,  // tell jQuery not to set contentType
+        xhr: function () {
+          xhr = $.ajaxSettings.xhr();
+          if (xhr.upload) {
+            xhr.upload.onprogress = function (event) {
+              if (event.lengthComputable) {
+                var complete = (event.loaded / event.total * 100 | 0);
+                that.set({progress: complete})
+              }
+            };
+          }
+          return xhr;
+        }
+      }).done(function() {
+        that.set({progress: 100})
+      }).error(function(jqXHR, textStatus, errorThrown) {
+        that.set({serverError: true});
+      });
+    }
+  }); // end ProgressModel
+
+
+  var ProgressView = Backbone.View.extend({
+    tagName: "div",
+
+    // Cache the template function for a single item.
+    template: HandlebarsTemplates["products/upload_progress"],
+
+    initialize: function() {
+      this.listenTo(this.model, 'change:progress', this.updateProgressBar);
+      this.listenTo(this.model, 'change', this.render);
+      this.listenTo(this.model, 'destroy', this.remove);
+    },
+
+    events: {
+      "clear" : "clear"
+    },
+
+    className: 'col-sm-6 col-md-4 margin-bottom-one',
+
+    attributes: function() {
+      return {
+        "data-upload-id": this.model.cid
+      }
+    },
+
+    render: function() {
+      // Skip progress bar update for better performance
+      var changedAttrs = Object.keys(this.model.changed);
+      if(changedAttrs.length === 1 && changedAttrs[0] == 'progress') return this;
+
+      this.el.innerHTML = this.template(this.model.attributes);
+      return this;
+    },
+
+    updateProgressBar: function() {
+      var progressBar = this.el.querySelector('progress');
+      progressBar.value = progressBar.innerHTML = this.model.get('progress');
+      return this;
+    },
+
+    // Remove the item, destroy the model
+    clear: function() {
+      this.model.destroy();
+    }
+  }); // end ProgressView
+
+
+  // Kick off by binding the events on the upload zone
+  new UploadZone();
+
+}; // end prepareImageUploader
+
+
+Spree.ready(function () {
+  Spree.prepareImageUploader();
+});

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

@@ -15,7 +15,8 @@ $.fn.optionValueAutocomplete = function (options) {
     multiple: multiple,
     initSelection: function (element, callback) {
       $.get(Spree.routes.option_value_search, {
-        ids: element.val().split(',')
+        ids: element.val().split(','),
+        token: Spree.api_key
       }, function (data) {
         callback(multiple ? data : data[0]);
       });

data/app/assets/javascripts/spree/backend/stock_management/index_update_forms.coffee

@@ -46,7 +46,7 @@ Spree.EditStockItemView = Backbone.View.extend
   onSubmit: (ev) ->
     ev.preventDefault()
     backorderable = @$('[name=backorderable]').prop("checked")
-    countOnHand = parseInt($("input[name='count_on_hand']").val(), 10)
+    countOnHand = parseInt(@$("input[name='count_on_hand']").val(), 10)
 
     @model.set
       count_on_hand: countOnHand

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

@@ -5,11 +5,15 @@ $.fn.taxonAutocomplete = function () {
       placeholder: Spree.translations.taxon_placeholder,
       multiple: true,
       initSelection: function (element, callback) {
+        var ids = element.val(),
+            count = ids.split(",").length;
+
         Spree.ajax({
           type: "GET",
           url: Spree.routes.taxons_search,
           data: {
-            ids: element.val(),
+            ids: ids,
+            per_page: count,
             without_children: true
           },
           success: function (data) {

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

@@ -68,6 +68,6 @@ $ ->
   $('#taxon_id').on "change", (e) ->
     Spree.ajax
       url: Spree.routes.taxon_products_api,
-      data: { id: e.val }
+      data: { id: e.val, simple: 1 }
       success: (data) ->
         sortable.html productListTemplate(data.products)

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

@@ -0,0 +1,15 @@
+//= require spree/backend/templates/orders/customer_details/autocomplete
+//= require spree/backend/templates/products/sortable
+//= require spree/backend/templates/products/upload_progress
+//= require spree/backend/templates/promotions/calculators/fields/tiered_flat_rate
+//= require spree/backend/templates/promotions/calculators/fields/tiered_percent
+//= require spree/backend/templates/promotions/rules/option_values
+//= require spree/backend/templates/promotions/rules/option_values_select
+//= require spree/backend/templates/stock_items/stock_location_stock_item
+//= require spree/backend/templates/stock_transfers/transfer_item
+//= 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/templates/products/upload_progress.hbs

@@ -0,0 +1,12 @@
+<div class="card progress-card">
+  <img src="{{ imgSrc }}" class="card-img-top img-fluid">
+
+  <div class="card-block">
+    <progress min="0" max="100" value="{{ progress }}">{{ progress }}</progress>
+
+    <summary>{{ summary }}</summary>
+    <br>
+
+    <error class="text-danger {{#unless serverError}} hidden {{/unless}}">{{t 'admin.images.index.image_process_failed' }}</error>
+  </div>
+</div>

data/app/assets/javascripts/spree/backend/templates/promotions/calculators/fields/tiered_flat_rate.hbs

@@ -1,16 +1,18 @@
 <div class="fullwidth tier">
-  <a class="fa fa-trash remove js-remove-tier"></a>
-  <div class="two columns alpha omega">
-    <div class="input-group">
-      <span class="input-group-addon">$</span>
-      <input class="js-base-input form-control" type="text" value={{baseField.value}}>
+  <div class="row">
+    <div class="col-xs-6">
+      <a class="fa fa-trash remove js-remove-tier"></a>
+      <div class="input-group">
+        <span class="input-group-addon">$</span>
+        <input class="js-base-input form-control" type="text" value={{baseField.value}}>
+      </div>
     </div>
-  </div>
-  <div class="two columns alpha omega right">
-    <div class="input-group">
-      <span class="input-group-addon">$</span>
-      <input class="js-value-input form-control"
-        name="{{valueField.name}}" type="text" value={{valueField.value}}>
+    <div class="col-xs-6">
+      <div class="input-group">
+        <span class="input-group-addon">$</span>
+        <input class="js-value-input form-control"
+          name="{{valueField.name}}" type="text" value={{valueField.value}}>
+      </div>
     </div>
   </div>
   <div class="clear"></div>

data/app/assets/javascripts/spree/backend/templates/promotions/calculators/fields/tiered_percent.hbs

@@ -1,16 +1,18 @@
 <div class="fullwidth tier">
   <a class="fa fa-trash remove js-remove-tier"></a>
-  <div class="two columns alpha omega">
-    <div class="input-group">
-      <span class="input-group-addon">$</span>
-      <input class="js-base-input form-control" type="text" value={{baseField.value}}>
+  <div class="row">
+    <div class="col-xs-6">
+      <div class="input-group">
+        <span class="input-group-addon">$</span>
+        <input class="js-base-input form-control" type="text" value={{baseField.value}}>
+      </div>
     </div>
-  </div>
-  <div class="two columns alpha omega right">
-    <div class="input-group">
-      <input class="js-value-input form-control right-align"
-        name="{{valueField.name}}" type="text" value={{valueField.value}}>
-      <span class="input-group-addon">%</span>
+    <div class="col-xs-6">
+      <div class="input-group">
+        <input class="js-value-input form-control right-align"
+          name="{{valueField.name}}" type="text" value={{valueField.value}}>
+        <span class="input-group-addon">%</span>
+      </div>
     </div>
   </div>
   <div class="clear"></div>

data/app/assets/javascripts/spree/backend/templates/promotions/rules/option_values.hbs

@@ -1,9 +1,11 @@
 <div class="fullwidth promo-rule-option-value">
-  <div class="four columns alpha">
-    <input class="js-promo-rule-option-value-product-select fullwidth" type="hidden" value="{{ productSelect.value }}">
-  </div>
-  <div class="three columns omega">
-    <input class="js-promo-rule-option-value-option-values-select fullwidth" name="{{ paramPrefix }}[preferred_eligible_values][{{ productSelect.value }}]" type="hidden" value={{optionValuesSelect.value}}>
+  <div class="row">
+    <div class="col-xs-6">
+      <input class="js-promo-rule-option-value-product-select fullwidth" type="hidden" value="{{ productSelect.value }}">
+    </div>
+    <div class="col-xs-5">
+      <input class="js-promo-rule-option-value-option-values-select fullwidth" name="{{ paramPrefix }}[preferred_eligible_values][{{ productSelect.value }}]" type="hidden" value={{optionValuesSelect.value}}>
+    </div>
   </div>
   <a class="fa fa-trash remove js-remove-promo-rule-option-value"></a>
   <div class="clear"></div>

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

@@ -12,7 +12,61 @@
 //= require solidus_admin/bootstrap
 //= require prism
 //= require spree
-//= require ./backend/backbone-overrides
+//= require spree/backend/backbone-overrides
 //= require spree/backend/spree-select2
-//= require_tree ./backend/templates
-//= require_tree .
+//
+//= require spree/backend/templates
+//
+//= require spree/backend/address_states
+//= require spree/backend/adjustments
+//= require spree/backend/admin
+//= require spree/backend/calculator
+//= require spree/backend/checkouts/edit
+//= require spree/backend/components/tabs
+//= require spree/backend/components/tooltips
+//= require spree/backend/flash
+//= require spree/backend/gateway
+//= require spree/backend/handlebars_extensions
+//= require spree/backend/images/index
+//= require spree/backend/images/new
+//= require spree/backend/images/upload
+//= require spree/backend/line_items
+//= require spree/backend/line_items_on_order_edit
+//= require spree/backend/navigation
+//= require spree/backend/number_field_updater
+//= require spree/backend/option_type_autocomplete
+//= require spree/backend/option_value_picker
+//= require spree/backend/orders/edit
+//= require spree/backend/payments/edit
+//= require spree/backend/payments/new
+//= require spree/backend/product_picker
+//= require spree/backend/progress
+//= require spree/backend/promotions
+//= require spree/backend/returns/expedited_exchanges_warning
+//= require spree/backend/returns/return_item_selection
+//= require spree/backend/routes
+//= require spree/backend/select_payments
+//= require spree/backend/shipments
+//= require spree/backend/spree-select2
+//= require spree/backend/states
+//= require spree/backend/stock_management/index_add_forms
+//= require spree/backend/stock_management/index_update_forms
+//= require spree/backend/stock_management/stock_item
+//= require spree/backend/stock_movement
+//= require spree/backend/stock_transfers/count_update_forms
+//= require spree/backend/stock_transfers/edit
+//= require spree/backend/stock_transfers/receive
+//= require spree/backend/stock_transfers/received_counter
+//= require spree/backend/stock_transfers/stock_transfer
+//= require spree/backend/stock_transfers/transfer_item
+//= require spree/backend/stock_transfers/transfer_item_deleting
+//= require spree/backend/stock_transfers/variant_form
+//= require spree/backend/store_credits
+//= require spree/backend/style_guide
+//= require spree/backend/taxon_autocomplete
+//= require spree/backend/taxonomy
+//= require spree/backend/taxons
+//= require spree/backend/user_picker
+//= require spree/backend/variant_autocomplete
+//= require spree/backend/variant_management
+//= require spree/backend/zone

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

@@ -49,7 +49,7 @@ $enable-shadows:            false !default;
 $enable-gradients:          false !default;
 $enable-transitions:        false !default;
 $enable-hover-media-query:  false !default;
-$enable-grid-classes:       false !default;
+$enable-grid-classes:       true !default;
 
 
 // Spacing

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

@@ -26,6 +26,8 @@ body:not(.new-layout) #sidebar {
       min-height: 3em;
     }
   }
+
+  @media print { display: none }
 }
 
 body.new-layout .content-sidebar {

data/app/assets/stylesheets/spree/backend/components/_table-filter.scss

@@ -11,4 +11,6 @@
   .actions {
     text-align: center;
   }
-}
+
+  @media print { display: none }
+}

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

@@ -13,6 +13,8 @@
   a {
     padding: 1em;
   }
+
+  @media print { display: none }
 }
 
 .tabs > li:not(.in-dropdown) {

data/app/assets/stylesheets/spree/backend/sections/_adjustments.scss

@@ -0,0 +1,3 @@
+.adjustment-ineligible {
+  text-decoration: line-through;
+}

data/app/assets/stylesheets/spree/backend/sections/_products.scss

@@ -1,20 +1,3 @@
-[data-hook="admin_products_index_search"] {
-  @include make-row();
-
-  > * {
-    @include make-col();
-    @include padding(0 null); // override the padding on .field
-  }
-}
-
-.product-search-field-name {
-  @include make-col-span(6);
-}
-
-.product-search-field-sku {
-  @include make-col-span(4);
-}
-
 .product-search-field-show-deleted.field.checkbox {
   // extra specificity to override styles
   @include make-col-span(2);
@@ -52,3 +35,32 @@ div[data-hook="admin_products_index_search_buttons"] {
     color: $color-2;
   }
 }
+
+#upload-zone {
+  border: 2px dashed $color-border;
+  padding: 2rem 5rem;
+  text-align: center;
+  margin: 1rem auto;
+  width: 70%;
+
+  label.upload {
+    display: block;
+  }
+
+  &.with-images {
+    border-color: $color-success;
+  }
+}
+
+progress {
+  width: 100%;
+}
+
+.margin-bottom-one {
+  margin-bottom: 1rem;
+}
+
+.progress-card {
+  height: 100%;
+  padding: 1rem;
+}

data/app/assets/stylesheets/spree/backend/sections/_stock_management.scss

@@ -10,6 +10,7 @@
     > tr.stock-item-edit-row {
       td {
         background-color: $color-tbl-even;
+        border-left: none;
       }
       &:nth-child(even) td {
         /* An nth-even child is actually an odd row */
@@ -39,4 +40,9 @@
     }
   }
 
+  tr:hover {
+    .stock-variant-field-table td {
+      background-color: transparent;
+    }
+  }
 }

data/app/assets/stylesheets/spree/backend/shared/_header.scss

@@ -8,6 +8,8 @@
   body:not(.new-layout) & {
     margin-left: $width-sidebar;
   }
+
+  @media print { display: none }
 }
 
 .page-title {

data/app/assets/stylesheets/spree/backend/shared/_layout.scss

@@ -14,11 +14,16 @@ body {
 .admin-nav {
   @include position(absolute, 0 null 0 0);
   width: $width-sidebar;
+  img {
+    max-width: 100%;
+  }
+  @media print { display: none }
 }
 
 .content-wrapper {
   body:not(.new-layout) & {
     margin-left: $width-sidebar;
+    @media print { margin-left: 0 }
   }
 
   body.new-layout & {

data/app/assets/stylesheets/spree/backend/shared/_utilities.scss

@@ -26,8 +26,7 @@
   margin-right: -10px;
 }
 
-.container .column,
-.container .columns {
+.container {
   // Float container right instead of left.
   .right {
     float: right;

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

@@ -37,14 +37,12 @@
 @import 'spree/backend/plugins/select2';
 @import 'spree/backend/plugins/bootstrap_tooltip';
 
-@import 'spree/backend/sections/adjustments_table';
+@import 'spree/backend/sections/adjustments';
 @import 'spree/backend/sections/orders';
 @import 'spree/backend/sections/products';
 @import 'spree/backend/sections/promotions';
-@import 'spree/backend/sections/edit_checkouts';
 @import 'spree/backend/sections/bulk_transfer';
 @import 'spree/backend/sections/return_authorizations';
-@import 'spree/backend/sections/tax_zones';
 @import 'spree/backend/sections/log_entries';
 @import 'spree/backend/sections/taxonomies';
 @import 'spree/backend/sections/taxons';

data/app/controllers/spree/admin/orders_controller.rb

@@ -1,6 +1,8 @@
 module Spree
   module Admin
     class OrdersController < Spree::Admin::BaseController
+      helper 'spree/admin/payments'
+
       before_action :initialize_order_events
       before_action :load_order, only: [:edit, :update, :complete, :advance, :cancel, :resume, :approve, :resend, :unfinalize_adjustments, :finalize_adjustments, :cart, :confirm]
       around_action :lock_order, only: [:update, :advance, :complete, :confirm, :cancel, :resume, :approve, :resend]

data/app/controllers/spree/admin/payments_controller.rb

@@ -78,7 +78,7 @@ module Spree
 
       def load_data
         @amount = params[:amount] || load_order.total
-        @payment_methods = PaymentMethod.available(:back_end)
+        @payment_methods = PaymentMethod.available_to_admin
         if @payment && @payment.payment_method
           @payment_method = @payment.payment_method
         else