solidus_backend 1.0.0.pre → 1.0.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 755295bf34a7606a47e392377d53e2b54bd93bda
-  data.tar.gz: e21e4ba6714ec98ff4b0cf0368c61c67d72ec04e
+  metadata.gz: 19e43bc690cae1fd3d31bf43d19a84913c5a362f
+  data.tar.gz: 28eb88ebb395e74c2749dd64bddc7d38c757d59b
 SHA512:
-  metadata.gz: d0220c146ab349eaa94ddcb6793a1e23c6b12c08585127d35edf683b393c4749a75b804518ee02c76f7892b83656144649d82470f2d28c0cc2e6ef45120adff7
-  data.tar.gz: 80a91b22323c6ca0ff1eaeb15961775ddc65d1064f2d73e4ef60796a6cffc0704f97d7181e0a17d4f16387da3429e0eac94e24cdae994f819a000e8e993b8f46
+  metadata.gz: 9d6abcd850e647d41c9429d5b73b04aff715a364c2501e5fb7203cdbe7a8366587037c8c7b98b5069117b310be3d048733df5f029fdf8c2b2be54c3bc28b8f54
+  data.tar.gz: af36c277c5df47747c78193f357668ff30b2909b59fcedcb11cc11a8c8850749676f624a7331088524f2afa54924542cff1e35f5ad105ae5ddf41a1718a53671

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

@@ -6,15 +6,10 @@
 //= require jquery-ui/autocomplete
 //= require modernizr
 //= require jquery.cookie
-//= require jquery.delayedobserver
 //= require jquery.jstree/jquery.jstree
 //= require jquery.alerts/jquery.alerts
 //= require jquery.powertip
 //= require jquery.vAlign
-//= require css_browser_selector_dev
-//= require spin
-//= require trunk8
-//= require jquery.adaptivemenu
 //= require equalize
 //= require responsive-tables
 //= require underscore-min
@@ -24,40 +19,3 @@
 //= require spree/backend/spree-select2
 //= require_tree .
 
-Spree.routes.checkouts_api = Spree.pathFor('api/checkouts')
-Spree.routes.classifications_api = Spree.pathFor('api/classifications')
-Spree.routes.clear_cache = Spree.pathFor('admin/general_settings/clear_cache')
-Spree.routes.option_type_search = Spree.pathFor('api/option_types')
-Spree.routes.orders_api = Spree.pathFor('api/orders')
-Spree.routes.product_search = Spree.pathFor('api/products')
-Spree.routes.shipments_api = Spree.pathFor('api/shipments')
-Spree.routes.checkouts_api = Spree.pathFor('api/checkouts')
-Spree.routes.stock_locations_api = Spree.pathFor('api/stock_locations')
-Spree.routes.taxon_products_api = Spree.pathFor('api/taxons/products')
-Spree.routes.taxons_search = Spree.pathFor('api/taxons')
-Spree.routes.user_search = Spree.pathFor('admin/search/users')
-Spree.routes.variants_api = Spree.pathFor('api/variants')
-
-Spree.routes.line_items_api = function(order_id) {
-  return Spree.pathFor('api/orders/' + order_id + '/line_items')
-}
-
-Spree.routes.payments_api = function(order_id) {
-  return Spree.pathFor('api/orders/' + order_id + '/payments')
-}
-
-Spree.routes.stock_items_api = function(stock_location_id) {
-  return Spree.pathFor('api/stock_locations/' + stock_location_id + '/stock_items')
-}
-
-Spree.routes.receive_transfer_items_api = function(stockTransferNumber) {
-  return Spree.pathFor('api/stock_transfers/' + stockTransferNumber + '/receive')
-}
-
-Spree.routes.create_transfer_items_api = function(stockTransferNumber) {
-  return Spree.pathFor('api/stock_transfers/' + stockTransferNumber + '/transfer_items')
-}
-
-Spree.routes.update_transfer_items_api = function(stockTransferNumber, itemId) {
-  return Spree.pathFor('api/stock_transfers/' + stockTransferNumber + '/transfer_items/' + itemId)
-}

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

