shoppe 1.0.2 → 1.0.3

data/app/controllers/shoppe/users_controller.rb

@@ -1,53 +1,53 @@
 module Shoppe
   class UsersController < Shoppe::ApplicationController
-  
+
     before_filter { @active_nav = :users }
     before_filter { params[:id] && @user = Shoppe::User.find(params[:id]) }
     before_filter(:only => [:create, :update, :destroy]) do
       if Shoppe.settings.demo_mode?
-        raise Shoppe::Error, "You cannot make changes to users in demo mode. Sorry about that."
+        raise Shoppe::Error, t('shoppe.users.demo_mode_error')
       end
     end
-  
+
     def index
       @users = Shoppe::User.all
     end
-  
+
     def new
       @user = Shoppe::User.new
     end
-  
+
     def create
       @user = Shoppe::User.new(safe_params)
       if @user.save
-        redirect_to :users, :flash => {:notice => "User has been created successfully"}
+        redirect_to :users, :flash => {:notice => t('shoppe.users.create_notice') }
       else
         render :action => "new"
       end
     end
-  
+
     def edit
     end
-  
+
     def update
       if @user.update(safe_params)
-        redirect_to [:edit, @user], :flash => {:notice => "User has been updated successfully"}
+        redirect_to [:edit, @user], :flash => {:notice => t('shoppe.users.update_notice') }
       else
         render :action => "edit"
       end
     end
-  
+
     def destroy
-      raise Shoppe::Error, "You cannot remove yourself" if @user == current_user
+      raise Shoppe::Error, t('shoppe.users.self_remove_error') if @user == current_user
       @user.destroy
-      redirect_to :users, :flash => {:notice => "User has been removed successfully"}
+      redirect_to :users, :flash => {:notice => t('shoppe.users.destroy_notice') }
     end
-  
+
     private
-  
+
     def safe_params
       params[:user].permit(:first_name, :last_name, :email_address, :password, :password_confirmation)
     end
-  
+
   end
 end

data/app/controllers/shoppe/variants_controller.rb

@@ -1,50 +1,50 @@
 module Shoppe
   class VariantsController < ApplicationController
-    
+
     before_filter { @active_nav = :products }
     before_filter { @product = Shoppe::Product.find(params[:product_id]) }
     before_filter { params[:id] && @variant = @product.variants.find(params[:id]) }
-    
+
     def index
       @variants = @product.variants.ordered
     end
-    
+
     def new
       @variant = @product.variants.build
       render :action => "form"
     end
-    
+
     def create
       @variant = @product.variants.build(safe_params)
       if @variant.save
-        redirect_to [@product, :variants], :notice => "Varient has been added successfully"
+        redirect_to [@product, :variants], :notice =>  t('shoppe.variants.create_notice')
       else
         render :action => "form"
       end
     end
-    
+
     def edit
       render :action => "form"
     end
-    
+
     def update
       if @variant.update(safe_params)
-        redirect_to edit_product_variant_path(@product, @variant), :notice => "Varient has been updated successfully"
+        redirect_to edit_product_variant_path(@product, @variant), :notice => t('shoppe.variants.update_notice')
       else
         render :action => "form"
       end
     end
-    
+
     def destroy
       @variant.destroy
-      redirect_to [@product, :variants], :notice => "Varient has been removed successfully"
+      redirect_to [@product, :variants], :notice =>  t('shoppe.variants.destroy_notice')
     end
-    
+
     private
-    
+
     def safe_params
       params[:product].permit(:name, :permalink, :sku, :default_image_file, :price, :cost_price, :tax_rate_id, :weight, :stock_control, :active, :default)
     end
-    
+
   end
 end

data/app/helpers/shoppe/application_helper.rb

@@ -1,14 +1,14 @@
 module Shoppe
   module ApplicationHelper
-    
+
     def navigation_manager_link(item)
       link_to item.description, item.url(self), item.link_options.merge(:class => item.active?(self) ? 'active' : 'inactive')
     end
-  
+
     def status_tag(status)
-      content_tag :span, status, :class => "status-tag #{status}"
+      content_tag :span, t("shoppe.orders.statuses.#{status}"), :class => "status-tag #{status}"
     end
-  
+
     def attachment_preview(attachment, options = {})
       if attachment
         String.new.tap do |s|
@@ -22,24 +22,24 @@ module Shoppe
           s << "<div class='desc'>"
           s << "<span class='filename'><a href='#{attachment_path(attachment)}'>#{attachment.file_name}</a></span>"
           s << "<span class='delete'>"
