shoppe 1.1.1 → 1.1.2

data/app/models/shoppe/product_category.rb

@@ -13,25 +13,25 @@ module Shoppe
     self.table_name = 'shoppe_product_categories'
 
     # Attachments for this product category
-    has_many :attachments, :as => :parent, :dependent => :destroy, :class_name => "Shoppe::Attachment"
+    has_many :attachments, as: :parent, dependent: :destroy, class_name: "Shoppe::Attachment"
 
     # All products within this category
     has_many :product_categorizations, dependent: :restrict_with_exception, class_name: 'Shoppe::ProductCategorization', inverse_of: :product_category
     has_many :products, class_name: 'Shoppe::Product', through: :product_categorizations
 
     # Validations
-    validates :name, :presence => true
-    validates :permalink, :presence => true, :uniqueness => {scope: :parent_id}, :permalink => true
+    validates :name, presence: true
+    validates :permalink, presence: true, uniqueness: { scope: :parent_id }, permalink: true
 
     # Root (no parent) product categories only
     scope :without_parent, -> { where(parent_id: nil) }
 
-    # No descendents
+    # No descendants
     scope :except_descendants, ->(record) { where.not(id: (Array.new(record.descendants) << record).flatten) }
 
     translates :name, :permalink, :description
     scope :ordered, -> { includes(:translations).order(:name) }
-    
+
     # Set the permalink on callback
     before_validation :set_permalink, :set_ancestral_permalink
     after_save :set_child_permalinks
@@ -56,7 +56,7 @@ module Shoppe
     end
 
     # Attachment with the role image
-    # 
+    #
     # @return [String]
     def image
       self.attachments.for("image")

data/app/models/shoppe/setting.rb

@@ -2,17 +2,17 @@ require 'ostruct'
 
 module Shoppe
   class Setting < ActiveRecord::Base
-    
+
     # Validations
-    validates :key, :presence => true, :uniqueness => true
-    validates :value, :presence => true
-    validates :value_type, :presence => true
-    
+    validates :key, presence: true, uniqueness: true
+    validates :value, presence: true
+    validates :value_type, presence: true
+
     before_validation do
       self.value_type = I18n.t("shoppe.settings.types")[self.key.to_sym].try(:capitalize) || self.value.class.to_s
       self.value      = encoded_value
     end
-    
+
     # The encoded value for saving in the backend (as a string)
     #
     # @return [String]
@@ -23,7 +23,7 @@ module Shoppe
       else                        value.to_s
       end
     end
-    
+
     # The decoded value for the setting attribute (in it's native type)
     #
     # @return [Object]
@@ -36,7 +36,7 @@ module Shoppe
       else                        value.to_s
       end
     end
-    
+
     # A full hash of all settings available in the current scope
     #
     # @return [Hash]
@@ -46,8 +46,8 @@ module Shoppe
         h
       end
     end
-    
-    # Update settings from a given hash and persist them. Accepts a 
+
+    # Update settings from a given hash and persist them. Accepts a
     # hash of keys (which should be strings).
     #
     # @return [Hash]
@@ -56,13 +56,13 @@ module Shoppe
       hash.each do |key, value|
         existing = existing_settings.select { |s| s.key.to_s == key.to_s }.first
         if existing
-          value.blank? ? existing.destroy! : existing.update!(:value => value)
+          value.blank? ? existing.destroy! : existing.update!(value: value)
         else
-          value.blank? ? nil : self.create!(:key => key, :value => value)
+          value.blank? ? nil : self.create!(key: key, value: value)
         end
       end
       hash
     end
-    
+
   end
 end

data/app/models/shoppe/stock_level_adjustment.rb

@@ -2,18 +2,18 @@ module Shoppe
   class StockLevelAdjustment < ActiveRecord::Base
 
     # The orderable item which the stock level adjustment belongs to
-    belongs_to :item, :polymorphic => true
+    belongs_to :item, polymorphic: true
 
     # The parent (OrderItem) which the stock level adjustment belongs to
-    belongs_to :parent, :polymorphic => true
+    belongs_to :parent, polymorphic: true
 
     # Validations
-    validates :description, :presence => true
-    validates :adjustment, :numericality => true
+    validates :description, presence: true
+    validates :adjustment, numericality: true
     validate { errors.add(:adjustment, I18n.t('shoppe.activerecord.attributes.stock_level_adjustment.must_be_greater_or_equal_zero')) if adjustment == 0 }
 
     # All stock level adjustments ordered by their created date desending
