spree 0.6.0 → 0.7.0

data/vendor/extensions/shipping/app/controllers/shipments_controller.rb

@@ -1,96 +0,0 @@
-class ShipmentsController < Spree::BaseController
-  before_filter :login_required
-  before_filter :load_data, :except => :country_changed              
-  before_filter :load_shipping_methods, :only => :edit
-  before_filter :prevent_orphaned_shipments, :only => [:new, :create] 
-  
-  resource_controller
-  
-  belongs_to :order  
-  actions :new, :create
-
-  # override r_c defaults so we can handle special presenter logic
-  def create        
-    build_object
-    load_object
-    state_check("shipment")  
-    unless @shipment_presenter.valid?
-      render :action => "new" and return
-    end
-    @shipment = @order.shipments.new(:address => @shipment_presenter.address)
-    # choose first shipping method just as a starting point (user can change in next step)
-    @shipment.shipping_method =  @shipment.shipping_methods.first
-    @shipment.save
-    @order.next!
-    redirect_to edit_order_shipment_url(@order, @shipment)
-  end
-
-  # override r_c defaults so we can handle special presenter logic
-  def update
-    if params[:method_id]
-      state_check("shipping_method")
-      shipping_method = ShippingMethod.find(params[:method_id])
-      @shipment.update_attribute(:shipping_method, shipping_method)
-      calculator = @shipment.shipping_method.shipping_calculator.constantize.new
-      @order.update_attribute(:ship_amount, calculator.calculate_shipping(@shipment))
-      @order.next!
-    end
-    redirect_to checkout_order_url(@order)
-  end
-
-  def country_changed
-    country_id = params[:shipment_presenter][:address_country_id]
-    @states = State.find_all_by_country_id(country_id, :order => 'name')  
-    render :partial => "shared/states", :locals => {:presenter_type => "shipment"}
-  end  
-
-  private      
-  def build_object
-    @object ||= end_of_association_chain.send parent? ? :build : :new, object_params     
-    if params[:shipment_presenter]
-      @shipment_presenter = ShipmentPresenter.new(params[:shipment_presenter]) 
-    else
-      @shipment_presenter = ShipmentPresenter.new(:address => Address.new(:country_id => @selected_country_id))
-    end
-  end
-  
-  def load_data 
-    load_object
-    @selected_country_id = params[:shipment_presenter][:address_country_id].to_i if params.has_key?('shipment_presenter')
-    @selected_country_id ||= Spree::Config[:default_country_id] 
-    @states = State.find_all_by_country_id(@selected_country_id, :order => 'name')  
-    @countries = @order.shipping_countries 
-  end
-
-  def state_check(state)
-    if @order.checkout_complete
-      # if order has already completed user shouldn't be able to edit shipping information
-      redirect_to checkout_order_url(@order) and return 
-    else 
-      # reset the state to the appropriate value (in case user has hit back button from some other state)
-      @order.update_attribute("state", state) unless @order.state == state   
-    end
-  end
-
-  def prevent_orphaned_shipments
-    # right now we assume only one shipment and we're going to clear out any existing (abandoned) shipments
-    # in case user has edited cart in the meantime (or perhaps they have started the checkout process over)
-    @order.shipments.clear
-  end
-
-  def load_shipping_methods
-    @shipping_methods = @shipment.shipping_methods
-    # check that the rate for each method is available - if we encounter an error, we can inform the user gracefully
-    # (instead of having the next view just crash when asked the rate)
-    begin
-      @shipping_methods.each do |shipping_method|
-        rate = shipping_method.calculate_shipping(@shipment)
-      end      
-    rescue Spree::ShippingError => se
-      # We cannot recover from this error (for now.)  Send back to the previous step (and alert the user)
-      flash[:error] = se.message
-      redirect_to fatal_shipping_order_url(@order)
-    end
-  end
-  
-end

data/vendor/extensions/shipping/app/helpers/shipments_helper.rb

@@ -1,20 +0,0 @@
-module ShipmentsHelper
-  # Creates a radio button to represent a choice of shipping method.  The choice will be disabled if for some 
-  # reason the rate is nil (perhaps the web service didn't return a quote for that method for some reason.)
-  def shipping_radio(shipping_method, shipment)
-    cost = shipping_method.calculate_shipping(shipment)    
-    checked = @shipment.shipping_method == shipping_method || @default_method == shipping_method
-    if cost
-      radio =  "<input type='radio' name='method_id' value='#{shipping_method.id}' #{"checked='true'" if checked} onclick='calculate_order_total(this);'/>" 
-      radio += shipping_method.name
-      radio += "&nbsp; (Cost: #{number_to_currency(cost)})"
-    else
-      radio =  "<input type='radio' name='method_id' disabled='true' onclick='calculate_order_total(this);'/>"
-      radio += "<span class='disabled'>#{shipping_method.name}</span>" 
-    end
-    
-    radio += "<script type=""text/javascript"">shipping_costs.set('#{shipping_method.id}',#{cost});</script>"
-    
-    radio
-  end
-end

data/vendor/extensions/shipping/app/views/orders/fatal_shipping.html.erb

@@ -1,6 +0,0 @@
-<!-- NOTE: Hopefull this page is never seen.  Its suggested that you customize it for each application anyways so we're 
-not bothering with translation (the flash error message will be translated.)_ -->
-<p>
-  We are experiencing technical difficulties obtaining a shipping quote from one or more carriers.  Your order has been 
-  saved and we hope to resolve the issue shortly.  We appologize for the inconvenience.
-</p>