@@ -18,15 +18,6 @@ jQuery(function($) {
   // Vertical align of checkbox fields
   $('.field.checkbox label').vAlign()
 
-  <% # Re-adjusting admin menu during test causes tests to fail,
-     # like states_spec and shipping_methods_spec. Let's not do this. %>
-  <% unless Rails.env.test? %>
-    $('.main-menu-wrapper ul').AdaptiveMenu({
-      text: "<a href='#'><i class='fa fa-chevron-down'></i> " + Spree.translations.more + "</a>",
-      klass: "dropdown"
-    });
-  <% end %>
-
   // Add some tips
   $('.with-tip').powerTip({
     smartPlacement: true,
@@ -59,18 +50,6 @@ jQuery(function($) {
     tr.prev().removeClass('before-' + klass);
   });
 
-  // Trunkate text in page_title that didn't fit
-  var truncate_elements = $('.truncate');
-
-  truncate_elements.each(function(){
-    $(this).trunk8();
-  });
-  $(window).resize(function (event) {
-    truncate_elements.each(function(){
-      $(this).trunk8();
-    })
-  });
-
   // Make height of dt/dd elements the same
   $("dl").equalize('outerHeight');
 
@@ -268,10 +247,6 @@ $(document).ready(function(){
       });
   });
 
-  $('a.dismiss').click(function() {
-    $(this).parent().fadeOut();
-  });
-
   window.Spree.advanceOrder = function() {
       Spree.ajax({
           type: "PUT",

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

@@ -1,27 +1,7 @@
-$(document).ready ->
-  opts =
-    lines: 11
-    length: 2
-    width: 3
-    radius: 9
-    corners: 1
-    rotate: 0
-    color: '#fff'
-    speed: 0.8
-    trail: 48
-    shadow: false
-    hwaccel: true
-    className: 'spinner'
-    zIndex: 2e9
-    top: 'auto'
-    left: 'auto'
-
-  target  = document.getElementById("spinner")
-  spinner = new Spinner(opts).spin(target)
-
+$ ->
   $(document).ajaxStart ->
-    $("#progress").stop(true, true).fadeIn()
+    $("#progress").show()
 
   $(document).ajaxStop ->
-    $("#progress").fadeOut()
+    $("#progress").hide()
 

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

@@ -0,0 +1,37 @@
+Spree.routes.checkouts_api = Spree.pathFor('api/checkouts')
+Spree.routes.classifications_api = Spree.pathFor('api/classifications')
+Spree.routes.clear_cache = Spree.pathFor('admin/general_settings/clear_cache')
+Spree.routes.option_type_search = Spree.pathFor('api/option_types')
+Spree.routes.orders_api = Spree.pathFor('api/orders')
+Spree.routes.product_search = Spree.pathFor('api/products')
+Spree.routes.shipments_api = Spree.pathFor('api/shipments')
+Spree.routes.checkouts_api = Spree.pathFor('api/checkouts')
+Spree.routes.stock_locations_api = Spree.pathFor('api/stock_locations')
+Spree.routes.taxon_products_api = Spree.pathFor('api/taxons/products')
+Spree.routes.taxons_search = Spree.pathFor('api/taxons')
+Spree.routes.user_search = Spree.pathFor('admin/search/users')
+Spree.routes.variants_api = Spree.pathFor('api/variants')
+
+Spree.routes.line_items_api = function(order_id) {
+  return Spree.pathFor('api/orders/' + order_id + '/line_items')
+}
+
+Spree.routes.payments_api = function(order_id) {
+  return Spree.pathFor('api/orders/' + order_id + '/payments')
+}
+
+Spree.routes.stock_items_api = function(stock_location_id) {
+  return Spree.pathFor('api/stock_locations/' + stock_location_id + '/stock_items')
+}
+
+Spree.routes.receive_transfer_items_api = function(stockTransferNumber) {
+  return Spree.pathFor('api/stock_transfers/' + stockTransferNumber + '/receive')
+}
+
+Spree.routes.create_transfer_items_api = function(stockTransferNumber) {
+  return Spree.pathFor('api/stock_transfers/' + stockTransferNumber + '/transfer_items')
+}
+
+Spree.routes.update_transfer_items_api = function(stockTransferNumber, itemId) {
+  return Spree.pathFor('api/stock_transfers/' + stockTransferNumber + '/transfer_items/' + itemId)
+}

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

@@ -132,7 +132,7 @@ $(document).ready(function () {
 
       var show = link.parents('tbody').find('tr.show-tracking');
       show.toggle();
-      show.find('.tracking-value').html($("<strong>").html("<%= Spree.t(:tracking) %>: ")).append(data.tracking);
+      show.find('.tracking-value').html($("<strong>").html(Spree.translations.tracking + ": ")).append(data.tracking);
     });
   });
 });

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

@@ -1,20 +1,21 @@
 jQuery ->
   el = $('#stock_movement_stock_item_id')
-  el.select2
-    placeholder: "Find a stock item" # translate
-    ajax:
-      url: Spree.url(Spree.routes.stock_items_api(el.data('stock-location-id')))
-      params: { "headers": { "X-Spree-Token": Spree.api_key } }
-      data: (term, page) ->
-        q:
-          variant_product_name_cont: term
-        per_page: 50
-        page: page
-        token: Spree.api_key
-      results: (data, page) ->
-        more = (page * 50) < data.count
-        return { results: data.stock_items, more: more }
-    formatResult: (stock_item) ->
-      variantTemplate({ variant: stock_item.variant })
-    formatSelection: (stock_item) ->
-      "#{stock_item.variant.name} (#{stock_item.variant.options_text})"
+  if el.length
+    el.select2
+      placeholder: "Find a stock item" # translate
+      ajax:
+        url: Spree.url(Spree.routes.stock_items_api(el.data('stock-location-id')))
+        params: { "headers": { "X-Spree-Token": Spree.api_key } }
+        data: (term, page) ->
+          q:
+            variant_product_name_cont: term
+          per_page: 50
+          page: page
+          token: Spree.api_key
+        results: (data, page) ->
+          more = (page * 50) < data.count
+          return { results: data.stock_items, more: more }
+      formatResult: (stock_item) ->
+        variantTemplate({ variant: stock_item.variant })
+      formatSelection: (stock_item) ->
+        "#{stock_item.variant.name} (#{stock_item.variant.options_text})"

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

@@ -0,0 +1,40 @@
+$(document).ready ->
+  return unless $('#sc_memo_edit_form').length > 0
+
+  $('.js-edit-memo').on('click', (ev) =>
+    ev.preventDefault()
+    originalValue = $('#memo-edit-row').data('original-value')
+    $('#sc_memo_edit_form').find("[name='store_credit[memo]']").val(originalValue)
+    $('#memo-display-row').addClass('hidden')
+    $('#memo-edit-row').removeClass('hidden')
+  )
+
+  $('.js-save-memo').on('click', (ev) ->
+    ev.preventDefault()
+    Spree.ajax(
+      $('#sc_memo_edit_form').attr('url'), {
+        data: $('#sc_memo_edit_form').serialize(),
+        dataType: 'json',
+        method: 'put',
+        success: ( (response) =>
+          newValue = $('#sc_memo_edit_form').find("[name='store_credit[memo]']").val()
+          $('#memo-edit-row').data('original-value', newValue)
+          $('#memo-display-row').find('.js-memo-text').text(newValue)
+          hideEditMemoForm()
+          show_flash('success', response.message)
+        ),
+        error: ( (xhr, status) =>
+          show_flash('error', xhr.responseJSON.message)
+        )
+      }
+    )
+  )
+
+  $('.js-cancel-memo').on('click', (ev) =>
+    ev.preventDefault()
+    hideEditMemoForm()
+  )
+
+  hideEditMemoForm = ->
+    $('#memo-edit-row').addClass('hidden')
+    $('#memo-display-row').removeClass('hidden')

data/app/assets/javascripts/spree/backend/variant_autocomplete.js.coffee.erb

@@ -15,8 +15,9 @@ $.fn.variantAutocomplete = (searchOptions = {}) ->
     placeholder: Spree.translations.variant_placeholder
     minimumInputLength: 3
     initSelection: (element, callback) ->
-      $.get Spree.routes.variants_search + "/" + element.val(), {}, (data) ->
-        callback data
+      Spree.ajax
+        url: Spree.routes.variants_api + "/" + element.val()
+        success: callback
     ajax:
       url: Spree.routes.variants_api
       datatype: "json"

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

@@ -8,7 +8,6 @@
 
   .wrapper {
     border-radius: 10px;
-    top: -10px;
     position: absolute;
     left: 50%;
     width: 200px;
@@ -20,10 +19,7 @@
   }
 
   #spinner {
-    position: absolute;
-    top: 10px;
-    left: 50%;
-    margin-left: -5px;
+    margin: auto;
   }
 
   .progress-message {
@@ -33,3 +29,22 @@
     text-transform: uppercase;
   }
 }
