opensteam 0.9.2 → 0.9.3

data/generators/opensteam/templates/app/controllers/admin/tax_groups_controller.rb

@@ -0,0 +1,124 @@
+class Admin::TaxGroupsController < AdminController
+  
+  
+  before_filter :set_sort_column
+  
+  def index
+    @tax_groups = ProductTaxGroup.find( :all, :include => [:tax_zones, :inventories ] )
+
+
+    #    @tax_groups = apply_filter( "TaxGroup" )
+    #    
+    #    @tax_groups = ( @tax_groups || TaxGroup ).order_by( @sort_column.order )
+    #    
+    #    if params[:sort]
+    #      @tax_groups.reverse! if session[:tax_group]
+    #      session[:tax_group] = session[:tax_group] ? false : true
+    #    end
+   
+    respond_to do |format|
+      format.html
+      format.xml { render :xml => @tax_groups.to_xml( :root => "tax_groups") }
+      format.js { render :partial => "admin/tax_groups/tax_groups_row", :collection => @tax_groups}
+    end
+
+  end
+  
+  
+  def new
+    @tax_group = Opensteam::Money::Tax::ProductTaxGroup.new
+    @tax_zones = Opensteam::Money::Tax::TaxZone.all
+  
+    @tax_rules = @tax_group.tax_rules.build
+  
+  end
+
+
+  
+  
+  
+  def create
+    @tax_group = Opensteam::Money::Tax::ProductTaxGroup.new( params[:tax_group] )
+    @tax_zones = Opensteam::Money::Tax::TaxZone.all.to_h2 { |a| a.country }
+    
+    respond_to do |format|
+      if @tax_group.save
+        flash[:notice] = "TaxGroup successfully created!"
+        format.html { redirect_to :action => :index }
+        format.xml { render :xml => @tax_group.to_xml( :root => "tax_group" ), :status => :created, :location => @tax_zone }
+      else
+        format.html { render :action => :new }
+        format.xml { render :xml => @tax_group.errors, :status => :unprocessable_entity }
+      end
+    end
+    
+  end
+
+  
+  def show
+    @tax_group = Opensteam::Money::Tax::TaxGroup.find( params[:id], :include => :tax_rules )
+    
+    respond_to do |format|
+      format.html
+      format.xml { render :xml => @tax_group.to_xml( :root => "tax_group" ) }
+    end
+  end
+  
+  
+  def edit
+    @tax_group = Opensteam::Money::Tax::TaxGroup.find( params[:id] )
+    @tax_zones = Opensteam::Money::Tax::TaxZone.all
+  end
+  
+  
+  def update
+    @tax_group = Opensteam::Money::Tax::ProductTaxGroup.find( params[:id] )
+    @tax_zones = Opensteam::Money::Tax::TaxZone.all
+    
+    params[:tax_group][:existing_tax_rule_attributes] ||= {}
+    
+    respond_to do |format|
+      if @tax_group.update_attributes( params[:tax_group] )
+        flash[:notice] = "TaxGroup successfully created!"
+        format.html { redirect_to admin_tax_group_path( @tax_group ) }
+        format.xml { render :xml => @tax_group.to_xml( :root => "tax_group" ), :status => :created, :location => @tax_zone }
+      else
+        format.html { render :action => :edit }
+        format.xml { render :xml => @tax_group.errors, :status => :unprocessable_entity }
+      end
+    end
+    
+  end
+  
+  
+
+  def destroy
+    @tax_group = Opensteam::Money::Tax::TaxGroup.find( params[:id] )
+    
+    respond_to do |format|
+      unless @tax_group.inventories.empty?
+        flash[:error] = "Cannot delete TaxGroup '#{@tax_group.name}'. Remove Product Associations first."
+        format.html { redirect_to :action => :index }
+      else
+        @tax_group.destroy
+        format.html { redirect_to :action => :index }
+        format.xml { head :ok }
+      end
+      
+    end
+    
+  end
+  
+ 
+
+  
+  
+  private
+  def set_sort_column
+    id = params[:sort] || "id"
+    @sort_column = TaxGroup.osteam_configtable.columns.find { |s| s.id.to_s == id }
+  end
+  
+    
+  
+end

data/generators/opensteam/templates/app/controllers/admin/tax_rules_controller.rb

@@ -0,0 +1,19 @@
+class Admin::TaxRulesController < AdminController
+  
+  def index
+    @inventories = Inventory.find( :all, :include => :product )
+    @product_tax_groups = ProductTaxGroup.find( :all, :include => :tax_zones )
+    @tax_zones = TaxZone.all.to_h2 { |a| a.country }
+  end
+  
+  
+  def get_tax_rule
+    @inventory = Inventory.find( params[:inventory] )
+    render :text => @inventory.tax_group.name.to_s
+  end
+  
+  
+  
+    
+  
+end

