shoppe 1.0.2 → 1.0.3

data/app/models/shoppe/product/variants.rb

@@ -1,18 +1,18 @@
 module Shoppe
   class Product < ActiveRecord::Base
-    
+
     # Validations
-    validate { errors.add :base, "can only belong to a root product" if self.parent && self.parent.parent }
-    
+    validate { errors.add :base, :can_belong_to_root if self.parent && self.parent.parent }
+
     # Variants of the product
     has_many :variants, -> { order(:default => :desc, :name => :asc) }, :class_name => 'Shoppe::Product', :foreign_key => 'parent_id', :dependent => :destroy
-    
+
     # The parent product (only applies to variants)
     belongs_to :parent, :class_name => 'Shoppe::Product', :foreign_key => 'parent_id'
-    
+
     # All products which are not variants
     scope :root, -> { where(:parent_id => nil) }
-    
+
     # If a variant is created, the base product should be updated so that it doesn't have stock control enabled
     after_save do
       if self.parent
@@ -24,14 +24,14 @@ module Shoppe
         self.parent.save if self.parent.changed?
       end
     end
-    
+
     # Does this product have any variants?
     #
     # @return [Boolean]
     def has_variants?
       !variants.empty?
     end
-    
+
     # Returns the default variant for the product or nil if none exists.
     #
     # @return [Shoppe::Product]
@@ -39,13 +39,13 @@ module Shoppe
       return nil if self.parent
       @default_variant ||= self.variants.select { |v| v.default? }.first
     end
-    
+
     # Is this product a variant of another?
     #
     # @return [Boolean]
     def variant?
       !self.parent_id.blank?
     end
-    
+
   end
 end

data/app/models/shoppe/product_category.rb

@@ -1,23 +1,23 @@
 module Shoppe
   class ProductCategory < ActiveRecord::Base
-  
+
     self.table_name = 'shoppe_product_categories'
-  
+
     # Categories have an image attachment
     attachment :image
-  
+
     # All products within this category
     has_many :products, :dependent => :restrict_with_exception, :class_name => 'Shoppe::Product'
-    
+
     # Validations
     validates :name, :presence => true
-    validates :permalink, :presence => true, :uniqueness => true
+    validates :permalink, :presence => true, :uniqueness => true, :permalink => true
 
     # All categories ordered by their name ascending
     scope :ordered, -> { order(:name) }
-    
+
     # Set the permalink on callback
     before_validation { self.permalink = self.name.parameterize if self.permalink.blank? && self.name.is_a?(String) }
-  
+
   end
 end

data/app/models/shoppe/stock_level_adjustment.rb

@@ -1,19 +1,19 @@
 module Shoppe
   class StockLevelAdjustment < ActiveRecord::Base
-    
+
     # The orderable item which the stock level adjustment belongs to
     belongs_to :item, :polymorphic => true
-    
+
     # The parent (OrderItem) which the stock level adjustment belongs to
     belongs_to :parent, :polymorphic => true
-    
+
     # Validations
     validates :description, :presence => true
     validates :adjustment, :numericality => true
-    validate { errors.add(:adjustment, "must be greater or less than zero") if adjustment == 0 }
-    
+    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) }
-    
+
   end
 end

data/app/validators/permalink_validator.rb

@@ -0,0 +1,7 @@
+class PermalinkValidator < ActiveModel::EachValidator
+  def validate_each(record, attribute, value)
+    unless value =~ /\A[a-zA-Z0-9-_]+\Z/
+      record.errors.add(attribute, :wrong_format)
+    end
+  end
+end

data/app/views/layouts/shoppe/application.html.haml

@@ -13,32 +13,22 @@
       %header.logo
         %h1= link_to "Shoppe", root_path
         %p v#{Shoppe::VERSION}
-      %p.logged
-        Logged in as #{current_user.full_name}
+      %p.logged= t('.logged_in_as', user_name: current_user.full_name)
+
       %ul
         - for item in Shoppe::NavigationManager.find(:admin_primary).items
           %li= navigation_manager_link item
