solidus_backend 1.2.3 → 1.3.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06d6b1de7edd33beb1e425946b6368e3b804bd7b
-  data.tar.gz: 0e87d015e40b26ed474a0df0ce5b98dc4c12c0e1
+  metadata.gz: 7d7f8257531544954cfb58934778763acca81477
+  data.tar.gz: e84a434b1008caaf54ce913f3bab66d25916faa1
 SHA512:
-  metadata.gz: 2a351cd2e1752f8bbe4660638e2cb4e14049c4b593f51ac1e435bab322375e699f5b43381347ad88b5fb06f5b1d1a8169433a7f676c06bfe62190932fc546960
-  data.tar.gz: 8632a4e4621c2ceacca0f756db80904f96dcedc37d05bb12c342d89d6a9b4f2336641ec0152291f3ab5c921e3e3395a7e15a26cd94e61568e37a934453d5f256
+  metadata.gz: ffa2d4bcfa0c61e67b21662adc9ab2be1457f2ba6225202a7c977d2db7784f7173a3e4bb07890bfeda8150960687c44853cc2a9934631e9ab49da8cf6da03888
+  data.tar.gz: 23c7b13590263d67042317d05b5c1b88a5a14bfa7c2941314f6d3aa6d81798791951e2f932225ba54bbf4bc928ccef66a65a3741b0c84f6726447662f5cc7aca

data/Gemfile

@@ -1,6 +1,6 @@
-eval(File.read(File.dirname(__FILE__) + '/../common_spree_dependencies.rb'))
+eval_gemfile File.expand_path('../../common_spree_dependencies.rb', __FILE__)
 
-gem 'solidus_core', :path => '../core'
-gem 'solidus_api', :path => '../api'
+gem 'solidus_core', path: '../core'
+gem 'solidus_api', path: '../api'
 
 gemspec

data/Rakefile

@@ -6,7 +6,7 @@ require 'spree/testing_support/common_rake'
 
 RSpec::Core::RakeTask.new
 
-task :default => :spec
+task default: :spec
 
 desc "Generates a dummy app for testing"
 task :test_app do

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

@@ -1,14 +1,15 @@
+//= require solidus_admin/bind-polyfill
 //= require handlebars
 //= require jquery
 //= require jquery_ujs
 //= require jquery-ui/datepicker
 //= require jquery-ui/sortable
 //= require jquery-ui/autocomplete
-//= require jquery.cookie
-//= require jquery.powertip
 //= require jquery.sticky-kit.min
-//= require underscore-min
-//= require backbone
+//= require solidus_admin/underscore
+//= require solidus_admin/backbone
+//= require solidus_admin/tether
+//= require solidus_admin/bootstrap
 //= require prism
 //= require spree
 //= require ./backend/backbone-overrides

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

