spree 0.10.0.beta → 0.10.0

data/config/locales/nl-NL.yml

@@ -515,6 +515,15 @@ nl-NL:
   none_available: "Niet op voorraad"
   not: not
   note: Note
+  notice_messages:
+    option_type_removed: "Succesfully removed option type."
+    product_cloned: "Product has been cloned"
+    product_deleted: "Product has been deleted"
+    product_not_cloned: "Product could not be cloned"
+    product_not_deleted: "Product could not be deleted"
+    track_me_in_GA: "Track Me in GA"
+    variant_deleted: "Variant has been deleted"
+    variant_not_deleted: "Variant could not be deleted"    
   on_hand: "Op voorraad"
   operation: Operatie
   option_Values: "Waarden Opties"
@@ -609,12 +618,12 @@ nl-NL:
         name: Ascend by product name
       ascend_by_updated_at:
         name: Ascend by actualization date
-      descend_by_popularity:
-        name: Sort by popularity(most popular first)
       descend_by_master_price:
         name: Descend by product master price
       descend_by_name:
         name: Descend by product name
+      descend_by_popularity:
+        name: Sort by popularity(most popular first)
       descend_by_updated_at:
         name: Descend by actualization date
       in_name:
@@ -882,6 +891,7 @@ nl-NL:
   use_as_shipping_address: "Gebruik als afleveringsadres"
   use_billing_address: "Gebruik als factuuradres"
   use_different_shipping_address: "Ander afleveringsadres gebruiken"
+  use_new_cc: "Use a new card"
   user: Gebruiker
   user_account: "Account Gebruiker"
   user_created_successfully: "User created successfully"

data/config/locales/pl.yml

@@ -515,6 +515,15 @@ pl:
   none_available: Niedostępne
   not: not
   note: Note
+  notice_messages:
+    option_type_removed: "Succesfully removed option type."
+    product_cloned: "Product has been cloned"
+    product_deleted: "Product has been deleted"
+    product_not_cloned: "Product could not be cloned"
+    product_not_deleted: "Product could not be deleted"
+    track_me_in_GA: "Track Me in GA"
+    variant_deleted: "Variant has been deleted"
+    variant_not_deleted: "Variant could not be deleted"    
   on_hand: "On Hand"
   operation: Operacja
   option_Values: "Wartości Opcji"
@@ -609,12 +618,12 @@ pl:
         name: Ascend by product name
       ascend_by_updated_at:
         name: Ascend by actualization date
-      descend_by_popularity:
-        name: Sort by popularity(most popular first)
       descend_by_master_price:
         name: Descend by product master price
       descend_by_name:
         name: Descend by product name
+      descend_by_popularity:
+        name: Sort by popularity(most popular first)
       descend_by_updated_at:
         name: Descend by actualization date
       in_name:
@@ -882,6 +891,7 @@ pl:
   use_as_shipping_address: Use as Shipping Address
   use_billing_address: Use Billing Address
   use_different_shipping_address: "Użyj innego adresy dostawy"
+  use_new_cc: "Use a new card"
   user: Użytkownik
   user_account: User Account
   user_created_successfully: "User created successfully"

data/config/locales/pt-BR.yml

@@ -515,6 +515,15 @@ pt-BR:
   none_available: "Nenhum Disponível"
   not: não
   note: Note
+  notice_messages:
+    option_type_removed: "Succesfully removed option type."
+    product_cloned: "Product has been cloned"
+    product_deleted: "Product has been deleted"
+    product_not_cloned: "Product could not be cloned"
+    product_not_deleted: "Product could not be deleted"
+    track_me_in_GA: "Track Me in GA"
+    variant_deleted: "Variant has been deleted"
+    variant_not_deleted: "Variant could not be deleted"    
   on_hand: "Na Mão"
   operation: Operação
   option_Values: "Opção de Valores"
@@ -609,12 +618,12 @@ pt-BR:
         name: Ascend by product name
       ascend_by_updated_at:
         name: Ascend by actualization date
-      descend_by_popularity:
-        name: Sort by popularity(most popular first)
       descend_by_master_price:
         name: Descend by product master price
       descend_by_name:
         name: Descend by product name
+      descend_by_popularity:
+        name: Sort by popularity(most popular first)
       descend_by_updated_at:
         name: Descend by actualization date
       in_name:
@@ -882,6 +891,7 @@ pt-BR:
   use_as_shipping_address: Use como Endereço de Entrega
   use_billing_address: Use como Endereço de Cobrança
   use_different_shipping_address: "Use um Endereço de Entrega Diferente"