-          s << link_to(t('shoppe.helpers.attachment_preview.delete', :default => 'Delete this file?'), attachment_path(attachment), :method => :delete, :data => {:confirm => t('shoppe.helpers.attachment_preview.delete_confirm', :default => "Are you sure you wish to remove this attachment?")})
+          s << link_to(t('helpers.attachment_preview.delete', :default => 'Delete this file?'), attachment_path(attachment), :method => :delete, :data => {:confirm => t('helpers.attachment_preview.delete_confirm', :default => "Are you sure you wish to remove this attachment?")})
           s << "</span>"
           s << "</div>"
           s << "</div>"
         end.html_safe
       elsif !options[:hide_if_blank]
-        "<div class='attachmentPreview'><div class='imgContainer'><div class='img none'></div></div><div class='desc none'>No attachment</div></div>".html_safe
+        "<div class='attachmentPreview'><div class='imgContainer'><div class='img none'></div></div><div class='desc none'>#{t('helpers.attachment_preview.no_attachment')},</div></div>".html_safe
       end
     end
-    
+
     def settings_label(field)
       "<label for='settings_#{field}'>#{t("shoppe.settings.labels.#{field}")}</label>".html_safe
     end
-    
+
     def settings_field(field, options = {})
-      default = t("shoppe.settings.defaults")[field.to_sym]
+      default = I18n.t("shoppe.settings.defaults")[field.to_sym]
       value = (params[:settings] && params[:settings][field]) || Shoppe.settings[field.to_s]
-      type = t("shoppe.settings.types")[field.to_sym] || 'string'
+      type = I18n.t("shoppe.settings.types")[field.to_sym] || 'string'
       case type
       when 'boolean'
         String.new.tap do |s|
@@ -55,6 +55,6 @@ module Shoppe
         text_field_tag "settings[#{field}]", value, options.merge(:placeholder => default, :class => 'text')
       end
     end
-  
+
   end
-end
+end

data/app/models/shoppe/order/actions.rb

@@ -1,6 +1,8 @@
 module Shoppe
   class Order < ActiveRecord::Base
     
+    extend ActiveModel::Callbacks
+    
     # These additional callbacks allow for applications to hook into other
     # parts of the order lifecycle.
     define_model_callbacks :confirmation, :acceptance, :rejection
@@ -41,7 +43,7 @@ module Shoppe
         self.order_items.each(&:confirm!)
 
         # Send an email to the customer
-        Shoppe::OrderMailer.received(self).deliver
+        deliver_received_order_email
       end
     
       # We're all good.
@@ -59,7 +61,7 @@ module Shoppe
           self.status = 'accepted'
           self.save!
           self.order_items.each(&:accept!)
-          Shoppe::OrderMailer.accepted(self).deliver
+          deliver_accepted_order_email
         end
       end
     end
@@ -75,10 +77,22 @@ module Shoppe
           self.status = 'rejected'
           self.save!
           self.order_items.each(&:reject!)
-          Shoppe::OrderMailer.rejected(self).deliver
+          deliver_rejected_order_email
         end
       end
     end
+
+    def deliver_accepted_order_email
+      Shoppe::OrderMailer.accepted(self).deliver
+    end
+
+    def deliver_rejected_order_email
+      Shoppe::OrderMailer.rejected(self).deliver
+    end
+
+    def deliver_received_order_email
+      Shoppe::OrderMailer.received(self).deliver
+    end
     
   end
 end

data/app/models/shoppe/order/billing.rb

@@ -1,14 +1,14 @@
 module Shoppe
   class Order < ActiveRecord::Base
-    
+
     # The country which this order should be billed to
     #
     # @return [Shoppe::Country]
     belongs_to :billing_country, :class_name => 'Shoppe::Country', :foreign_key => 'billing_country_id'
-    
+
     # Payments which have been stored for the order
     has_many :payments, :dependent => :destroy, :class_name => 'Shoppe::Payment'
-    
+
     # Validations
     with_options :if => Proc.new { |o| !o.building? } do |order|
       order.validates :first_name, :presence => true
@@ -19,43 +19,43 @@ module Shoppe
       order.validates :billing_postcode, :presence => true
       order.validates :billing_country, :presence => true
     end
-    
+
     # The name for billing purposes
     #
     # @return [String]
     def billing_name
       company.blank? ? full_name : "#{full_name} (#{company})"
     end
-    
+
     # The total cost of the order
     #
     # @return [BigDecimal]
     def total_cost
