spree_core 0.30.0.beta1 → 0.30.0

data/app/controllers/admin/checkouts_controller.rb

@@ -1,58 +0,0 @@
-class Admin::CheckoutsController  < Admin::BaseController
-  resource_controller :singleton
-  actions :edit, :update, :show
-  belongs_to :order
-  before_filter :load_data
-  ssl_required
-
-  create.flash nil
-  update.flash nil
-
-  edit.before :edit_before
-  update.before :update_before
-
-  update.wants.html do
-    if @order.in_progress?
-      redirect_to edit_admin_order_shipment_url(@order, @order.shipment)
-    else
-      redirect_to admin_order_checkout_url(@order)
-    end
-  end
-
-  private
-  def load_data
-    @countries = Country.find(:all).sort
-    if params[:checkout] && params[:checkout][:bill_address_attributes]
-      default_country = Country.find params[:checkout][:bill_address_attributes][:country_id]
-    elsif params[:checkout] && params[:checkout][:ship_address_attributes]
-      default_country = Country.find params[:checkout][:ship_address_attributes][:country_id]
-    elsif object.bill_address && object.bill_address.country
-      default_country = object.bill_address.country
-    elsif current_user && current_user.bill_address
-      default_country = current_user.bill_address.country
-    else
-      default_country = Country.find Spree::Config[:default_country_id]
-    end
-    @states = default_country.states.sort
-  end
-
-  def edit_before
-    @checkout.build_bill_address(:country_id => Spree::Config[:default_country_id]) if @checkout.bill_address.nil?
-    @checkout.build_ship_address(:country_id => Spree::Config[:default_country_id]) if @checkout.ship_address.nil?
-    set_validations
-  end
-
-  def update_before
-    #assign order to existing user
-    @checkout.order.update_attribute(:user_id, params[:user_id]) unless params[:user_id].blank?
-    set_validations
-  end
-
-  def set_validations
-    @checkout.enable_validation_group(:address) #force validation group here as checkout state could be different
-
-    #need to add email to current validation fields as admin checkout
-    #is handling to validation groups at once register/address
-    @checkout.current_validation_fields << "email"
-  end
-end

data/app/models/checkout.rb

