shoppe 1.0.7 → 1.0.8

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

@@ -5,7 +5,7 @@ module Shoppe
     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
+    has_many :variants, :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'

data/app/models/shoppe/product_category.rb

@@ -23,15 +23,15 @@ module Shoppe
     validates :name, :presence => true
     validates :permalink, :presence => true, :uniqueness => {scope: :parent_id}, :permalink => true
 
-    # All categories ordered by their name ascending
-    scope :ordered, -> { order(:name) }
-
     # Root (no parent) product categories only
     scope :without_parent, -> { where(parent_id: nil) }
 
     # No descendents
     scope :except_descendants, ->(record) { where.not(id: (Array.new(record.descendants) << record).flatten) }
 
+    translates :name, :permalink, :description, :short_description
+    scope :ordered, -> { includes(:translations).order(:name) }
+    
     # Set the permalink on callback
     before_validation :set_permalink, :set_ancestral_permalink
     after_save :set_child_permalinks

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

@@ -0,0 +1,33 @@
+= form_for @address, url: [@customer, @address] do |f|
+  = f.error_messages
+
+  = field_set_tag "Address Information" do
+    %dl
+      %dt= f.label :address_type
+      %dd= f.select :address_type, Shoppe::Address::TYPES, {}, :class => "chosen"
+    .splitContainer
+      %dl.third
+        %dt= f.label :address1
+        %dd= f.text_field :address1, :class => "text"
+      %dl.third
+        %dt= f.label :address2
+        %dd= f.text_field :address2, :class => "text"
+      %dl.third
+        %dt= f.label :address3
+        %dd= f.text_field :address3, :class => "text"
+    .splitContainer
+      %dl.third
+        %dt= f.label :address4
+        %dd= f.text_field :address4, :class => "text"
+      %dl.third
+        %dt= f.label :postcode
+        %dd= f.text_field :postcode, :class => "text"
+      %dl.third
+        %dt= f.label :country_id
+        %dd= f.collection_select :country_id, Shoppe::Country.ordered, :id, :name, {:include_blank => true}, {:class => 'chosen', :data => { :placeholder => t('shoppe.orders.select_country')}} 
+
+  %p.submit
+    - unless @address.new_record?
+      %span.right= link_to t('shoppe.delete'), [@customer, @address], :class => 'button purple', :method => :delete, :data => {:confirm => "Are you sure you wish to remove this address?"}
+    = f.submit :class => 'button green', data: {disable_with: (@address.new_record? ? "Creating Address..." : "Updating Address...")}
+    = link_to t('shoppe.cancel'), :customers, :class => 'button'

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

@@ -0,0 +1,5 @@
+- @page_title = "Edit Address"
+= content_for :header do
+  %p.buttons= link_to "Back to customer", @customer, :class => 'button'
+  %h2.users Edit Address
+= render "form"

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

@@ -0,0 +1,5 @@
+- @page_title = "New Address for #{@customer.name}"
+= content_for :header do
+  %p.buttons= link_to "Back to customer", @customer, :class => 'button'
+  %h2.users New Address
+= render "form"

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

@@ -0,0 +1,20 @@
+.addresses
+  .table
+    %table.data
+      %thead
+        %tr
+          %th Type
+          %th Default
+          %th Address
+          %th
+      %tbody
+        - if @addresses.empty?
+          %tr.empty
+            %td{:colspan => 4} No addresses to display.
+        - 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)

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

@@ -0,0 +1,30 @@
+= form_for @customer do |f|
+  = f.error_messages
+
+  = field_set_tag "Customer Information" do
+    .splitContainer
+      %dl.third
+        %dt= f.label :first_name
+        %dd= f.text_field :first_name, :class => "text focus"
+      %dl.third
+        %dt= f.label :last_name
+        %dd= f.text_field :last_name, :class => "text"
+      %dl.third
+        %dt= f.label :company
+        %dd= f.text_field :company, :class => "text"
+    .splitContainer
+      %dl.third
+        %dt= f.label :email
+        %dd= f.text_field :email, :class => "text"
+      %dl.third
+        %dt= f.label :phone
+        %dd= f.text_field :phone, :class => "text"
+      %dl.third
+        %dt= f.label :mobile
+        %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'

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

