shoppe 0.0.14 → 0.0.15

data/app/controllers/shoppe/orders_controller.rb

@@ -1,41 +1,43 @@
-class Shoppe::OrdersController < Shoppe::ApplicationController
+module Shoppe
+  class OrdersController < Shoppe::ApplicationController
+  
+    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 update
+      @order.update_attributes!(params[:order].permit(:notes))
+      redirect_to @order, :notice => "Order has been saved successfully"
+    end
+  
+    def search
+      index
+      render :action => "index"
+    end
+  
+    def accept
+      @order.accept!(current_user)
+      redirect_to @order, :notice => "Order has been accepted successfully"
+    end
+  
+    def reject
+      @order.reject!(current_user)
+      redirect_to @order, :notice => "Order has been rejected successfully"
+    end
+  
+    def ship
+      @order.ship!(current_user, params[:consignment_number])
+      redirect_to @order, :notice => "Order has been shipped successfully"
+    end
+  
+    def pay
+      @order.pay!(params[:payment_reference], params[:payment_method].blank? ? 'Unknown' : params[:payment_method])
+      redirect_to @order, :notice => "Order has been marked as paid successfully"
+    end
   
-  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 => :product).page(params[:page]).search(params[:q])
-    @orders = @query.result
-  end
-  
-  def update
-    @order.update_attributes!(params[:order].permit(:notes))
-    redirect_to @order, :notice => "Order has been saved successfully"
-  end
-  
-  def search
-    index
-    render :action => "index"
-  end
-  
-  def accept
-    @order.accept!(current_user)
-    redirect_to @order, :notice => "Order has been accepted successfully"
   end
-  
-  def reject
-    @order.reject!(current_user)
-    redirect_to @order, :notice => "Order has been rejected successfully"
-  end
-  
-  def ship
-    @order.ship!(current_user, params[:consignment_number])
-    redirect_to @order, :notice => "Order has been shipped successfully"
-  end
-  
-  def pay
-    @order.pay!(params[:payment_reference], params[:payment_method].blank? ? 'Unknown' : params[:payment_method])
-    redirect_to @order, :notice => "Order has been marked as paid successfully"
-  end
-  
 end

data/app/controllers/shoppe/product_categories_controller.rb

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

data/app/controllers/shoppe/products_controller.rb

@@ -1,59 +1,47 @@
-class Shoppe::ProductsController < Shoppe::ApplicationController
+module Shoppe
+  class ProductsController < Shoppe::ApplicationController
   
-  before_filter { @active_nav = :products }
-  before_filter { params[:id] && @product = Shoppe::Product.find(params[:id]) }
+    before_filter { @active_nav = :products }
+    before_filter { params[:id] && @product = Shoppe::Product.root.find(params[:id]) }
   
-  def index
-    @products = Shoppe::Product.includes(:stock_level_adjustments, :default_image, :product_category).order(:title).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"}
-    else
-      render :action => "new"
+    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
-  end
   
-  def edit
-  end
+    def new
+      @product = Shoppe::Product.new
+    end
   
-  def update
-    if @product.update(safe_params)
-      redirect_to [:edit, @product], :flash => {:notice => "Product has been updated successfully"}
-    else
-      render :action => "edit"
+    def create
+      @product = Shoppe::Product.new(safe_params)
+      if @product.save
+        redirect_to :products, :flash => {:notice => "Product has been created successfully"}
+      else
+        render :action => "new"
+      end
     end
-  end
   
-  def destroy
-    @product.destroy
-    redirect_to :products, :flash => {:notice => "Product has been removed successfully"}
-  end
+    def edit
+    end
   
-  def stock_levels
-    @stock_level_adjustments = @product.stock_level_adjustments.ordered.page(params[:page])
-    if request.post?
-      @new_sla = @product.stock_level_adjustments.build(params[:stock_level_adjustment].permit(:description, :adjustment))
-      if @new_sla.save
-        redirect_to [:stock_levels, @product], :notice => "Stock level adjustment has been recorded"
+    def update
+      if @product.update(safe_params)
+        redirect_to [:edit, @product], :flash => {:notice => "Product has been updated successfully"}
       else
-        flash.now[:alert] = @new_sla.errors.full_messages.to_sentence
+        render :action => "edit"
       end
-    else
-      @new_sla = @product.stock_level_adjustments.build
     end
-  end
   
-  private
+    def destroy
+      @product.destroy
+      redirect_to :products, :flash => {:notice => "Product has been removed successfully"}
+    end
+    
+    private
   
