spree 0.10.2 → 0.11.0

data/vendor/extensions/payment_gateway/payment_gateway_extension.rb

@@ -6,8 +6,6 @@ class PaymentGatewayExtension < Spree::Extension
   def activate  
     require 'active_merchant'
 
-    # Set the global "gateway mode" for active merchant (depending on what environment we're in)
-    ActiveMerchant::Billing::Base.gateway_mode = :test unless ENV['RAILS_ENV'] == "production"
     # Mixin the payment_gateway method into the base controller so it can be accessed by the checkout process, etc.
     Creditcard.class_eval do
       # add gateway methods to the creditcard so we can authorize, capture, etc.
@@ -16,16 +14,17 @@ class PaymentGatewayExtension < Spree::Extension
     
     silence_warnings { require 'active_merchant/billing/authorize_net_cim' }
     
-		#register all payment methods
-		[
-			Gateway::Bogus,
+    #register all payment methods
+    [
+      Gateway::Bogus,
       Gateway::AuthorizeNet,
 			Gateway::AuthorizeNetCim,
+			Gateway::Eway,
       Gateway::Linkpoint,
-			Gateway::PayPal,
-			Gateway::Protx,
-			Gateway::Beanstream,
-			PaymentMethod::Check
+      Gateway::PayPal,
+      Gateway::SagePay,
+      Gateway::Beanstream,
+      PaymentMethod::Check
     ].each{|gw|
       begin
         gw.register  
@@ -35,4 +34,4 @@ class PaymentGatewayExtension < Spree::Extension
     }
 
   end
-end
+end

data/vendor/extensions/payment_gateway/test/unit/authorize_net_cim_test.rb

@@ -23,7 +23,8 @@ class AuthorizeNetCimTest < Test::Unit::TestCase
 
     @creditcard = Factory(:creditcard, :verification_value => '123', :number => '4242424242424242', :month => 9, :year => Time.now.year + 1, :first_name => 'John', :last_name => 'Doe')
     @checkout = Factory(:checkout, :bill_address => @address, :ship_address => @address)
-    @checkout.payments << Factory(:payment, :source => @creditcard)
+    @payment = Factory(:payment, :source => @creditcard, :payable => @checkout)
+    @checkout.payments << @payment
     @gateway = Gateway::AuthorizeNetCim.create!(:name => 'Authorize.net CIM Gateway')
     @creditcard.reload
     
@@ -44,13 +45,13 @@ class AuthorizeNetCimTest < Test::Unit::TestCase
     should "build correct options hash" do
       expected_options = {:profile => { 
         :payment_profiles => {
-          # :bill_to => @address_options,
+          :bill_to => @address_options,
           :payment => {:credit_card => @creditcard}
           },
           # :ship_to_list => @address_options
         }}
 
-      options = @gateway.send(:options_for_create_customer_profile, @creditcard, @creditcard.gateway_options(@checkout))
+      options = @gateway.send(:options_for_create_customer_profile, @payment)
       merchant_customer_id = options[:profile].delete(:merchant_customer_id)
 
       assert_equal expected_options, options
@@ -59,16 +60,16 @@ class AuthorizeNetCimTest < Test::Unit::TestCase
   
   context "create_customer_profile" do
     should "create a customer profile sucessfully" do
-      result = @gateway.send(:create_customer_profile, @creditcard, @creditcard.gateway_options(@checkout))
+      result = @gateway.send(:create_customer_profile, @payment)
       assert result.is_a?(Hash)
       assert_equal "123", result[:customer_profile_id]
     end
     should "raise a gateway error if there is a problem creating profile" do
       ActiveMerchant::Billing::AuthorizeNetCimGateway.force_failure = true
-      assert_raise(Spree::GatewayError) { @gateway.send(:create_customer_profile, @creditcard, @creditcard.gateway_options(@checkout)) }
+      assert_raise(Spree::GatewayError) { @gateway.send(:create_customer_profile, @payment) }
     end
   end
-
+  
   context "authorize" do
     setup do
       @response = @gateway.authorize(500, @creditcard, @creditcard.gateway_options(@checkout))

data/vendor/extensions/theme_default/app/stylesheets/_checkout.less

@@ -27,11 +27,11 @@ div#checkout {
     padding-right: 10px;
     text-align: right;
   }