-          
-        -#%li
-        -#  %span.pending= Shoppe::Order.pending.count
-        -#  = link_to "Orders", [:orders], :class => @active_nav == :orders ? 'active' : ''
-        -#%li= link_to "Products", [:products], :class => @active_nav == :products ? 'active' : ''
-        -#%li= link_to "Product Categories", :product_categories, :class => @active_nav == :product_categories ? 'active' : ''
-        -#%li= link_to "Delivery Services", [:delivery_services], :class => @active_nav == :delivery_services ? 'active' : ''
-        -#%li= link_to "Tax Rates", :tax_rates, :class => @active_nav == :tax_rates ? 'active' : ''
-        -#%li= link_to "Users", [:users], :class => @active_nav == :users ? 'active' : ''
-        -#%li= link_to "Countries", :countries, :class => @active_nav == :countries ? 'active' : ''
-        -#%li= link_to "Settings", :settings, :class => @active_nav == :settings ? 'active' : ''
-        %li= link_to "Logout", [:logout], :method => :delete
-    
+
+        %li= link_to t('.logout'), [:logout], :method => :delete
+
     %header.main
       = yield :header
-      
-    #content  
+
+    #content
       = display_flash
       %section.main
         = yield
 
-    %footer 
-      %p.store= link_to "← Goto #{Shoppe.settings.store_name}".html_safe, '/'
-      
+    %footer
+      %p.store= link_to "← #{t('.goto')} #{Shoppe.settings.store_name}".html_safe, '/'
+

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

@@ -1,31 +1,35 @@
 = form_for @country do |f|
   = f.error_messages
-  = field_set_tag "User Details" do
+  = field_set_tag t('shoppe.countries.country_details') do
+
     .splitContainer
       %dl.third
-        %dt= f.label :name
+        %dt= f.label :name, t('shoppe.countries.name')
         %dd= f.text_field :name, :class => 'focus text'
       %dl.third
-        %dt= f.label :code2, "ISO 3166-alpha-2"
+        %dt= f.label :code2, t('shoppe.countries.iso_alpha_2')
         %dd= f.text_field :code2, :class => 'text'
       %dl.third
-        %dt= f.label :code3, "ISO 3166-alpha-3"
+        %dt= f.label :code3, t('shoppe.countries.iso_alpha_3')
         %dd= f.text_field :code3, :class => 'text'
+
     .splitContainer
       %dl.third
-        %dt= f.label :continent
+        %dt= f.label :continent, t('shoppe.countries.continent')
         %dd= f.text_field :continent, :class => 'text'
       %dl.third
-        %dt= f.label :tld, "TLD"
+        %dt= f.label :tld, t('shoppe.countries.tld')
         %dd= f.text_field :tld, :class => 'text'
       %dl.third
-        %dt= f.label :eu_member, "EU Member?"
+        %dt= f.label :eu_member, t('shoppe.countries.eu_member')
         %dd.checkbox
           = f.check_box :eu_member
-          = f.label :eu_member, 'Country is an EU member?'
+          = f.label :eu_member, t('shoppe.countries.is_eu_member')
 
   %p.submit
     - unless @country.new_record?
-      %span.right= link_to "Delete", @country, :class => 'button purple', :method => :delete, :data => {:confirm => "Are you sure you wish to remove this country?"}
-    = f.submit :class => 'button green'
-    = link_to "Cancel", :countries, :class => 'button'
+      %span.right
+        = link_to t('shoppe.delete'), @country, :class => 'button purple',
+          :method => :delete, :data => {:confirm => t('shoppe.countries.delete_confirmation')}
+    = f.submit t('shoppe.submit'), :class => 'button green'
+    = link_to t('shoppe.cancel'), :countries, :class => 'button'

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

@@ -1,5 +1,6 @@
-- @page_title = "Countries"
+- @page_title = t('shoppe.countries.countries')
+
 = content_for :header do