data/vendor/extensions/shipping/app/views/shipments/_form.html.erb

@@ -1,46 +0,0 @@
-<table class="order-summary" style="width:100%;">
-  <tr>
-    <th><%= t('item_description') %></th>
-    <th><%= t('price') %></th>
-    <th><%= t('qty') %></th>
-    <th width="250" align="right"><%= t('total') %></th>
-  </tr>
-  <% @order.line_items.each do |item| %>
-  <tr >
-    <td width="300"><%=item.variant.product.name-%> <%= "(" + variant_options(item.variant) + ")" unless item.variant .option_values.empty? %></td>
-    <td valign="top"><%= number_to_currency item.price -%></td>
-    <td valign="top"><%=item.quantity-%></td>
-    <td valign="top" align="right"><%= number_to_currency (item.price * item.quantity)-%></td>
-  </tr>
-  <% end %>      
-  <tr id="subtotal-row">
-    <td colspan="3" align="right"><b><%= t('subtotal') %>:</b></td>
-    <td align="right"><%= number_to_currency @order.item_total -%></td>
-  </tr>
-  <tr>
-    <td colspan="3" align="right"><b><%= t('tax') %>:</b></td>
-    <td align="right"><%= number_to_currency @order.tax_amount -%></td>
-  </tr>
-  <tr><th colspan="4"/></tr>
-  <tr>
-    <th colspan="4"><%= t('select_preferred_shipping_option') %></th>
-  </tr>
-  <tr>
-    <td class="simple-radios">
-    	<% @shipping_methods.each do |shipping_method| %>
-		  	<li>
-		  	  <%= shipping_radio(shipping_method, @order) %>
-		  	</li>
-		  <% end%>
-    </td>
-  </tr>
-  <tr>
-    <td colspan="3" align="right"><b><%= t('order_total') %>:</b></td>
-    <td id="order_total_cell" align="right"><%= number_to_currency(@order.total + @default_method.calculate_shipping(@order))%></td>
-  </tr>
-</table>
-<script type="text/javascript">
-	var order_total_without_shipping = <%= @order.total %>;
-</script>
-
- 

data/vendor/extensions/shipping/app/views/shipments/edit.html.erb

@@ -1,57 +0,0 @@
-<div id="shipment">
-  <%= error_messages_for :shipment %>
-  <h1><%= t("shipment") %></h1>
-  <% form_for :shipment, :url => object_url, :html => { :method => :put } do |f| %>
-		<table class="order-summary" style="width:100%;">
-		  <tr>
-		    <th><%= t('item_description') %></th>
-		    <th><%= t('price') %></th>
-		    <th><%= t('qty') %></th>
-		    <th width="250" align="right"><%= t('total') %></th>
-		  </tr>
-		  <% @order.line_items.each do |item| %>
-		  <tr >
-		    <td width="300"><%=item.variant.product.name-%> 
-					<%= "(" + variant_options(item.variant) + ")" unless item.variant .option_values.empty? %>
-				</td>
-		    <td valign="top"><%= number_to_currency item.price -%></td>
-		    <td valign="top"><%=item.quantity-%></td>
-		    <td valign="top" align="right"><%= number_to_currency (item.price * item.quantity)-%></td>
-		  </tr>
-		  <% end %>      
-		  <tr id="subtotal-row">
-		    <td colspan="3" align="right"><b><%= t('subtotal') %>:</b></td>
-		    <td align="right"><%= number_to_currency @order.item_total -%></td>
-		  </tr>
-		  <tr>
-		    <td colspan="3" align="right"><b><%= t('tax') %>:</b></td>
-		    <td align="right"><%= number_to_currency @order.tax_amount -%></td>
-		  </tr>
-		  <tr><th colspan="4"/></tr>
-		  <tr>
-		    <th colspan="4"><%= t('select_preferred_shipping_option') %></th>
-		  </tr>
-		  <tr>
-		    <td class="simple-radios">
-		    	<% @shipping_methods.each do |shipping_method| %>
-				  	<li>
-				  	  <%= shipping_radio(shipping_method, @shipment) %>
-				  	</li>
-				  <% end%>
-		    </td>
-		  </tr>
-		  <tr>
-		    <td colspan="3" align="right"><b><%= t('order_total') %>:</b></td>
-		    <td id="order_total_cell" align="right">
-					<%= number_to_currency(@order.item_total + @shipment.shipping_method.calculate_shipping(@shipment))%>
-				</td>
-		  </tr>
-		</table>
-		<script type="text/javascript">
-			var order_total_without_shipping = <%= @order.total %>;
-		</script>
-    <div align="right">
-      <%= submit_tag t('continue') %>
-    </div>
-  <% end %>
-</div>

data/vendor/extensions/shipping/app/views/shipments/new.html.erb

@@ -1,10 +0,0 @@
-<div id="shipment">
-  <%=error_messages_for :shipment_presenter%>
-  <h1><%= t("shipping_address")%></h1>
-  <% form_for :shipment_presenter, :url => collection_url do |f| %>
-		<%= render :partial => 'shared/form_address', :locals => {:f => f, :presenter_type => "shipment"} %>
-    <div align="right">
-      <%= submit_tag t('continue') %>
-    </div>
-  <% end %>
-</div>