@@ -0,0 +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"
+      %dd= f.text_field :first_name_or_last_name_or_company_cont
+      %dt= f.label :company_cont, "Company"
+      %dd= f.text_field :company_cont
+    %dl.right
+      %dt= f.label :email_cont, "Email Address"
+      %dd= f.text_field :email_cont
+      %dt= f.label :phone_cont, "Phone Number"
+      %dd= f.text_field :phone_cont
+      %dd= f.submit "Search", :class => 'button green button'

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

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

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

@@ -0,0 +1,32 @@
+- @page_title = "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
+
+= render "search_form"
+
+.table
+  %table.data
+    %thead
+      %tr
+        %th Name
+        %th Company
+        %th Email
+        %th Phone
+        %th Mobile
+    %tbody
+      - if @customers.empty?
+        %tr.empty
+          %td{colspan: 5} No customers to display.
+      - else
+        - for customer in @customers
+          %tr
+            %td= link_to customer.full_name, customer
+            %td= link_to customer.company, customer
+            %td= customer.email
+            %td= customer.phone
+            %td= customer.mobile
+= paginate @customers

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

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

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

@@ -0,0 +1,53 @@
+- @page_title = "Customer - #{@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}
+
+#customer
+  .details
+    .left
+      %dl
+        %dt Name
+        %dd= @customer.full_name
+        %dt Company
+        %dd= @customer.company.blank? ? '-' : @customer.company
+    .right
+      %dl
+        %dt Email Address
+        %dd= mail_to @customer.email
+        %dt Telephone
+        %dd= @customer.phone
+        %dt Mobile
+        %dd= @customer.mobile
+
+  = field_set_tag "Addresses", :class => 'padded' do
+    = render "addresses"
+
+  = field_set_tag t('shoppe.orders.orders'), :class => 'padded' do
+    .table
+      %table.data
+        %thead
+          %tr
+            %th= t('shoppe.orders.number')
+            %th= t('shoppe.orders.status')
+            %th= t('shoppe.orders.products')
+            %th= t('shoppe.orders.total')
+            %th= t('shoppe.orders.payment')
+        %tbody
+          - if @orders.empty?
+            %tr.empty
+              %td{:colspan => 6}= t('shoppe.orders.no_orders')
+          - else
+            - for order in @orders
+              %tr
+                %td= link_to order.number, order
+                %td= status_tag order.status
+                %td
+                  %ul
+                    - 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)

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

@@ -1,4 +1,7 @@
 = field_set_tag t('shoppe.orders.billing_address') do
+  %dl
+    %dt= f.label :customer_id, t('shoppe.orders.customer')
+    %dd= f.collection_select :customer_id, Shoppe::Customer.ordered, :id, :name, {:include_blank => true}, {:data => {:placeholder => t('shoppe.orders.select_customer')}}
   .splitContainer
     %dl.third
       %dt= f.label :first_name, t('shoppe.orders.first_name')

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

@@ -47,5 +47,4 @@
   %p.submit
     - unless @product_category.new_record?
       %span.right= link_to t('shoppe.delete') , @product_category, :class => 'button purple', :method => :delete, :data => {:confirm => t('shoppe.product_category.delete_confirmation') }
-    = f.submit t('shoppe.submit'),  :class => 'button green'
-    = link_to t('shoppe.cancel') , :product_categories, :class => 'button'
+    = f.submit t('shoppe.submit'),  :class => 'button green'

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

@@ -1,6 +1,8 @@
 - @page_title = t('shoppe.product_category.product_categories')
 = content_for :header do
-  %p.buttons= link_to t('shoppe.product_category.back_to_categories'), :product_categories, :class => 'button'
+  %p.buttons
+    = link_to t('shoppe.localisations.localisations') , [@product_category, :localisations], :class => 'button'
+    = link_to t('shoppe.product_category.back_to_categories'), :product_categories, :class => 'button'
   %h2.products= t('shoppe.product_category.product_categories')
 = render 'form'
 

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

@@ -9,6 +9,8 @@
     %thead
       %tr
         %th= t('shoppe.product_category.name')