-  %p.buttons= link_to "Back to countries", :countries, :class => 'button'
-  %h2.countries Countries
-= render 'form'
+  %p.buttons= link_to t('shoppe.countries.back'), :countries, :class => 'button'
+  %h2.countries= t('shoppe.countries.countries')
+= render 'form'

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

@@ -1,19 +1,19 @@
-- @page_title = "Countries"
+- @page_title = t('shoppe.countries.countries')
 
 = content_for :header do
-  %p.buttons=link_to "New country", :new_country, :class => 'button green'
-  %h2.countries Countries
+  %p.buttons=link_to t('shoppe.countries.new_country') , :new_country, :class => 'button green'
+  %h2.countries= t('shoppe.countries.countries')
 
 .table
   %table.data
     %thead
       %tr
-        %th Name
-        %th ISO 3166-1-alpha-2
-        %th ISO 3166-1-alpha-3
-        %th Continent
-        %th TLD
-        %th EU?
+        %th= t('shoppe.countries.name')
+        %th= t('shoppe.countries.iso_alpha_2')
+        %th= t('shoppe.countries.iso_alpha_3')
+        %th= t('shoppe.countries.continent')
+        %th= t('shoppe.countries.tld')
+        %th= t('shoppe.countries.eu?')
     %tbody
       - for country in @countries
         %tr

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

@@ -1,5 +1,7 @@
-- @page_title = "Countries"
+- @page_title = t('shoppe.countries.countries')
+
 = content_for :header do
-  %p.buttons= link_to "Back to countries", :countries, :class => 'button'
-  %h2.countries Countries
-= render 'form'
+  %p.buttons= link_to t('shoppe.countries.back') , :countries, :class => 'button'
+  %h2.countries= t('shoppe.countries.countries')
+
+= render 'form'

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

@@ -1,44 +1,44 @@
 = form_for [@delivery_service, @delivery_service_price] do |f|
   = f.error_messages
-  = field_set_tag "Identification & Weight" do
+  = field_set_tag t('shoppe.delivery_service_prices.identification_weight')  do
     .splitContainer
       %dl.third
-        %dt= f.label :code
+        %dt= f.label :code, t('shoppe.delivery_service_prices.code')
         %dd= f.text_field :code, :class => 'focus text'
-      
+
       %dl.third
-        %dt= f.label :min_weight
+        %dt= f.label :min_weight, t('shoppe.delivery_service_prices.min_weight')
         %dd= f.text_field :min_weight, :class => 'text'
       %dl.third
-        %dt= f.label :max_weight
+        %dt= f.label :max_weight, t('shoppe.delivery_service_prices.max_weight')
         %dd= f.text_field :max_weight, :class => 'text'
 
-  = field_set_tag "Pricing" do
+  = field_set_tag t('shoppe.delivery_service_prices.pricing') do
     .splitContainer
       %dl.third
-        %dt= f.label :price
+        %dt= f.label :price, t('shoppe.delivery_service_prices.price')
         %dd
           .moneyInput
             .currency= Shoppe.settings.currency_unit.html_safe
             = f.text_field :price, :class => 'text'
       %dl.third
-        %dt= f.label :cost_price
+        %dt= f.label :cost_price, t('shoppe.delivery_service_prices.cost_price')
         %dd
           .moneyInput
             .currency= Shoppe.settings.currency_unit.html_safe
             = f.text_field :cost_price, :class => 'text'
       %dl.third
-        %dt= f.label :tax_rate_id
-        %dd= f.collection_select :tax_rate_id, Shoppe::TaxRate.ordered, :id, :description, {:include_blank => true}, {:class => 'chosen-with-deselect', :data => {:placeholder => "No tax"}}
+        %dt= f.label :tax_rate_id, t('shoppe.delivery_service_prices.tax_rate')
+        %dd= f.collection_select :tax_rate_id, Shoppe::TaxRate.ordered, :id, :description, {:include_blank => true}, {:class => 'chosen-with-deselect', :data => {:placeholder => t('shoppe.delivery_service_prices.no_tax')}}
 
