spree 0.7.1 → 0.8.0

data/app/controllers/account_controller.rb

@@ -1,31 +0,0 @@
-class AccountController < Spree::BaseController
-  before_filter :login_from_cookie
-
-  def index
-    redirect_to(login_path) unless logged_in? || User.count > 0
-  end
-
-  def login
-    return unless request.post?
-    self.current_user = User.authenticate(params[:email], params[:password])
-    if logged_in?
-      if params[:remember_me] == "1"
-        self.current_user.remember_me
-        cookies[:auth_token] = { :value => self.current_user.remember_token , :expires => self.current_user.remember_token_expires_at }
-      end
-      redirect_back_or_default(products_path)
-      flash.now[:notice] = "Logged in successfully"
-    else
-      flash.now[:error] = "Login authentication failed."
-    end
-  end 
-  
-  def logout
-    self.current_user.forget_me if logged_in?
-    cookies.delete :auth_token
-    reset_session
-    flash[:notice] = "You have been logged out."
-    redirect_back_or_default('/')
-    #redirect_back_or_default(:controller => '/account', :action => 'index')
-  end
-end

data/app/controllers/checkout_controller.rb

@@ -1,96 +0,0 @@
-class CheckoutController < Spree::BaseController                 
-  before_filter :stop_monkey_business, :except => :cvv
-  before_filter :require_user_account
-  before_filter :load_data, :except => :cvv
-  before_filter :build_object, :except => [:new, :create, :cvv]
-
-  ssl_required :new, :create
-
-  resource_controller   
-  model_name :checkout_presenter
-  object_name :checkout_presenter
-
-  # modified version of r_c create method (easier then all the before after hooks - especially for gateway error handling)
-  def create
-    build_object
-    load_object
-
-    @order.user = current_user       
-    @order.ip_address = request.env['REMOTE_ADDR']
-    
-    begin
-      if object.save
-        # remove the order from the session
-        session[:order_id] = nil if @order.checkout_complete  
-      else
-        flash[:error] = t("unable_to_save_order")
-        render :action => "new" and return
-      end       
-    rescue Spree::GatewayError => ge
-      flash.now[:error] = t("unable_to_authorize_credit_card") + ": #{ge.message}"
-      render :action => "new" and return 
-    end
-        
-    respond_to do |format|
-      format.html {redirect_to order_url(@order, :checkout_complete => true) }
-      format.js {render :json => { :order => @checkout_presenter.order_hash, 
-                                   :available_methods => @order.shipment.rates }.to_json,
-                        :layout => false}
-    end
-    
-  end         
-
-  def cvv
-    render :layout => false
-  end  
-         
-  def select_country         
-    @states = @object.bill_address.country.states#, :order => 'name')  
-    respond_to do |format|
-      format.js
-    end
-  end
-  
-  protected
-  def require_user_account
-    return if logged_in?
-    store_location
-    redirect_to signup_path 
-  end
-  
-  private
-
-  def build_object
-    @order = Order.find_by_number(params[:order_number])
-    if params[:checkout_presenter]
-      @object ||= end_of_association_chain.send parent? ? :build : :new, params[:checkout_presenter]  
-    else                       
-      # user has not yet submitted checkout parameters, we can use defaults of current_user and order objects
-      bill_address = current_user.last_address unless current_user == :false
-      bill_address ||= Address.new
-      ship_address = @order.ship_address || Address.new
-      shipping_method = @order.shipment ? @order.shipment.shipping_method : nil
-      @object ||= end_of_association_chain.send parent? ? :build : :new, {:bill_address => bill_address, 
-                                                                          :ship_address => ship_address, 
-                                                                          :shipping_method => shipping_method }
-    end     
-    @object.final_answer = params[:final_answer] unless params[:final_answer].blank? 
-    @object.order = @order      
-    @object.shipping_method = ShippingMethod.find_by_id(params[:method_id]) if params[:method_id]        
-  end
-  
-  def load_data
-    @countries = Country.find(:all).sort  
-    @shipping_countries = @object.order.shipping_countries.sort  
-    @states = Country.find(214).states.sort
-
-    month = @object.creditcard.month ? @object.creditcard.month.to_i : Date.today.month
-    year = @object.creditcard.year ? object.creditcard.year.to_i : Date.today.year
-    @date = Date.new(year, month, 1)
-  end 
-  
-  def stop_monkey_business
-    build_object
-    redirect_to order_url(@order) and return if @order.checkout_complete    
-  end
-end

data/app/helpers/payments_helper.rb

@@ -1,2 +0,0 @@
-module PaymentsHelper
-end  

data/app/helpers/store_helper.rb

@@ -1,3 +0,0 @@
-module StoreHelper
-  
-end

