spree_core 1.0.3 → 1.0.4

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

@@ -7,6 +7,10 @@ module Spree
       before_filter :load_data, :except => :index
       update.before :update_before
 
+      def show
+        redirect_to( :action => :edit )
+      end
+
       def index
         respond_with(@collection) do |format|
           format.html

data/app/controllers/spree/products_controller.rb

@@ -13,7 +13,7 @@ module Spree
     end
 
     def show
-      @product = Product.find_by_permalink!(params[:id])
+      @product = Product.active.find_by_permalink!(params[:id])
       return unless @product
 
       @variants = Variant.active.includes([:option_values, :images]).where(:product_id => @product.id)

data/app/models/spree/calculator/per_item.rb

@@ -7,7 +7,10 @@ module Spree
     end
 
     def compute(object=nil)
-      self.preferred_amount * object.line_items.length
+      return 0 if object.nil?
+      self.preferred_amount * object.line_items.reduce(0) do |sum, value|
+        sum + value.quantity
+      end
     end
   end
 end

data/app/models/spree/order.rb

@@ -553,11 +553,8 @@ module Spree
       end
 
       def restock_items!
-        shipments.each do |shipment|
-          shipment.inventory_units.each do |inventory_unit|
-            line_item = line_items.find_by_variant_id(inventory_unit.variant_id)
-            InventoryUnit.decrease(self, inventory_unit.variant, line_item.quantity)
-          end
+        line_items.each do |line_item|
+          InventoryUnit.decrease(self, line_item.variant, line_item.quantity)
         end
       end
 
@@ -566,11 +563,8 @@ module Spree
       end
 
       def unstock_items!
-        shipments.each do |shipment|
-          shipment.inventory_units.each do |inventory_unit|
-            line_item = line_items.find_by_variant_id(inventory_unit.variant_id)
-            InventoryUnit.increase(self, inventory_unit.variant, line_item.quantity)
-          end
+        line_items.each do |line_item|
+          InventoryUnit.increase(self, line_item.variant, line_item.quantity)
         end
       end
 

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

@@ -2,16 +2,21 @@
 
 <h2><%= t(:new) %> <%= t("activerecord.models.#{@payment.class.to_s.underscore}.one") %></h2>
 
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @payment } %>
+<% if @payment_methods.any? %>
+  <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @payment } %>
 
-<%= form_for @payment, :url => admin_order_payments_path(@order) do |f| %>
+  <%= form_for @payment, :url => admin_order_payments_path(@order) do |f| %>
 
-  <%= render :partial => 'form', :locals => { :f => f } %>
+    <%= render :partial => 'form', :locals => { :f => f } %>
 
-  <p class="form-buttons" data-hook="buttons">
-    <%= button @order.cart? ? t(:continue) : t(:update) %>
-  </p>
+    <p class="form-buttons" data-hook="buttons">
+      <%= button @order.cart? ? t(:continue) : t(:update) %>
+    </p>
 
+  <% end %>
+<% else %>
+  <%= t(:cannot_create_payment_without_payment_methods) %>
+  <%= link_to t(:please_define_payment_methods), admin_payment_methods_url %>
 <% end %>
 
 <% content_for :head do %>

data/config/locales/en.yml

@@ -284,6 +284,7 @@ en:
   cancel_my_account: Cancel my account
   cancel_my_account_description: "Unhappy?"
   canceled: Canceled
+  cannot_create_payment_without_payment_methods: You cannot create a payment for an order without any payment methods defined.
   cannot_create_returns: Cannot create returns as this order has no shipped units.
   cannot_perform_operation: "Cannot perform requested operation"
   capture: Capture
@@ -668,6 +669,7 @@ en:
   phone: Phone
   place_order: Place Order
   please_create_user: "Please create a user account"
+  please_define_payment_methods: "Please define some payment methods first."
   powered_by: "Powered by"
   presentation: Presentation
   preview: Preview

data/lib/spree/core/engine.rb

@@ -74,10 +74,6 @@ module Spree
         app.config.assets.precompile += ['store/all.*', 'admin/all.*', 'admin/orders/edit_form.js', 'admin/address_states.js', 'jqPlot/excanvas.min.js', 'admin/images/new.js', 'jquery.jstree/themes/apple/*']
       end
 
-      initializer "spree.asset.pipeline" do |app|
-        app.config.assets.debug = false
-      end
-
       initializer "spree.mail.settings" do |app|
         if Spree::MailMethod.table_exists?
           Spree::Core::MailSettings.init

data/lib/spree/core/url_helpers.rb