data/generators/opensteam/templates/app/controllers/admin/tax_zones_controller.rb

@@ -0,0 +1,118 @@
+class Admin::TaxZonesController < AdminController
+  
+  
+  before_filter :set_sort_column
+  
+  
+#  def filter
+#    save_filter( "TaxZone" )
+#    # @tax_zones = apply_filter( "TaxZone" )
+#    redirect_to :action => :index
+#  end
+#  
+  
+  def index
+    # save_filter( "TaxZone" ) if request.post?
+    @tax_zones = apply_filter( "TaxZone" )
+    
+    @tax_zones = ( @tax_zones || TaxZone ).order_by( @sort_column.order )
+    
+    if params[:sort]
+      @tax_zones.reverse! if session[:tax_zones]
+      session[:tax_zones] = session[:tax_zones] ? false : true
+    end
+   
+    
+    respond_to do |format|
+      format.html
+      format.xml { render :xml => @tax_zones.to_xml( :root => "tax_zones") }
+      format.js { render :partial => "admin/tax_zones/tax_zone_row", :collection => @tax_zones }
+    end
+    
+    
+  end
+  
+  
+  def new
+    @tax_zone = Opensteam::Money::Tax::TaxZone.new
+    @countries = CountryCodes.countries_for_select "name"
+  
+  end
+  
+  
+  def create
+    @tax_zone = Opensteam::Money::Tax::TaxZone.new( params[:tax_zone] )
+    
+    respond_to do |format|
+
+      if @tax_zone.save
+        flash[:notice] = "TaxZone was successfully created!"
+        format.html { redirect_to :action => 'index' }
+        format.xml { render :xml => @tax_zone.to_xml( :root => "tax_zone" ), :status => :creates, :location => @tax_zone }
+      else
+        format.html { render :action => 'new' }
+        format.xml { render :xml => @tax_zone.errors, :status => :unprocessable_entity }
+      end
+      
+    end
+  end
+  
+  
+  def show
+    @tax_zone = Opensteam::Money::Tax::TaxZone.find( params[:id] )
+    
+    respond_to do |format|
+      format.html
+      format.xml { render :xml => @tax_zone.to_xml( :root => "tax_zone" ) }
+    end
+  end
+
+  
+  
+  def edit
+    @tax_zone = Opensteam::Money::Tax::TaxZone.find( params[:id] )
+    @countries = CountryCodes.countries_for_select "name"
+  end
+
+  
+  
+  def update
+    @tax_zone = Opensteam::Money::Tax::TaxZone.find( params[:id] )
+    
+    respond_to do |format|
+      if @tax_zone.update_attributes( params[:tax_zone] )
+        flash[:notice] = "TaxZone was sucessfully updated!"
+        format.html { redirect_to( admin_tax_zone_path( @tax_zone ) ) }
+        format.xml { head :ok }
+      else
+        format.html { render :action => 'edit' }
+        format.xml  { render :xml => @tax_zone.errors, :status => :unprocessable_entity }
+      end
+  
+    end
+  end
+
+  
+  def destroy
+    @tax_zone = Opensteam::Tax::TaxZone.find( params[:id] )
+    @tax_zone.destroy
+    
+    respond_to do |format|
+      format.html { redirect_to( admin_tax_zones_path ) }
+      format.xml { head :ok }
+    end
+  end
+
+ 
+
+  
+  
+  private
+  def set_sort_column
+    id = params[:sort] || "id"
+    @sort_column = TaxZone.osteam_configtable.columns.find { |s| s.id.to_s == id }
+  end
+  
+    
+  
+end

data/generators/opensteam/templates/app/controllers/admin/users_controller.rb

@@ -92,7 +92,7 @@ class Admin::UsersController < AdminController
       
       if ret 
         flash[:notice] = "User succesfully created"
-        format.html { redirect_to :action => "show" }
+        format.html { redirect_to admin_user_path( @user ) }
         format.xml
       else
         format.html { render :action => "new" }

data/generators/opensteam/templates/app/controllers/admin_controller.rb

@@ -32,6 +32,26 @@ class AdminController < ApplicationController
   end
   
   
+  def filter
+    self.class.name =~ /^Admin::(.+)Controller$/
+    model = $1
+    save_filter( model.singularize )
+    redirect_to :action => :index
+  end
+  
+  
+  
+  def payment_types
+    @payment_types = Opensteam::Payment::Types.all
+  end
+  
+  
+  def toggle_payment_type
+    Opensteam::Payment::Types.find( params[:id] ).toggle!
+    redirect_to :action => :payment_types
+  end
+  
+  
   private
   def authorized?
     unless logged_in? && is_admin?