-  def safe_params
-    params[:product].permit(:product_category_id, :title, :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
+    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

@@ -1,30 +1,32 @@
-class Shoppe::SessionsController < Shoppe::ApplicationController
-  layout 'shoppe/sub'
-  skip_before_filter :login_required, :only => [:new, :create, :reset]
+module Shoppe
+  class SessionsController < Shoppe::ApplicationController
+    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."
-      render :action => "new"
+    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."
+        render :action => "new"
+      end
     end
-  end
   
-  def destroy
-    session[:shoppe_user_id] = nil
-    redirect_to :login
-  end
+    def destroy
+      session[:shoppe_user_id] = nil
+      redirect_to :login
+    end
   
-  def reset
+    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"
-      else
-        flash.now[:alert] = "No user was found matching the e-mail address"
+      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"
+        else
+          flash.now[:alert] = "No user was found matching the e-mail address"
+        end
       end
     end
   end

data/app/controllers/shoppe/stock_level_adjustments_controller.rb

@@ -0,0 +1,40 @@
+module Shoppe
+  class StockLevelAdjustmentsController < ApplicationController
+
+    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])
+      @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?
+      if request.xhr?
+        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
+        if request.xhr?
+          @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"
+        end
+      else
+        if request.xhr?
+          render :text => @new_sla.errors.full_messages.to_sentence, :status => 422
+        else
+          index
+          flash.now[:alert] = @new_sla.errors.full_messages.to_sentence
+          render :action => "index"
+        end
+      end
+    end
+    
+  end
+end

data/app/controllers/shoppe/tax_rates_controller.rb

@@ -1,47 +1,49 @@
-class Shoppe::TaxRatesController < Shoppe::ApplicationController
+module Shoppe
+  class TaxRatesController < Shoppe::ApplicationController
   
-  before_filter { @active_nav = :tax_rates }
-  before_filter { params[:id] && @tax_rate = Shoppe::TaxRate.find(params[:id]) }
+    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 index
+      @tax_rates = Shoppe::TaxRate.ordered.all
+    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"}
-    else
+    def new
+      @tax_rate = Shoppe::TaxRate.new
       render :action => "form"
     end
-  end
   
-  def edit
-    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"}
+      else
+        render :action => "form"
+      end
+    end
   
-  def update
-    if @tax_rate.update(safe_params)
-      redirect_to [:edit, @tax_rate], :flash => {:notice => "Tax rate has been updated successfully"}
-    else
+    def edit
       render :action => "form"
     end
-  end
   
-  def destroy
-    @tax_rate.destroy
-    redirect_to :tax_rates, :flash => {:notice => "Tax rate has been removed successfully"}
-  end
+    def update
+      if @tax_rate.update(safe_params)
+        redirect_to [:edit, @tax_rate], :flash => {:notice => "Tax rate has been updated successfully"}
+      else
+        render :action => "form"
+      end
+    end
   
-  private
+    def destroy
+      @tax_rate.destroy
+      redirect_to :tax_rates, :flash => {:notice => "Tax rate has been removed successfully"}
+    end
   
-  def safe_params
-    params[:tax_rate].permit(:name, :rate, :country_ids => [])
-  end
+    private
   
+    def safe_params
+      params[:tax_rate].permit(:name, :rate, :country_ids => [])
+    end
+  
+  end
 end

data/app/controllers/shoppe/users_controller.rb

@@ -1,46 +1,53 @@
-class Shoppe::UsersController < Shoppe::ApplicationController
+module Shoppe
+  class UsersController < Shoppe::ApplicationController
+  
+    before_filter { @active_nav = :users }
+    before_filter { params[:id] && @user = Shoppe::User.find(params[:id]) }
+    if Shoppe.config[:demo_mode]
+      before_filter(:only => [:create, :update, :destroy]) do
+        raise Shoppe::Error, "You cannot make changes to user in demo mode. Sorry about that."
+      end
+    end
   
-  before_filter { @active_nav = :users }
-  before_filter { params[:id] && @user = Shoppe::User.find(params[:id]) }
+    def index
+      @users = Shoppe::User.all
+    end
   
-  def index
-    @users = Shoppe::User.all
-  end
+    def new
+      @user = Shoppe::User.new
+    end
   
-  def new
-    @user = Shoppe::User.new
-  end
+    def create
+      @user = Shoppe::User.new(safe_params)
+      if @user.save
+        redirect_to :users, :flash => {:notice => "User has been created successfully"}
+      else
+        render :action => "new"
+      end
+    end
   
-  def create
-    @user = Shoppe::User.new(safe_params)
-    if @user.save
-      redirect_to :users, :flash => {:notice => "User has been created successfully"}
-    else
-      render :action => "new"
+    def edit
     end
-  end
   
-  def edit
-  end
+    def update
+      if @user.update(safe_params)
+        redirect_to [:edit, @user], :flash => {:notice => "User has been updated successfully"}
+      else
+        render :action => "edit"
+      end
+    end
   
-  def update
-    if @user.update(safe_params)
-      redirect_to [:edit, @user], :flash => {:notice => "User has been updated successfully"}
-    else
-      render :action => "edit"
+    def destroy
+      raise Shoppe::Error, "You cannot remove yourself" if @user == current_user
+      @user.destroy
+      redirect_to :users, :flash => {:notice => "User has been removed successfully"}
     end
-  end
   
-  def destroy
-    raise Shoppe::Error, "You cannot remove yourself" if @user == current_user
-    @user.destroy
-    redirect_to :users, :flash => {:notice => "User has been removed successfully"}
-  end
+    private
   
-  private
+    def safe_params
+      params[:user].permit(:first_name, :last_name, :email_address, :password, :password_confirmation)
+    end
   
-  def safe_params
-    params[:user].permit(:first_name, :last_name, :email_address, :password, :password_confirmation)
   end
-  
 end