data/app/helpers/tax_categories_helper.rb

@@ -1,2 +0,0 @@
-module TaxCategoriesHelper
-end

data/app/helpers/users_helper.rb

@@ -1,2 +0,0 @@
-module UsersHelper
-end

data/app/presenters/checkout_presenter.rb

@@ -1,58 +0,0 @@
-class CheckoutPresenter < ActivePresenter::Base
-  presents :creditcard, {:bill_address => Address}, {:ship_address => Address} 
-
-  include ActionView::Helpers::NumberHelper # Needed for JS usable rate information 
-  
-  alias_method :old_initialize, :initialize 
-  attr_accessor :order
-  attr_accessor :shipping_method
-  attr_accessor :order_hash   
-  attr_accessor :final_answer
-  
-  def initialize(args = {})               
-    old_initialize(args)
-    default_country = Country.find_by_id Spree::Config[:default_country_id]
-    bill_address.country ||= default_country
-    ship_address.country ||= default_country    
-    # credit card needs to use some bill_address attributes
-    creditcard.address = bill_address  
-    creditcard.first_name = bill_address.firstname
-    creditcard.last_name = bill_address.lastname   
-    self.order_hash = {}   
-  end 
-  
-  def save           
-    return false if final_answer and not valid?
-    saved = false
-    ActiveRecord::Base.transaction do
-      # clear existing shipments (no orphans please)                             
-      order.shipments.clear
-      # clear existing addresses, eventually this won't be necessary (we'll have an address book)
-      order.user.addresses.clear
-      
-      order.user.addresses << bill_address.clone
-      
-      order.shipments.create(:address => ship_address, :shipping_method => shipping_method)
-      
-      order.ship_amount = order.shipment.shipping_method.calculate_shipping(order.shipment) if order.shipment and order.shipment.shipping_method
-      order.tax_amount = order.calculate_tax
-      order.save
-      
-      if final_answer
-        # authorize the credit card and then save (authorize first before number is cleared for security purposes)
-        creditcard.order = order
-        creditcard.authorize(order.total)
-        creditcard.save
-        order.complete
-      end      
-      saved = true
-    end  
-    # populate the order hash  
-    
-    order_hash[:ship_amount] = number_to_currency(order.ship_amount)
-    order_hash[:tax_amount] = number_to_currency(order.tax_amount)
-    order_hash[:order_total] = number_to_currency(order.total)
-    order_hash[:ship_method] = order.shipment.shipping_method.name if order.shipment and order.shipment.shipping_method
-    saved  
-  end
-end

data/app/presenters/payment_presenter.rb

@@ -1,3 +0,0 @@
-class PaymentPresenter < ActivePresenter::Base
-  presents :creditcard, :address
-end

data/app/views/admin/zones/_country.html.erb

@@ -1,15 +0,0 @@
-<li>
-  <%= t("name") %>: 
-  <%= text_field_with_auto_complete :zone, 
-                                    :member_name,
-                                    {:size => 35,
-                                     :onkeypress => "return event.which == Event.KEY_RETURN ? false : true",
-                                     :autocomplete => "off",
-                                     :name => "member_names[]",
-                                     :value => "#{value if local_assigns.has_key? :value}"
-                                    },
-                                    {:url => formatted_countries_path(:js),
-                                     :method => :get,
-                                     :with => "Object.toQueryString({q: element.value})" 
-                                    } %>
-</li>

data/app/views/admin/zones/_function.rjs

@@ -1,11 +0,0 @@
-page << 'function add_country() {'
-    page.insert_html :bottom, 'country-list', :partial => 'country'
-page << '}'
-
-page << 'function add_state() {'
-    page.insert_html :bottom, 'state-list', :partial => 'state'
-page << '}'
-
-page << 'function add_zone() {'
-    page.insert_html :bottom, 'zone-list', :partial => 'zone'
-page << '}'

data/app/views/admin/zones/_state.html.erb

@@ -1,15 +0,0 @@
-<li>
-  <%= t("name") %>: 
-  <%= text_field_with_auto_complete :zone, 
-                                    :member_name,
-                                    {:size => 35,
-                                     :onkeypress => "return event.which == Event.KEY_RETURN ? false : true",
-                                     :autocomplete => "off",
-                                     :name => "member_names[]",
-                                     :value => "#{value if local_assigns.has_key? :value}"
-                                    },
-                                    {:url => formatted_states_path(:js),
-                                     :method => :get,
-                                     :with => "Object.toQueryString({q: element.value})" 
-                                    } %>
-</li>

data/app/views/admin/zones/_zone.html.erb