data/generators/opensteam/templates/app/controllers/carts_controller.rb

@@ -0,0 +1,118 @@
+## TEMPLATE ##
+class CartsController < ApplicationController
+  
+  layout "<%= file_name %>"
+  
+  before_filter :get_cart
+  
+  before_filter :check_availability, :only => [:create]
+  before_filter :check_storage, :only => [:update]
+  
+  
+  
+  def check_availability
+    if Inventory.find( params[:id] ).is_available?
+      return true
+    else
+      render :update do |page| page.alert( "This Item is current not available!" ) end
+      return false
+    end
+  end
+
+  def check_storage
+    if params[:incr]
+      if ( @cart[ params[:id] ].quantity + 1 ) <= @cart[ params[:id].to_i ].item.storage
+        return true
+      else
+        render :update do |page| page.alert( "Sorry, there are only #{@cart[ params[:id] ].item.storage} items available!") end
+        return false
+      end
+    end
+    
+  end
+  
+  
+  
+  
+  def index
+  end
+  
+  
+  def create
+    @inventory = Inventory.find( params[:id] )
+    @cart.push( @inventory )
+    
+    respond_to do |format|
+      format.html { redirect_to :action => 'index' }
+      format.js
+    end
+  end
+   
+  
+  def show
+    @inventory = @cart[ params[:id] ].item
+    @product = @inventory.product
+    @product.selected_inventory = @inventory
+    @properties = @inventory.properties.to_h2 { |x| x.class.to_s.tableize }
+    
+    @inventory = [ @inventory ] # TODO: change webshop/show template ...
+    
+    @cart_details = true
+
+    render :template => "<%= file_name %>/show" 
+
+  end
+  
+  
+  def destroy
+    if params[:id]
+      @cart[ params[:id].to_i ].destroy
+      @cart.reload
+    else
+      wipe_cart
+    end
+    
+
+    respond_to do |format|
+      format.html { redirect_to :action => 'index' }
+      format.js { render :template => "carts/create.rjs" }
+    end
+    
+  end
+  
+  
+  def update
+    if params[:id]
+      @cart[ params[:id].to_i ].incr if params[:incr]
+      @cart[ params[:id].to_i ].decr if params[:decr]
+    end
+    
+    if params[:quantity]
+      @cart.update_attributes( :set_quantity => Hash[ params[:quantity] ] )
+    end 
+    
+    @cart.reload
+    
+    respond_to do |format|
+      format.html { redirect_to :action => 'index', :controller => '<%= file_name %>' }
+      format.js
+    end
+    
+  end
+
+  
+  private
+  def get_cart
+    session[:cart] ||= Cart.create.id
+    @cart = Cart.find( session[:cart] )
+  end
+  
+  def wipe_cart
+    session[:cart] = nil
+    get_cart
+      
+  end
+
+
+  
+end

data/generators/opensteam/templates/app/controllers/checkout_controller.rb

@@ -11,9 +11,26 @@ class CheckoutController < ApplicationController
   layout "<%= file_name %>"
   include Opensteam::Checkout
   include Opensteam::ShoppingCart
+  before_filter :check_admin
+  before_filter :set_instance_vars
   
   
-  before_filter :check_admin
+  
+  
+  def shipping_types
+    locals = { :country => params[:order][:shipping_address][:country] }
+    locals[:payment_type] = params[:order][:payment_type] if params[:order][:payment_type]
+
+    
+    render :update do |page|
+      for st in Opensteam::ShipmentBase::RegionShippingRate.all.collect(&:shipping_method ).uniq
+        page.replace_html "shipping_type_rate_#{st.underscore}", @cart.calculate_shipping_rate( 
+          locals.update( :shipping_method => st ) )
+      end
+    end
+    #    render :partial => "shipping_buttons", :locals => locals , :layout => false, :object => @cart
+  end
+  
   
   # initialize checkout-flow
   #
@@ -24,106 +41,129 @@ class CheckoutController < ApplicationController
     end
   end
 	
-	
-  # checkout intro		
-  #
-  # dummy page
-  def intro 
-    @cart = get_cart
-    order = Opensteam::OrderBase::Order.create
-    session[:active_order] = order.id
-    if logged_in?
-      redirect_to :action => :place_order
-      return
-    end
-    session[:return_to] = url_for :controller => 'checkout', :action => 'show_cart'
-
+   
+  def intro
+    redirect_to :action => :new
   end