+        - I18n.available_locales.each do |i|
+          %th
     %tbody
       - if @product_categories_without_parent.empty?
         %tr.empty
@@ -17,4 +19,9 @@
         - for cat in @product_categories_without_parent
           %tr
             %td= link_to cat.name, [:edit, cat]
+            - I18n.available_locales.each do |i|
+              - if cat.translations.where(locale: i).count >= 1
+                %td= link_to i, edit_product_category_localisation_path(cat, cat.translations.where(locale: i).first.id)
+              - else
+                %td= link_to i, new_product_category_localisation_path(cat, locale_field: i)
           = nested_product_category_rows(cat)

data/app/views/shoppe/product_category_localisations/form.html.haml

@@ -0,0 +1,29 @@
+- @page_title = "#{t('shoppe.localisations.localisations')} - #{@product_category.name}"
+= content_for :header do
+  %p.buttons= link_to t('shoppe.localisations.back_to_localisations'), [@product_category, :localisations], :class => 'button'
+  %h2.products= t('shoppe.localisations.localisations_of', name: @product_category.name)
+
+- loc = @localisation.new_record? ? :en : @localisation.locale.to_sym
+- Globalize.with_locale(loc) do
+  = form_for [@product_category, @localisation], :url => @localisation.new_record? ? product_category_localisations_path(@product_category) : product_category_localisation_path(@product_category, @localisation), :html => {:multipart => true} do |f|
+    = f.error_messages
+
+    = field_set_tag t('shoppe.product_category.category_details') do
+      .splitContainer
+        %dl.half
+          %dt= f.label :name, t('shoppe.product_category.name')
+          %dd= f.text_field :name, :class => 'focus text'
+        %dl.half
+          %dt= f.label :locale
+          %dd= f.select :locale, I18n.available_locales, {selected: @localisation.locale || params[:locale_field]}, {class: "chosen"}
+      %dl
+        %dt= f.label :permalink, t('shoppe.product_category.permalink')
+        %dd= f.text_field :permalink, :class => 'text'
+      %dl.cleared
+        %dt= f.label :description, t('shoppe.product_category.description')
+        %dd= f.text_area :description, :class => 'text'
+
+    %p.submit
+      - unless @localisation.new_record?
+        %span.right= link_to t('shoppe.delete'), product_category_localisation_path(@product_category, @localisation), :class => 'button purple', :method => :delete, :data => {:confirm => t('shoppe.localisations.delete_confirmation')}
+      = f.submit t('shoppe.localisations.save_localisation'), :class => 'button green'

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

@@ -0,0 +1,26 @@
+- @page_title = "#{t('shoppe.localisations.localisations')} - #{@product_category.name}"
+
+= content_for :header do
+  %p.buttons
+    = link_to t('shoppe.localisations.back'), product_categories_path, :class => 'button'
+    = link_to t('shoppe.localisations.new_localisation'), [:new, @product_category, :localisation], :class => 'button green'
+
+  %h2.products= t('shoppe.localisations.localisations_of', name: @product_category.name)
+
+.table
+  %table.data
+    %thead
+      %tr
+        %th{:width => '20%'}= t('shoppe.localisations.language')
+        %th{:width => '50%'}= t('shoppe.products.name')
+        %th{:width => '15%'}= t('shoppe.products.permalink')
+    %tbody
+      - if @localisations.empty?
+        %tr.empty
+          %td{:colspan => 4}= t('shoppe.localisations.no_localisations')
+      - else
+        - for localisation in @localisations
+          %tr
+            %td= localisation.locale
+            %td= link_to localisation.name, edit_product_category_localisation_path(@product_category, localisation)
+            %td= localisation.permalink

data/app/views/shoppe/product_localisations/form.html.haml

