spree_backend 2.1.12 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7516bdc5334462347a1bc6272c9192f4c5a7e8f5
-  data.tar.gz: 0d74ca795d60169edb469909967f86756db48783
+  metadata.gz: 0eb4b17ed3a2191a75982b34586811474e257424
+  data.tar.gz: 11d1332518050f7b4cc0d918ed90202876e8fb0c
 SHA512:
-  metadata.gz: dd560e534cb1ff82ac9cd043ce4b3088235e6e4789008b33402b4733d7c3c3e7028db82af9830b87864b8fc67c7410c1dc3e0c832f2732f182730bc9d1942235
-  data.tar.gz: 44ceeeb179d3cff03ecce0ceeb26b291944ac4526d17fe93e017b593b281cec276dc8c1fcb71400b676a0ea34c7b40d8cb8b81b72eb122c5783311a2db8d524f
+  metadata.gz: 51695cae86f3f9fd40b797749b05c15d78d4d80b7c1e7f995d86e473fe00e1e34c1812a626f6f071999898ee0feec3fd391c8925c65a04fe5132627311380384
+  data.tar.gz: 2956047cd5b1b703bd524c539f3f2b9d2dffe729a100a33119e257fbf3b58b459a5b4aa555eb80bfe6882bec038b51afd1eb2b463b4a39c9f7ff46a0d2c543f1

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

@@ -15,7 +15,7 @@ var update_state = function (region) {
       }].concat(states);
       $.each(states_with_blank, function (pos, state) {
         var opt = $(document.createElement('option'))
-          .attr('value', state.id)
+          .prop('value', state.id)
           .html(state.name);
         state_select.append(opt);
       });

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

@@ -0,0 +1,16 @@
+$(@).ready( ->
+  $('[data-hook=adjustments_new_coupon_code] #add_coupon_code').click ->
+    return if $("#coupon_code").val().length == 0
+    $.ajax
+      type: 'PUT'
+      url: Spree.url(Spree.routes.orders_api + '/' + order_number + '/apply_coupon_code.json');
+      data:
+        coupon_code: $("#coupon_code").val()
+      success: ->
+        window.location.reload();
+      error: (msg) ->
+        if msg.responseJSON["error"]
+          show_flash 'error', msg.responseJSON["error"]
+        else
+          show_flash 'error', "There was a problem adding this coupon code."
+)

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

@@ -1,10 +1,11 @@
 //= require_self