-	
-	
-	
-	
-  # checkout outro
-  #
-  # dummy page
-  def outro
-    session[:cart] = nil
-    @cart = get_cart
-    session[:active_order] = nil
+  
+  
+  def new
+    @order = Opensteam::OrderBase::Order.new
+
+    respond_to do |format|
+      format.html
+    end
   end
 
 
   
-	
-  # checkout shipping
-  # [POST] + [GET]
-  def shipping
-    @order = Opensteam::OrderBase::Order.find( session[:active_order] )
-    @cart = get_cart
-			
+  def create
+    @order = Opensteam::OrderBase::Order.new( params[:order] )
     
+    @customer = logged_in? ? current_user : Opensteam::UserBase::User.new_or_existing_guest( params[:guest_customer] )
+    @order.real_customer = @customer
     
-    @customer = logged_in? ? current_user : Opensteam::UserBase::User.new
-    @shipping_address = Opensteam::UserBase::Address.new
-    @payment_address  = Opensteam::UserBase::Address.new
-		
-    #saving the form
-    if request.post?
+    respond_to do |format|
       
-      if logged_in?
-        @customer = current_user
-        unless @customer.update_attributes( params[:order][:customer] )
-          render :action => :shipping
-        end
-        params[:order].delete :customer
-        @order.real_customer = @customer
-      end
+      ret = @order.valid?
+      @payment = Opensteam::Payment::Base[ @order.payment_type ].new( params[:payment_fields] ) if @order.payment_type
+      ret2 = @payment.valid? if @order.payment_type
       
-      if @order.update_attributes( params[:order] )
-        @order.customer.addresses << [ @order.shipping_address, @order.payment_address ]
-        
-        self.current_user = @order.customer 
+      if ret && ret2
+        @order.save
+        @order.copy_items_from @cart
+        @order.update_price_and_tax!
+        @order.set_shipping_rate!
+        @order.save
         
-        
-        redirect_to :action => :outro
+        session[:active_order] = @order.id
+        format.html { render :action => :show }
       else
-        @customer = @order.customer
-        @payment_address = @order.payment_address
-        @shipping_address = @order.shipping_address
-        render :action => :shipping
+        flash[:error] = "could not save order"
+        format.html { render :action => :new }
       end
- 			
     end
-		
+    
   end
-		
-	
-  # show cart
-  # [GET]
-  #
-  # show the shopping cart again
-  def show_cart
-    @cart = get_cart
+  
+    
+  def show
+    @order = Opensteam::OrderBase::Order.find( session[:active_order],
+      :include => [ :shipping_address, :payment_address, :items, :customer ] )
   end
-	
-
-  # place order
-  # [POST]
-  #
+  
   def place_order
-    #   if request.post?
-				
     @order = Opensteam::OrderBase::Order.find( session[:active_order] )
-    @order.copy_from_cart( get_cart )
+    @order.customer.addresses << [ @order.shipping_address, @order.payment_address ]
+    @order.payments.build_payment( params[:payment] )
     @order.save
-    session[:active_order] = @order.id
-			
-    redirect_to :action => :shipping
-    #    end
+    
+    @order.state = :pending
+    
+    clear_cart
+    redirect_to :action => :outro
+  end
+  
+  
+  
+  def edit
+    @order = Opensteam::OrderBase::Order.find( session[:active_order],
+      :include => [ :shipping_address, :payment_address, :customer ] )
+    
+    @customer = @order.customer
   end
   
+  
+  def update
+    @order = Opensteam::OrderBase::Order.find( session[:active_order] )
+    @customer = @order.customer
+    
+    
+    respond_to do |format|
+      
+      ret = @order.update_attributes( params[:order] )
+      @payment = Opensteam::Payment::Base[ @order.payment_type ].new( params[:payment_fields] ) if ret
+
+      if ret && @payment.valid?
+       
+        @order.update_price_and_tax!
+        @order.set_shipping_rate!
+        @order.save
+        
+        session[:active_order] = @order.id
+        format.html { render :action => :show }
+      else
+        flash[:error] = "Error: Could not update order"
+        format.html { render :action => :edit }
+      end
+    end
+    
+    
+  end
+  
+  
+
+
+
+
+  def outro
+  end
+
+
+  
   private
   
+  
+  def set_instance_vars
+    #@order = Opensteam::OrderBase::Order.find( session[:active_order] )
+    @countries = Zone.all.collect(&:country_name).sort
+#    @countries = CountryCodes.countries_for_select("name").sort
+    @customer = logged_in? ? current_user : Opensteam::UserBase::User.new
+    @addresses = @customer.addresses
+  end
+
+  
+  
   def check_admin
     if( logged_in? && is_admin? )
       flash[:error] = "Checkout not allowed for Admin User #{current_user.email}"