+
+.spinner {
+  position: relative;
+  width: 30px;
+  height: 30px;
+  border: 6px solid rgba($color-spinner, 0.2);
+  border-left-color: rgba($color-spinner, 1);
+  @include animation(spinner 1s infinite linear);
+  border-radius: 50%;
+}
+
+@include keyframes(spinner) {
+  from {
+    @include transform(rotate(0));
+  }
+  to {
+    @include transform(rotate(360deg));
+  }
+}

data/app/assets/stylesheets/spree/backend/globals/_variables.scss

@@ -34,6 +34,9 @@ $color-success:                  $color-2 !default;
 $color-notice:                   $color-6 !default;
 $color-error:                    $color-5 !default;
 
+// Color for spinner
+$color-spinner: #fff;
+
 // Table colors
 $color-tbl-odd:                  $color-1 !default;
 $color-tbl-even:                 very-light($color-3, 4) !default;

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

@@ -1,6 +1,8 @@
 @import "spree/backend/globals/variables";
 
 .return-items-table {
+  table-layout: fixed;
+
   .refund-amount-input {
     width: 80px;
   }

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

@@ -0,0 +1,24 @@
+#sc_memo_edit_form {
+  #store_credit_memo {
+    width: 100%;
+  }
+}
+
+#sc-detail-table {
+  tr {
+    &:hover {
+      td {
+        background-color: inherit;
+      }
+    }
+    td {
+      border: none;
+    }
+  }
+}
+
+#sc-current-balance {
+  width: 100%;
+  padding: 20px 5px;
+  text-align: right;
+}

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