-    scope :ordered, -> { order(:id => :desc) }
+    scope :ordered, -> { order(id: :desc) }
 
   end
 end

data/app/models/shoppe/tax_rate.rb

@@ -1,37 +1,37 @@
 module Shoppe
   class TaxRate < ActiveRecord::Base
-    
+
     self.table_name = 'shoppe_tax_rates'
-    
+
     include Shoppe::AssociatedCountries
-    
+
     # The order address types which may be used when choosing how to apply the tax rate
     ADDRESS_TYPES = ['billing', 'delivery']
-    
+
     # Validations
-    validates :name, :presence => true
-    validates :address_type, :inclusion => {:in => ADDRESS_TYPES}
-    validates :rate, :numericality => true
-    
+    validates :name, presence: true
+    validates :address_type, inclusion: {in: ADDRESS_TYPES}
+    validates :rate, numericality: true
+
     # All products which are assigned to this tax rate
-    has_many :products, :dependent => :restrict_with_exception, :class_name => 'Shoppe::Product'
-    
+    has_many :products, dependent: :restrict_with_exception, class_name: 'Shoppe::Product'
+
     # All delivery service prices which are assigned to this tax rate
-    has_many :delivery_service_prices, :dependent => :restrict_with_exception, :class_name => 'Shoppe::DeliveryServicePrice'
-    
+    has_many :delivery_service_prices, dependent: :restrict_with_exception, class_name: 'Shoppe::DeliveryServicePrice'
+
     # All tax rates ordered by their ID
     scope :ordered, -> { order(:id)}
-    
+
     # Set the address type if appropriate
     before_validation { self.address_type = ADDRESS_TYPES.first if self.address_type.blank? }
-    
+
     # A description of the tax rate including its name & percentage
     #
     # @return [String]
     def description
       "#{name} (#{rate}%)"
     end
-    
+
     # The rate for a given order based on the rules on the tax rate
     #
     # @return [BigDecimal]
@@ -41,6 +41,6 @@ module Shoppe
       return rate if address_type == 'delivery' && (order.delivery_country.nil?  || country?(order.delivery_country))
       BigDecimal(0)
     end
-    
+
   end
 end

data/app/models/shoppe/user.rb

@@ -2,48 +2,48 @@ module Shoppe
   class User < ActiveRecord::Base
 
     self.table_name = 'shoppe_users'
-  
+
     has_secure_password
-  
+
     # Validations
-    validates :first_name, :presence => true
-    validates :last_name, :presence => true
-    validates :email_address, :presence => true
-  
+    validates :first_name, presence: true
+    validates :last_name, presence: true
+    validates :email_address, presence: true
+
     # The user's first name & last name concatenated
     #
     # @return [String]
     def full_name
       "#{first_name} #{last_name}"
     end
-  
+
     # The user's first name & initial of last name concatenated
     #
     # @return [String]
     def short_name
       "#{first_name} #{last_name[0,1]}"
     end
-  
+
     # Reset the user's password to something random and e-mail it to them
     def reset_password!
       self.password = SecureRandom.hex(8)
       self.password_confirmation = self.password
       self.save!
-      Shoppe::UserMailer.new_password(self).deliver_now
+      Shoppe::UserMailer.new_password(self).deliver
     end
-  
-    # Attempt to authenticate a user based on email & password. Returns the 
+
+    # Attempt to authenticate a user based on email & password. Returns the
     # user if successful otherwise returns false.
     #
     # @param email_address [String]
     # @param paassword [String]
     # @return [Shoppe::User]
     def self.authenticate(email_address, password)
-      user = self.where(:email_address => email_address).first
+      user = self.where(email_address: email_address).first
       return false if user.nil?
       return false unless user.authenticate(password)
       user
     end
-  
+
   end
 end

data/app/uploaders/shoppe/attachment_uploader.rb

@@ -4,7 +4,6 @@ class Shoppe::AttachmentUploader < CarrierWave::Uploader::Base
 
   include CarrierWave::MiniMagick
 
-  storage :file
 
   # Where should files be stored?
   def store_dir

data/app/views/shoppe/customers/_addresses.html.haml

@@ -3,18 +3,18 @@
     %table.data
       %thead
         %tr