-  = field_set_tag "Countries" do
+  = field_set_tag t('shoppe.delivery_service_prices.countries') do
     %dl
       %dd
-        = f.collection_select :country_ids, Shoppe::Country.ordered, :id, :name, {}, {:class => 'chosen', :multiple => true, :data => {:placeholder => "All countries"}}
-        %p.help This delivery rate will only be available to orders where the country selected is listed here.
+        = f.collection_select :country_ids, Shoppe::Country.ordered, :id, :name, {}, {:class => 'chosen', :multiple => true, :data => {:placeholder => t('shoppe.delivery_service_prices.all_countries')}}
+        %p.help= t('shoppe.delivery_service_prices.help.countries')
 
   %p.submit
     - unless @delivery_service_price.new_record?
-      %span.right= link_to "Delete", [@delivery_service, @delivery_service_price], :class => 'button purple', :method => :delete, :data => {:confirm => "Are you sure you wish to remove this price?"}
-    = f.submit :class => 'button green'
-    = link_to "Cancel", [@delivery_service, :delivery_service_prices], :class => 'button'
+      %span.right= link_to t('shoppe.delete'), [@delivery_service, @delivery_service_price], :class => 'button purple', :method => :delete, :data => {:confirm => "Are you sure you wish to remove this price?"}
+    = f.submit t('shoppe.submit'), :class => 'button green'
+    = link_to t('shoppe.cancel'), [@delivery_service, :delivery_service_prices], :class => 'button'

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

@@ -1,5 +1,6 @@
-- @page_title = "Delivery Services"
+- @page_title = t('shoppe.delivery_service_prices.delivery_services')
+
 = content_for :header do
-  %p.buttons= link_to "Back to prices", [@delivery_service, :delivery_service_prices], :class => 'button'
-  %h2.delivery_services Delivery Services
-= render 'form'
+  %p.buttons= link_to t('shoppe.delivery_service_prices.back'), [@delivery_service, :delivery_service_prices], :class => 'button'
+  %h2.delivery_services= t('shoppe.delivery_service_prices.delivery_services')
+= render 'form'

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

@@ -1,19 +1,19 @@
-- @page_title = "Delivery Services"
+- @page_title = t('shoppe.delivery_service_prices.delivery_services')
 
 = content_for :header do
   %p.buttons
-    = link_to "New price", [:new, @delivery_service, :delivery_service_price], :class => 'button green'
-    = link_to "Back to delivery services", :delivery_services, :class => 'button'
-  %h2.delivery_services Delivery Pricing for #{@delivery_service.name}
+    = link_to t('shoppe.delivery_service_prices.new_price'), [:new, @delivery_service, :delivery_service_price], :class => 'button green'
+    = link_to t('shoppe.delivery_service_prices.back_to_delivery_services'), :delivery_services, :class => 'button'
+  %h2.delivery_services= t('shoppe.delivery_service_prices.pricing_for', delivery_name: @delivery_service.name)
 
 .table
   %table.data
     %thead
       %tr
-        %th Code
-        %th Weight Allowance
-        %th Price
-        %th Cost
+        %th= t('shoppe.delivery_service_prices.code')
+        %th= t('shoppe.delivery_service_prices.weight_allowance')
+        %th= t('shoppe.delivery_service_prices.price')
+        %th= t('shoppe.delivery_service_prices.cost')
     %tbody
       - for price in @delivery_service_prices
         %tr
@@ -21,4 +21,3 @@
           %td #{number_to_weight price.min_weight} → #{number_to_weight price.max_weight}
           %td= number_to_currency(price.price)
           %td= number_to_currency price.cost_price
-          

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

