shoppe 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa73eb9e87ef1d27482822773c0ca8d61f7baea1
-  data.tar.gz: e94359654bfb0ad01f39eaf0ac0638e14c2bac4e
+  metadata.gz: bf9a0256bc9ea841945749f08d51e47c307c574d
+  data.tar.gz: 538c996c91a1a34081fbfe945b7afa450fed2443
 SHA512:
-  metadata.gz: abffb88a987ab3a8aa34e0ff5da824f89cec0fc7905a1a250cc01b80e95b24eb4735b1fe27aa218845efb03002ab16b540b380734955f5b909f781f4b6c69655
-  data.tar.gz: 9b830ff1d41ff811b183b0aabd62be74b625ccedea233d1034ccb52f0ae2f459e04afe247b9965bd581e301bb29cd788d728c4252c82ddf43b20b7d6242a6c97
+  metadata.gz: e75007e5bccf210a4954380863cadd7061396f758dd59ecfc7a28dd368068f56521c64ab2a501febf51eca1b5530122c7599f2590a740a5547903e78104056b6
+  data.tar.gz: 7f896f5bf90086972c0119d604ad1390262d6ef7d21ee8c382da5a8c7025d3eb72c1745cf9aa69f0db73908bad0fa38b09ddc426e08eb8e570521c8e5623dab9

data/app/assets/javascripts/shoppe/application.coffee

@@ -13,6 +13,10 @@ $ ->
   # When clicking the order search button, toggle the form
   $('a[rel=searchOrders]').on 'click', ->
     $('div.orderSearch').toggle()
+
+  # When clicking the customer search button, toggle the form
+  $('a[rel=searchCustomers]').on 'click', ->
+    $('div.customerSearch').toggle()
   
   # Add a new attribute to a table
   $('a[data-behavior=addAttributeToAttributesTable]').on 'click', ->

data/app/assets/stylesheets/shoppe/application.scss

@@ -321,9 +321,9 @@ header.main {
 	}
 
 	//
-	// order summary page
+	// order & customer summary pages
 	//