@@ -0,0 +1,9 @@
+module Spree
+  module Core
+    module UrlHelpers
+      def spree
+        Spree::Core::Engine.routes.url_helpers
+      end
+    end
+  end
+end

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "1.0.3"
+    "1.0.4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-16 00:00:00.000000000 Z
+date: 2012-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
-  requirement: &70306761339840 !ruby/object:Gem::Requirement
+  requirement: &70302537108460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 0.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70306761339840
+  version_requirements: *70302537108460
 - !ruby/object:Gem::Dependency
   name: nested_set
-  requirement: &70306761334700 !ruby/object:Gem::Requirement
+  requirement: &70302537107400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 1.6.8
   type: :runtime
   prerelease: false
-  version_requirements: *70306761334700
+  version_requirements: *70302537107400
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70306761348180 !ruby/object:Gem::Requirement
+  requirement: &70302537106340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +46,10 @@ dependencies:
         version: 1.0.19
   type: :runtime
   prerelease: false
-  version_requirements: *70306761348180
+  version_requirements: *70302537106340
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70306761367760 !ruby/object:Gem::Requirement
+  requirement: &70302537104500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -57,10 +57,10 @@ dependencies:
         version: 1.6.8
   type: :runtime
   prerelease: false
-  version_requirements: *70306761367760
+  version_requirements: *70302537104500
 - !ruby/object:Gem::Dependency
   name: state_machine
-  requirement: &70306761365620 !ruby/object:Gem::Requirement
+  requirement: &70302537124460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -68,10 +68,10 @@ dependencies:
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70306761365620
+  version_requirements: *70302537124460
 - !ruby/object:Gem::Dependency
   name: ffaker
-  requirement: &70306761362000 !ruby/object:Gem::Requirement
+  requirement: &70302537123780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -79,21 +79,21 @@ dependencies:
         version: 1.12.0
   type: :runtime
   prerelease: false
-  version_requirements: *70306761362000
+  version_requirements: *70302537123780
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70306761374600 !ruby/object:Gem::Requirement
+  requirement: &70302537123120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *70306761374600
+  version_requirements: *70302537123120
 - !ruby/object:Gem::Dependency
   name: meta_search
-  requirement: &70306761373120 !ruby/object:Gem::Requirement
+  requirement: &70302537122500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -101,10 +101,10 @@ dependencies:
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70306761373120
+  version_requirements: *70302537122500
 - !ruby/object:Gem::Dependency
   name: activemerchant
-  requirement: &70306761371140 !ruby/object:Gem::Requirement
+  requirement: &70302537121860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -112,10 +112,10 @@ dependencies:
         version: 1.20.1
   type: :runtime
   prerelease: false
-  version_requirements: *70306761371140
+  version_requirements: *70302537121860
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70306761368680 !ruby/object:Gem::Requirement
+  requirement: &70302537121300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -126,10 +126,10 @@ dependencies:
         version: 3.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70306761368680
+  version_requirements: *70302537121300
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &70306761391800 !ruby/object:Gem::Requirement
+  requirement: &70302537119740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -137,10 +137,10 @@ dependencies:
         version: 0.13.0
   type: :runtime
   prerelease: false
-  version_requirements: *70306761391800
+  version_requirements: *70302537119740
 - !ruby/object:Gem::Dependency
   name: deface
-  requirement: &70306761389880 !ruby/object:Gem::Requirement
+  requirement: &70302537118780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -148,10 +148,10 @@ dependencies:
         version: 0.7.2
   type: :runtime
   prerelease: false
-  version_requirements: *70306761389880
+  version_requirements: *70302537118780
 - !ruby/object:Gem::Dependency
   name: stringex
-  requirement: &70306761408520 !ruby/object:Gem::Requirement
+  requirement: &70302537117760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -159,7 +159,7 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70306761408520
+  version_requirements: *70302537117760
 description: Required dependency for Spree
 email: sean@spreecommerce.com
 executables: []
@@ -521,7 +521,6 @@ files:
 - app/views/spree/admin/products/index.html.erb
 - app/views/spree/admin/products/new.html.erb
 - app/views/spree/admin/products/new.js.erb
-- app/views/spree/admin/products/show.html.erb
 - app/views/spree/admin/properties/_form.html.erb
 - app/views/spree/admin/properties/edit.html.erb
 - app/views/spree/admin/properties/filtered.html.erb
@@ -761,6 +760,7 @@ files:
 - lib/spree/core/testing_support/factories.rb
 - lib/spree/core/theme_support/hook_listener.rb
 - lib/spree/core/theme_support.rb
+- lib/spree/core/url_helpers.rb
 - lib/spree/core/user_banners.rb
 - lib/spree/core/version.rb
 - lib/spree/core.rb
@@ -973,7 +973,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2934504040878488639
+      hash: -350126003318038634
 requirements:
 - none
 rubyforge_project: spree_core

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

@@ -1,4 +0,0 @@
-<%= render :partial => 'shared/product_sub_menu' %>
-TODO - show product details here <br /><br />
-
-<%= render :partial => 'shared/show_resource_links' %>