-  #checkout_form_address #billing input, #checkout_form_address #shipping input, 
+  #checkout_form_address #billing input, #checkout_form_address #shipping input,
   #checkout_form_address #billing select, #checkout_form_address #shipping select {
     width:304px;
   }
-  #checkout_form_address #billing p.checkbox, 
+  #checkout_form_address #billing p.checkbox,
   #checkout_form_address #shipping p.checkbox,
   #checkout_form_address .form-buttons {
     padding-left:200px;
@@ -56,7 +56,7 @@ div#checkout {
     list-style: none;
     display:block;
     padding: 0; margin: 0;
-  	width: 720px;
+    width: 720px;
     li {
         display:block;
         .column(5);
@@ -66,4 +66,11 @@ div#checkout {
     }
   }
 
+  #checkout-summary {
+    background-color: #C3C9DF;
+    float: right;
+    margin-top: 10px;
+    padding: 20px;
+    width: 180px;
+  }
 }

data/vendor/extensions/theme_default/app/views/admin/adjustments/index.html.erb

@@ -33,4 +33,4 @@
   <% end %>
 </table>
 
-<%= button_link_to t('continue'), admin_orders_url %>
+<%= button_link_to t('continue'), @order.in_progress? ? new_admin_order_payment_url(@order) : admin_orders_url %>

data/vendor/extensions/theme_default/app/views/admin/checkouts/_form.html.erb

@@ -1,14 +1,40 @@
-<p>
-  <label>Email: </label><%= f.text_field :email %>
-</p>
+
+<h3><%= t("customer_details") %></h3>
+<table class="index">
+  <thead>
+    <th colspan="8"><%= t('account') %></th>
+  </thead>
+  <tbody>
+    <tr>
+      <td class="lbl-col"><%= f.label :email, t(:email)+':' %></td>
+      <td class="val-col" colspan="3"><%= f.text_field :email, :class => "fullwidth" %></td>
+      <td class="lbl-col"><label><%= t('guest_checkout') %>:</label></td>
+      <td class="val-col" colspan="3">
+        <% if @order.state == "in_progress" %>
+          <label class="sub">
+            <%= radio_button_tag :guest_checkout, true, @checkout.order.user.nil? %>
+            <%= t("yes") %>
+          </label> &nbsp;
+          <label class="sub">
+            <%= radio_button_tag :guest_checkout, false, !@checkout.order.user.nil?, :disabled => @checkout.order.state == "in_progress" %>
+            <%= t("no") %>
+          </label>
+          <%= hidden_field_tag :user_id, @checkout.order.user_id %>
+        <% else %>
+          <%= @checkout.order.user.nil? ? "Yes" : "No" %>
+        <% end %>
+      </td>
+    </tr>
+  </tbody>
+</table>
 
 <h3><%= Address.human_name(:count => 2) %></h3>
 <% f.fields_for 'bill_address' do |ba_form|  %>
-  <%= render :partial => "admin/shared/address_form", :locals => {:f => ba_form, :name => t('billing_address')} %>
+  <%= render :partial => "admin/shared/address_form", :locals => {:f => ba_form, :name => t('billing_address'), :use_billing => false} %>
 <% end %>
 
 <% f.fields_for 'ship_address' do |sa_form|  %>
-  <%= render :partial => "admin/shared/address_form", :locals => {:f => sa_form, :name => t('shipping_address')} %>
+  <%= render :partial => "admin/shared/address_form", :locals => {:f => sa_form, :name => t('shipping_address'), :use_billing => true} %>
 <% end %>
 
 <p class="form-buttons">

data/vendor/extensions/theme_default/app/views/admin/checkouts/show.html.erb

@@ -4,27 +4,38 @@
 
 <%= render :partial => 'admin/shared/order_tabs', :locals => {:current => "Customer Details"} %>
 