@@ -0,0 +1,32 @@
+- @page_title = "#{t('shoppe.localisations.localisations')} - #{@product.name}"
+= content_for :header do
+  %p.buttons= link_to t('shoppe.localisations.back_to_localisations'), [@product, :localisations], :class => 'button'
+  %h2.products= t('shoppe.localisations.localisations_of', name: @product.name)
+
+- loc = @localisation.new_record? ? :en : @localisation.locale.to_sym
+- Globalize.with_locale(loc) do
+  = form_for [@product, @localisation], :url => @localisation.new_record? ? product_localisations_path(@product) : product_localisation_path(@product, @localisation), :html => {:multipart => true} do |f|
+    = f.error_messages
+
+    = field_set_tag t('shoppe.product.category_details') do
+      .splitContainer
+        %dl.half
+          %dt= f.label :name, t('shoppe.product.name')
+          %dd= f.text_field :name, :class => 'focus text'
+        %dl.half
+          %dt= f.label :locale
+          %dd= f.select :locale, I18n.available_locales, {}, {class: "chosen"}
+      %dl
+        %dt= f.label :permalink, t('shoppe.product.permalink')
+        %dd= f.text_field :permalink, :class => 'text'
+      %dl.cleared
+        %dt= f.label :description, t('shoppe.product.description')
+        %dd= f.text_area :description, :class => 'text'
+      %dl.cleared
+        %dt= f.label :short_description, t('shoppe.product.short_description')
+        %dd= f.text_area :short_description, :class => 'text'
+
+    %p.submit
+      - unless @localisation.new_record?
+        %span.right= link_to t('shoppe.delete'), product_localisation_path(@product, @localisation), :class => 'button purple', :method => :delete, :data => {:confirm => t('shoppe.localisations.delete_confirmation')}
+      = f.submit t('shoppe.localisations.save_localisation'), :class => 'button green'

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

@@ -0,0 +1,26 @@
+- @page_title = "#{t('shoppe.localisations.localisations')} - #{@product.name}"
+
+= content_for :header do
+  %p.buttons
+    = link_to t('shoppe.localisations.back'), [:edit, @product], :class => 'button'
+    = link_to t('shoppe.localisations.new_localisation'), [:new, @product, :localisation], :class => 'button green'
+
+  %h2.products= t('shoppe.localisations.localisations_of', name: @product.name)
+
+.table
+  %table.data
+    %thead
+      %tr
+        %th{:width => '20%'}= t('shoppe.localisations.language')
+        %th{:width => '50%'}= t('shoppe.products.name')
+        %th{:width => '15%'}= t('shoppe.products.permalink')
+    %tbody
+      - if @localisations.empty?
+        %tr.empty
+          %td{:colspan => 4}= t('shoppe.localisations.no_localisations')
+      - else
+        - for localisation in @localisations
+          %tr
+            %td= localisation.locale
+            %td= link_to localisation.name, edit_product_localisation_path(@product, localisation)
+            %td= localisation.permalink

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

@@ -1,6 +1,7 @@
 - @page_title = t('shoppe.products.products')
 = content_for :header do
   %p.buttons
+    = link_to t('shoppe.localisations.localisations') , [@product, :localisations], :class => 'button'
     = link_to t('shoppe.products.variants') , [@product, :variants], :class => 'button'
     = link_to t('shoppe.products.stock_levels') , stock_level_adjustments_path(:item_id => @product.id, :item_type => @product.class), :class => 'button', :rel => 'dialog', :data => {:dialog_width => 700, :dialog_behavior => 'stockLevelAdjustments'}
     = link_to t('shoppe.products.back_to_products') , :products, :class => 'button'

data/app/views/shoppe/variants/form.html.haml

@@ -1,6 +1,8 @@
 - @page_title = "#{t('shoppe.variants.variants')} - #{@product.name}"
 = content_for :header do
-  %p.buttons= link_to t('shoppe.variants.back_to_variants'), [@product, :variants], :class => 'button'
+  %p.buttons
+    = link_to t('shoppe.localisations.localisations') , [@variant, :localisations], :class => 'button'
+    = link_to t('shoppe.variants.back_to_variants'), [@product, :variants], :class => 'button'
   %h2.products= t('shoppe.variants.variants_of', product:@product.name)
 
 = form_for [@product, @variant], :url => @variant.new_record? ? product_variants_path(@product) : product_variant_path(@product, @variant), :html => {:multipart => true} do |f|

data/config/locales/en.yml

@@ -185,6 +185,65 @@ en:
     edit: Edit
     import: Import
     remove: Remove