+  use_new_cc: "Use a new card"
   user: Usuário
   user_account: Conta do Usuário
   user_created_successfully: "User created successfully"

data/config/locales/pt-PT.yml

@@ -515,6 +515,15 @@ pt-PT:
   none_available: "Nenhum Disponível"
   not: not
   note: Note
+  notice_messages:
+    option_type_removed: "Succesfully removed option type."
+    product_cloned: "Product has been cloned"
+    product_deleted: "Product has been deleted"
+    product_not_cloned: "Product could not be cloned"
+    product_not_deleted: "Product could not be deleted"
+    track_me_in_GA: "Track Me in GA"
+    variant_deleted: "Variant has been deleted"
+    variant_not_deleted: "Variant could not be deleted"    
   on_hand: "Em Stock"
   operation: Operação
   option_Values: "Valores Opcionais"
@@ -609,12 +618,12 @@ pt-PT:
         name: Ascend by product name
       ascend_by_updated_at:
         name: Ascend by actualization date
-      descend_by_popularity:
-        name: Sort by popularity(most popular first)
       descend_by_master_price:
         name: Descend by product master price
       descend_by_name:
         name: Descend by product name
+      descend_by_popularity:
+        name: Sort by popularity(most popular first)
       descend_by_updated_at:
         name: Descend by actualization date
       in_name:
@@ -882,6 +891,7 @@ pt-PT:
   use_as_shipping_address: Use as Shipping Address
   use_billing_address: Use Billing Address
   use_different_shipping_address: "Use um Endereço de Entrega Diferente"
+  use_new_cc: "Use a new card"
   user: Utilizador
   user_account: User Account
   user_created_successfully: "User created successfully"

data/config/locales/ru-RU.yml

@@ -515,6 +515,15 @@ ru-RU:
   none_available: "Нет в наличии"
   not: "не"
   note: "Примечание"
+  notice_messages:
+    option_type_removed: "Товарная опция успешно убрана."
+    product_cloned: "Копия товара создана"
+    product_deleted: "Товар успешно удалён"
+    product_not_cloned: "Товар не может быть клонирован"
+    product_not_deleted: "Товар не может быть удалён"
+    track_me_in_GA: "Отслеживай меня в Google Analytics"
+    variant_deleted: "Вариант успешно удалён"
+    variant_not_deleted: "Вариант не может быть удален"  
   on_hand: "В наличии"
   operation: "Операция"
   option_Values: "Значения опции"
@@ -609,12 +618,12 @@ ru-RU:
         name: "по названию товара (по алфавиту)"
       ascend_by_updated_at:
         name: "по дате обновления информации о товаре (прямой порядок)"
-      descend_by_popularity:
-        name: "По популярности (обратный порядок)"
       descend_by_master_price:
         name: "по основной цене товара (по убыванию)"
       descend_by_name:
         name: "по названию товара (по алфавиту в обратном порядке)"
+      descend_by_popularity:
+        name: "По популярности (обратный порядок)"
       descend_by_updated_at:
         name: "по дате обновления информации о товаре (обратный порядок)"
       in_name:
@@ -882,6 +891,7 @@ ru-RU:
   use_as_shipping_address: "Использовать как адрес доставки"
   use_billing_address: "Использовать адрес для фактурации"
   use_different_shipping_address: "использовать другой адрес доставки"
+  use_new_cc: "Использовать новую карту"
   user: "Пользователь"
   user_account: "Учетная запись пользователя"
   user_created_successfully: "Учётная запись успешно создана"

data/config/locales/th.yml

@@ -515,6 +515,15 @@ th:
   none_available: "None Available"
   not: "ไม่"
   note: Note
+  notice_messages:
+    option_type_removed: "Succesfully removed option type."
+    product_cloned: "Product has been cloned"
+    product_deleted: "Product has been deleted"
+    product_not_cloned: "Product could not be cloned"
+    product_not_deleted: "Product could not be deleted"
+    track_me_in_GA: "Track Me in GA"
+    variant_deleted: "Variant has been deleted"
+    variant_not_deleted: "Variant could not be deleted"    
   on_hand: สินค้าในคลัง
   operation: Operation
   option_Values: รายการตัวเลือก
@@ -609,12 +618,12 @@ th:
         name: Ascend by product name
       ascend_by_updated_at:
         name: Ascend by actualization date
-      descend_by_popularity:
-        name: Sort by popularity(most popular first)
       descend_by_master_price:
         name: Descend by product master price
       descend_by_name:
         name: Descend by product name
+      descend_by_popularity:
+        name: Sort by popularity(most popular first)
       descend_by_updated_at:
         name: Descend by actualization date
       in_name:
