spree_backend 2.1.5 → 2.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a67893cb1246afcc0b5633e064a985fc5bef80a9
-  data.tar.gz: 461eab8dabfc977a06b14203561983a768120bb7
+  metadata.gz: d66b5d26cfa4ae38fe8681bea1a28383fc734681
+  data.tar.gz: 08484ecf9094fd841dfb2ab5f3d831f473c533bd
 SHA512:
-  metadata.gz: 650dcdb0372b5c022d2fdb616572b8da81809c44e1bd586d1ba35c3c5ff293f6aa618802b9e751c8e92e6a0323000d81389cedffe4b1f9dda9fe5fea9363ca28
-  data.tar.gz: 8045ce114eeb4db7729a73994d6a108377b55aa4398750faa7746145add558df4a86a870fdf1f1448997ad7aeb8fad198a6d23c9b1f28e4486790c65842934c7
+  metadata.gz: 7018f4e61a2db7c7b3d5283526610ef38ebc7803f5fd5e94b515311a713bea750510e49d238910c4efab63d99f2694b85f11624d6e03204bc03be636afe3f8a2
+  data.tar.gz: 222bd1b2aaf5844266ae88910c24d24b6939e945a445a004c518e9660b05e45e9c43d59addf5124c1d7232a82be5e7008bb6afdb0994c30690c4e4ccb053002f

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