@@ -1,15 +0,0 @@
-<li>
-  <%= t("name") %>: 
-  <%= text_field_with_auto_complete :zone, 
-                                    :member_name,
-                                    {:size => 35,
-                                     :onkeypress => "return event.which == Event.KEY_RETURN ? false : true",
-                                     :autocomplete => "off",
-                                     :name => "member_names[]",
-                                     :value => "#{value if local_assigns.has_key? :value}"
-                                    },
-                                    {:url => formatted_admin_zones_path(:js),
-                                     :method => :get,
-                                     :with => "Object.toQueryString({q: element.value})" 
-                                    } %>
-</li>

data/app/views/admin/zones/index.js.erb

@@ -1 +0,0 @@
-<%= auto_complete_result @zones, :name %>

data/app/views/admin/zones/show.html.erb

@@ -1,4 +0,0 @@
-
-<%= link_to t("edit"), edit_object_url %>
-|
-<%= link_to t("back"), collection_url %>

data/app/views/checkout/_billing.html.erb

@@ -1,49 +0,0 @@
-<h2><%= t("billing_address")%></h2>
-<div class="inner">
-	<p id="bfname">
-		<label for="<%= t("first_name") %>"><%= t("first_name") %></label>
-		<%= f.text_field :bill_address_firstname, :class => 'required' -%><span class="req">*</span>
-	</p>
-	<p id="blname">
-		<label for="<%= t("last_name") %>"><%= t("last_name") %></label>
-		<%= f.text_field :bill_address_lastname, :class => 'required' -%><span class="req">*</span>
-	</p>
-	<p id="baddress">
-		<label for=""><%= t("street_address") %></label>
-		<%= f.text_field :bill_address_address1, :class => 'required' -%><span class="req">*</span>
-	</p>
-	<p id="baddress2">
-		<label for=""><%= t("street_address_2") %></label>
-		<%= f.text_field :bill_address_address2 %>
-	</p>
-	<p id="bcity">
-		<label for=""><%= t("city") %></label>
-		<%= f.text_field :bill_address_city, :class => 'required' -%><span class="req">*</span>
-	</p>                        
-	<p>
-		<label for=""><%= t("state") %></label>
-		<span id="bstate">
-			<%= collection_select("checkout_presenter", 
-			:bill_address_state_id, 
-			@states, 
-			:id, 
-			:name, 
-			{:include_blank => true}, 
-			{:style=> 'width:150px;'}) %>
-		</span>
-		<span class="req">*</span>
-	</p>
-	<p id="bzip">
-		<label for=""><%= t("zip") %></label>
-		<%= f.text_field :bill_address_zipcode, :class => 'required' -%><span class="req">*</span>
-	</p>    
-	<p id="bcountry">
-		<label for=""><%= t("country") %></label>
-		<span id="bcountry"><%= f.collection_select :bill_address_country_id, @countries, :id, :name, {}, {:style => 'width:150px;', :class => 'required'} %></span>
-	</p>
-	<p id="bphone">
-		<label for=""><%= t("phone") %></label>
-		<%= f.text_field :bill_address_phone, :class => 'required' -%><span class="req">*</span>
-	</p>
-	<p><input id="validate_billing" type="button" value="<%=t("continue")%>"/></p>
-</div>

data/app/views/checkout/_form.html.erb

@@ -1,33 +0,0 @@
-<% content_for :head do %>
-  <%= javascript_include_tag 'jquery-1.3.2.min' %>
-  <%= javascript_include_tag 'jquery.validate.pack.js' %>
-  <%= javascript_include_tag 'checkout' %> 
-  <%= javascript_tag "var AUTH_TOKEN = #{form_authenticity_token.inspect};" if protect_against_forgery? %>
-  <%= stylesheet_link_tag 'checkout.css' %>
-<% end %>                 
-
-<input type="hidden" id="hidden_bstate" name="hidden_bstate" value="<%= @object.bill_address.state_id || @object.bill_address.state_name %>" />
-<input type="hidden" id="hidden_bcountry" name="hidden_bcountry" value="<%= @object.bill_address.country_id %>" />
-<input type="hidden" id="hidden_sstate" name="hidden_sstate" value="<%= @object.ship_address.state_id || @object.ship_address.state_name %>" />
-<input type="hidden" id="hidden_scountry" name="hidden_scountry" value="<%= @object.ship_address.country_id %>" />
-
-<%= error_messages_for :checkout_presenter %>
-<div id="billing">
-  <%= render :partial => 'billing', :locals => {:f => f} %>
-</div>
-
-<div id="shipping" class="checkout_disabled">
-  <%= render :partial => 'shipping', :locals => {:f => f} %>
-</div>
-            
-<div id="shipping_method" class="checkout_disabled">
-  <%= render :partial => 'shipping_method', :locals => {:f => f} %>
-</div>
-
-<div id="creditcard" class="checkout_disabled">
-  <%= render :partial => 'payment', :locals => {:f => f} %>
-</div>
-
-<div id="confirm_order" class="checkout_disabled">
-  <%= render :partial => 'confirm_order', :locals => {:f => f} %>
-</div>

