spree_backend 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1edfef75f84d807cf8c95f2859bc483117a9d906
-  data.tar.gz: 0b68a358dfefe75da826cc499a6f452a4e15a46d
+  metadata.gz: 12021adfcb10f00a2b98a07f498f4edef06d5d24
+  data.tar.gz: 4d536e1bc06c6e6ad0920efa39c156a401b5a6a6
 SHA512:
-  metadata.gz: 0899662385e5da0455968e7b1c39f5bae6e50fbaa78ed448231ecdca68cd083c3187ba7cf699e31efe2eb618daab65da2423148699324aebcbdce57558c5196d
-  data.tar.gz: 0cf2af22c6bbcf29dde8eac4612a1f0aa0ed226b6a1d8c65e0d04f6e85e12b16aa508caca779ec539f39cc1e37a00515dcb9fc58c1a34f4b27d85b8ce9db9314
+  metadata.gz: e1e3f510b20c7c7243503752495bea80ce72982bd284c9e569cbe43f5a4539dc3864a4e279c92c84ce82c5a718870ff00db70bfa927eb25ecba4139acf4d3589
+  data.tar.gz: 50227ecf97ee5deb2ff786c43ea1190738882a39e3992e9a8f7a4feb2a5b0aad34313f7c5f4530399abc49ff0bbc2da2daa63f2e68883007ce4f66285b818bc8

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

@@ -25,10 +25,9 @@ $(document).ready(function() {
   });
 
   // Handle adding new styles
-  var styles_hash_index = 1;
   $(document).on('click', '.add_new_style', function(e) {
     e.preventDefault();
-    $('#new-styles').append(generate_html_for_hash("new_attachment_styles", styles_hash_index));
+    $('#new-styles').append(generate_html_for_hash("new_attachment_styles", new Date().getTime()));
   });
 
   // Handle adding new headers

data/app/assets/javascripts/admin/orders/edit.js

@@ -1,22 +1,5 @@
 $(document).ready(function () {
   'use strict';
 
-  $('#add_line_item_to_order').on('click', function () {
-    if ($('#add_variant_id').val() === '') {
-      return false;
-    }
-
-    var update_target = '#' + $(this).attr('data-update');
-    $.post(this.href, {
-        'line_item[variant_id]': $('#add_variant_id').val(),
-        'line_item[quantity]': $('#add_quantity').val()
-      },
-
-      function (data) {
-        $(update_target).html(data);
-      });
-    return false;
-  });
-
   $('[data-hook="add_product_name"]').find('.variant_autocomplete').variantAutocomplete();
-});
+});

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

@@ -27,7 +27,6 @@ $(document).ready(function () {
         },
         results: function (data, page) {
           var more = page < data.pages;
-          console.log(more)
           return {
             results: data['taxons'],
             more: more

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

@@ -14,7 +14,7 @@ handle_move = (e, data) ->
     type: "POST",
     dataType: "json",
     url: url.toString(),
-    data: ({_method: "put", "taxon[parent_id]": new_parent.attr("id"), "taxon[position]": position }),
+    data: ({_method: "put", "taxon[parent_id]": new_parent.attr("id"), "taxon[child_index]": position }),
     error: handle_ajax_error
 
   true
@@ -30,7 +30,7 @@ handle_create = (e, data) ->
     type: "POST",
     dataType: "json",
     url: base_url.toString(),
-    data: ({"taxon[name]": name, "taxon[parent_id]": new_parent.attr("id"), "taxon[position]": position }),
+    data: ({"taxon[name]": name, "taxon[parent_id]": new_parent.attr("id"), "taxon[child_index]": position }),
     error: handle_ajax_error,
     success: (data,result) ->
       node.attr('id', data.id)

data/app/assets/stylesheets/admin/hacks/_ie.scss

@@ -18,7 +18,6 @@ html.ie {
   }
   .select2-search {
     &:before {
-      position: relative;
       z-index: 10000;
       content: '\f002' !important;
     }
@@ -70,4 +69,4 @@ html.ie8 {
     }
   }
 
-}
+}

data/app/assets/stylesheets/admin/hacks/_mozilla.scss

@@ -22,6 +22,7 @@ html.firefox {
 
   // Fix select2 search input left padding to not overlap search icon
   .select2-search input.select2-input {
+    padding-bottom: 12px !important;
     padding-left: 25px !important;
   }
 
@@ -29,4 +30,4 @@ html.firefox {
   input#image_attachment {
     width: 80%;
   }
-}
+}

data/app/assets/stylesheets/admin/plugins/_select2.scss

@@ -63,7 +63,7 @@
     @extend [class^="icon-"]:before;
 
     position: absolute;
-    top: 13px;
+    top: 16px;
     left: 13px;
   }
 

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

@@ -39,39 +39,22 @@ module Spree
         parent_id = params[:taxon][:parent_id]
         new_position = params[:taxon][:position]
 
