spree_backend 2.0.0 → 2.0.1

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

@@ -27,31 +27,6 @@ $(document).ready(function() {
       dropdownCssClass: 'customer_search',
       formatResult: formatCustomerResult,
       formatSelection: function (customer) {
-        _.each(['bill_address', 'ship_address'], function(address) {
-          var data = customer[address];
-          address_parts = ['firstname', 'lastname',
-                           'company', 'address1',
-                           'address2', 'city',
-                           'zipcode', 'phone']
-          var attribute_wrapper = '#order_' + address + '_attributes_'
-          if(data != undefined) {
-            _.each(address_parts, function(part) {
-              $(attribute_wrapper + part).val(data[part]);
-            })
-
-            $(attribute_wrapper + 'state_id').select2("val", data['state_id']);
-            $(attribute_wrapper + 'country_id').select2("val", data['country_id']);
-          }
-          else {
-            _.each(address_parts, function(part) {
-              $(attribute_wrapper + part).val("");
-            })
-
-            $(attribute_wrapper + 'state_id').select2("val", '');
-            $(attribute_wrapper + 'country_id').select2("val", '');
-          }
-        });
-
         $('#order_email').val(customer.email);
         $('#user_id').val(customer.id);
         $('#guest_checkout_true').prop("checked", false);

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

@@ -51,8 +51,8 @@ handle_rename = (e, data) ->
     error: handle_ajax_error
 
 handle_delete = (e, data) ->
-  last_rollback = data.rlb
-  node = data.rslt.ob
+  last_rollback = data.rlbk
+  node = data.rslt.obj
   delete_url = base_url.clone()
   delete_url.setPath delete_url.path() + '/' + node.attr("id")
   jConfirm Spree.translations.are_you_sure_delete, Spree.translations.confirm_delete, (r) ->
@@ -70,11 +70,12 @@ handle_delete = (e, data) ->
 root = exports ? this
 root.setup_taxonomy_tree = (taxonomy_id) ->
   if taxonomy_id != undefined
+    # this is defined within admin/taxonomies/edit
+    root.base_url = Spree.url(Spree.routes.taxonomy_taxons_path)
+
     $.ajax
-      url: '/api/taxonomies/' + taxonomy_id + '/jstree', 
+      url: base_url.path().replace("/taxons", "/jstree"),
       success: (taxonomy) ->
-        # this is defined within admin/taxonomies/edit
-        root.base_url = Spree.url(Spree.routes.taxonomy_taxons_path)
         last_rollback = null
 
         conf =
@@ -82,7 +83,7 @@ root.setup_taxonomy_tree = (taxonomy_id) ->
             data: taxonomy,
             ajax:
               url: (e) ->
-                '/api/taxonomies/' + taxonomy_id + '/taxons/' + e.attr('id') + '/jstree'
+                base_url.path() + '/' + e.attr('id') + '/jstree'
           themes:
             theme: "apple",
             url: "/assets/jquery.jstree/themes/apple/style.css"

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

@@ -21,7 +21,6 @@ module Spree
         end
       end
 
-
       private
 
       def update_styles(params)
@@ -55,7 +54,7 @@ module Spree
           Spree::Image.attachment_definitions[:attachment].delete :storage
         end
 
-        Spree::Image.attachment_definitions[:attachment][:styles] = ActiveSupport::JSON.decode(Spree::Config[:attachment_styles])
+        Spree::Image.attachment_definitions[:attachment][:styles] = ActiveSupport::JSON.decode(Spree::Config[:attachment_styles]).symbolize_keys!
         Spree::Image.attachment_definitions[:attachment][:path] = Spree::Config[:attachment_path]
         Spree::Image.attachment_definitions[:attachment][:default_url] = Spree::Config[:attachment_default_url]
         Spree::Image.attachment_definitions[:attachment][:default_style] = Spree::Config[:attachment_default_style]
@@ -63,4 +62,3 @@ module Spree
     end
   end
 end
-

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

@@ -70,7 +70,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.map {|sr| ["#{sr.name} #{sr.display_price}", sr.id] }, shipment.selected_shipping_rate_id),
+                  options_for_select(shipment.shipping_rates.backend.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/product_properties/_product_property_fields.html.erb

@@ -10,8 +10,8 @@
     <%= f.text_field :value, :class => 'autocomplete' %>
   </td>
   <td class="actions">
-    <% unless @product.properties.empty? %>
-      <%= link_to_remove_fields Spree.t(:remove), f, :no_text => true %>
+    <% if f.object.persisted? %>
+      <%= link_to_delete f.object, :no_text => true %>
     <% end %>
   </td>
 </tr>

metadata

@@ -1,46 +1,52 @@
 --- !ruby/object:Gem::Specification
 name: spree_backend
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
+  prerelease: 
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-19 00:00:00.000000000 Z
+date: 2013-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: spree_api
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: select2-rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -83,6 +94,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -90,6 +102,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -97,6 +110,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: email_spec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -104,6 +118,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -484,26 +499,30 @@ files:
 - vendor/assets/stylesheets/responsive-tables.css
 homepage: http://spreecommerce.com
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 89217670578797386
 requirements:
 - none
 rubyforge_project: spree_backend
-rubygems_version: 2.0.3
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: backend e-commerce functionality for the Spree project.
 test_files: []

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ODRlNDA4YmNiMDU0OGZiMDNlNzc5ZTBkZDdkNjk4ZWIwODQ3MDYyMg==
-  data.tar.gz: !binary |-
-    N2MwNDE2ZjQ4ZmZjZDhkYjg0MTFmMDEzM2NkMzA1MmYzYTUzZTQ3ZQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    OTg2YWYxNzVhMTgwYTM3ZjU0MjJmMzUyODFlZjczYjYwY2QwY2NhZTcxOTA1
-    OTdmMjdiMmNhNDgyODM1ZDZlYjI4NmM0ODNjMjc3ZWZkOTU4NzRhNDkyZDQy
-    YzgzOWEyMmY5OTU0OGVkY2Q3YWRkNzgwNTIwOGQ5NjY0M2ZkMWY=
-  data.tar.gz: !binary |-
-    NjAzMjZlOWIxNjhkNjkwZWI4ZjU1ZDMxYmMzYzQxYjhjZDk0NDc2NTBjY2I5
-    N2VhODg3ZTk3ZjFiMWZhNDU5MDY3OTBlMzdlM2VkNmUwOWZhNWZlMWQzNWUy
-    NzRhNTEwZjM0MzNjOThjZDBiZTY1ZGU3Y2VlNjlmMTljMWQ1ZDI=