@@ -1,141 +0,0 @@
-class Checkout < ActiveRecord::Base
-  extend ValidationGroup::ActiveRecord::ActsMethods
-
-  before_update :check_addresses_on_duplication, :if => "!ship_address.nil? && !bill_address.nil?"
-  after_save :process_coupon_code
-  after_save :update_order_shipment
-  before_validation :clone_billing_address, :if => "@use_billing"
-
-  belongs_to :order
-  belongs_to :bill_address, :foreign_key => "bill_address_id", :class_name => "Address"
-  belongs_to :ship_address, :foreign_key => "ship_address_id", :class_name => "Address"
-  belongs_to :shipping_method
-  has_many :payments, :as => :payable
-
-  accepts_nested_attributes_for :bill_address
-  accepts_nested_attributes_for :ship_address
-  accepts_nested_attributes_for :payments
-
-  attr_accessor :coupon_code
-  attr_accessor :use_billing
-
-  validates :order_id, :shipping_method_id, :presence => true
-  validates :email, :format => { :with => /^\S+@\S+\.\S+$/ }
-
-  validation_group :register, :fields => ["email"]
-
-  validation_group :address, :fields=>["bill_address.firstname", "bill_address.lastname", "bill_address.phone",
-                                       "bill_address.zipcode", "bill_address.state", "bill_address.lastname",
-                                       "bill_address.address1", "bill_address.city", "bill_address.statename",
-                                       "bill_address.zipcode", "ship_address.firstname", "ship_address.lastname", "ship_address.phone",
-                                       "ship_address.zipcode", "ship_address.state", "ship_address.lastname",
-                                       "ship_address.address1", "ship_address.city", "ship_address.statename",
-                                       "ship_address.zipcode"]
-  validation_group :delivery, :fields => ["shipping_method_id"]
-
-  def completed_at
-    order.completed_at
-  end
-
-  # This is a temporary Shipment object for the purpose of showing available shiping rates in delivery step of checkout
-  def shipment
-    @shipment ||= Shipment.new(:order => order, :address => ship_address)
-  end
-
-
-  alias :ar_valid? :valid?
-  def valid?(context=nil)
-    # will perform partial validation when @checkout.enabled_validation_group :step is called
-    result = ar_valid?(context)
-    return result unless validation_group_enabled?
-
-    relevant_errors = errors.select { |attr, msg| @current_validation_fields.include?(attr) }
-    errors.clear
-    relevant_errors.each { |attr, msg| errors.add(attr, msg) }
-    relevant_errors.empty?
-  end
-
-  # checkout state machine (see http://github.com/pluginaweek/state_machine/tree/master for details)
-  state_machine :initial => 'address' do
-    after_transition :to => 'complete', :do => :complete_order
-    before_transition :to => 'complete', :do => :process_payment
-    event :next do
-      transition :to => 'delivery', :from  => 'address'
-      transition :to => 'payment', :from => 'delivery'
-      transition :to => 'confirm', :from => 'payment', :if => Proc.new { Gateway.current and Gateway.current.payment_profiles_supported? }
-      transition :to => 'complete', :from => 'confirm'
-      transition :to => 'complete', :from => 'payment'
-    end
-  end
-  def self.state_names
-    state_machine.states.by_priority.map(&:name)
-  end
-
-  def shipping_methods(display_on=nil)
-    return [] unless ship_address
-    ShippingMethod.all_available(order,display_on)
-  end
-
-  def payment
-    payments.first
-  end
-
-  private
-
-  def check_addresses_on_duplication
-    if order.user
-      if order.user.ship_address.nil?
-        order.user.ship_address = ship_address
-      elsif ship_address.same_as?(order.user.ship_address)
-        #self.ship_address = order.user.ship_address
-      end
-      if order.user.bill_address.nil?
-        order.user.bill_address = bill_address
-      elsif bill_address.same_as?(order.user.bill_address)
-        #self.bill_address = order.user.bill_address
-      end
-    end
-    true
-  end
-
-  def clone_billing_address
-    if self.ship_address.nil?
-      self.ship_address = bill_address.clone
-    else
-      self.ship_address.attributes = bill_address.attributes.except("id", "updated_at", "created_at")
-    end
-    true
-  end
-
-  def complete_order
-    order.complete!
-    order.pay! if Spree::Config[:auto_capture]
-  end
-
-  def process_payment
-    return if order.payments.total == order.total
-    payments.each(&:process!)
-  end
-
-  def process_coupon_code
-    return unless @coupon_code and coupon = Promotion.find(:first, :conditions => ["UPPER(code) = ?",@coupon_code.upcase])
-    coupon.create_discount(order)
-    # recalculate order totals
-    order.save
-  end
-
-  # list of countries available for checkout
-  def self.countries
-    return Country.all unless zone = Zone.find_by_name(Spree::Config[:checkout_zone])
-    zone.country_list
-  end
-
-  def update_order_shipment
-    if order.shipment
-      order.shipment.shipping_method = shipping_method
-      order.shipment.address_id = ship_address.id unless ship_address.nil?
-      order.shipment.save
-    end
-  end
-
-end

data/app/models/order_mailer.rb

@@ -1,24 +0,0 @@
-class OrderMailer < ActionMailer::Base
-  helper "spree/base"
-  default :from => Spree::Config[:order_from]
-
-  def confirm(order, resend = false)
-    @subject    = (resend ? "[RESEND] " : "")
-    @subject    += Spree::Config[:site_name] + ' ' + 'Order Confirmation #' + order.number
-    mail(:subject => @subject, :body =>  {"order" => order}, :to => order.email, :bcc => order_bcc)
-  end
-
-  def cancel(order)
-    @subject    = '[CANCEL]' + Spree::Config[:site_name] + ' Order Confirmation #' + order.number
-    mail(:subject => @subject, :body =>  {"order" => order}, :to => order.email, :bcc => order_bcc)
-  end
-
-  private
-  def order_bcc
-      bcc = [Spree::Config[:order_bcc] || "", Spree::Config[:mail_bcc] || ""]
-      bcc = bcc.inject([]){|array, config_string| array + config_string.split(",")}
-      bcc = bcc.collect{|email| email.strip}
-      bcc = bcc.uniq
-      bcc
-  end
-end

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