-	#order {
+	#order, #customer {
 		.details {
 			overflow:hidden;
 			.left {
@@ -433,7 +433,7 @@ header.main {
 	//
 	// order search
 	//
-	div.orderSearch {
+	div.orderSearch, div.customerSearch {
 		overflow:hidden;
 		display:none;
 		dl.left, dl.right {

data/app/controllers/shoppe/addresses_controller.rb

@@ -0,0 +1,47 @@
+module Shoppe
+  class AddressesController < Shoppe::ApplicationController
+
+    before_filter { @active_nav = :customers }  
+    before_filter { params[:customer_id] && @customer = Shoppe::Customer.find(params[:customer_id])}
+    before_filter { params[:id] && @address = @customer.addresses.find(params[:id])}
+
+    def new
+      @address = Shoppe::Address.new
+    end
+
+    def edit
+    end
+
+    def create
+      @address = @customer.addresses.build(safe_params)
+      if @customer.addresses.count == 0
+        @address.default = true
+      end
+      if @customer.save
+        redirect_to @customer, :flash => {:notice => "Address has been created successfully"}
+      else
+        render action: "new"
+      end
+    end
+
+    def update
+      if @address.update(safe_params)
+        redirect_to @customer, :flash => {:notice => "Address has been updated successfully"}
+      else
+        render action: "edit"
+      end
+    end
+
+    def destroy
+      @address.destroy
+      redirect_to @customer, :flash => {:notice => "Address has been deleted successfully"}
+    end
+
+    private
+  
+    def safe_params
+      params[:address].permit(:address_type, :address1, :address2, :address3, :address4, :postcode, :country_id)
+    end
+
+  end
+end

data/app/controllers/shoppe/customers_controller.rb

@@ -0,0 +1,55 @@
+module Shoppe
+  class CustomersController < Shoppe::ApplicationController
+
+    before_filter { @active_nav = :customers }  
+    before_filter { params[:id] && @customer = Shoppe::Customer.find(params[:id])}
+
+    def index
+      @query = Shoppe::Customer.ordered.page(params[:page]).search(params[:q])
+      @customers = @query.result
+    end
+
+    def new
+      @customer = Shoppe::Customer.new
+    end
+
+    def show
+      @addresses = @customer.addresses.ordered.load
+      @orders = @customer.orders.ordered.load
+    end
+
+    def create
+      @customer = Shoppe::Customer.new(safe_params)
+      if @customer.save
+        redirect_to @customer, :flash => {:notice => "Customer has been created successfully"}
+      else
+        render :action => "new"
+      end
+    end
+
+    def update
+      if @customer.update(safe_params)
+        redirect_to @customer, :flash => {:notice => "Customer has been updated successfully"}
+      else
+        render :action => "edit"
+      end
+    end
+
+    def destroy
+      @customer.destroy
+      redirect_to customers_path, :flash => {:notice => "Customer has been deleted successfully"}
+    end
+
+    def search
+      index
+      render :action => "index"
+    end
+
+    private
+  
+    def safe_params
+      params[:customer].permit(:first_name, :last_name, :company, :email, :phone, :mobile)
+    end
+
+  end
+end

data/app/controllers/shoppe/orders_controller.rb

@@ -18,6 +18,34 @@ module Shoppe
       Shoppe::Order.transaction do
         @order = Shoppe::Order.new(safe_params)
         @order.status = 'confirming'
+
+        if safe_params[:customer_id]
+          @customer = Shoppe::Customer.find safe_params[:customer_id]
+          @order.first_name = @customer.first_name
+          @order.last_name = @customer.last_name
+          @order.company = @customer.company
+          @order.email_address = @customer.email
+          @order.phone_number = @customer.phone
+          if @customer.addresses.billing.present?
+            billing = @customer.addresses.billing.first
+            @order.billing_address1 = billing.address1
+            @order.billing_address2 = billing.address2
+            @order.billing_address3 = billing.address3
+            @order.billing_address4 = billing.address4
+            @order.billing_postcode = billing.postcode
+            @order.billing_country_id = billing.country_id
+          end
+          if @customer.addresses.delivery.present?
+            delivery = @customer.addresses.delivery.first
+            @order.delivery_address1 = delivery.address1
+            @order.delivery_address2 = delivery.address2
+            @order.delivery_address3 = delivery.address3
+            @order.delivery_address4 = delivery.address4
+            @order.delivery_postcode = delivery.postcode
+            @order.delivery_country_id = delivery.country_id
+          end
+        end
+
         if !request.xhr? && @order.save
           @order.confirm!
           redirect_to @order, :notice => t('shoppe.orders.create_notice')
@@ -76,6 +104,7 @@ module Shoppe
 
     def safe_params
       params[:order].permit(
+        :customer_id,
         :first_name, :last_name, :company,
         :billing_address1, :billing_address2, :billing_address3, :billing_address4, :billing_postcode, :billing_country_id,
         :separate_delivery_address,

data/app/controllers/shoppe/product_category_localisations_controller.rb

@@ -0,0 +1,58 @@
+require "globalize"
+
+module Shoppe
+  class ProductCategoryLocalisationsController < ApplicationController
+
+    before_filter { @active_nav = :product_categories }
+    before_filter { @product_category = Shoppe::ProductCategory.find(params[:product_category_id]) }
+    before_filter { params[:id] && @localisation = @product_category.translations.find(params[:id]) }
+
+    def index
+      @localisations = @product_category.translations
+    end
+
+    def new
+      @localisation = @product_category.translations.new
+      render :action => "form"
+    end
+
+    def create
+      if I18n.available_locales.include? safe_params[:locale].to_sym
+        I18n.locale = safe_params[:locale].to_sym
+
+        if @product_category.update(safe_params)
+          I18n.locale = I18n.default_locale
+          redirect_to [@product_category, :localisations], :flash => { :notice => t("shoppe.localisations.localisation_created") }
+        else
+          render :action => "edit"
+        end
+      else
+        redirect_to [@product_category, :localisations]
+      end
+    end
+
+    def edit
+      render :action => "form"
+    end
+
+    def update
+      if @localisation.update(safe_params)
+        redirect_to [@product_category, :localisations], :notice => t('shoppe.localisations.localisation_updated')
+      else
+        render :action => "form"
+      end
+    end
+
+    def destroy
+      @localisation.destroy
+      redirect_to [@product_category, :localisations], :notice =>  t('shoppe.localisations.localisation_destroyed')
+    end
+
+    private
+
+    def safe_params
+      params[:product_category_translation].permit(:name, :locale, :permalink, :description)
+    end
+
+  end
+end

data/app/controllers/shoppe/product_localisations_controller.rb

@@ -0,0 +1,58 @@
+require "globalize"
+
+module Shoppe
+  class ProductLocalisationsController < ApplicationController
+
+    before_filter { @active_nav = :products }
+    before_filter { @product = Shoppe::Product.find(params[:product_id]) }
+    before_filter { params[:id] && @localisation = @product.translations.find(params[:id]) }
+
+    def index
+      @localisations = @product.translations
+    end
+
+    def new
+      @localisation = @product.translations.new
+      render :action => "form"
+    end
+
+    def create
+      if I18n.available_locales.include? safe_params[:locale].to_sym
+        I18n.locale = safe_params[:locale].to_sym
+
+        if @product.update(safe_params)
+          I18n.locale = I18n.default_locale
+          redirect_to [@product, :localisations], :flash => { :notice => t("shoppe.localisations.localisation_created") }
+        else
+          render :action => "form"
+        end
+      else
+        redirect_to [@product, :localisations]
+      end
+    end
+
+    def edit
+      render :action => "form"
+    end
+
+    def update
+      if @localisation.update(safe_params)
+        redirect_to [@product, :localisations], :notice => t('shoppe.localisations.localisation_updated')
+      else
+        render :action => "form"
+      end
+    end
+
+    def destroy
+      @localisation.destroy
+      redirect_to [@product, :localisations], :notice =>  t('shoppe.localisations.localisation_destroyed')
+    end
+
+    private
+
+    def safe_params
+      params[:product_translation].permit(:name, :locale, :permalink, :description, :short_description)
+    end
+
+  end
+end

data/app/controllers/shoppe/products_controller.rb

@@ -5,7 +5,7 @@ module Shoppe
     before_filter { params[:id] && @product = Shoppe::Product.root.find(params[:id]) }
 
     def index
-      @products = Shoppe::Product.root.includes(:stock_level_adjustments, :default_image, :product_categories, :variants).order(:name).group_by(&:product_category).sort_by { |cat,pro| cat.name }
+      @products = Shoppe::Product.root.includes(:translations, :stock_level_adjustments, :default_image, :product_categories, :variants).order(:name).group_by(&:product_category).sort_by { |cat,pro| cat.name }
     end
 
     def new

data/app/models/shoppe/address.rb

@@ -0,0 +1,44 @@
+module Shoppe
+  class Address < ActiveRecord::Base
+
+    # An array of all the available types for an address
+    TYPES = ["billing", "delivery"]
+
+    # Set the table name
+    self.table_name = "shoppe_addresses"
+    
+    # The customer which this address should be linked to
+    # 
+    # @return [Shoppe::Customer]
+    belongs_to :customer, :class_name => "Shoppe::Customer"
+    
+    # The order which this address should be linked to
+    # 
+    # @return [Shoppe::Order]
+    belongs_to :order, :class_name => "Shoppe::Order"
+
+    # The country which this address should be linked to
+    #
+    # @return [Shoppe::Country]
+    belongs_to :country, :class_name => "Shoppe::Country"
+
+    # Validations
+    validates :address_type, :presence => true, :inclusion => {:in => TYPES}
+    validates :address1, :presence => true
+    validates :address3, :presence => true
+    validates :address4, :presence => true
+    validates :postcode, :presence => true
+    validates :country, :presence => true
+
+    # All addresses ordered by their id asending
+    scope :ordered, -> { order(:id => :desc)}
+    scope :default, -> { where(default: true)}
+    scope :billing, -> { where(address_type: "billing")}
+    scope :delivery, -> { where(address_type: "delivery")}
+
+    def full_address
+      [address1, address2, address3, address4, postcode, country.try(:name)].join(", ")
+    end
+
+  end
+end

data/app/models/shoppe/customer.rb

@@ -0,0 +1,41 @@
+module Shoppe
+  class Customer < ActiveRecord::Base
+
+    self.table_name = "shoppe_customers"
+
+    has_many :addresses, :dependent => :restrict_with_exception, :class_name => "Shoppe::Address"
+
+    has_many :orders, :dependent => :restrict_with_exception, :class_name => "Shoppe::Order"
+
+    # Validations
+    validates :email, :presence => true, :uniqueness => true, :format => {:with => /\A\b[A-Z0-9\.\_\%\-\+]+@(?:[A-Z0-9\-]+\.)+[A-Z]{2,6}\b\z/i}
+    validates :phone, :presence => true, :format => {:with => /\A[\d\ \-x\(\)]{7,}\z/}
+
+    # All customers ordered by their ID desending
+    scope :ordered, -> { order(:id => :desc)}
+
+    # The name of the customer in the format of "Company (First Last)" or if they don't have
+    # company specified, just "First Last".
+    #
+    # @return [String]
+    def name
+      company.blank? ? full_name : "#{company} (#{full_name})"
+    end
+
+    # The full name of the customer created by concatinting the first & last name
+    #
+    # @return [String]
+    def full_name
+      "#{first_name} #{last_name}"
+    end
+
+    def self.ransackable_attributes(auth_object = nil) 
+      ["id", "first_name", "last_name", "company", "email", "phone", "mobile"] + _ransackers.keys
+    end
+  
+    def self.ransackable_associations(auth_object = nil)
+      []
+    end
+
+  end
+end

data/app/models/shoppe/order.rb

@@ -19,6 +19,10 @@ module Shoppe
     # All products which are part of this order (accessed through the items)
     has_many :products, :through => :order_items, :class_name => 'Shoppe::Product', :source => :ordered_item, :source_type => 'Shoppe::Product'
 
+    # The order can belong to a customer
+    belongs_to :customer, :class_name => 'Shoppe::Customer'
+    has_many :addresses, :through => :customers, :class_name => "Shoppe::Address"
+
     # Validations
     validates :token, :presence => true
     with_options :if => Proc.new { |o| !o.building? } do |order|
@@ -29,6 +33,9 @@ module Shoppe
     # Set some defaults
     before_validation { self.token = SecureRandom.uuid  if self.token.blank? }
 
+    # Some methods for setting the billing & delivery addresses
+    attr_accessor :save_addresses, :billing_address_id, :delivery_address_id
+
     # The order number
     #
     # @return [String] - the order number padded with at least 5 zeros

data/app/models/shoppe/product.rb

@@ -1,4 +1,5 @@
-require 'roo'
+require "roo"
+require "globalize"
 
 module Shoppe
   class Product < ActiveRecord::Base
@@ -58,8 +59,9 @@ module Shoppe
     # All featured products
     scope :featured, -> {where(:featured => true)}
 
-    # All products ordered with default items first followed by name ascending
-    scope :ordered, -> {order(:default => :desc, :name => :asc)}
+    # Localisations
+    translates :name, :permalink, :description, :short_description
+    scope :ordered, -> { includes(:translations).order(:name) }
 
     # Return the name of the product
     #
@@ -81,6 +83,7 @@ module Shoppe
     #
     # @return [BigDecimal]
     def price
+      # self.default_variant ? self.default_variant.price : read_attribute(:price)
       self.default_variant ? self.default_variant.price : read_attribute(:price)
     end