spree 0.8.5 → 0.9.0

data/app/views/admin/products/_images.html.erb

@@ -1,42 +0,0 @@
-<h2><%= t('images') %></h2>
-<%=error_message_on :viewable, :images %>
-<table class="index">
-  <tr>
-    <th><%= t('image') %></th>
-    <th><%= t('action') %></th>
-  </tr>
-  <% viewable.images.each do |image| %>
-  <tr>
-    <td><%= image_tag image.attachment.url(:small) %></td>
-    <td>
-      <%= link_to_remote t('delete'),
-          :url => admin_image_url(image),
-          :method => 'delete',
-          :before => "Element.show('img_busy_indicator')", 
-          :complete => "Element.hide('img_busy_indicator')",
-          :confirm => t("are_you_sure_delete_image"),
-          :update => 'image-listing' %>
-      <%= image_tag "spinner.gif", :plugin=>"spree", :style => "display:none", :id => 'img_busy_indicator' %>
-    </td>
-  </tr>
-  <% end %>
-  <% if viewable.images.empty? %>
-    <tr>
-      <td colspan="3"><%= t('none_available') %>.</td>
-    </tr>
-  <% end %>
-</table>
-
-<p>
-  <%= button_link_to_function t("new_image"), "$('new-img-link').hide();$('new-image').show()", :icon => 'add', :id => "new-img-link" %>
-</p>
-
-
-<table id="new-image" style="display:none">
-  <% fields_for :image do |image| %>
-    <tr>
-      <td>Filename:</td>
-      <td><%= image.file_field :attachment, :size => 50 %></td>      
-    </tr>
-  <% end %>
-</table>

data/app/views/admin/taxonomies/_yui_head.html.erb

@@ -1,17 +0,0 @@
-<% content_for :head do %>
-	<%= stylesheet_link_tag 'admin/yui-includes.css' %>
-	<%= javascript_include_tag 'yui-includes.js' %>
-	<%= javascript_include_tag 'spree-yui.js' %>
-	<script type="text/javascript">
-	<!-- Add authenticity token to prototype --/>
-	Ajax.Base.prototype.initialize = Ajax.Base.prototype.initialize.wrap(
-	        function(p, options){
-	                p(options);
-	                this.options.parameters = this.options.parameters || {};
-	                this.options.parameters.authenticity_token = '<%= form_authenticity_token %>';
-	        }
-	);
-
-	spree.YUI.authenticity_token = '<%= form_authenticity_token %>';
-	</script>
-<% end %>

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

@@ -1,53 +0,0 @@
-<% order_form.fields_for :bill_address do |bill_form| %>
-  <h2><%= t("billing_address")%></h2>
-  <div class="inner">
-  	<p id="bfname">
-  		<label for="<%= t("first_name") %>"><%= t("first_name") %></label>
-  		<%= bill_form.text_field :firstname, :class => 'required' -%><span class="req">*</span>
-  	</p>
-  	<p id="blname">
-  		<label for="<%= t("last_name") %>"><%= t("last_name") %></label>
-  		<%= bill_form.text_field :lastname, :class => 'required' -%><span class="req">*</span>
-  	</p>
-  	<p id="baddress">
-  		<label for="<%= t("street_address") %>"><%= t("street_address") %></label>
-  		<%= bill_form.text_field :address1, :class => 'required' -%><span class="req">*</span>
-  	</p>
-  	<p id="baddress2">
-  		<label for="<%= t("street_address_2") %>"><%= t("street_address_2") %></label>
-  		<%= bill_form.text_field :address2 %>
-  	</p>
-  	<p id="bcity">
-  		<label for="<%= t("city") %>"><%= t("city") %></label>
-  		<%= bill_form.text_field :city, :class => 'required' -%><span class="req">*</span>
-  	</p>                        
-  	<p>
-  		<label for="<%= t("state") %>"><%= t("state") %></label>
-  		<span id="bstate">
-  			<%= collection_select("order[bill_address_attributes]", 
-  			:state_id, 
-  			@states, 
-  			:id, 
-  			:name, 
-  			{:include_blank => true}, 
-  			{:style=> 'width:150px;'}) %>
-  		</span>
-  		<span class="req">*</span>
-  	</p>
-  	<p id="bzip">
-  		<label for="<%= t("zip") %>"><%= t("zip") %></label>
-  		<%= bill_form.text_field :zipcode, :class => 'required' -%><span class="req">*</span>
-  	</p>    
-  	<p id="bcountry">
-  		<label for="<%= t("country") %>"><%= t("country") %></label>
-  		<span id="bcountry"><%= bill_form.collection_select :country_id, @countries, :id, :name, {}, {:style => 'width:150px;', :class => 'required'} %></span>
-  	</p>
-  	<p id="bphone">
-  		<label for="<%= t("phone") %>"><%= t("phone") %></label>
-  		<%= bill_form.text_field :phone, :class => 'required' -%><span class="req">*</span>
-  	</p>
-  	<div class="form-buttons">
-      <input id="continue_billing" type="button" class="button primary" value="<%=t("continue")%>"/>
-    </div>
-  </div>
-<% end %>

