spree_core 1.1.2.rc1 → 1.1.2

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

@@ -1,40 +1,42 @@
-<div class="clearfix">
-  <div class="left" data-hook="variants">
+<div data-hook="admin_variant_form_fields">
+  <div class="clearfix">
+    <div class="left" data-hook="variants">
 
-    <% @product.options.each do |option| %>
-      <p data-hook="presentation">
-        <%= label :new_variant, option.option_type.presentation %><br />
-        <% if @variant.new_record? %>
-          <%= select(:new_variant, option.option_type.presentation,
-            option.option_type.option_values.collect {|ov| [ ov.presentation, ov.id ] },
-            {})
-          %>
-        <% else %>
-          <% opt = @variant.option_values.detect {|o| o.option_type == option.option_type }.presentation %>
-          <%= text_field(:new_variant,  option.option_type.presentation, :value => opt, :disabled => 'disabled') %>
-        <% end %>
-      </p>
-    <% end %>
+      <% @product.options.each do |option| %>
+        <p data-hook="presentation">
+          <%= label :new_variant, option.option_type.presentation %><br />
+          <% if @variant.new_record? %>
+            <%= select(:new_variant, option.option_type.presentation,
+              option.option_type.option_values.collect {|ov| [ ov.presentation, ov.id ] },
+              {})
+            %>
+          <% else %>
+            <% opt = @variant.option_values.detect {|o| o.option_type == option.option_type }.presentation %>
+            <%= text_field(:new_variant,  option.option_type.presentation, :value => opt, :disabled => 'disabled') %>
+          <% end %>
+        </p>
+      <% end %>
 
-    <p data-hook="sku"><%= f.label :sku, t(:sku) %><br />
-    <%= f.text_field :sku %></p>
+      <p data-hook="sku"><%= f.label :sku, t(:sku) %><br />
+      <%= f.text_field :sku %></p>
 
-    <p data-hook="price"><%= f.label :price, t(:price) %>:<br />
-    <%= f.text_field :price, :value => number_with_precision(@variant.price, :precision => 2) %></p>
+      <p data-hook="price"><%= f.label :price, t(:price) %>:<br />
+      <%= f.text_field :price, :value => number_with_precision(@variant.price, :precision => 2) %></p>
 
-    <p data-hook="cost_price"><%= f.label :cost_price, t(:cost_price) %>:<br />
-    <%= f.text_field :cost_price, :value => number_with_precision(@variant.cost_price, :precision => 2) %></p>
+      <p data-hook="cost_price"><%= f.label :cost_price, t(:cost_price) %>:<br />
+      <%= f.text_field :cost_price, :value => number_with_precision(@variant.cost_price, :precision => 2) %></p>
 
-    <% if Spree::Config[:track_inventory_levels] %>
-      <p data-hook="on_hand"><%= f.label :on_hand, t(:on_hand) %>: <br />
-      <%= f.text_field :on_hand %></p>
-    <% end %>
-  </div>
-  <div class="right">
+      <% if Spree::Config[:track_inventory_levels] %>
+        <p data-hook="on_hand"><%= f.label :on_hand, t(:on_hand) %>: <br />
+        <%= f.text_field :on_hand %></p>
+      <% end %>
+    </div>
+    <div class="right">
 
-    <% Spree::Variant.additional_fields.select{|af| af[:only].nil? || af[:only].include?(:variant) }.each do |field| %>
-      <%= render :partial => 'spree/admin/shared/additional_field', :locals => { :field => field, :f => f } %>
-    <% end %>
+      <% Spree::Variant.additional_fields.select{|af| af[:only].nil? || af[:only].include?(:variant) }.each do |field| %>
+        <%= render :partial => 'spree/admin/shared/additional_field', :locals => { :field => field, :f => f } %>
+      <% end %>
 
+    </div>
   </div>
 </div>

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

@@ -1,29 +1,31 @@
-<%= zone_form.field_container :name do %>
-  <%= zone_form.label :name, t(:name) %><br />
-  <%= zone_form.text_field :name %>
-<% end %>
+<div data-hook="admin_zone_form_fields">
+  <%= zone_form.field_container :name do %>
+    <%= zone_form.label :name, t(:name) %><br />
+    <%= zone_form.text_field :name %>
+  <% end %>
 
-<%= zone_form.field_container :description do %>
-  <%= zone_form.label :description, t(:description) %><br />
-  <%= zone_form.text_field :description %>
-<% end %>
+  <%= zone_form.field_container :description do %>
+    <%= zone_form.label :description, t(:description) %><br />
+    <%= zone_form.text_field :description %>
+  <% end %>
 
-<p data-hook="default">
-  <td><%= t(:default_tax_zone) %></td>
-  <td><%= zone_form.check_box :default_tax %></td>
-</p>
+  <p data-hook="default">
+    <td><%= t(:default_tax_zone) %></td>
+    <td><%= zone_form.check_box :default_tax %></td>
+  </p>
 
-<p data-hook="type">
-  <%= label_tag nil, t(:type) %><br />
-  <label class="sub">
-    <%= zone_form.radio_button('kind', 'country', { :id => 'country_based' }) %>
-    <%= t(:country_based) %>
-  </label> &nbsp;
-  <label class="sub">
-    <%= zone_form.radio_button('kind', 'state', { :id => 'state_based' }) %>
-    <%= t(:state_based) %>
-  </label> &nbsp;
-</p>
+  <p data-hook="type">
+    <%= label_tag nil, t(:type) %><br />
+    <label class="sub">
+      <%= zone_form.radio_button('kind', 'country', { :id => 'country_based' }) %>
+      <%= t(:country_based) %>
+    </label> &nbsp;
+    <label class="sub">
+      <%= zone_form.radio_button('kind', 'state', { :id => 'state_based' }) %>
+      <%= t(:state_based) %>
+    </label> &nbsp;
+  </p>
 