@@ -1,5 +1,6 @@
-- @page_title = "Delivery Services"
+- @page_title = t('shoppe.delivery_service_prices.delivery_services')
+
 = content_for :header do
-  %p.buttons= link_to "Back to prices", [@delivery_service, :delivery_service_prices], :class => 'button'
-  %h2.delivery_services Delivery Services
-= render 'form'
+  %p.buttons= link_to t('shoppe.delivery_service_prices.back') , [@delivery_service, :delivery_service_prices], :class => 'button'
+  %h2.delivery_services= t('shoppe.delivery_service_prices.delivery_services')
+= render 'form'

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

@@ -1,37 +1,38 @@
 = form_for @delivery_service do |f|
   = f.error_messages
-  = field_set_tag "Details" do
+  = field_set_tag t('shoppe.delivery_services.details') do
     .splitContainer
       %dl.half
-        %dt= f.label :name
+        %dt= f.label :name, t('shoppe.delivery_services.name')
         %dd= f.text_field :name, :class => 'focus text'
       %dl.half
-        %dt= f.label :code
+        %dt= f.label :code, t('shoppe.delivery_services.code')
         %dd= f.text_field :code, :class => 'text'
     .splitContainer
       %dl.half
-        %dt= f.label :active
+        %dt= f.label :active, t('shoppe.delivery_services.active')
         %dd.checkbox
           = f.check_box :active
-          = f.label :active, 'Service will be available for use'
+          = f.label :active,  t('shoppe.delivery_services.active_info')
       %dl.half
-        %dt= f.label :default
+        %dt= f.label :default, t('shoppe.delivery_services.default')
         %dd.checkbox
           = f.check_box :default
-          = f.label :default, 'Service will be used by default (if possible)'
-  = field_set_tag "Courier" do
+          = f.label :default,  t('shoppe.delivery_services.default_info')
+
+  = field_set_tag  t('shoppe.delivery_services.courier') do
     .splitContainer
       %dl.half
-        %dt= f.label :courier, "Courier Name"
+        %dt= f.label :courier,  t('shoppe.delivery_services.courier_name')
         %dd= f.text_field :courier, :class => 'text'
       %dl.half
-        %dt= f.label :tracking_url, "Tracking URL"
+        %dt= f.label :tracking_url,  t('shoppe.delivery_services.tracking_url')
         %dd
           = f.text_field :tracking_url, :class => 'text'
-          %p.help Use <code>{{consignment_number}}</code> to insert the consignment number.
+          %p.help=  t('shoppe.delivery_services.tracking_url_help_html')
 
   %p.submit
     - unless @delivery_service.new_record?
-      %span.right= link_to "Delete", [@delivery_service], :class => 'button purple', :method => :delete, :data => {:confirm => "Are you sure you wish to remove this delivery service?"}
-    = f.submit :class => 'button green'
-    = link_to "Cancel", :delivery_services, :class => 'button'
+      %span.right= link_to  t('shoppe.delete'), [@delivery_service], :class => 'button purple', :method => :delete, :data => {:confirm => t('shoppe.delivery_services.delete_confirmation')}
+    = f.submit t('shoppe.submit'), :class => 'button green'
+    = link_to t('shoppe.cancel'), :delivery_services, :class => 'button'

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

@@ -1,7 +1,9 @@
-- @page_title = "Delivery Services"
+- @page_title = t('shoppe.delivery_services.delivery_services')
+
 = content_for :header do
   %p.buttons
-    = link_to "Prices", [@delivery_service, :delivery_service_prices], :class => 'button' 
-    = link_to "Back to delivery services", :delivery_services, :class => 'button'
-  %h2.delivery_services Delivery Services
-= render 'form'
+    = link_to t('shoppe.delivery_services.prices'), [@delivery_service, :delivery_service_prices], :class => 'button'
+    = link_to t('shoppe.delivery_services.back'), :delivery_services, :class => 'button'
+  %h2.delivery_services= t('shoppe.delivery_services.delivery_services')
+
+= render 'form'