-      self.delivery_cost_price + 
+      self.delivery_cost_price +
       order_items.inject(BigDecimal(0)) { |t, i| t + i.total_cost }
     end
-  
+
     # Return the price for the order
     #
     # @return [BigDecimal]
     def profit
       total_before_tax - total_cost
     end
-    
+
     # The total price of all items in the basket excluding delivery
     #
     # @return [BigDecimal]
     def items_sub_total
       order_items.inject(BigDecimal(0)) { |t, i| t + i.sub_total }
     end
-  
+
     # The total price of the order before tax
     #
     # @return [BigDecimal]
     def total_before_tax
       self.delivery_price + self.items_sub_total
     end
-  
+
     # The total amount of tax due on this order
     #
     # @return [BigDecimal]
@@ -63,43 +63,43 @@ module Shoppe
       self.delivery_tax_amount +
       order_items.inject(BigDecimal(0)) { |t, i| t + i.tax_amount }
     end
-  
+
     # The total of the order including tax
     #
     # @return [BigDecimal]
     def total
-      self.delivery_price + 
-      self.delivery_tax_amount + 
+      self.delivery_price +
+      self.delivery_tax_amount +
       order_items.inject(BigDecimal(0)) { |t, i| t + i.total }
     end
-    
+
     # The total amount due on the order
     #
     # @return [BigDecimal]
     def balance
       @balance ||= total - amount_paid
     end
-    
+
     # Is there a payment still outstanding on this order?
     #
     # @return [Boolean]
     def payment_outstanding?
       balance > BigDecimal(0)
     end
-    
+
     # Has this order been paid in full?
     #
     # @return [Boolean]
     def paid_in_full?
       !payment_outstanding?
     end
-  
+
     # Is the order invoiced?
     #
     # @return [Boolean]
     def invoiced?
       !invoice_number.blank?
     end
-    
+
   end
 end

data/app/models/shoppe/order/delivery.rb

@@ -1,24 +1,24 @@
 module Shoppe
   class Order < ActiveRecord::Base
-    
+
     # The associated delivery service
     #
     # @return [Shoppe::DeliveryService]
     belongs_to :delivery_service, :class_name => 'Shoppe::DeliveryService'
-    
+
     # The country where this order is being delivered to (if one has been provided)
     #
     # @return [Shoppe::Country]
     belongs_to :delivery_country, :class_name => 'Shoppe::Country', :foreign_key => 'delivery_country_id'
-    
+
     # The user who marked the order has shipped
     #
     # @return [Shoppe::User]
     belongs_to :shipper, :class_name => 'Shoppe::User', :foreign_key => 'shipped_by'
-    
+
     # Set up a callback for use when an order is shipped
     define_model_callbacks :ship
-    
+
     # Validations
     with_options :if => :separate_delivery_address? do |order|
       order.validates :delivery_name, :presence => true
@@ -28,17 +28,17 @@ module Shoppe
       order.validates :delivery_postcode, :presence => true
       order.validates :delivery_country, :presence => true
     end
-    
+
     validate do
       if self.delivery_required?
         if self.delivery_service.nil?
-          errors.add :delivery_service_id, "must be specified"
+          errors.add :delivery_service_id, :must_be_specified
         elsif !self.valid_delivery_service?
-          errors.add :delivery_service_id, "is not suitable for this order"
+          errors.add :delivery_service_id, :not_suitable
         end
       end
     end
-    
+
     before_confirmation do
       # Ensure that before we confirm the order that the delivery service which has been selected
       # is appropritae for the contents of the order.
@@ -47,7 +47,7 @@ module Shoppe
       end
       cache_delivery_pricing
     end
-    
+
     # If an order has been received and something changes the delivery service or the delivery price
     # is cleared, we will re-cache all the delivery pricing so that we have the latest.
     before_save do
@@ -59,7 +59,7 @@ module Shoppe
         cache_delivery_pricing
       end
     end
-    
+
     # If there isn't a seperate address needed, clear all the fields back to nil
     before_validation do
       unless separate_delivery_address?
@@ -72,7 +72,7 @@ module Shoppe
         self.delivery_country = nil
       end
     end
-    
+
     # Create some delivery_ methods which will mimic the billing methods if the order does
     # not need a seperate address.
     [:delivery_name, :delivery_address1, :delivery_address2, :delivery_address3, :delivery_address4, :delivery_postcode, :delivery_country].each do |f|