@@ -3,7 +3,7 @@ $(@).ready( ->
     return if $("#coupon_code").val().length == 0
     Spree.ajax
       type: 'PUT'
-      url: Spree.url(Spree.routes.apply_coupon_code(order_number))
+      url: Spree.routes.apply_coupon_code(order_number)
       data:
         coupon_code: $("#coupon_code").val()
         token: Spree.api_key

data/app/assets/javascripts/spree/backend/{admin.js.erb → admin.js}

@@ -15,36 +15,19 @@ Hopefully, this will evolve into a propper class.
 **/
 
 jQuery(function($) {
-
-  // Add some tips
-  $('.with-tip').powerTip({
-    smartPlacement: true,
-    fadeInTime: 50,
-    fadeOutTime: 50,
-  });
-
-  $('body')
-    .on('powerTipPreRender', '.with-tip', function() {
-      $('#powerTip').addClass($(this).data('action'));
-      $('#powerTip').addClass($(this).data('tip-color'));
-    })
-    .on('powerTipClose', '.with-tip', function() {
-      $('#powerTip').removeClass($(this).data('action'));
-    })
-
   // Highlight hovered table column
-  $('table tbody tr td.actions').find('a, button').hover(function(){
+  $('table').on("mouseenter", 'td.actions a, td.actions button', function(){
     var tr = $(this).closest('tr');
     var klass = 'highlight action-' + $(this).data('action')
     tr.addClass(klass)
     tr.prev().addClass('before-' + klass);
-  }, function(){
+  });
+  $('table').on("mouseleave", 'td.actions a, td.actions button', function(){
     var tr = $(this).closest('tr');
     var klass = 'highlight action-' + $(this).data('action')
     tr.removeClass(klass)
     tr.prev().removeClass('before-' + klass);
   });
-
 });
 
 
@@ -128,7 +111,6 @@ $(document).ready(function(){
         url: $(this).prop("href"),
         data: {
           _method: 'delete',
-          authenticity_token: AUTH_TOKEN
         },
         dataType: 'script',
         success: function(response) {
@@ -156,7 +138,6 @@ $(document).ready(function(){
         url: el.prop("href"),
         data: {
           _method: 'delete',
-          authenticity_token: AUTH_TOKEN
         },
         success: function(response) {
           el.parents("tr").fadeOut('hide');
@@ -170,18 +151,6 @@ $(document).ready(function(){
     return false;
   });
 
-  $('body').on('click', '.select_properties_from_prototype', function(){
-    $("#busy_indicator").show();
-    var clicked_link = $(this);
-    Spree.ajax({ dataType: 'script', url: clicked_link.prop("href"), type: 'get',
-        success: function(data){
-          clicked_link.parent("td").parent("tr").hide();
-          $("#busy_indicator").hide();
-        }
-    });
-    return false;
-  });
-
   // Fix sortable helper
   var fixHelper = function(e, ui) {
       ui.children().each(function() {
@@ -235,15 +204,15 @@ $(document).ready(function(){
   });
 
   window.Spree.advanceOrder = function() {
-      Spree.ajax({
-          type: "PUT",
-          async: false,
-          data: {
-            token: Spree.api_key
-          },
-          url: Spree.url(Spree.routes.checkouts_api + "/" + order_number + "/advance")
-      }).done(function() {
-          window.location.reload();
-      });
+    Spree.ajax({
+      type: "PUT",
+      async: false,
+      data: {
+        token: Spree.api_key
+      },
+      url: Spree.routes.checkouts_api + "/" + order_number + "/advance"
+    }).done(function() {
+      window.location.reload();
+    });
   }
 });

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

@@ -14,47 +14,58 @@ $(document).ready(function() {
     $("#customer_search").select2({
       placeholder: Spree.translations.choose_a_customer,
       ajax: {
-        url: Spree.routes.user_search,
+        url: Spree.routes.users_api,
         params: { "headers": { "X-Spree-Token": Spree.api_key } },
         datatype: 'json',
         data: function(term, page) {
           return {
-            q: term,
-            token: Spree.api_key
+            q: {
+              m: 'or',
+              email_start: term,
+              addresses_firstname_start: term,
+              addresses_lastname_start: term
+            }
           }
         },
         results: function(data, page) {
-          return { results: data.users }
+          return {
+            results: data.users,
+            more: data.current_page < data.pages
+          }
         }
       },
       dropdownCssClass: 'customer_search',
       formatResult: formatCustomerResult,
       formatSelection: function (customer) {
-        $('#order_email').val(customer.email);
-        $('#user_id').val(customer.id);
-        $('#guest_checkout_true').prop("checked", false);
-        $('#guest_checkout_false').prop("checked", true);
-        $('#guest_checkout_false').prop("disabled", false);
+        return Select2.util.escapeMarkup(customer.email);
+      }
+    })
 
-        var billAddress = customer.bill_address;
-        if(billAddress) {
-          $('#order_bill_address_attributes_firstname').val(billAddress.firstname);
-          $('#order_bill_address_attributes_lastname').val(billAddress.lastname);
-          $('#order_bill_address_attributes_address1').val(billAddress.address1);
-          $('#order_bill_address_attributes_address2').val(billAddress.address2);
-          $('#order_bill_address_attributes_city').val(billAddress.city);
-          $('#order_bill_address_attributes_zipcode').val(billAddress.zipcode);
-          $('#order_bill_address_attributes_phone').val(billAddress.phone);
+    $("#customer_search").on("select2-selecting", function(e) {
+      var customer = e.choice;
+      $('#order_email').val(customer.email);
+      $('#user_id').val(customer.id);
+      $('#guest_checkout_true').prop("checked", false);
+      $('#guest_checkout_false').prop("checked", true);
+      $('#guest_checkout_false').prop("disabled", false);
 
-          $('#order_bill_address_attributes_country_id').select2("val", billAddress.country_id).promise().done(function () {
-            update_state('b', function () {
-              $('#order_bill_address_attributes_state_id').select2("val", billAddress.state_id);
-            });
+      var billAddress = customer.bill_address;
+      if (billAddress) {
+        $('#order_bill_address_attributes_firstname').val(billAddress.firstname);
+        $('#order_bill_address_attributes_lastname').val(billAddress.lastname);
+        $('#order_bill_address_attributes_address1').val(billAddress.address1);
+        $('#order_bill_address_attributes_address2').val(billAddress.address2);
+        $('#order_bill_address_attributes_city').val(billAddress.city);
+        $('#order_bill_address_attributes_zipcode').val(billAddress.zipcode);
+        $('#order_bill_address_attributes_phone').val(billAddress.phone);
+
+        $('#order_bill_address_attributes_country_id').select2("val", billAddress.country_id).promise().done(function () {
+          update_state('b', function () {
+            $('#order_bill_address_attributes_state_id').select2("val", billAddress.state_id);
           });
-        }
-        return Select2.util.escapeMarkup(customer.email);
+        });
       }
-    })
+    });
   }
 
   var order_use_billing_input = $('input#order_use_billing');

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

@@ -0,0 +1,79 @@
+class Tabs
+  constructor: (@el) ->
+    @$tabList = $(@el)
+    @$tabs = @$tabList.find("li:not(.tabs-dropdown)")
+    @tabs = @$tabs.toArray()
+    @$tabList.append("<li class='tabs-dropdown'><a href='#'></a><ul></ul></li>")
+    @$dropdown = @$tabList.find(".tabs-dropdown")
+    @setWidths()
+    @initEvents()
+
+  initEvents: ->
+    $(window).on "resize", @overflowTabs
+    @overflowTabs()
+
+  setWidths: ->
+    @tabWidths = @tabs.map (tab) ->
+      tab.offsetWidth
+    @totalTabsWidth = @tabWidths.reduce (previousValue, currentValue) ->
+      previousValue + currentValue
+
+  overflowTabs: =>
+    containerWidth = @$tabList[0].offsetWidth
+    @lastKnownWidth = containerWidth unless @lastKnownWidth
+    widthDifference = @totalTabsWidth - containerWidth
+    widthDifferenceWithDropdown = widthDifference + @dropdownWidth()
+    dropdownActive = @$dropdown.find("li").length
+
+    if containerWidth <= @lastKnownWidth
+      # The window is being sized down or we've just loaded the page
+      if (dropdownActive and widthDifferenceWithDropdown > 0) or (not dropdownActive and widthDifference > 0)
+        @hideTabsToFit(widthDifferenceWithDropdown)
+    if containerWidth > @lastKnownWidth
+      # The window is getting larger
+      @showTabsToFit(widthDifference)
+
+    @lastKnownWidth = containerWidth
+
+  dropdownWidth: ->
+    # If the dropdown isn't initiated we need to provide
+    # our best guess of the size it will take up
+    @$dropdown[0].offsetWidth or 50
+
+  hideTabsToFit: (widthDifference) ->
+    @$tabList.addClass("tabs-overflowed")
+    tabs = @tabs.slice().reverse()
+
+    for tab in tabs
+      # Bail if things are now fitting
+      return if widthDifference <= 0
+      # Skip items already in the dropdown or active
+      continue if $(tab).hasClass("in-dropdown") or $(tab).hasClass("active")
+
+      tabWidth = tab.offsetWidth
+      @totalTabsWidth -= tabWidth
+      widthDifference -= tabWidth
+      $(tab).appendTo(@$dropdown.find("ul")).addClass("in-dropdown")
+
+  showTabsToFit: (widthDifference) ->
+    for tab, i in @tabs.slice()
+      # Skip items that aren't already in the dropdown
+      continue unless $(tab).hasClass("in-dropdown")
+
+      # Get our tab's width from the array
+      # We can't measure it here because it's hidden in the dropdown
+      tabWidth = @tabWidths[i]
+
+      # Bail if there's no room for this tab
+      break if widthDifference + tabWidth > 0
+
+      @totalTabsWidth += tabWidth
+      widthDifference += tabWidth
+      $(tab).insertBefore(@$dropdown).removeClass("in-dropdown")
+
+    # Reset styles if our dropdown is now empty
+    if @$dropdown.find("li").length is 0
+      @$tabList.removeClass("tabs-overflowed")
+
+window.onload = ->
+  new Tabs(el) for el in $(".tabs")

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

@@ -0,0 +1,31 @@
+$(function(){
+  $('body').tooltip({selector: '.with-tip'});
+
+  /*
+   * Poll tooltips to hide them if they are no longer being hovered.
+   *
+   * This is necessary to fix tooltips hanging around after their attached
+   * element has been removed from the DOM (and will therefore receive no
+   * mouseleave event). This may be unnecessary in a future version of
+   * bootstrap, which intends to solve this using MutationObserver.
+   */
+  var removeDesyncedTooltip = function(tooltip) {
+    var interval = setInterval(function(){
+      if(!$(tooltip.element).is(":hover")) {
+        tooltip.hide();
+        clearInterval(interval);
+      }
+    }, 200);
+    $(tooltip.element).on('hidden.bs.tooltip', function(){
+      clearInterval(interval);
+    });
+  };
+
+  $('body').on('inserted.bs.tooltip', function(e){
+    var $target = $(e.target);
+    var tooltip = $target.data('bs.tooltip');
+    removeDesyncedTooltip(tooltip);
+    var $tooltip = $("#" + $target.attr("aria-describedby"));
+    $tooltip.addClass("action-" + $target.data("action"));
+  });
+});

data/app/assets/javascripts/spree/backend/images/index.js.coffee

@@ -8,9 +8,6 @@ $ ->
     Spree.ajax
       type: 'GET'
       url: @href
-      data: (
-        authenticity_token: AUTH_TOKEN
-      )
       success: (r) ->
         ($ '#images').html r
         ($ '.select2').select2()

data/app/assets/javascripts/spree/backend/{line_items_on_order_edit.js.erb → line_items_on_order_edit.js}

@@ -9,19 +9,12 @@ $(document).ready(function () {
         var variant = _.find(window.variants, function(variant){
             return variant.id == variant_id
         })
+
+        var variantLineItemTemplate = HandlebarsTemplates["variants/line_items_autocomplete_stock"];
         $('#stock_details').html(variantLineItemTemplate({variant: variant}));
         $('#stock_details').show();
 
         $('button.add_variant').click(addVariant);
-
-        // Add some tips
-        $('.with-tip').powerTip({
-            smartPlacement: true,
-            fadeInTime: 50,
-            fadeOutTime: 50,
-            intentPollInterval: 300
-        });
-
     });
 });
 
@@ -53,7 +46,7 @@ adjustLineItems = function(order_number, variant_id, quantity, stock_location_qu
 
     Spree.ajax({
         type: "POST",
-        url: Spree.url(url),
+        url: url,
         data: {
           line_item: {
             variant_id: variant_id,

data/app/assets/javascripts/spree/backend/payments/edit.js.coffee

@@ -1,149 +1,34 @@
-jQuery ($) ->
-  # Payment model
+PaymentRowView = Backbone.View.extend
+  events:
+    "click .js-edit": "onEdit"
+    "click .js-save": "onSave"
+    "click .js-cancel": "onCancel"
+    "click .js-display-amount": "onEdit"
+
+  onEdit: (e) ->
+    e.preventDefault()
+    @$el.addClass("editing")
+
+  onCancel: (e) ->
+    e.preventDefault()
+    @$el.removeClass("editing")
+
+  onSave: (e) ->
+    e.preventDefault()
+    amount = @$(".js-edit-amount").val()
+    options =
+      success: (model, response, options) =>
+        @$(".js-display-amount").text(model.attributes.display_amount)
+        @$el.removeClass("editing")
+      error: (model, response, options) =>
+        show_flash 'error', response.responseJSON.error
+    @model.save({ amount: amount }, options)
+
+$ ->
   order_id = $('#payments').data('order-id')
-  class Payment
-    constructor: (id) ->
-      @url  = "#{Spree.routes.payments_api(order_id)}/#{id}.json"
-      @json = Spree.getJSON @url, (data) =>
-        @data = data
+  Payment = Backbone.Model.extend
+    urlRoot: Spree.routes.payments_api(order_id)
 
-    if_pending: (callback) ->
-      @json.done (data) ->
-        callback() if data.state is 'pending'
-
-    update: (attributes, success) ->
-      jqXHR = Spree.ajax
-        type: 'PUT'
-        url:  @url
-        data: { payment: attributes }
-      jqXHR.done (data) =>
-        @data = data
-      jqXHR.fail ->
-        response = $.parseJSON(jqXHR.responseText)
-        show_flash('error', response.error)
-
-    amount:         -> @data.amount
-    display_amount: -> @data.display_amount
-
-  # Payment base view
-  class PaymentView
-    constructor: (@$el, @payment) ->
-      @render()
-
-    render: ->
-      @add_action_button()
-
-    show: ->
-      @remove_buttons()
-      new ShowPaymentView(@$el, @payment)
-
-    edit: ->
-      @remove_buttons()
-      new EditPaymentView(@$el, @payment)
-
-    add_action_button: ->
-      @$actions().prepend @$new_button(@action)
-
-    remove_buttons: ->
-      @$buttons().remove()
-
-    $new_button: (action) ->
-      $('<a />')
-        .attr
-          class: "fa fa-#{action} icon_link no-text with-tip"
-          title: Spree.translations[action]
-        .data
-          action: action
-        .one
-          click: (event) ->
-            event.preventDefault()
-          mousedown: ->
-            $(@).data('clicked', true)
-          mouseup: =>
-            @[action]()
-        .powerTip
-          smartPlacement: true
-          fadeInTime:     50
-          fadeOutTime:    50
-
-    $buttons: ->
-      @$actions().find(".fa-#{@action}, .fa-cancel")
-
-    $actions: ->
-      @$el.find('.actions')
-
-    $amount: ->
-      @$el.find('td.amount')
-
-  # Payment show view
-  class ShowPaymentView extends PaymentView
-    action: 'edit'
-
-    render: ->
-      super
-      @set_actions_display()
-      @show_actions()
-      @show_amount()
-
-    set_actions_display: ->
-      width = @$actions().width()
-      @$actions().width(width).css('text-align', 'left')
-
-    show_actions: ->
-      @$actions().find('a').show()
-
-    show_amount: ->
-      amount = $('<span />')
-        .html(@payment.display_amount())
-        .one('click', => @edit().$input().focus())
-      @$amount().html(amount)
-
-  # Payment edit view
-  class EditPaymentView extends PaymentView
-    action: 'save'
-
-    render: ->
-      super
-      @hide_actions()
-      @edit_amount()
-      @add_cancel_button()
-
-    add_cancel_button: ->
-      @$actions().append @$new_button('cancel')
-
-    hide_actions: ->
-      @$actions().find('a').not(@$buttons()).hide()
-
-    edit_amount: ->
-      amount = @$amount()
-      amount.html(@$new_input(amount.find('span').width()))
-
-    save: (event) ->
-      @payment.update(amount: @$input().val())
-        .done(=> @show())
-
-    cancel: @::show
-
-    $new_input: (width) ->
-      amount = @constructor.normalize_amount(@payment.display_amount())
-      $('<input />')
-        .prop(id: 'amount', value: amount)
-        .width(width)
-        .one
-          blur: =>
-            clicked = (@$buttons().filter -> $(@).data('clicked')).length
-            @save() unless clicked
-        .css('text-align': 'right')
-
-    $input: ->
-      @$amount().find('input')
-
-    @normalize_amount: (amount) ->
-      separator = Spree.translations.currency_separator
-      amount.replace(///[^\d#{separator}]///g, '')
-
-  # Attach ShowPaymentView to each pending payment in the table
-  $('.admin tr[data-hook=payments_row]').each ->
-    $el = $(@)
-    payment = new Payment($el.prop('id').match(/\d+$/))
-    payment.if_pending -> new ShowPaymentView($el, payment)
+  $('tr.payment').each ->
+    model = new Payment({id: $(@).data('payment-id')})
+    new PaymentRowView({el: @, model: model})