shoppe 1.0.2 → 1.0.3

data/app/controllers/shoppe/delivery_services_controller.rb

@@ -1,47 +1,47 @@
 module Shoppe
   class DeliveryServicesController < Shoppe::ApplicationController
-  
+
     before_filter { @active_nav = :delivery_services }
     before_filter { params[:id] && @delivery_service = Shoppe::DeliveryService.find(params[:id]) }
-  
+
     def index
       @delivery_services = Shoppe::DeliveryService.all
     end
-  
+
     def new
       @delivery_service = Shoppe::DeliveryService.new
     end
-  
+
     def create
       @delivery_service = Shoppe::DeliveryService.new(safe_params)
       if @delivery_service.save
-        redirect_to :delivery_services, :flash => {:notice => "Delivery Service has been created successfully"}
+        redirect_to :delivery_services, :flash => {:notice => t('shoppe.delivery_services.create_notice')}
       else
         render :action => "new"
       end
     end
-  
+
     def edit
     end
-  
+
     def update
       if @delivery_service.update(safe_params)
-        redirect_to [:edit, @delivery_service], :flash => {:notice => "Delivery Service has been updated successfully"}
+        redirect_to [:edit, @delivery_service], :flash => {:notice => t('shoppe.delivery_services.update_notice')}
       else
         render :action => "edit"
       end
     end
-  
+
     def destroy
       @delivery_service.destroy
-      redirect_to :delivery_services, :flash => {:notice => "Delivery Service has been removed successfully"}
+      redirect_to :delivery_services, :flash => {:notice =>t('shoppe.delivery_services.destroy_notice')}
     end
-  
+
     private
-  
+
     def safe_params
       params[:delivery_service].permit(:name, :code, :active, :default, :courier, :tracking_url)
     end
-  
+
   end
 end

data/app/controllers/shoppe/orders_controller.rb

@@ -1,79 +1,79 @@
 module Shoppe
   class OrdersController < Shoppe::ApplicationController
-  
-    before_filter { @active_nav = :orders }  
+
+    before_filter { @active_nav = :orders }
     before_filter { params[:id] && @order = Shoppe::Order.find(params[:id])}
-  
+
     def index
       @query = Shoppe::Order.ordered.received.includes(:order_items => :ordered_item).page(params[:page]).search(params[:q])
       @orders = @query.result
     end
-    
+
     def new
       @order = Shoppe::Order.new
       @order.order_items.build(:ordered_item_type => 'Shoppe::Product')
     end
-    
+
     def create
       Shoppe::Order.transaction do
         @order = Shoppe::Order.new(safe_params)
         @order.status = 'confirming'
         if !request.xhr? && @order.save
           @order.confirm!
-          redirect_to @order, :notice => "Order has been created successfully"
+          redirect_to @order, :notice => t('shoppe.orders.create_notice')
         else
           @order.order_items.build(:ordered_item_type => 'Shoppe::Product')
           render :action => "new"
         end
       end
     rescue Shoppe::Errors::InsufficientStockToFulfil => e
-      flash.now[:alert] = "Insufficient stock to order #{e.out_of_stock_items.map { |t| t.ordered_item.full_name }.to_sentence}. Quantities have been updated to max total stock available."
+      flash.now[:alert] = t('shoppe.orders.insufficient_stock_order', out_of_stock_items: e.out_of_stock_items.map { |t| t.ordered_item.full_name }.to_sentence)
       render :action => 'new'
     end
-    
+
     def show
       @payments = @order.payments.to_a
     end
-  
+
     def update
       @order.attributes = safe_params
       if !request.xhr? && @order.update_attributes(safe_params)
-        redirect_to @order, :notice => "Order has been saved successfully"
+        redirect_to @order, :notice => t('shoppe.orders.update_notice')
       else
         render :action => "edit"
       end
     end
-  
+
     def search
       index
       render :action => "index"
     end
-  
+
     def accept
       @order.accept!(current_user)