data/app/views/checkout/_payment.erb

@@ -1,24 +0,0 @@
-<h2><%= t("payment_information") %></h2>
-<div class="inner">
-	<p>
-		<%= image_tag "creditcard.gif", :id => 'creditcard-image' %>
-	</p>
-	<p>
-		<label for=""><%= t("card_number") %></label>
-		<%= f.text_field :creditcard_number, :size=> 19, :class => 'required' -%><span class="req">*</span>
-	</p>
-	<p>
-		<label for=""><%= t("expiration") %></label>
-		<%= select_month(@date, :prefix => 'checkout_presenter', :field_name => 'creditcard_month', :use_month_numbers => true, :class => 'required') -%>
-		<%= select_year(@date, :prefix => 'checkout_presenter', :field_name => 'creditcard_year', :start_year => Date.today.year, :end_year => Date.today.year + 15, :class => 'required') -%>
-		<span class="req">*</span>
-	</p>
-	<p>
-		<label for=""><%= t("card_code") %></label>
-		<%= f.text_field :creditcard_verification_value, {:style => 'width:40px', :class => 'required'} -%><span class="req">*</span>
-		<a href="" onclick="window.open('/checkout/cvv','mywin','left=20,top=20,width=500,height=500,toolbar=0,resizable=0,scrollbars=1');return false">
-			(<%= t("whats_this") %>)
-		</a>
-	</p>
-	<p><input id="confirm_payment" type="button" value="<%=t("continue")%>"/></p>
-</div>

data/app/views/checkout/_shipping.html.erb

@@ -1,50 +0,0 @@
-<h2><%= t("shipping_address")%></h2>
-<div class="inner">
-	<p><label for="<%= t("use_billing_address") %>" id="use_billing"><%= t("use_billing_address") %></label><input id="checkout_presenter_same_address" name="checkout_presenter_same_address" type="checkbox" /></p> 
-	<p id="sfname">
-		<label for="<%= t("first_name") %>"><%= t("first_name") %></label>
-		<%= f.text_field :ship_address_firstname, :class => 'required' -%><span class="req">*</span>
-	</p>
-	<p id="slname">
-		<label for="<%= t("last_name") %>"><%= t("last_name") %></label>
-		<%= f.text_field :ship_address_lastname, :class => 'required' -%><span class="req">*</span>
-	</p>
-	<p id="saddress">
-		<label for="<%= t("street_address") %>"><%= t("street_address") %></label>
-		<%= f.text_field :ship_address_address1, :class => 'required' -%><span class="req">*</span>
-	</p>
-	<p id="saddress2">
-		<label for="<%= t("street_address_2") %>"><%= t("street_address_2") %></label>
-		<%= f.text_field :ship_address_address2 %>
-	</p>
-	<p id="scity">
-		<label for="<%= t("city") %>"><%= t("city") %></label>
-		<%= f.text_field :ship_address_city, :class => 'required' -%><span class="req">*</span>
-	</p>    
-	<p>
-		<label for="<%= t("state") %>"><%= t("state") %></label>
-		<span id="sstate">
-			<%= collection_select("checkout_presenter", 
-			:ship_address_state_id, 
-			@states, 
-			:id, 
-			:name, 
-			{:include_blank => true}, 
-			{:style=> 'width:150px;'}) %>
-		</span>
-		<span class="req">*</span>
-	</p>  
-	<p id="szip">
-		<label for="<%=t ("zip") %>"><%= t("zip") %></label>
-		<%= f.text_field :ship_address_zipcode, :class => 'required' -%><span class="req">*</span>
-	</p>
-	<p id="scountry">
-		<label for="<%= t("country") %>"><%= t("country") %></label>
-		<span id="scountry"><%= f.collection_select :ship_address_country_id, @shipping_countries, :id, :name, {}, {:style => 'width:150px;', :class => 'required'} %></span>
-	</p>
-	<p id="sphone">
-		<label for="<%= t("phone") %>"><%= t("phone") %></label>
-		<%= f.text_field :ship_address_phone, :class => 'required' -%><span class="req">*</span>
-	</p>
-	<p><input id="validate_shipping" type="button" value="<%=t("continue")%>"/></p>
-</div>

data/app/views/checkout/_shipping_method.html.erb

@@ -1,5 +0,0 @@
-<h2><%= t("shipping_method") %></h2>
-<div class="inner">
-	<div id="methods"></div>
-	<p><input id="select_shipping_method" type="button" value="<%=t("continue")%>"/></p>
-</div>