@@ -1,131 +0,0 @@
-<div class='toolbar order-links'>
-  <%= button_link_to t("edit"), edit_admin_order_checkout_url(@order.number), :icon => 'edit' %>
-</div>
-
-<%= render :partial => 'admin/shared/order_tabs', :locals => {:current => "Customer Details"} %>
-
-<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? ? t('yes') : t('no') %>
-      </td>
-    </tr>
-  </tbody>
-</table>
-
-<h3><%= Address.human_name(:count => 2) %></h3>
-<table class="index">
-  <tr>
-    <th colspan="8"><%= t("billing_address") %></th>
-  </tr>
-  <% if @checkout.bill_address %>
-  <tr>
-    <td  class="lbl-col">
-      <label><%= Address.human_attribute_name(:first_name) %>:</label>
-    </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 class="val-col" colspan="3"><%= @checkout.bill_address.lastname %></td>
-  </tr>
-  <tr>
-    <td>
-      <label><%= Address.human_attribute_name(:address1) %>:</label>
-    </td>
-    <td colspan="3"><%= @checkout.bill_address.address1 %></td>
-    <td>
-      <label><%= Address.human_attribute_name(:address2) %>:</label>
-    </td>
-    <td colspan="3"><%= @checkout.bill_address.address2 %></td>
-  </tr>
-  <tr>
-    <td>
-      <label><%= Address.human_attribute_name(:city) %>:</label>
-    </td>
-    <td colspan="3"><%= @checkout.bill_address.city %></td>
-    <td>
-      <label><%= Address.human_attribute_name(:zipcode) %>:</label>
-    </td>
-    <td colspan="3"><%= @checkout.bill_address.zipcode %></td>
-  </tr>
-  <tr>
-    <td>
-      <label><%= Address.human_attribute_name(:state) %>:</label>
-    </td>
-    <td colspan="3"><%= @checkout.bill_address.state.nil? ? @checkout.bill_address.state_name : @checkout.bill_address.state.name %></td>
-    <td>
-      <label><%= Address.human_attribute_name(:country) %>:</label>
-    </td>
-    <td colspan="3"><%= @checkout.bill_address.country %></td>
-  </tr>
-  <tr>
-    <td>
-      <label><%= Address.human_attribute_name(:phone) %>:</label>
-    </td>
-    <td colspan="7"><%= @checkout.bill_address.phone %></td>
-  </tr>
-  <% end %>
-</table>
-
-<table class="index">
-  <tr>
-    <th colspan="8"><%= t("shipping_address") %></th>
-  </tr>
-  <% if @checkout.ship_address %>
-  <tr>
-    <td class="lbl-col">
-      <label><%= Address.human_attribute_name(:first_name) %>:</label>
-    </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 class="val-col" colspan="3"><%= @checkout.ship_address.lastname %></td>
-  </tr>
-  <tr>
-    <td>
-      <label><%= Address.human_attribute_name(:address1) %>:</label>
-    </td>
-    <td colspan="3"><%= @checkout.ship_address.address1 %></td>
-    <td>
-      <label><%= Address.human_attribute_name(:address2) %>:</label>
-    </td>
-    <td colspan="3"><%= @checkout.ship_address.address2 %></td>
-  </tr>
-  <tr>
-    <td>
-      <label><%= Address.human_attribute_name(:city) %>:</label>
-    </td>
-    <td colspan="3"><%= @checkout.ship_address.city %></td>
-    <td>
-      <label><%= Address.human_attribute_name(:zipcode) %>:</label>
-    </td>
-    <td colspan="3"><%= @checkout.ship_address.zipcode %></td>
-  </tr>
-  <tr>
-    <td>
-      <label><%= Address.human_attribute_name(:state) %>:</label>
-    </td>
-    <td colspan="3"><%= @checkout.ship_address.state.nil? ? @checkout.ship_address.state_name : @checkout.ship_address.state.name %></td>
-    <td>
-      <label><%= Address.human_attribute_name(:country) %>:</label>
-    </td>
-    <td colspan="3"><%= @checkout.ship_address.country %></td>
-  </tr>
-  <tr>
-    <td>
-      <label><%= Address.human_attribute_name(:phone) %>:</label>
-    </td>
-    <td colspan="7"><%= @checkout.ship_address.phone %></td>
-  </tr>
-  <% end %>
-</table>