data/app/views/orders/_checkout_form.html.erb

@@ -1,14 +0,0 @@
-<% content_for :head do %>
-  <%= javascript_tag "var AUTH_TOKEN = #{form_authenticity_token.inspect};" if protect_against_forgery? %> 
-  <script type="text/javascript">
-    var regions = new Array(<%= @checkout_steps.collect { |step| "'#{step}'" }.join(",") %>);  
-  </script>
-<% end %>                 
-
-<%= error_messages_for :order %>
-
-<% @checkout_steps.each do |step| %>
-  <div id="<%=step%>" class="checkout disabled">
-    <%= render step, :order_form => order_form %>  
-  </div>
-<% end %>

data/app/views/orders/_confirmation.html.erb

@@ -1,11 +0,0 @@
-<h2><%= t("confirm") %></h2>
-<div class="inner">         
-	<input id="final_answer" name="final_answer" type="hidden">
-	<div id="bdisplay"><img src="/images/ajax_loader.gif" id="bconfirm_loader" /></div>
-	<div id="sdisplay"><img src="/images/ajax_loader.gif" id="sconfirm_loader" /></div>
-	<div class="clear"></div>
-	<%= render :partial => 'shared/order_details', :locals => {:order => @order} -%>
-	<div class="form-buttons">
-	  <%= submit_tag t('place_order'), {:id => "continue_confirmation", :class => "button primary"}  %>
-	</div>
-</div>

data/app/views/orders/_payment.html.erb