@@ -172,7 +172,9 @@ $(document).ready(function(){
         },
         dataType: 'script',
         success: function(response) {
-          el.parents("tr").fadeOut('hide');
+          el.parents("tr").fadeOut('hide', function() {
+            $(this).remove();
+          });
         },
         error: function(response, textStatus, errorThrown) {
           show_flash('error', response.responseText);

data/app/assets/javascripts/admin/option_type_autocomplete.js.erb

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

data/app/assets/javascripts/admin/taxonomy.js.coffee

@@ -74,7 +74,7 @@ root.setup_taxonomy_tree = (taxonomy_id) ->
     root.base_url = Spree.url(Spree.routes.taxonomy_taxons_path)
 
     $.ajax
-      url: base_url.path().replace("/taxons", "/jstree"),
+      url: Spree.url(base_url.path().replace("/taxons", "/jstree")).toString(),
       success: (taxonomy) ->
         last_rollback = null
 
@@ -83,7 +83,7 @@ root.setup_taxonomy_tree = (taxonomy_id) ->
             data: taxonomy,
             ajax:
               url: (e) ->
-                base_url.path() + '/' + e.attr('id') + '/jstree'
+                Spree.url(base_url.path() + '/' + e.prop('id') + '/jstree').toString()
           themes:
             theme: "apple",
             url: Spree.url(Spree.routes.jstree_theme_path)

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

@@ -0,0 +1,7 @@
+$ ->
+  if $('.new_payment').is('*')
+    $('.payment-method-settings fieldset').addClass('hidden').first().removeClass('hidden')
+    $('input[name="payment[payment_method_id]"]').click ()->
+      $('.payment-method-settings fieldset').addClass('hidden')
+      id = $(this).parents('li').data('id')
+      $("fieldset##{id}").removeClass('hidden')

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

@@ -6,7 +6,7 @@ module Spree
       before_filter :set_zones, :only => [:create, :update]
 
       def destroy
-        @object.touch :deleted_at
+        @object.destroy
 
         flash[:success] = flash_message_for(@object, :successfully_removed)
 

data/app/views/spree/admin/mail_methods/_form.html.erb

@@ -56,11 +56,15 @@
         </div>  
         <div class="field">
           <%= label_tag :secure_connection_type, Spree.t(:secure_connection_type) %><br />
-          <%= select_tag(:secure_connection_type, options_from_collection_for_select(Spree::Core::MailSettings::SECURE_CONNECTION_TYPES.map{|w| Spree.t(w.downcase.to_sym, :default => w, :scope => 'mail_settings.security')}, :to_s, :to_s, Spree::Config[:secure_connection_type]), :class => 'select2 fullwidth') %>
+          <%= select_tag(:secure_connection_type,
+                         options_from_collection_for_select(Spree::Core::MailSettings::SECURE_CONNECTION_TYPES, :to_s, :to_s, Spree::Config[:secure_connection_type]),
+                         :class => 'select2 fullwidth') %>
         </div>
         <div class="field">
           <%= label_tag :mail_auth_type, Spree.t(:smtp_authentication_type) %><br />
-          <%= select_tag(:mail_auth_type, options_from_collection_for_select(Spree::Core::MailSettings::MAIL_AUTH.map{|w| Spree.t(w.downcase.to_sym, :default => w, :scope => 'mail_settings.auth')}, :to_s, :to_s, Spree::Config[:mail_auth_type]), :class => 'select2 fullwidth') %>
+          <%= select_tag(:mail_auth_type,
+                         options_from_collection_for_select(Spree::Core::MailSettings::MAIL_AUTH, :to_s, :to_s, Spree::Config[:mail_auth_type]),
+                         :class => 'select2 fullwidth') %>
         </div>
         <div class="field">
           <%= label_tag :smtp_username, Spree.t(:smtp_username) %><br />

data/app/views/spree/admin/orders/_shipment.html.erb

@@ -41,7 +41,7 @@
             <div class="field alpha five columns">
               <%= label_tag 'selected_shipping_rate_id', Spree.t(:shipping_method) %>
               <%= select_tag :selected_shipping_rate_id,
-                    options_for_select(shipment.shipping_rates.with_shipping_method.map {|sr| ["#{sr.name} #{sr.display_price}", sr.id] }, shipment.selected_shipping_rate_id),
+                    options_for_select(shipment.shipping_rates.map {|sr| ["#{sr.name} #{sr.display_price}", sr.id] }, shipment.selected_shipping_rate_id),
                     {:class => 'select2 fullwidth', :data => {'shipment-number' => shipment.number } } %>
             </div>
 

data/app/views/spree/admin/orders/customer_details/_form.html.erb

@@ -14,22 +14,16 @@
         <div class="field">
           <%= label_tag nil, Spree.t(:guest_checkout) %>
           <ul>
-            <% if @order.completed? %>
-              <li>
-                <%= @order.user.nil? ? Spree.t(:say_yes) : Spree.t(:say_no) %>
-              </li>
-            <% else %>
-              <% guest = @order.user.nil? %>
-              <li>
-                <%= radio_button_tag :guest_checkout, true, guest %>
-                <%= label_tag :guest_checkout_true, Spree.t(:say_yes) %>
-              </li>
-              <li>
-                <%= radio_button_tag :guest_checkout, false, !guest, :disabled => @order.cart? %>
-                <%= label_tag :guest_checkout_false, Spree.t(:say_no) %>
-              </li>
-              <%= hidden_field_tag :user_id, @order.user_id %>
-            <% end %>
+            <% guest = @order.user.nil? %>
+            <li>
+              <%= radio_button_tag :guest_checkout, true, guest %>
+              <%= label_tag :guest_checkout_true, Spree.t(:say_yes) %>
+            </li>
+            <li>
+              <%= radio_button_tag :guest_checkout, false, !guest, :disabled => @order.cart? %>
+              <%= label_tag :guest_checkout_false, Spree.t(:say_no) %>
+            </li>
+            <%= hidden_field_tag :user_id, @order.user_id %>
           </ul>
         </div>
       </div>

data/app/views/spree/admin/payments/_form.html.erb

@@ -10,7 +10,7 @@
       <label><%= Spree.t(:payment_method) %></label>
       <ul>
         <% @payment_methods.each do |method| %>
-          <li>
+          <li data-id="<%= Spree.t(method.name, :scope => :payment_methods, :default => method.name).parameterize %>">
             <label data-hook="payment_method_field">
               <%= radio_button_tag 'payment[payment_method_id]', method.id, method == @payment_method %>
               <%= Spree.t(method.name, :scope => :payment_methods, :default => method.name) %>

data/lib/spree/backend/engine.rb

@@ -23,6 +23,7 @@ module Spree
           jqPlot/excanvas.min.js
           admin/images/new.js
           jquery.jstree/themes/apple/*
+          fontawesome-webfont*
         ]
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_backend
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.1.6
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-18 00:00:00.000000000 Z
+date: 2014-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_api
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.5
+        version: 2.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.5
+        version: 2.1.6
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.5
+        version: 2.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.5
+        version: 2.1.6
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -141,6 +141,7 @@ files:
 - app/assets/javascripts/admin/variant_autocomplete.js.erb
 - app/assets/javascripts/admin/variant_management.js.coffee
 - app/assets/javascripts/admin/zone.js.coffee
+- app/assets/javascripts/spree/backend/select_payments.js.coffee
 - app/assets/javascripts/store/backend.js
 - app/assets/stylesheets/admin/components/_actions.scss
 - app/assets/stylesheets/admin/components/_date-picker.scss
@@ -509,7 +510,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubyforge_project: spree_backend
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: backend e-commerce functionality for the Spree project.