@@ -80,7 +80,7 @@ module Shoppe
         separate_delivery_address? ? super() : send(f.to_s.gsub('delivery_', 'billing_'))
       end
     end
-    
+
     # Cache delivery prices for the order
     def cache_delivery_pricing
       if self.delivery_service
@@ -96,34 +96,34 @@ module Shoppe
         write_attribute :delivery_tax_amount, nil
       end
     end
-    
+
     # Cache prices and save the order
     def cache_delivery_pricing!
       cache_delivery_pricing
       save!
     end
-    
+
     # Has this order been shipped?
     #
     # @return [Boolean]
     def shipped?
       !!self.shipped_at?
     end
-    
+
     # The total weight of the order
     #
     # @return [BigDecimal]
     def total_weight
       order_items.inject(BigDecimal(0)) { |t,i| t + i.total_weight}
     end
-    
+
     # Is delivery required for this order?
     #
     # @return [Boolean]
     def delivery_required?
       total_weight > BigDecimal(0)
     end
-    
+
     # An array of all the delivery services which are suitable for this order in it's
     # current state (based on its current weight)
     #
@@ -131,7 +131,7 @@ module Shoppe
     def available_delivery_services
       delivery_service_prices.map(&:delivery_service).uniq
     end
-    
+
     # An array of all the delivery service prices which can be applied to this order.
     #
     # @return [Array] an array of Shoppe:DeliveryServicePrice objects
@@ -139,8 +139,7 @@ module Shoppe
       if delivery_required?
         prices = Shoppe::DeliveryServicePrice.joins(:delivery_service).where(:shoppe_delivery_services => {:active => true}).order(:price).for_weight(total_weight)
         prices = prices.select { |p| p.countries.empty? || p.country?(self.delivery_country) }
-        prices = prices.group_by { |dsp| dsp.delivery_service.default? }
-        (prices[true] || []) | (prices[false] || [])
+        prices.sort{ |x,y| (y.delivery_service.default? ? 1 : 0) <=> (x.delivery_service.default? ? 1 : 0) } # Order by truthiness
       else
         []
       end
@@ -152,28 +151,28 @@ module Shoppe
     def delivery_service
       super || available_delivery_services.first
     end
-  
+
     # Return the delivery price for this order in its current state
     #
     # @return [BigDecimal]
     def delivery_service_price
       self.delivery_service && self.delivery_service.delivery_service_prices.for_weight(self.total_weight).first
     end
-  
+
     # The price for delivering this order in its current state
     #
     # @return [BigDecimal]
     def delivery_price
       read_attribute(:delivery_price) || delivery_service_price.try(:price) || BigDecimal(0)
     end
-  
+
     # The cost of delivering this order in its current state
     #
     # @return [BigDecimal]
     def delivery_cost_price
       read_attribute(:delivery_cost_price) || delivery_service_price.try(:cost_price) || BigDecimal(0)
     end
-  
+
     # The tax amount due for the delivery of this order in its current state
     #
     # @return [BigDecimal]
@@ -181,7 +180,7 @@ module Shoppe
       read_attribute(:delivery_tax_amount) ||
       delivery_price / BigDecimal(100) * delivery_tax_rate
     end
-  
+
     # The tax rate for the delivery of this order in its current state
     #
     # @return [BigDecimal]
@@ -190,14 +189,14 @@ module Shoppe
       delivery_service_price.try(:tax_rate).try(:rate_for, self) ||
       BigDecimal(0)
     end
-  
+
     # Is the currently assigned delivery service appropriate for this order?
     #
     # @return [Boolean]
     def valid_delivery_service?
       self.delivery_service ? self.available_delivery_services.include?(self.delivery_service) : !self.delivery_required?
     end
-  
+
     # Remove the associated delivery service if it's invalid
     def remove_delivery_service_if_invalid
       unless self.valid_delivery_service?
@@ -205,7 +204,7 @@ module Shoppe
         self.save
       end
     end
-  
+
     # The URL which can be used to track the delivery of this order
     #
     # @return [String]
@@ -213,7 +212,7 @@ module Shoppe
       return nil if self.shipped_at.blank? || self.consignment_number.blank?
       @courier_tracking_url ||= self.delivery_service.tracking_url_for(self)
     end
-    
+
     # Mark this order as shipped
     def ship!(consignment_number, user = nil)
       run_callbacks :ship do
@@ -225,6 +224,6 @@ module Shoppe
         Shoppe::OrderMailer.shipped(self).deliver
       end
     end
-    
+
   end
 end