@@ -1,30 +0,0 @@
-<% order_form.fields_for :creditcards do |creditcard_form| %> 
-  <h2><%= t("payment_information") %></h2>
-  <div class="inner">
-  	<p>
-  		<%= image_tag "creditcard.gif", :id => 'creditcard-image' %>
-  	</p>
-  	<p>
-  		<label for=""><%= t("card_number") %></label>
-  		<%= creditcard_form.text_field :number, :size=> 19, :max_length => 19, :class => 'required' -%><span class="req">*</span>
-  	</p>
-  	<p>
-  		<label for=""><%= t("expiration") %></label>  		
-  		<%= select_month(Date.today, :prefix => 'order[creditcards_attributes][0]', :field_name => 'month', :use_month_numbers => true, :class => 'required') -%>
-  		<%= select_year(Date.today, :prefix => 'order[creditcards_attributes][0]', :field_name => '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>
-  		<%= creditcard_form.text_field :verification_value, {:style => 'width:40px', :class => 'required'} -%><span class="req">*</span>
-  		<a href="" onclick="window.open('/content/cvv','mywin','left=20,top=20,width=500,height=500,toolbar=0,resizable=0,scrollbars=1');return false">
-  			(<%= t("whats_this") %>)
-  		</a>
-  	</p>
-  	<div class="form-buttons">
-  	  <input id="continue_payment" type="button" class="button primary" value="<%=t("continue")%>"/>
-  	</div>
-  	<%= creditcard_form.hidden_field :first_name -%>
-    <%= creditcard_form.hidden_field :last_name -%>  	
-  </div>    
-<% end %>

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

@@ -1,54 +0,0 @@
-<% order_form.fields_for :ship_address do |ship_form| %>     
-  <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_same_address" name="checkout_same_address" type="checkbox" /></p> 
-  	<p id="sfname">
-  		<label for="<%= t("first_name") %>"><%= t("first_name") %></label>
-  		<%= ship_form.text_field :firstname, :class => 'required' -%><span class="req">*</span>
-  	</p>
-  	<p id="slname">
-  		<label for="<%= t("last_name") %>"><%= t("last_name") %></label>
-  		<%= ship_form.text_field :lastname, :class => 'required' -%><span class="req">*</span>
-  	</p>
-  	<p id="saddress">
-  		<label for="<%= t("street_address") %>"><%= t("street_address") %></label>
-  		<%= ship_form.text_field :address1, :class => 'required' -%><span class="req">*</span>
-  	</p>
-  	<p id="saddress2">
-  		<label for="<%= t("street_address_2") %>"><%= t("street_address_2") %></label>
-  		<%= ship_form.text_field :address2 %>
-  	</p>
-  	<p id="scity">
-  		<label for="<%= t("city") %>"><%= t("city") %></label>
-  		<%= ship_form.text_field :city, :class => 'required' -%><span class="req">*</span>
-  	</p>    
-  	<p>
-  		<label for="<%= t("state") %>"><%= t("state") %></label>
-  		<span id="sstate">
-  			<%= collection_select("order[ship_address_attributes]", 
-  			: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>
-  		<%= ship_form.text_field :zipcode, :class => 'required' -%><span class="req">*</span>
-  	</p>
-  	<p id="scountry">
-  		<label for="<%= t("country") %>"><%= t("country") %></label>
-  		<span id="scountry"><%= ship_form.collection_select :country_id, @shipping_countries, :id, :name, {}, {:style => 'width:150px;', :class => 'required'} %></span>
-  	</p>
-  	<p id="sphone">
-  		<label for="<%= t("phone") %>"><%= t("phone") %></label>
-  		<%= ship_form.text_field :phone, :class => 'required' -%><span class="req">*</span>
-  	</p>
-  	<div class="form-buttons">
-  	  <input id="continue_shipping" type="button" class="button primary" value="<%=t("continue")%>"/>
-  	</div>
-  </div>
-<% end %>

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

@@ -1,10 +0,0 @@
-<h2><%= t("shipping_method") %></h2>
-<div class="inner">
-  <div id="methods"></div>
-  <div class="error">
-    <%= t('unable_ship_method') %>
-  </div>
-  <div class="form-buttons">
-    <input id="continue_shipping_method" type="button" class="button primar" value="<%=t("continue")%>"/>
-  </div>
-</div>

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

@@ -1,15 +0,0 @@
-<% content_for :head do %>
-  <%= javascript_include_tag 'checkout' %>
-<% end %>
-<div id="checkout">
-  <h1><%= t("checkout")%></h1>
-  <% form_for @order, :url => checkout_order_path(@order), :html => { :method => :post, :id => 'checkout_form'} do |order_form| %>
-    <%= render :partial => 'checkout_form', :locals => {:order_form => order_form} %>    
-    <input id="post-final" type="submit" style="display:none"/>
-  <% end %>
-</div>
-
-<input type="hidden" id="hidden_bstate" name="hidden_bstate" value="<%= @order.bill_address.state_id || @order.bill_address.state_name %>" />
-<input type="hidden" id="hidden_bcountry" name="hidden_bcountry" value="<%= @order.bill_address.country_id %>" />
-<input type="hidden" id="hidden_sstate" name="hidden_sstate" value="<%= @order.ship_address.state_id || @order.ship_address.state_name %>" />
-<input type="hidden" id="hidden_scountry" name="hidden_scountry" value="<%= @order.ship_address.country_id %>" />

data/config/initializers/searchlogic.rb

@@ -1,6 +0,0 @@
-# config/initializers/searchlogic.rb
-
-# global configuration switches
-Searchlogic::Config.configure do |config|
-  config.helpers.page_links_div_wrapper = true
-end

data/db/sample/zone_members.yml

@@ -1,16 +0,0 @@
-usa_member:
-  zone: available_shipping
-  zoneable_id: 214
-  zoneable_type: Country
-canada_member:
-  zone: available_shipping
-  zoneable_id: 35
-  zoneable_type: Country
-uk_one_ship_opt:
-  zone: one_ship_option
-  zoneable_id: 213
-  zoneable_type: Country
-uae_one_ship_opt:
-  zone: one_ship_option
-  zoneable_id: 212                # UAE, just cos it's close to US/UK in the list
-  zoneable_type: Country

data/db/sample/zones.yml

@@ -1,6 +0,0 @@
-available_shipping:
-  name: North America
-  description: USA + Canada
-one_ship_option:
-  name: Zone with one shipping option 
-  description: Zone with one shipping option 

data/lib/flat_rate.rb

@@ -1,10 +0,0 @@
-class FlatRate
-  
-  def description
-    "Flat Rate Shipping (USPS)"
-  end
-  
-  def shipping_cost(order)
-    return FLAT_SHIPPING_RATE
-  end
-end

data/lib/spree/checkout.rb

@@ -1,74 +0,0 @@
-# Custom logic to be included in OrdersController.  It has intentionally been isolated in its own library to make it 
-# easier for developers to customize the checkout process.
-module Spree::Checkout
-
-  def checkout
-    build_object 
-    load_object 
-    load_data
-    load_checkout_steps                                             
-
-    @order.update_attributes(params[:order])
-
-    # additional default values needed for checkout
-    @order.bill_address ||= Address.new(:country => @default_country)
-    @order.ship_address ||= Address.new(:country => @default_country) 
-    if @order.creditcards.empty?
-      @order.creditcards.build(:month => Date.today.month, :year => Date.today.year)
-    end
-    @shipping_method = ShippingMethod.find_by_id(params[:method_id]) if params[:method_id]  
-    @shipping_method ||= @order.shipping_methods.first    
-    @order.shipments.build(:address => @order.ship_address, :shipping_method => @shipping_method) if @order.shipments.empty?    
-
-    if request.post?                           
-      @order.creditcards.clear
-      @order.attributes = params[:order]
-      @order.creditcards[0].address = @order.bill_address if @order.creditcards.present?
-      @order.user = current_user       
-      @order.ip_address = request.env['REMOTE_ADDR']
-      @order.update_totals
-      @order.email = current_user.email if @order.email.blank? && current_user
-
-      begin
-        # need to check valid b/c we dump the creditcard info while saving
-        if @order.valid?                       
-          if params[:final_answer].blank?
-            @order.save
-          else                                           
-            @order.creditcards[0].authorize(@order.total)
-            @order.complete
-            # remove the order from the session
-            session[:order_id] = nil 
-          end
-        else
-          flash.now[:error] = t("unable_to_save_order")  
-          render :action => "checkout" and return unless request.xhr?
-        end       
-      rescue Spree::GatewayError => ge
-        flash.now[:error] = t("unable_to_authorize_credit_card") + ": #{ge.message}"
-        render :action => "checkout" and return 
-      end
-      
-
-      respond_to do |format|
-        format.html do  
-          flash[:notice] = t('order_processed_successfully')
-          order_params = {:checkout_complete => true}
-          order_params[:order_token] = @order.token unless @order.user
-          redirect_to order_url(@order, order_params)
-        end
-        format.js {render :json => { :order_total => number_to_currency(@order.total), 
-                                     :ship_amount => number_to_currency(@order.ship_amount), 
-                                     :tax_amount => number_to_currency(@order.tax_amount),
-                                     :available_methods => rate_hash}.to_json,
-                          :layout => false}
-      end
-      
-    end
-  end
-  
-  def load_checkout_steps
-    @checkout_steps = %w{registration billing shipping shipping_method payment confirmation}
-    @checkout_steps.delete "registration" if current_user
-  end  
-end