-<h2><%= t("customer_details")%></h2>
-
-<p>
-  <label>Email: </label><%= @checkout.email %>
-</p>
+<h3><%= t("customer_details") %></h3>
+<table class="index">
+  <thead>
+    <th colspan="8"><%= t('account') %></th>
+  </thead>
+  <tbody>
+    <tr>
+      <td class="lbl-col"><label><%= t(:email) %>:</label></td>
+      <td class="val-col" colspan="3"><%= @checkout.email %></td>
+      <td class="lbl-col"><label><%= t('guest_checkout') %>:</label></td>
+      <td class="val-col" colspan="3">
+        <%= @checkout.order.user.nil? ? "Yes" : "No" %>
+      </td>
+    </tr>
+  </tbody>
+</table>
 
 <h3><%= Address.human_name(:count => 2) %></h3>
 <table class="index">
   <tr>
     <th colspan="8"><%= t("billing_address") %></th>
-  </tr>  
+  </tr>
   <% if @checkout.bill_address %>
   <tr>
-    <td>
+    <td  class="lbl-col">
       <label><%= Address.human_attribute_name(:first_name) %>:</label>
     </td>
-    <td colspan="3"><%= @checkout.bill_address.firstname %></td>
-    <td>
+    <td class="val-col" colspan="3"><%= @checkout.bill_address.firstname %></td>
+    <td class="lbl-col">
       <label><%= Address.human_attribute_name(:last_name) %>:</label>
     </td>
-    <td colspan="3"><%= @checkout.bill_address.lastname %></td>
+    <td class="val-col" colspan="3"><%= @checkout.bill_address.lastname %></td>
   </tr>
   <tr>
     <td>
@@ -61,24 +72,24 @@
       <label><%= Address.human_attribute_name(:phone) %>:</label>
     </td>
     <td colspan="7"><%= @checkout.bill_address.phone %></td>
-  </tr> 
+  </tr>
   <% end %>
 </table>
 
 <table class="index">
   <tr>
     <th colspan="8"><%= t("shipping_address") %></th>
-  </tr> 
+  </tr>
   <% if @checkout.ship_address %>
   <tr>
-    <td>
+    <td class="lbl-col">
       <label><%= Address.human_attribute_name(:first_name) %>:</label>
     </td>
-    <td colspan="3"><%= @checkout.ship_address.firstname %></td>
-    <td>
+    <td class="val-col" colspan="3"><%= @checkout.ship_address.firstname %></td>
+    <td class="lbl-col">
       <label><%= Address.human_attribute_name(:last_name) %>:</label>
     </td>
-    <td colspan="3"><%= @checkout.ship_address.lastname %></td>
+    <td class="val-col" colspan="3"><%= @checkout.ship_address.lastname %></td>
   </tr>
   <tr>
     <td>

data/vendor/extensions/theme_default/app/views/admin/images/_form.html.erb

@@ -10,3 +10,7 @@
 <% else %>
   <%= hidden_field_tag :product_id, @product.id %>
 <% end %>
+<tr>
+  <td><%= t("alt_text") %>:</td>
+  <td><%= f.text_area :alt %></td>
+</tr>

data/vendor/extensions/theme_default/app/views/admin/images/index.html.erb

@@ -3,20 +3,22 @@
 <%= render :partial => 'admin/shared/product_tabs', :locals => {:current => "Images"} %>
 
 <table class="index">
-	<tr>
-	  <th><%= t("thumbnail") %></th>
+  <tr>
+    <th><%= t("thumbnail") %></th>
     <% if @product.has_variants? %>
-	    <th><%= Variant.human_name %></th>
-	  <% end %>
-	  <th><%= t("action") %></th>
-	</tr>
- 
+      <th><%= Variant.human_name %></th>
+    <% end %>
+    <th><%= t("alt_text") %></th>
+    <th><%= t("action") %></th>
+  </tr>
+
   <% @product.images.each do |image| %>
     <tr id="<%= dom_id(image) %>">
       <td><%= link_to(image_tag(image.attachment.url(:mini)), image.attachment.url(:product)) %></td>
       <% if @product.has_variants? %>
         <td><%= t('all') %></td>
       <% end %>