@@ -1,8 +1,8 @@
+@import 'bourbon';
+
 @import 'spree/backend/globals/functions';
 @import 'spree/backend/globals/variables_override';
 @import 'spree/backend/globals/variables';
-@import 'spree/backend/globals/mixins';
-@import 'spree/backend/globals/mixins/border_radius';
 
 @import 'spree/backend/shared/typography';
 @import 'spree/backend/shared/tables';
@@ -42,10 +42,7 @@
 @import 'spree/backend/sections/log_entries';
 @import 'spree/backend/sections/taxons';
 @import 'spree/backend/sections/users';
+@import 'spree/backend/sections/store_credits';
 @import 'spree/backend/sections/stock_management';
 @import 'spree/backend/sections/transfer_items';
 @import 'spree/backend/sections/stock_transfers';
-
-@import 'spree/backend/hacks/mozilla';
-@import 'spree/backend/hacks/opera';
-@import 'spree/backend/hacks/ie';

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

@@ -0,0 +1,6 @@
+module Spree
+  module Admin
+    class AdjustmentReasonsController < ResourceController
+    end
+  end
+end

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

@@ -12,6 +12,8 @@ module Spree
 
       before_action :find_adjustment, only: [:destroy, :edit, :update]
 
+      helper_method :reasons_for
+
       def index
         @adjustments = @order.all_adjustments.order("created_at ASC")
       end
@@ -33,6 +35,12 @@ module Spree
         parent.adjustments.build(order: parent)
       end
 
+      def reasons_for(adjustment)
+        [
+          AdjustmentReason.active.to_a,
+          @adjustment.adjustment_reason,
+        ].flatten.compact.uniq.sort_by { |r| r.name.downcase }
+      end
     end
   end
 end

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

@@ -44,6 +44,11 @@ module Spree
       def load_form_data
         return_items = @order.inventory_units.map(&:current_or_new_return_item).reject(&:customer_return_id)
         @rma_return_items, @new_return_items = return_items.partition(&:return_authorization_id)
+        load_return_reasons
+      end
+
+      def load_return_reasons
+        @reasons = Spree::ReturnReason.reasons_for_return_items(@customer_return.return_items)
       end
 
       def permitted_resource_params