-          %th Type
-          %th Default
-          %th Address
+          %th= t('shoppe.customers.type')
+          %th= t('shoppe.customers.default')
+          %th= t('shoppe.custoemrs.address')
           %th
       %tbody
         - if @addresses.empty?
           %tr.empty
-            %td{:colspan => 4} No addresses to display.
+            %td{:colspan => 4}= t('shoppe.customers.no_addresses')
         - else
           - for address in @addresses
             %tr
               %td= address.address_type.capitalize
               %td= boolean_tag address.default
               %td= address.full_address
-              %td= link_to "Edit", edit_customer_address_path(@customer, address)
+              %td= link_to t('shoppe.customers.edit'), edit_customer_address_path(@customer, address)

data/app/views/shoppe/customers/_form.html.haml

@@ -1,30 +1,37 @@
 = form_for @customer do |f|
   = f.error_messages
 
-  = field_set_tag "Customer Information" do
+  = field_set_tag t('shoppe.customers.customer_information') do
     .splitContainer
       %dl.third
-        %dt= f.label :first_name
+        %dt= f.label :first_name, t('shoppe.customers.first_name')
         %dd= f.text_field :first_name, :class => "text focus"
       %dl.third
-        %dt= f.label :last_name
+        %dt= f.label :last_name, t('shoppe.customers.last_name')
         %dd= f.text_field :last_name, :class => "text"
       %dl.third
-        %dt= f.label :company
+        %dt= f.label :company, t('shoppe.customers.company')
         %dd= f.text_field :company, :class => "text"
     .splitContainer
       %dl.third
-        %dt= f.label :email
+        %dt= f.label :email, t('shoppe.customers.email')
         %dd= f.text_field :email, :class => "text"
       %dl.third
-        %dt= f.label :phone
+        %dt= f.label :phone, t('shoppe.customers.phone')
         %dd= f.text_field :phone, :class => "text"
       %dl.third
-        %dt= f.label :mobile
+        %dt= f.label :mobile, t('shoppe.customers.mobile_phone')
         %dd= f.text_field :mobile, :class => "text"
 
   %p.submit
     - unless @customer.new_record?
-      %span.right= link_to "Delete", @customer, :class => 'button purple', :method => :delete, :data => {:confirm => "Are you sure you wish to remove this product?"}
-    = f.submit :class => 'button green', data: {disable_with: (@customer.new_record? ? "Creating Customer..." : "Updating Customer...")}
-    = link_to "Cancel", :customers, :class => 'button'
+      %span.right
+        = link_to t('shoppe.customers.delete'),
+                  @customer,
+                  class: 'button purple',
+                  method: :delete,
+                  data: {confirm: t('shoppe.customers.delete_confirmation')}
+    = f.submit t('shoppe.customers.save'),
+               class: 'button green',
+               data: {disable_with: (@customer.new_record? ? t('shoppe.customers.creating_customer') : t('shoppe.customers.updating_customer'))}
+    = link_to t('shoppe.customers.cancel'), :customers, :class => 'button'

data/app/views/shoppe/customers/_search_form.html.haml

@@ -1,13 +1,13 @@
 .customerSearch{:style => action_name == 'search' ? "display:block" : ''}
   = search_form_for @query, :url => search_customers_path, :html => { :method => :post } do |f|
     %dl.left
-      %dt= f.label :first_name_or_last_name_or_company_cont, "First or Last Name"
+      %dt= f.label :first_name_or_last_name_or_company_cont, t('shoppe.customers.first_or_last_name')
       %dd= f.text_field :first_name_or_last_name_or_company_cont
-      %dt= f.label :company_cont, "Company"
+      %dt= f.label :company_cont, t('shoppe.customers.company')
       %dd= f.text_field :company_cont
     %dl.right
-      %dt= f.label :email_cont, "Email Address"
+      %dt= f.label :email_cont, t('shoppe.customers.email')
       %dd= f.text_field :email_cont
-      %dt= f.label :phone_cont, "Phone Number"
+      %dt= f.label :phone_cont, t('shoppe.customers.phone')
       %dd= f.text_field :phone_cont
-      %dd= f.submit "Search", :class => 'button green button'
+      %dd= f.submit t('shoppe.customers.search'), :class => 'button green button'

data/app/views/shoppe/customers/edit.html.haml

@@ -1,5 +1,5 @@
-- @page_title = "Customers"
+- @page_title = t('shoppe.customers.customers')
 = content_for :header do