-<%= render :partial => 'member_type', :locals => { :type => 'country', :zone_form => zone_form }%>
-<%= render :partial => 'member_type', :locals => { :type => 'state', :zone_form => zone_form } %>
+  <%= render :partial => 'member_type', :locals => { :type => 'country', :zone_form => zone_form }%>
+  <%= render :partial => 'member_type', :locals => { :type => 'state', :zone_form => zone_form } %>
+</div>

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "1.1.2.rc1"
+    "1.1.2"
   end
 end

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 1.1.2.rc1
-  prerelease: 6
+  version: 1.1.2
+  prerelease: 
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-25 00:00:00.000000000Z
+date: 2012-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
-  requirement: &70099197054680 !ruby/object:Gem::Requirement
+  requirement: &70163167995040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 0.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70099197054680
+  version_requirements: *70163167995040
 - !ruby/object:Gem::Dependency
   name: nested_set
-  requirement: &70099197053340 !ruby/object:Gem::Requirement
+  requirement: &70163167992340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 1.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *70099197053340
+  version_requirements: *70163167992340
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70099197052140 !ruby/object:Gem::Requirement
+  requirement: &70163167989400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70099197052140
+  version_requirements: *70163167989400
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70099197050120 !ruby/object:Gem::Requirement
+  requirement: &70163168002860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.11
   type: :runtime
   prerelease: false
-  version_requirements: *70099197050120
+  version_requirements: *70163168002860
 - !ruby/object:Gem::Dependency
   name: state_machine
-  requirement: &70099197048020 !ruby/object:Gem::Requirement
+  requirement: &70163167999340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -65,10 +65,10 @@ dependencies:
         version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70099197048020
+  version_requirements: *70163167999340
 - !ruby/object:Gem::Dependency
   name: ffaker
-  requirement: &70099197045240 !ruby/object:Gem::Requirement
+  requirement: &70163167996220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.12.0
   type: :runtime
   prerelease: false
-  version_requirements: *70099197045240
+  version_requirements: *70163167996220
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70099197043420 !ruby/object:Gem::Requirement
+  requirement: &70163168010080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '2.7'
   type: :runtime
   prerelease: false
-  version_requirements: *70099197043420
+  version_requirements: *70163168010080
 - !ruby/object:Gem::Dependency
   name: aws-sdk
-  requirement: &70099197042100 !ruby/object:Gem::Requirement
+  requirement: &70163168007600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 1.3.4
   type: :runtime
   prerelease: false
-  version_requirements: *70099197042100
+  version_requirements: *70163168007600
 - !ruby/object:Gem::Dependency
   name: ransack
-  requirement: &70099197040680 !ruby/object:Gem::Requirement
+  requirement: &70163168005980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *70099197040680
+  version_requirements: *70163168005980
 - !ruby/object:Gem::Dependency
   name: activemerchant
-  requirement: &70099197039820 !ruby/object:Gem::Requirement
+  requirement: &70163168019780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -120,10 +120,10 @@ dependencies:
         version: 1.20.4
   type: :runtime
   prerelease: false
-  version_requirements: *70099197039820
+  version_requirements: *70163168019780
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70099197039120 !ruby/object:Gem::Requirement
+  requirement: &70163168017400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: 3.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *70099197039120
+  version_requirements: *70163168017400
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &70099197038300 !ruby/object:Gem::Requirement
+  requirement: &70163168015260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: 0.13.0
   type: :runtime
   prerelease: false
-  version_requirements: *70099197038300
+  version_requirements: *70163168015260
 - !ruby/object:Gem::Dependency
   name: deface
-  requirement: &70099197037420 !ruby/object:Gem::Requirement
+  requirement: &70163168013540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *70099197037420
+  version_requirements: *70163168013540
 - !ruby/object:Gem::Dependency
   name: stringex
-  requirement: &70099197014760 !ruby/object:Gem::Requirement
+  requirement: &70163168012340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -164,7 +164,7 @@ dependencies:
         version: 1.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *70099197014760
+  version_requirements: *70163168012340
 description: Required dependency for Spree
 email: sean@spreecommerce.com
 executables: []
@@ -299,7 +299,6 @@ files:
 - app/assets/javascripts/admin/payments/new.js
 - app/assets/javascripts/admin/products.js
 - app/assets/javascripts/admin/shipping_methods.js
-- app/assets/javascripts/admin/spree.routes.js.erb
 - app/assets/javascripts/admin/spree_core.js
 - app/assets/javascripts/admin/taxonomy.js
 - app/assets/javascripts/admin/underscore-min.js
@@ -968,9 +967,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: 3949392994446669213
 requirements:
 - none
 rubyforge_project: spree_core

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

@@ -1,30 +0,0 @@
-// This object provides dynamically generated Rails routes in Javascript.
-// Since Rails does not provide url_helpers in js.erb files, we have to use this little neat hack.
-// Found via https://github.com/magiclabs/alchemy_cms
-
-<% self.class.instance_eval { include Spree::Core::Engine.routes.url_helpers } %>
-
-if (typeof(Spree) === 'undefined') {
-  var Spree = {};
-}
-
-(function($) {
-
-  var routes = {};
-  $.extend(Spree, routes);
-
-  Spree.routes = {
-
-    admin_users_path: function(options) {
-      if (typeof(options) === 'undefined') options = {format: 'html'};
-      return '<%= admin_users_path %>' + '.' + options.format;
-    },
-
-    admin_products_path: function(options) {
-      if (typeof(options) === 'undefined') options = {format: 'html'};
-      return '<%= admin_products_path %>' + '.' + options.format;
-    }
-
-  }
-
-})(jQuery);