@@ -882,6 +891,7 @@ th:
   use_as_shipping_address: ใช้ที่อยู่ในการจัดส่ง
   use_billing_address: ใช้ที่อยู่ในใบเสร็จรับเงิน
   use_different_shipping_address: "ใช้ที่อยู่อื่นในการจัดส่ง"
+  use_new_cc: "Use a new card"
   user: ผู้ใช้
   user_account: "บัญชีผู้ใช้"
   user_created_successfully: "User created successfully"

data/config/locales/vn.yml

@@ -515,6 +515,15 @@ vn:
   none_available: "Không có hàng nào"
   not: không
   note: Ghi chú
+  notice_messages:
+    option_type_removed: "Succesfully removed option type."
+    product_cloned: "Product has been cloned"
+    product_deleted: "Product has been deleted"
+    product_not_cloned: "Product could not be cloned"
+    product_not_deleted: "Product could not be deleted"
+    track_me_in_GA: "Track Me in GA"
+    variant_deleted: "Variant has been deleted"
+    variant_not_deleted: "Variant could not be deleted"    
   on_hand: "Có hàng"
   operation: Hoạt động
   option_Values: "Giá trị tùy chọn"
@@ -609,12 +618,12 @@ vn:
         name: Xếp ngược thứ tự theo tên sản phẩm
       ascend_by_updated_at:
         name: Xếp ngược thứ tự theo ngày thật
-      descend_by_popularity:
-        name: Sắp xếp theo tính phổ biến (phổ biến nhất trước)
       descend_by_master_price:
         name: Xếp xuôi theo giá chủ của sản phẩm
       descend_by_name:
         name: Xếp xuôi theo tên sản phẩm
+      descend_by_popularity:
+        name: Sắp xếp theo tính phổ biến (phổ biến nhất trước)
       descend_by_updated_at:
         name: Xếp xuôi theo ngày thật
       in_name:
@@ -882,6 +891,7 @@ vn:
   use_as_shipping_address: Dùng như địa chỉ giao hàng
   use_billing_address: Dùng địa chỉ thanh toán
   use_different_shipping_address: "Dùng như địa chỉ giao hàng"
+  use_new_cc: "Use a new card"
   user: Người dùng
   user_account: Tài khoản người dùng
   user_created_successfully: "Tạo người dùng thành công"

data/db/migrate/20091021133257_charge_refactoring.rb

@@ -7,8 +7,8 @@ class ChargeRefactoring < ActiveRecord::Migration
   
   def self.up
     add_column :orders, :completed_at, :timestamp
-    Order.reset_column_information
-    Order.all.each{|o| o.update_attribute(:completed_at, o.checkout && o.checkout.completed_at)}
+    Order.reset_column_information   
+    Order.all.each {|o| o.update_attribute(:completed_at, o.checkout && o.checkout.read_attribute(:completed_at)) }
     remove_column :checkouts, :completed_at
     
     change_column :adjustments, :amount, :decimal, :null => true, :default => nil, :precision => 8, :scale => 2

data/db/migrate/20100105132138_shipment_id_for_inventory_units.rb

@@ -5,6 +5,10 @@ class ShipmentIdForInventoryUnits < ActiveRecord::Migration
     
     # migrate legacy shipments
     Shipment.all.each do |shipment|
+      unless shipment.order
+        puts "Warning: shipment has invalid order - #{shipment.id}"
+        next
+      end
       shipment.order.inventory_units.each do |unit|
         unit.update_attribute("shipment_id", shipment.id)
       end

data/db/schema.rb

@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20100301163454) do
+ActiveRecord::Schema.define(:version => 20100306153445) do
 
   create_table "addresses", :force => true do |t|
     t.string   "firstname"

data/lib/spree.rb

@@ -10,7 +10,7 @@ unless defined? Spree::Version
       Major = '0'
       Minor = '10'
       Tiny  = '0'  
-      Pre   = 'beta'
+      Pre   = nil
 
       class << self
         def to_s

data/test/functional/admin/payments_controller_test.rb

@@ -66,10 +66,11 @@ class Admin::PaymentsControllerTest < ActionController::TestCase
       end
       
 