-        if parent_id || new_position #taxon is being moved
-          new_parent = parent_id.nil? ? @taxon.parent : Taxon.find(parent_id.to_i)
-          new_position = new_position.nil? ? -1 : new_position.to_i
-
-          # Bellow is a very complicated way of finding where in nested set we
-          # should actually move the taxon to achieve sane results,
-          # JS is giving us the desired position, which was awesome for previous setup,
-          # but now it's quite complicated to find where we should put it as we have
-          # to differenciate between moving to the same branch, up down and into
-          # first position.
-          new_siblings = new_parent.children
-          if new_position <= 0 && new_siblings.empty?
-            @taxon.move_to_child_of(new_parent)
-          elsif new_parent.id != @taxon.parent_id
-            if new_position == 0
-              @taxon.move_to_left_of(new_siblings.first)
-            else
-              @taxon.move_to_right_of(new_siblings[new_position-1])
-            end
-          elsif new_position < new_siblings.index(@taxon)
-            @taxon.move_to_left_of(new_siblings[new_position]) # we move up
-          else
-            @taxon.move_to_right_of(new_siblings[new_position-1]) # we move down
-          end
-          # Reset legacy position, if any extensions still rely on it
-          new_parent.children.reload.each{|t| t.update_column(:position, t.position)}
-
-          if parent_id
-            @taxon.reload
-            @taxon.set_permalink
-            @taxon.save!
-            @update_children = true
-          end
+        if parent_id
+          @taxon.parent = Taxon.find(parent_id.to_i)
+        end
+
+        if new_position
+          @taxon.child_index = new_position.to_i
+        end
+
+        @taxon.save!
+
+        # regenerate permalink
+        if parent_id
+          @taxon.reload
+          @taxon.set_permalink
+          @taxon.save!
+          @update_children = true
         end
 
         if params.key? "permalink_part"

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

@@ -53,14 +53,14 @@
         <div class="field">
           <%= label_tag :mail_port, Spree.t(:smtp_port) %><br />
           <%= text_field_tag :mail_port, Spree::Config[:mail_port], :class => 'fullwidth' %>
-        </div>
+        </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)}, :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.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') %>
         </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)}, :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.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') %>
         </div>
         <div class="field">
           <%= label_tag :smtp_username, Spree.t(:smtp_username) %><br />

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

@@ -2,7 +2,7 @@
 
 <% content_for :page_title do %>
   <i class="icon-arrow-right"></i>
-  <%= Spree.t("activerecord.models.#{@payment.class.to_s.underscore}.one") %>
+  <%= I18n.t(:one, scope: "activerecord.models.spree/payment") %>
   <i class="icon-arrow-right"></i>
   <%= payment_method_name(@payment) %>
 <% end %>

data/app/views/spree/admin/shared/_report_criteria.html.erb

@@ -1,13 +1,13 @@
 <%= search_form_for @search, :url => spree.sales_total_admin_reports_path  do |s| %>
     <div class="date-range-filter field align-center">
         <%= label_tag nil, Spree.t(:start), :class => 'inline' %>
-        <%= s.text_field :created_at_gt, :class => 'datepicker datepicker-from' %>
+        <%= s.text_field :created_at_gt, :class => 'datepicker datepicker-from', :value => datepicker_field_value(params[:q][:created_at_gt]) %>
         
         <span class="range-divider">
           <i class="icon-arrow-right"></i>
         </span>
 
-        <%= s.text_field :created_at_lt, :class => 'datepicker datepicker-to' %>
+        <%= s.text_field :created_at_lt, :class => 'datepicker datepicker-to', :value => datepicker_field_value(params[:q][:created_at_lt]) %>
         <%= label_tag nil, Spree.t(:end), :class => 'inline' %>
     </div>
 

data/config/routes.rb

@@ -11,11 +11,7 @@ Spree::Core::Engine.add_routes do
 
     resources :adjustments
     resources :zones
-    resources :banners do
-      member do
-        post :dismiss
-      end
-    end
+
     resources :countries do
       resources :states
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_backend
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-15 00:00:00.000000000 Z
+date: 2013-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_api
@@ -16,42 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: 2.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: 2.1.3
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: 2.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.2
-- !ruby/object:Gem::Dependency
-  name: deface
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 2.1.3
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -194,7 +180,6 @@ files:
 - app/assets/stylesheets/admin/spree_backend.css
 - app/assets/stylesheets/store/backend.css
 - app/controllers/spree/admin/adjustments_controller.rb
-- app/controllers/spree/admin/banners_controller.rb
 - app/controllers/spree/admin/base_controller.rb
 - app/controllers/spree/admin/countries_controller.rb
 - app/controllers/spree/admin/general_settings_controller.rb
@@ -254,7 +239,6 @@ files:
 - app/views/spree/admin/adjustments/edit.html.erb
 - app/views/spree/admin/adjustments/index.html.erb
 - app/views/spree/admin/adjustments/new.html.erb
-- app/views/spree/admin/banners/_gateway.html.erb
 - app/views/spree/admin/countries/_form.html.erb
 - app/views/spree/admin/countries/edit.html.erb
 - app/views/spree/admin/countries/index.html.erb

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

@@ -1,14 +0,0 @@
-module Spree
-  module Admin
-    class BannersController < Spree::Admin::BaseController
-      def dismiss
-        if params[:id]
-          if user = try_spree_current_user
-            user.dismiss_banner(params[:id])
-          end
-        end
-        render :nothing => true
-      end
-    end
-  end
-end

data/app/views/spree/admin/banners/_gateway.html.erb

@@ -1,16 +0,0 @@
-<% if !try_spree_current_user.try(:dismissed_banner?, :gateway) &&
-      Spree::PaymentMethod.production.where("type != 'Spree::Gateway::Bogus'").empty?  %>
-
-  <div class="banner payment_banner">
-    <p class="message">
-      <%= Spree.t(:payment_processor_choose_banner_text)%>
-      <%= link_to Spree.t(:payment_processor_choose_link), "http://spreecommerce.com/products/payment_processing", :target => '_blank' %>
-    </p>
-
-    <%= link_to Spree.t(:dismiss_banner), dismiss_admin_banner_path(:gateway),
-      :remote => true, :method => :post, :class => 'dismiss', :id => "dismiss-banner" %>
-  </div>
-
-  
-
-<% end %>