+      <td><%= image.alt %></td>
       <td class="actions">
         <%= link_to_with_icon('edit', t("edit"), edit_admin_product_image_url(@product, image)) %>
         &nbsp;
@@ -24,14 +26,15 @@
       </td>
     </tr>
   <% end %>
- 
-	<% @product.variants.each do |variant| %>
+
+  <% @product.variants.each do |variant| %>
     <% variant.images.each do |image| %>
       <tr id="<%= dom_id(image) %>">
         <td><%= link_to(image_tag(image.attachment.url(:mini)), image.attachment.url(:product)) %></td>
         <% if @product.has_variants? %>
           <td><%= variant.options_text %></td>
         <% end %>
+        <td><%= image.alt %></td>
         <td class="actions">
           <%= link_to_with_icon('edit', t("edit"), edit_admin_product_image_url(@product, image)) %>
           &nbsp;
@@ -50,14 +53,14 @@
 
 <% content_for :head do %>
   <script type="text/javascript">
-    jQuery(document).ready(function(){  
-      
-      jQuery('#new_image_link').click(function (event) { 
+    jQuery(document).ready(function(){
+
+      jQuery('#new_image_link').click(function (event) {
         event.preventDefault();
         jQuery(this).hide();
         jQuery.ajax({type: 'GET', url: this.href, data: ({authenticity_token: AUTH_TOKEN}), success: function(r){ jQuery('#images').html(r);} });
       });
-      
+
     });
   </script>
 <% end %>

data/vendor/extensions/theme_default/app/views/admin/orders/_add_product.html.erb

@@ -2,7 +2,7 @@
   <fieldset>
     <legend><%= t('add_product') %></legend>
     <div style="float:left;width:65%;margin-right:5%;">
-      <%= label_tag :add_product_name, t("name") %>
+      <%= label_tag :add_product_name, t("name_or_sku") %>
       <%= text_field_tag :add_product_name,  {}, :class => 'fullwidth title'  %>
       <%= hidden_field_tag :add_variant_id %>
     </div>

data/vendor/extensions/theme_default/app/views/admin/orders/_form.html.erb

@@ -1,3 +1,5 @@
+<%=error_messages_for :line_item %>
+
 <% form_for(@order, :url => admin_order_url(@order), :html => { :method => :put}) do |f| %>
   <%= f.hidden_field :number %>
   <table class="index">
@@ -66,5 +68,10 @@
 
 <% end %>
 
+<script type="text/javascript">
+  $('#order_tab_summary h5#order_total').html('<%= "#{t('total')}: #{number_to_currency(@order.total)}" %>');
+  $('#order_tab_summary h5#order_status').html('<%= "#{t('status')}: #{t(@order.state)}" %>');
+</script>
+
 <%= javascript_include_tag 'admin/orders/edit_form.js' %>
 

data/vendor/extensions/theme_default/app/views/admin/orders/index.html.erb

@@ -41,7 +41,7 @@
   <% end %>
   </tbody>
 </table>
-<%= will_paginate(:previous_label => "&#171; #{t('previous')}", :next_label => "#{t('next')} &#187;") %>
+<%= will_paginate(@orders, :previous_label => "&#171; #{t('previous')}", :next_label => "#{t('next')} &#187;") %>
 
 
 <% content_for :sidebar do %>
@@ -74,12 +74,12 @@
         <%= f.text_field :checkout_email_contains, :size=>25 %>
       </p>
       <p>
-      <label><%= t 'first_name' %></label><br />
-          <%= f.text_field :checkout_bill_address_firstname_contains, :size=>25 %>
+      <label><%= t 'first_name_begins_with' %></label><br />
+          <%= f.text_field :checkout_bill_address_firstname_begins_with, :size=>25 %>
       </p>
       <p>
-        <label><%= t 'last_name' %></label><br />
-        <%= f.text_field :checkout_bill_address_lastname_contains, :size=>25 %>
+        <label><%= t 'last_name_begins_with' %></label><br />
+        <%= f.text_field :checkout_bill_address_lastname_begins_with, :size=>25 %>
       </p>
       <p>
         <%= f.check_box :completed_at_not_null, {:style => "vertical-align:middle;"} %>

data/vendor/extensions/theme_default/app/views/admin/payment_methods/_form.html.erb

@@ -1,9 +1,9 @@
 <table>
-	<tr>
+  <tr>
     <td><label><%=t("name")%></label></td>
     <td><%= text_field :payment_method, :name, {"style" => "width:200px"} %></td>
   </tr>
-	<tr>
+  <tr>
     <td><label><%=t("description")%></label></td>
     <td><%= text_area :payment_method, :description, {:cols => 60, :rows => 4} %></td>
   </tr>
@@ -13,13 +13,19 @@
       <%= collection_select(:payment_method, :environment, Configuration.configurations.keys, :to_s, :titleize, {}, {:id => "gtwy-env"}) %>
     </td>
   </tr>
+  <tr>
+    <td><label><%=t("display")%></label></td>
+    <td>
+      <%= select(:payment_method, :display, PaymentMethod::DISPLAY.collect {|display| [t(display), display == :both ? nil : display.to_s]}) %>
+    </td>
+  </tr>
   <tr>
     <td><label><%= t("active") %></label></td>
     <td>
       <label class="sub">
         <%= radio_button(:payment_method, :active, true ) %>
         <%= t("yes") %>
-      </label> &nbsp; 
+      </label> &nbsp;
       <label class="sub">
         <%= radio_button(:payment_method, :active, false ) %>
         <%= t("no") %>
@@ -27,7 +33,7 @@
     </td>
   </tr>
 </table>
- 
+
 <h2><%= t('settings') %></h2>
 
 <div id="preference-settings">
@@ -35,9 +41,9 @@
   <%= collection_select(:payment_method, :type, @providers, :to_s, :name, {}, {:id => "gtwy-type"}) %>
 
   <% unless @object.new_record? %>
- 
+
     <%= preference_fields(@object, f) %>
- 
+
     <% if @object.respond_to?(:preferences) %>
       <div id="gateway-settings-warning" style="color:#FF0000"><%= t('provider_settings_warning')%></div>
       <% end %>

data/vendor/extensions/theme_default/app/views/admin/payment_methods/index.html.erb

@@ -13,22 +13,33 @@
 
 <table class="index">
   <thead>
-    <th><%= t("name") %></th>
-    <th><%= t("provider") %></th>
-    <th><%= t("environment") %></th>
-    <th><%= t("active") %></th>     
-    <th><%= t("action") %></th>
+    <% hook :admin_payment_methods_index_headers do %>
+      <th><%= t("name") %></th>
+      <th><%= t("provider") %></th>
+      <th><%= t("environment") %></th>
+      <th><%= t("display") %></th>
+      <th><%= t("active") %></th>
+    <% end %>
+    <th>
+      <% hook :admin_payment_methods_index_header_actions %>
+    </th>
   </thead>
   <tbody>
     <% @payment_methods.each do |method|%>
       <tr id="<%= dom_id method %>">
-        <td width="120px"><%= method.name %></td>
-        <td width="140px"><%= method.type %></td>
-        <td width="100px"><%= method.environment.to_s.titleize %></td>
-        <td width="60px"><%= method.active ? t(:yes) : t(:no) %></td>
+        <%- locals = {:method => method} -%>
+        <% hook :admin_payment_methods_index_rows, locals do %>
+          <td width="120px"><%= method.name %></td>
+          <td width="140px"><%= method.type %></td>
+          <td width="100px"><%= method.environment.to_s.titleize %></td>
+          <td width="60px"><%= method.display.blank? ? "Both" : t(method.display) %></td>
+          <td width="60px"><%= method.active ? t(:yes) : t(:no) %></td>
+        <% end %>
         <td width="140px">
-        	<%= link_to_edit method %> &nbsp;
-        	<%= link_to_delete method %>
+          <% hook :admin_payment_methods_index_row_actions, locals do %>
+            <%= link_to_edit method %> &nbsp;
+            <%= link_to_delete method %>
+          <% end %>
         </td>
       </tr>
     <% end %>