data/app/views/admin/mail_settings/edit.html.erb

@@ -1,114 +0,0 @@
-<%= render :partial => 'admin/shared/configuration_menu' %>
-
-<h1><%= t('mail_server_preferences') %></h1>
-
-<%= form_tag(admin_mail_settings_path, :method => :put) do %>
-
-<div class="yui-g">
-
-  <div class="yui-u first">
-
-    <fieldset>
-      <legend><%= t('general') %></legend>
-
-      <p>
-        <label>
-        <input name="preferences[enable_mail_delivery]" type="hidden" value="0" />
-          <%= check_box_tag('preferences[enable_mail_delivery]', "1", Spree::Config[:enable_mail_delivery]) %>
-          <%= t('enable_mail_delivery') %>
-        </label>
-      </p>
-
-      <p>
-        <label><%= t('send_mails_as') %></label><br />
-        <%= text_field_tag('preferences[mails_from]', Spree::Config[:mails_from], :maxlength => 256)%>
-        <br/>
-        <span class="info">
-          <%= t("smtp_send_all_emails_as_from_following_address") %>
-        </span>
-      </p>
-
-      <p>
-        <label><%= t('send_copy_of_all_mails_to') %></label><br />
-        <%= text_field_tag('preferences[mail_bcc]', Spree::Config[:mail_bcc], :size => 40, :maxlength => 256)%>
-        <br/>
-        <span class="info">
-          <%= t("smtp_send_copy_to_this_addresses") %>
-        </span>
-      </p>
-
-    </fieldset>
-
-
-
-    <fieldset>
-      <legend><%= t('orders') %></legend>
-      <p>
-        <label><%= t('send_order_mails_as') %></label><br />
-        <%= text_field_tag('preferences[order_from]', Spree::Config[:order_from], :maxlength => 256)%>
-        <br/>
-        <span class="info">
-          <%= t("smtp_send_order_mails_as_from_following_address")%>
-        </span>
-      </p>
-
-      <p>
-        <label><%= t('send_copy_of_orders_mails_to') %></label><br />
-        <%= text_field_tag('preferences[order_bcc]', Spree::Config[:order_bcc], :size => 40, :maxlength => 256)%>
-        <br/>
-        <span class="info">
-          <%= t("smtp_send_copy_of_orders_to_this_addresses")%>
-        </span>
-      </p>
-    </fieldset>
-
-
-  </div>
-
-  <div class="yui-u">
-
-    <fieldset>
-      <legend><%= t('smtp') %></legend>
-      <p>
-        <label><%= t("smtp_domain") %></label><br />
-        <%= text_field_tag('preferences[mail_domain]', Spree::Config[:mail_domain]) %>
-      </p>
-      <p>
-        <label><%= t('smtp_mail_host') %></label><br />
-        <%= text_field_tag('preferences[mail_host]', Spree::Config[:mail_host])%>
-      </p>
-      <p>
-        <label><%= t('smtp_port') %></label><br />
-        <%= text_field_tag('preferences[mail_port]', Spree::Config[:mail_port])%>
-      </p>
-      <p>
-        <label><%= t('secure_connection_type')  %></label><br />
-        <%= select_tag('preferences[secure_connection_type]',
-        options_for_select(
-        AppConfiguration::SECURE_CONNECTION_TYPES,
-        Spree::Config[:secure_connection_type])) %>
-      </p>
-      <p>
-        <label><%= t('smtp_authentication_type') %></label><br />
-        <%= select_tag('preferences[mail_auth_type]',
-        options_for_select(AppConfiguration::MAIL_AUTH,
-        Spree::Config[:mail_auth_type])) %>
-      </p>
-
-      <p>
-        <label><%= t('smtp_username') %></label><br />
-        <%= text_field_tag('preferences[smtp_username]', Spree::Config[:smtp_username])%>
-      </p>
-      <p>
-        <label><%= t('smtp_password') %></label><br />
-        <%= password_field_tag('preferences[smtp_password]', Spree::Config[:smtp_password])%>
-      </p>
-    </fieldset>
-
-  </div>
-
-</div>
-
-<p class="form-buttons"><%= button t('save_preferences') %></p>
-
-<% end %>