-      redirect_to @order, :notice => "Order has been accepted successfully"
+      redirect_to @order, :notice => t('shoppe.orders.accept_notice')
     rescue Shoppe::Errors::PaymentDeclined => e
       redirect_to @order, :alert => e.message
     end
-  
+
     def reject
       @order.reject!(current_user)
-      redirect_to @order, :notice => "Order has been rejected successfully"
+      redirect_to @order, :notice => t('shoppe.orders.reject_notice')
     rescue Shoppe::Errors::PaymentDeclined => e
       redirect_to @order, :alert => e.message
     end
-  
+
     def ship
       @order.ship!(params[:consignment_number], current_user)
-      redirect_to @order, :notice => "Order has been shipped successfully"
+      redirect_to @order, :notice => t('shoppe.orders.ship_notice')
     end
-  
+
     def despatch_note
       render :layout => 'shoppe/printable'
     end
-  
+
     private
-    
+
     def safe_params
       params[:order].permit(
         :first_name, :last_name, :company,

data/app/controllers/shoppe/payments_controller.rb

@@ -1,33 +1,33 @@
 module Shoppe
   class PaymentsController < ApplicationController
-    
+
     before_filter { @order = Shoppe::Order.find(params[:order_id]) }
     before_filter { params[:id] && @payment = @order.payments.find(params[:id]) }
-    
+
     def create
       payment = @order.payments.build(params[:payment].permit(:amount, :method, :reference))
       if payment.save
-        redirect_to @order, :notice => "Payment has been added successfully"
+        redirect_to @order, :notice => t('shoppe.payments.create_notice')
       else
         redirect_to @order, :alert => payment.errors.full_messages.to_sentence
       end
     end
-    
+
     def destroy
       @payment.destroy
-      redirect_to @order, :notice => "Payment has been removed successfully"
+      redirect_to @order, :notice => t('shoppe.payments.destroy_notice')
     end
-    
+
     def refund
       if request.post?
         @payment.refund!(params[:amount])
-        redirect_to @order, :notice => "Refund has been processed successfully."
+        redirect_to @order, :notice => t('shoppe.payments.refund_notice')
       else
         render :layout => false
       end
     rescue Shoppe::Errors::RefundFailed => e
       redirect_to @order, :alert => e.message
     end
-    
+
   end
 end

data/app/controllers/shoppe/product_categories_controller.rb

@@ -1,47 +1,47 @@
 module Shoppe
   class ProductCategoriesController < Shoppe::ApplicationController
 
-    before_filter { @active_nav = :product_categories }  
+    before_filter { @active_nav = :product_categories }
     before_filter { params[:id] && @product_category = Shoppe::ProductCategory.find(params[:id]) }
-  
+
     def index
       @product_categories = Shoppe::ProductCategory.ordered.all
     end
-  
+
     def new
       @product_category = Shoppe::ProductCategory.new
     end
-  
+
     def create
       @product_category = Shoppe::ProductCategory.new(safe_params)
       if @product_category.save
-        redirect_to :product_categories, :flash => {:notice => "Category has been created successfully"}
+        redirect_to :product_categories, :flash => { :notice => t('shoppe.product_category.create_notice') }
       else
         render :action => "new"
       end
     end
-  
+
     def edit
     end
-  
+
     def update
       if @product_category.update(safe_params)
-        redirect_to [:edit, @product_category], :flash => {:notice => "Category has been updated successfully"}
+        redirect_to [:edit, @product_category], :flash => { :notice => t('shoppe.product_category.update_notice') }
       else
         render :action => "edit"
       end
     end
-  
+
     def destroy
       @product_category.destroy
-      redirect_to :product_categories, :flash => {:notice => "Category has been removed successfully"}
+      redirect_to :product_categories, :flash => { :notice => t('shoppe.product_category.destroy_notice') }
     end
-  
+
     private
-  
+
     def safe_params
       params[:product_category].permit(:name, :permalink, :description, :image_file)
     end
-  
+
   end
 end

data/app/controllers/shoppe/products_controller.rb

@@ -1,47 +1,58 @@
 module Shoppe
   class ProductsController < Shoppe::ApplicationController
-  
+
     before_filter { @active_nav = :products }
     before_filter { params[:id] && @product = Shoppe::Product.root.find(params[:id]) }
-  
+
     def index
       @products = Shoppe::Product.root.includes(:stock_level_adjustments, :default_image, :product_category, :variants).order(:name).group_by(&:product_category).sort_by { |cat,pro| cat.name }
     end
-  
+
     def new
       @product = Shoppe::Product.new
     end
-  
+
     def create
       @product = Shoppe::Product.new(safe_params)
       if @product.save
-        redirect_to :products, :flash => {:notice => "Product has been created successfully"}
+        redirect_to :products, :flash => {:notice =>  t('shoppe.products.create_notice') }
       else
         render :action => "new"
       end
     end
-  
+
     def edit
     end
-  
+
     def update
       if @product.update(safe_params)
-        redirect_to [:edit, @product], :flash => {:notice => "Product has been updated successfully"}
+        redirect_to [:edit, @product], :flash => {:notice => t('shoppe.products.update_notice') }
       else
         render :action => "edit"
       end
     end
-  
+
     def destroy
       @product.destroy
-      redirect_to :products, :flash => {:notice => "Product has been removed successfully"}
+      redirect_to :products, :flash => {:notice =>  t('shoppe.products.destroy_notice')}
     end
-    
+
+    def import
+      if request.post?
+        if params[:import].nil?
+          redirect_to import_products_path, :flash => {:alert => I18n.t('shoppe.imports.errors.no_file')}
+        else
+          Shoppe::Product.import(params[:import][:import_file])
+          redirect_to products_path, :flash => {:notice => I18n.t("shoppe.products.imports.success")}
+        end
+      end
+    end
+
     private
-  
+
     def safe_params
       params[:product].permit(:product_category_id, :name, :sku, :permalink, :description, :short_description, :weight, :price, :cost_price, :tax_rate_id, :stock_control, :default_image_file, :data_sheet_file, :active, :featured, :in_the_box, :product_attributes_array => [:key, :value, :searchable, :public])
     end
-  
+
   end
 end

data/app/controllers/shoppe/sessions_controller.rb

@@ -3,30 +3,30 @@ module Shoppe
 
     layout 'shoppe/sub'
     skip_before_filter :login_required, :only => [:new, :create, :reset]
-  
+
     def create
       if user = Shoppe::User.authenticate(params[:email_address], params[:password])
         session[:shoppe_user_id] = user.id
         redirect_to :orders
       else
-        flash.now[:alert] = "The email address and/or password you have entered is invalid. Please check and try again."
+        flash.now[:alert] =  t('shoppe.sessions.create_alert')
         render :action => "new"
       end
     end
-  
+
     def destroy
       session[:shoppe_user_id] = nil
       redirect_to :login
     end
-  
+
     def reset
-    
+
       if request.post?
         if user = Shoppe::User.find_by_email_address(params[:email_address])
           user.reset_password!
-          redirect_to login_path(:email_address => params[:email_address]), :notice => "An e-mail has been sent to #{user.email_address} with a new password"
+          redirect_to login_path(:email_address => params[:email_address]), :notice => t('shoppe.sessions.reset_notice', email_address: user.email_address)
         else
-          flash.now[:alert] = "No user was found matching the e-mail address"
+          flash.now[:alert] = t('shoppe.sessions.reset_alert')
         end
       end
     end

data/app/controllers/shoppe/settings_controller.rb

@@ -1,16 +1,16 @@
 module Shoppe
   class SettingsController < ApplicationController
-    
+
     before_filter { @active_nav = :settings }
-    
+
     def update
       if Shoppe.settings.demo_mode?
-        raise Shoppe::Error, "You cannot make changes to settings in demo mode. Sorry about that."
+        raise Shoppe::Error, t('shoppe.settings.demo_mode_error')
       end
-      
+
       Shoppe::Setting.update_from_hash(params[:settings].permit!)
-      redirect_to :settings, :notice => "Settings have been updated successfully."
+      redirect_to :settings, :notice => t('shoppe.settings.update_notice')
     end
-    
+
   end
 end

data/app/controllers/shoppe/stock_level_adjustments_controller.rb

@@ -3,11 +3,11 @@ module Shoppe
 
     SUITABLE_OBJECTS = ['Shoppe::Product']
     before_filter do
-      raise Shoppe::Error, "Invalid item_type (must be one of #{SUITABLE_OBJECTS.to_sentence})" unless SUITABLE_OBJECTS.include?(params[:item_type])
+      raise Shoppe::Error, t('shoppe.stock_level_adjustments.invalid_item_type', suitable_objects:  SUITABLE_OBJECTS.to_sentence) unless SUITABLE_OBJECTS.include?(params[:item_type])
       @item = params[:item_type].constantize.find(params[:item_id].to_i)
     end
     before_filter { params[:id] && @sla = @item.stock_level_adjustments.find(params[:id].to_i) }
-    
+
     def index
       @stock_level_adjustments = @item.stock_level_adjustments.ordered.page(params[:page]).per(10)
       @new_sla = @item.stock_level_adjustments.build if @new_sla.nil?
@@ -15,7 +15,7 @@ module Shoppe
         render :action => 'index', :layout => false
       end
     end
-    
+
     def create
       @new_sla = @item.stock_level_adjustments.build(params[:stock_level_adjustment].permit(:description, :adjustment))
       if @new_sla.save
@@ -23,7 +23,7 @@ module Shoppe
           @new_sla = @item.stock_level_adjustments.build
           index
         else
-          redirect_to stock_level_adjustments_path(:item_id => params[:item_id], :item_type => params[:item_type]), :notice => "Adjustment has been added successfully"
+          redirect_to stock_level_adjustments_path(:item_id => params[:item_id], :item_type => params[:item_type]), :notice => t('shoppe.stock_level_adjustments.create_notice')
         end
       else
         if request.xhr?
@@ -35,6 +35,6 @@ module Shoppe
         end
       end
     end
-    
+
   end
 end

data/app/controllers/shoppe/tax_rates_controller.rb

@@ -1,49 +1,49 @@
 module Shoppe
   class TaxRatesController < Shoppe::ApplicationController
-  
+
     before_filter { @active_nav = :tax_rates }
     before_filter { params[:id] && @tax_rate = Shoppe::TaxRate.find(params[:id]) }
-  
+
     def index
       @tax_rates = Shoppe::TaxRate.ordered.all
     end
-  
+
     def new
       @tax_rate = Shoppe::TaxRate.new
       render :action => "form"
     end
-  
+
     def create
       @tax_rate = Shoppe::TaxRate.new(safe_params)
       if @tax_rate.save
-        redirect_to :tax_rates, :flash => {:notice => "Tax rate has been created successfully"}
+        redirect_to :tax_rates, :flash => {:notice => t('shoppe.tax_rates.create_notice') }
       else
         render :action => "form"
       end
     end
-  
+
     def edit
       render :action => "form"
     end
-  
+
     def update
       if @tax_rate.update(safe_params)
-        redirect_to [:edit, @tax_rate], :flash => {:notice => "Tax rate has been updated successfully"}
+        redirect_to [:edit, @tax_rate], :flash => {:notice => t('shoppe.tax_rates.update_notice')}
       else
         render :action => "form"
       end
     end
-  
+
     def destroy
       @tax_rate.destroy
-      redirect_to :tax_rates, :flash => {:notice => "Tax rate has been removed successfully"}
+      redirect_to :tax_rates, :flash => {:notice => t('shoppe.tax_rates.destroy_notice')}
     end
-  
+
     private
-  
+
     def safe_params
       params[:tax_rate].permit(:name, :rate, :address_type, :country_ids => [])
     end
-  
+
   end
 end