-//= require admin/handlebar_extensions
-//= require admin/variant_autocomplete
-//= require admin/taxon_autocomplete
-//= require admin/option_type_autocomplete
-//= require admin/user_picker
-//= require admin/product_picker
+//= require spree/backend/handlebar_extensions
+//= require spree/backend/variant_autocomplete
+//= require spree/backend/taxon_autocomplete
+//= require spree/backend/option_type_autocomplete
+//= require spree/backend/user_picker
+//= require spree/backend/product_picker
+//= require spree/backend/taxons
 
 /**
 This is a collection of javascript functions and whatnot
@@ -48,12 +49,12 @@ jQuery(function($) {
   // Highlight hovered table column
   $('table tbody tr td.actions a').hover(function(){
     var tr = $(this).closest('tr');
-    var klass = 'highlight action-' + $(this).attr('data-action')
+    var klass = 'highlight action-' + $(this).data('action')
     tr.addClass(klass)
     tr.prev().addClass('before-' + klass);
   }, function(){
     var tr = $(this).closest('tr');
-    var klass = 'highlight action-' + $(this).attr('data-action')
+    var klass = 'highlight action-' + $(this).data('action')
     tr.removeClass(klass)
     tr.prev().removeClass('before-' + klass);
   });
@@ -125,12 +126,12 @@ handle_date_picker_fields = function(){
 $(document).ready(function(){
   handle_date_picker_fields();
   $(".observe_field").on('change', function() {
-    target = $(this).attr("data-update");
-    ajax_indicator = $(this).attr("data-ajax-indicator") || '#busy_indicator';
+    target = $(this).data("update");
+    ajax_indicator = $(this).data("ajax-indicator") || '#busy_indicator';
     $(target).hide();
     $(ajax_indicator).show();
     $.ajax({ dataType: 'html',
-             url: $(this).attr("data-base-url")+encodeURIComponent($(this).val()),
+             url: $(this).data("base-url")+encodeURIComponent($(this).val()),
              type: 'get',
              success: function(data){
                $(target).html(data);
@@ -147,15 +148,15 @@ $(document).ready(function(){
     new_table_row.find("input, select").each(function () {
       var el = $(this);
       el.val("");
-      el.attr("id", el.attr("id").replace(/\d+/, new_id))
-      el.attr("name", el.attr("name").replace(/\d+/, new_id))
+      el.prop("id", el.prop("id").replace(/\d+/, new_id))
+      el.prop("name", el.prop("name").replace(/\d+/, new_id))
     })
     // When cloning a new row, set the href of all icons to be an empty "#"
     // This is so that clicking on them does not perform the actions for the
     // duplicated row
     new_table_row.find("a").each(function () {
       var el = $(this);
-      el.attr('href', '#');
+      el.prop('href', '#');
     })
     $(target).prepend(new_table_row);
   })
@@ -165,16 +166,14 @@ $(document).ready(function(){
     if (confirm(el.data("confirm"))) {
       $.ajax({
         type: 'POST',
-        url: $(this).attr("href"),
+        url: $(this).prop("href"),
         data: {
           _method: 'delete',
           authenticity_token: AUTH_TOKEN
         },
         dataType: 'script',
         success: function(response) {
-          el.parents("tr").fadeOut('hide', function() {
-            $(this).remove();
-          });
+          el.parents("tr").fadeOut('hide');
         },
         error: function(response, textStatus, errorThrown) {
           show_flash('error', response.responseText);
@@ -188,12 +187,12 @@ $(document).ready(function(){
     el = $(this);
     el.prev("input[type=hidden]").val("1");
     el.closest(".fields").hide();
-    if (el.attr("href") == '#') {
+    if (el.prop("href").substr(-1) == '#') {
       el.parents("tr").fadeOut('hide');
-    }else if (el.attr("href")) {
+    }else if (el.prop("href")) {
       $.ajax({
         type: 'POST',
-        url: el.attr("href"),
+        url: el.prop("href"),
         data: {
           _method: 'delete',
           authenticity_token: AUTH_TOKEN
@@ -213,7 +212,7 @@ $(document).ready(function(){
   $('body').on('click', '.select_properties_from_prototype', function(){
     $("#busy_indicator").show();
     var clicked_link = $(this);
-    $.ajax({ dataType: 'script', url: clicked_link.attr("href"), type: 'get',
+    $.ajax({ dataType: 'script', url: clicked_link.prop("href"), type: 'get',
         success: function(data){
           clicked_link.parent("td").parent("tr").hide();
           $("#busy_indicator").hide();
@@ -242,7 +241,7 @@ $(document).ready(function(){
           positions = {};
           $.each($('table.sortable tbody tr'), function(position, obj){
             reg = /spree_(\w+_?)+_(\d+)/;
-            parts = reg.exec($(obj).attr('id'));
+            parts = reg.exec($(obj).prop('id'));
             if (parts) {
               positions['positions['+parts[2]+']'] = position;
             }

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

@@ -1,9 +1,9 @@
 $(function() {
   var calculator_select = $('select#calc_type')
-  var original_calc_type = calculator_select.attr('value');
+  var original_calc_type = calculator_select.prop('value');
   $('.calculator-settings-warning').hide();
   calculator_select.change(function() {
-    if (calculator_select.attr('value') == original_calc_type) {
+    if (calculator_select.prop('value') == original_calc_type) {
       $('div.calculator-settings').show();
       $('.calculator-settings-warning').hide();
       $('.calculator-settings').find('input,textarea').prop("disabled", false);

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

@@ -1,8 +1,8 @@
 $(function() {
-  var original_gtwy_type = $('#gtwy-type').attr('value');
+  var original_gtwy_type = $('#gtwy-type').prop('value');
   $('div#gateway-settings-warning').hide();
   $('#gtwy-type').change(function() { 
-    if ($('#gtwy-type').attr('value') == original_gtwy_type) {
+    if ($('#gtwy-type').prop('value') == original_gtwy_type) {
       $('div.gateway-settings').show();
       $('div#gateway-settings-warning').hide();
     } else {

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

@@ -0,0 +1,9 @@
+//= require handlebars
+Handlebars.registerHelper("t", function(key) {
+  if (Spree.translations[key]) {
+    return Spree.translations[key]
+  } else {
+    console.error("No translation found for " + key + ". Does it exist within spree/admin/shared/_translations.html.erb?")
+  }
+});
+

data/app/assets/javascripts/spree/backend/index.html

@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
+    <style type="text/css">
+      html { height: 100% }
+      body { height: 100%; margin: 0; padding: 0 }
+      #map-canvas { height: 100% }
+    </style>
+    
+  </head>
+  <body>
+    <div id="map-canvas"/>
+  </body>
+</html>

data/app/assets/javascripts/{admin → spree/backend}/nested-attribute.js

@@ -8,9 +8,9 @@ $(function () {
   'use strict';
 
   $('a[id*=nested]').on('click', function () {
-    var template = $(this).attr('href').replace(/.*#/, '');
+    var template = $(this).prop('href').replace(/.*#/, '');
     var html = replace_ids(eval(template));
-    $('#ul-' + $(this).attr('id')).append(html);
+    $('#ul-' + $(this).prop('id')).append(html);
     update_remove_links();
   });
   update_remove_links();

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

@@ -6,10 +6,7 @@ $(document).ready(function () {
       placeholder: Spree.translations.option_type_placeholder,
       multiple: true,
       initSelection: function (element, callback) {
-        var url = Spree.url(Spree.routes.option_type_search, {
-          ids: element.val()
-        });
-        return $.getJSON(url, null, function (data) {
+        return $.getJSON(Spree.routes.option_type_search + '?ids=' + (element.val()), null, function (data) {
           return callback(data);
         });
       },

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

@@ -5,7 +5,7 @@ $(document).ready(function () {
 
     $(input).on('change', function () {
 
-      var id = '#' + $(this).attr('id').replace('_quantity', '_id');
+      var id = '#' + $(this).prop('id').replace('_quantity', '_id');
 
       $.post('/admin/orders/' + $('input#order_number').val() + '/line_items/' + $(id).val(), {
           _method: 'put',

data/app/assets/javascripts/{admin → spree/backend}/payments/edit.js.coffee

@@ -126,7 +126,7 @@ jQuery ($) ->
     $new_input: (width) ->
       amount = @constructor.normalize_amount(@payment.display_amount())
       $('<input />')
-        .attr(id: 'amount', value: amount)
+        .prop(id: 'amount', value: amount)
         .width(width)
         .one
           blur: =>
@@ -144,5 +144,5 @@ jQuery ($) ->
   # Attach ShowPaymentView to each pending payment in the table
   $('.admin tr[data-hook=payments_row]').each ->
     $el = $(@)
-    payment = new Payment($el.attr('id').match(/\d+$/))
+    payment = new Payment($el.prop('id').match(/\d+$/))
     payment.if_pending -> new ShowPaymentView($el, payment)

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

@@ -9,7 +9,7 @@ $(document).ready(function(){
   $('#cvv_link').click(function(event){
     window_name = 'cvv_info';
     window_options = 'left=20,top=20,width=500,height=500,toolbar=0,resizable=0,scrollbars=1';
-    window.open($(this).attr('href'), window_name, window_options);
+    window.open($(this).prop('href'), window_name, window_options);
     event.preventDefault();
   });
 

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

@@ -24,7 +24,7 @@ var initProductActions = function () {
       if ($(this).val() === originalType) {
         $warning.hide();
         $settings.show();
-        $settings.find('input').removeAttr('disabled');
+        $settings.find('input').removeProp('disabled');
       } else {
         $warning.show();
         $settings.hide();
@@ -87,11 +87,4 @@ $(document).ready(function () {
 
   initProductActions();
 
-  // toggle fields for specific events
-  $('#promotion_event_name').on('change', function () {
-    $('#promotion_code_field').toggle($('#promotion_event_name').val() === 'spree.checkout.coupon_code_added');
-    $('#promotion_path_field').toggle($('#promotion_event_name').val() === 'spree.content.visited');
-  });
-  $('#promotion_event_name').change();
-
 });

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

@@ -129,6 +129,7 @@ $(document).ready(function () {
 
 });
 
+
 adjustShipmentItems = function(shipment_number, variant_id, quantity){
     var shipment = _.findWhere(shipments, {number: shipment_number + ''});
     var inventory_units = _.where(shipment.inventory_units, {variant_id: variant_id});

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

@@ -16,5 +16,5 @@
 //= require equalize
 //= require responsive-tables
 //= require spree
-//= require admin/spree-select2
+//= require spree/backend/spree-select2
 //= require_tree .

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

@@ -2,8 +2,8 @@ $(document).ready(function () {
   'use strict';
 
   $('#country').on('change', function () {
-    var new_state_link_href = $('#new_state_link a').attr('href');
-    var selected_country_id = $('#country option:selected').attr('value');
+    var new_state_link_href = $('#new_state_link a').prop('href');
+    var selected_country_id = $('#country option:selected').prop('value');
     var new_link = new_state_link_href.replace(/countries\/(\d+)/,
       'countries/' + selected_country_id);
     $('#new_state_link a').attr('href', new_link);

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

@@ -105,7 +105,7 @@ $ ->
       for variant in variants
         $('#transfer_variant').append($('<option></option>')
                                     .text(variant.name)
-                                    .attr('value', variant.id)
+                                    .prop('value', variant.id)
                                     .data('variant', variant))
 
       $('#transfer_variant').select2()

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

@@ -9,12 +9,12 @@ handle_move = (e, data) ->
   new_parent = data.rslt.np
 
   url = Spree.url(base_url).clone()
-  url.setPath url.path() + '/' + node.attr("id")
+  url.setPath url.path() + '/' + node.prop("id")
   $.ajax
     type: "POST",
     dataType: "json",
     url: url.toString(),
-    data: ({_method: "put", "taxon[parent_id]": new_parent.attr("id"), "taxon[child_index]": position }),
+    data: ({_method: "put", "taxon[parent_id]": new_parent.prop("id"), "taxon[child_index]": position }),
     error: handle_ajax_error
 
   true
@@ -30,10 +30,10 @@ handle_create = (e, data) ->
     type: "POST",
     dataType: "json",
     url: base_url.toString(),
-    data: ({"taxon[name]": name, "taxon[parent_id]": new_parent.attr("id"), "taxon[child_index]": position }),
+    data: ({"taxon[name]": name, "taxon[parent_id]": new_parent.prop("id"), "taxon[child_index]": position }),
     error: handle_ajax_error,
     success: (data,result) ->
-      node.attr('id', data.id)
+      node.prop('id', data.id)
 
 handle_rename = (e, data) ->
   last_rollback = data.rlbk
@@ -41,7 +41,7 @@ handle_rename = (e, data) ->
   name = data.rslt.new_name
 
   url = Spree.url(base_url).clone()
-  url.setPath(url.path() + '/' + node.attr("id"))
+  url.setPath(url.path() + '/' + node.prop("id"))
 
   $.ajax
     type: "POST",
@@ -54,7 +54,7 @@ handle_delete = (e, data) ->
   last_rollback = data.rlbk
   node = data.rslt.obj
   delete_url = base_url.clone()
-  delete_url.setPath delete_url.path() + '/' + node.attr("id")
+  delete_url.setPath delete_url.path() + '/' + node.prop("id")
   jConfirm Spree.translations.are_you_sure_delete, Spree.translations.confirm_delete, (r) ->
     if r
       $.ajax
@@ -74,7 +74,7 @@ root.setup_taxonomy_tree = (taxonomy_id) ->
     root.base_url = Spree.url(Spree.routes.taxonomy_taxons_path)
 
     $.ajax
-      url: Spree.url(base_url.path().replace("/taxons", "/jstree")).toString(),
+      url: base_url.path().replace("/taxons", "/jstree"),
       success: (taxonomy) ->
         last_rollback = null
 
@@ -83,7 +83,7 @@ root.setup_taxonomy_tree = (taxonomy_id) ->
             data: taxonomy,
             ajax:
               url: (e) ->
-                Spree.url(base_url.path() + '/' + e.prop('id') + '/jstree').toString()
+                base_url.path() + '/' + e.prop('id') + '/jstree'
           themes:
             theme: "apple",
             url: Spree.url(Spree.routes.jstree_theme_path)
@@ -98,11 +98,11 @@ root.setup_taxonomy_tree = (taxonomy_id) ->
                 new_parent = m.np
 
                 # no parent or cant drag and drop
-                if !new_parent || node.attr("rel") == "root"
+                if !new_parent || node.prop("rel") == "root"
                   return false
 
                 # can't drop before root
-                if new_parent.attr("id") == "taxonomy_tree" && position == 0
+                if new_parent.prop("id") == "taxonomy_tree" && position == 0
                   return false
 
                 true

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

@@ -0,0 +1,51 @@
+$(document).ready ->
+  window.productTemplate = Handlebars.compile($('#product_template').text());
+  $('#taxon_products').sortable();
+  $('#taxon_products').on "sortstop", (event, ui) ->
+    $.ajax
+      url: Spree.routes.classifications_api,
+      method: 'PUT',
+      data:
+        product_id: ui.item.data('product-id'),
+        taxon_id: $('#taxon_id').val(),
+        position: ui.item.index()
+
+  if $('#taxon_id').length > 0
+    $('#taxon_id').select2
+      dropdownCssClass: "taxon_select_box",
+      placeholder: Spree.translations.find_a_taxon,
+      ajax:
+        url: Spree.routes.taxons_search,
+        datatype: 'json',
+        data: (term, page) ->
+          per_page: 50,
+          page: page,
+          q:
+            name_cont: term
+        results: (data, page) ->
+          more = page < data.pages;
+          results: data['taxons'],
+          more: more
+      formatResult: (taxon) ->
+        taxon.pretty_name;
+      formatSelection: (taxon) ->
+        taxon.pretty_name;
+
+  $('#taxon_id').on "change", (e) ->
+    el = $('#taxon_products')
+    $.ajax
+      url: Spree.routes.taxon_products_api,
+      data:
+        id: e.val
+      success: (data) ->
+        el.empty();
+        if data.products.length == 0
+          $('#sorting_explanation').hide()
+          $('#taxon_products').html("<h4>" + Spree.translations.no_results + "</h4>")
+        else
+          for product in data.products
+            if product.master.images[0] != undefined && product.master.images[0].small_url != undefined
+              product.image = product.master.images[0].small_url
+            el.append(productTemplate({ product: product }))
+          $('#sorting_explanation').show()
+