+
+    removed_it: "%{it} has been removed successfully"  
+    save_settings: Save Settings
+    separate_delivery_address: Separate delivery address
+    service_available: Service will be available for use
+    service_default: Service will be used by default (if possible)
+    settings_title: Settings
+    settings_not_in_demo: You cannot make changes to settings in demo mode. Sorry about that.
+    set_prices: Set Prices
+    shoppe_back: Back to Shoppe
+    sku: SKU
+    status: Status
+    stock: Stock
+    stock_current: Current stock level is
+    stock_control: Stock Control
+    stock_control_enable: Enable stock control for this product?
+    stock_levels: Stock levels
+    stock_levels_for: Stock levels %{item}
+    stock_none: No stock
+    system_settings: System settings
+    tax_rate: Tax rate
+    tax_rate_apply_to: Apply to orders where the %{to} matches one of the countries below
+    tax_rate_delete_confirm: Are you sure you wish to remove this tax_rate?
+    tax_rate_details: Rate Details
+    tax_rate_new: New tax rate
+    tax_rate_note: Do NOT edit tax rates that are already in use. 
+      Care should be taken when editing tax rates, as this may affect existing orders. 
+      while creating a new tax rate, you must delete it and create a new one. When you delete a tax rate
+      it is not removed from the system, only deactivated, so existing orders stay unaffected.
+    tax_rates: Tax Rates
+    tax_rates_back: Back to tax rates
+    tax_none: No tax
+    telephone: Telephone
+    total: Total
+    total_weight: Total weight
+    tracking_url: Tracking URL
+    unknown: Unknown
+    updated_it: "%{it} has been updated successfully"  
+    users: Users
+    users_back: Back to users
+    user_delete_confirm: Are you sure you wish to remove this user?
+    user_details: User Details
+    user: User
+    user_edit: Edit user
+    user_new: New User
+    user_not_in_demo: You cannot make changes to users in demo mode. Sorry about that.
+    user_not_yourself: You cannot remove yourself
+    variants: Variants
+    variants_back: Back to variants
+    variants_of: Variants of %{product}
+    variant_delete_confirm: Are you sure you wish to remove this variant?
+    variant_of: Variant of %{product}
+    variant_new: New variant
+    variant_save: Save Variant
+    value: Value
+    website_properties: Website Properties
+    weight: Weight
+    weight_allowance: Weight Allowance
+
     submit: Submit
 
     attachments:
@@ -318,6 +377,7 @@ en:
       order_rejected: Order Rejected
       order_shipped: Order Shipped
       ordered_products: Ordered products
+
       orders: Orders
       payment: Payment
       payment_remove_confirmation: Are you sure you wish to remove this payment?
@@ -339,6 +399,8 @@ en:
       search: Search
       search_orders: Search orders
       select_country: Select a country
+      customer: Customer
+      select_customer: Select a customer or leave blank
       separate_delivery_address: Separate delivery address
       ship_notice: Order has been shipped successfully
       sku: SKU
@@ -425,7 +487,7 @@ en:
       featured?: Featured?
       featured_info:  If checked, this product will appear on your homepage
       import_products: Import products
-      in_the_box: What's in the box?
+      in_the_box: "What's in the box?"
       name: Name
       new_product: New product
       no_products: No products to display.
@@ -601,8 +663,27 @@ en:
       destroy_notice: Payment has been removed successfully
       refund_notice: Refund has been processed successfully.
 
+    localisations:
+      localisations: Localisations
+      back: Back
+      back_to_localisations: Back
+      localisations_of: Localisations of %{name}
+      product_information: Product Information
+      locales: Locales
+      choose_locale: Please choose a locale
+      save_localisation: Save Localisation
+      new_localisation: New Localisation
+      edit_localisation: Edit Localisation
+      localisation_created: Localisation created successfully
+      localisation_updated: Localisation updated successfully
+      localisation_destroyed: Localisation destroyed successfully
+      language: Language
+      no_localisations: No localisations to display.
+      delete_confirmation: Are you sure?
+
     navigation:
       admin_primary:
+        customers: Customers
         orders: Orders
         products: Products
         product_categories: Product Categories