-      context "for cheque payment" do
+      context "for check payment" do
         setup do
           @params = {
             :order_id => @order.id, 
+            :card => Factory(:creditcard).id,
             :payment => {
               :payment_method_id => payment_methods(:check_payment_method).id.to_s, 
               :amount => '1.99'
@@ -79,6 +80,11 @@ class Admin::PaymentsControllerTest < ActionController::TestCase
         end
         should_create :payment
         should_respond_with :redirect
+        should "not be a check payment with no source" do
+          payment = Payment.first(:order => 'id DESC')
+          assert payment.source.nil?
+          assert payment.payment_method.is_a?(PaymentMethod::Check)
+        end
       end
 
     end

data/test/integration/checkout_test.rb

@@ -0,0 +1,59 @@
+require 'test_helper'                                    
+
+class CheckoutTest < ActionController::IntegrationTest
+  context "Checkout" do                                  
+    setup do 
+      @user = Factory(:admin_user, :password=>'test', :password_confirmation=>'test')
+      @product = Factory(:product)
+    end
+
+    should "restore last not completed order, associated with user after log on, even if user start new order while was logged out." do
+      get '/login'
+      post_via_redirect '/user_sessions/create', {:user_session=>{:login=>@user.login, :password=>'test', :openid_identifier=>''}}
+      assert_response :success
+      assert_equal '/products', path
+
+      #####
+      # Create a new order while logged in
+      #####
+      post_via_redirect '/orders/create', {:variants=>{@product.master.id=>"1"}}
+      assert_response :success
+      first_order = Order.last
+      assert_equal "/orders/#{first_order.number}/edit", path
+      assert_equal @user.id, first_order.user_id
+
+      get_via_redirect '/logout'
+      assert_response :success
+      assert_equal nil, response.session[:order_token]
+      assert_equal nil, response.session[:order_id]
+      
+      #####
+      # Create a new order while logged out
+      #####
+      post_via_redirect '/orders/create', {:variants=>{@product.master.id=>"1"}}      
+      assert_response :success
+      second_order = Order.last
+      assert_equal "/orders/#{second_order.number}/edit", path
+
+      get_via_redirect "/orders/#{second_order.number}/checkout/edit"
+      assert_response :success
+      assert_equal "/orders/#{second_order.number}/checkout/register", path
+
+      #####
+      # Login Again, as part of the checkout/register step
+      #####
+      get '/login'
+      post_via_redirect '/user_sessions/create', {:user_session=>{:login=>@user.login, :password=>'test', :openid_identifier=>''}}
+      assert_response :success
+      #####
+      # We are properly redirected to the first order
+      #####
+      assert_equal "/orders/#{first_order.number}/checkout/edit", path
+      assert_equal first_order.token, response.session[:order_token]
+      assert_equal first_order.id, response.session[:order_id]
+      
+      # line items from guest order should be added to restored uncompleted order
+      assert_equal first_order.total + second_order.total, first_order.reload.total
+    end
+  end
+end

data/test/test_helper.rb

@@ -7,6 +7,7 @@ require File.expand_path(File.dirname(__FILE__) + "/../vendor/extensions/payment
 class ActiveSupport::TestCase
   self.use_transactional_fixtures = true
   self.use_instantiated_fixtures  = false
+  fixtures :all
 end
 
 I18n.locale = "en-US"

data/test/unit/creditcard_test.rb

@@ -67,6 +67,9 @@ class CreditcardTest < ActiveSupport::TestCase
           @creditcard.void(@payment)
         end
         should_change("CreditcardTxn.count", :by => 1) { CreditcardTxn.count }
+        should "update payment amount to zero" do
+          assert_equal 0.00, @payment.amount.to_f
+        end
       end
     end
     context "followed by void" do
@@ -78,6 +81,9 @@ class CreditcardTest < ActiveSupport::TestCase
       should "create new transaction with correct attributes" do
         assert_equal CreditcardTxn::TxnType::VOID, @void_txn.txn_type
       end
+      should "update payment amount to zero" do
+        assert_equal 0.00, @payment.amount.to_f
+      end
     end
   end
   

data/vendor/extensions/localization/app/controllers/locale_controller.rb

@@ -1,6 +1,9 @@
 class LocaleController < ApplicationController
 
   def set
+    if request.referer && request.referer.starts_with?("http://" + request.host)
+      session[:return_to] = request.referer
+    end
     if params[:locale] && AVAILABLE_LOCALES.include?(params[:locale])
       I18n.locale = params[:locale]
       session[:locale] = params[:locale]
@@ -11,4 +14,4 @@ class LocaleController < ApplicationController
     redirect_back_or_default(root_path)
   end
 
-end
+end

data/vendor/extensions/payment_gateway/lib/spree/payment_gateway.rb

@@ -82,6 +82,7 @@ module Spree
         :txn_type => CreditcardTxn::TxnType::VOID
       )
       payment.update_attribute(:amount, 0.00)
+      payment.order.update_totals!
       payment.finalize!
     end