-  %p.buttons= link_to "Back to customer list", :customers, :class => 'button'
-  %h2.users Customers
-= render "form"
+  %p.buttons= link_to t('shoppe.customers.back_to_customers_list'), :customers, :class => 'button'
+  %h2.users= t('shoppe.customers.customers')
+= render "form"

data/app/views/shoppe/customers/index.html.haml

@@ -1,10 +1,10 @@
-- @page_title = "Customers"
+- @page_title = t('shoppe.customers.customers')
 
 = content_for :header do
   %p.buttons
-    = link_to "New Customer", :new_customer, class: "button green"
-    = link_to "Search Customers", '#', class: 'button', rel: "searchCustomers"
-  %h2.users Customers
+    = link_to t('shoppe.customers.new_customer'), :new_customer, class: "button green"
+    = link_to t('shoppe.customers.search_customer'), '#', class: 'button', rel: "searchCustomers"
+  %h2.users= t('shoppe.customers.customers')
 
 = render "search_form"
 
@@ -12,15 +12,15 @@
   %table.data
     %thead
       %tr
-        %th Name
-        %th Company
-        %th Email
-        %th Phone
-        %th Mobile
+        %th= t('shoppe.customers.name')
+        %th= t('shoppe.customers.company')
+        %th= t('shoppe.customers.email')
+        %th= t('shoppe.customers.phone')
+        %th= t('shoppe.customers.mobile_phone')
     %tbody
       - if @customers.empty?
         %tr.empty
-          %td{colspan: 5} No customers to display.
+          %td{colspan: 5}= t('shoppe.customers.no_customers')
       - else
         - for customer in @customers
           %tr
@@ -29,4 +29,4 @@
             %td= customer.email
             %td= customer.phone
             %td= customer.mobile
-= paginate @customers
+= paginate @customers

data/app/views/shoppe/customers/new.html.haml

@@ -1,5 +1,5 @@
-- @page_title = "Customers"
+- @page_title = t('shoppe.customers.customers')
 = content_for :header do
-  %p.buttons= link_to "Back to customer list", :customers, :class => 'button'
+  %p.buttons= link_to t('shoppe.customers.back_to_customers_list'), :customers, :class => 'button'
   %h2.users Customers
-= render "form"
+= render "form"

data/app/views/shoppe/customers/show.html.haml

@@ -1,29 +1,28 @@
-- @page_title = "Customer - #{@customer.name}"
+- @page_title = t('shoppe.customers.customers') + " - #{@customer.name}"
 = content_for :header do
   %p.buttons
-    = link_to "New Address", [:new, @customer, :address], class: "button"
-    = link_to "Edit", [:edit, @customer], class: "button"
-  %h2.users
-    Customer - #{@customer.name}
+    = link_to t('shoppe.customers.new_address'), [:new, @customer, :address], class: "button"
+    = link_to t('shoppe.customers.edit'), [:edit, @customer], class: "button"
+  %h2.users= t('shoppe.customers.customers') + "- #{@customer.name}"
 
 #customer
   .details
     .left
       %dl
-        %dt Name
+        %dt= t('shoppe.customers.name')
         %dd= @customer.full_name
-        %dt Company
+        %dt= t('shoppe.customers.company')
         %dd= @customer.company.blank? ? '-' : @customer.company
     .right
       %dl
-        %dt Email Address
+        %dt= t('shoppe.customers.email')
         %dd= mail_to @customer.email
-        %dt Telephone
+        %dt= t('shoppe.customers.phone')
         %dd= @customer.phone
-        %dt Mobile
+        %dt= t('shoppe.customers.mobile_phone')
         %dd= @customer.mobile
 
-  = field_set_tag "Addresses", :class => 'padded' do
+  = field_set_tag t('shoppe.customers.addresses'), :class => 'padded' do
     = render "addresses"
 
   = field_set_tag t('shoppe.orders.orders'), :class => 'padded' do
@@ -50,4 +49,4 @@
                     - for item in order.order_items
                       %li #{item.quantity} x #{item.ordered_item.full_name}
                 %td= number_to_currency order.total
-                %td= boolean_tag order.paid_in_full?, nil, :true_text => number_to_currency(order.amount_paid), :false_text => number_to_currency(order.amount_paid)
+                %td= boolean_tag order.paid_in_full?, nil, :true_text => number_to_currency(order.amount_paid), :false_text => number_to_currency(order.amount_paid)