opensteam 0.9.2 → 0.9.3

data/CHANGELOG

@@ -1,3 +1,56 @@
+*EDGE*
+
+* added a ContainerModel to hold the basic ShoppingCart Logic (add/update/delete items, increment/decrement), STI
+
+* moved Cart from session to database (into Container)
+
+* moved OrderBase into Container (same logic as ShoppingCart)
+
+* added a Tax-System (TaxZones, TaxGroups, Calculation, etc), MVC
+
+* implemented ActiveMerchant Integration. (CreditCard Payment)
+
+* added PaymentTypes and a Payment Base Class to simplify future integration of payment-methods
+
+* added ShippingRate calculation (ShippingRates, Zones, ShippingRateGroups), MVC
+
+* added shipping-rates, taxes, netto_price calculation, payment_type to OrderBase (Container)
+
+* refactored Checkout-Process and OrderBase-Model in order to work with payment_type, shipping-rate and taxes
+
+* added PDF-Export for Invoices (using the prawn-gem and prawnto-plugin http://www.cracklabs.com/prawnto )
+
+* removed state-logic from InvoiceBase (not needed)
+
+* added payment_process initializers (CreditCardPayment)
+
+* added Configuration Model (Backend), to hold simple key-value pairs
+
+* added units tests for Container::Base (Order, Cart), Payment, ProductBase and Order
+
+* refactored the "set_properties=" method in ProductBase. Now "building" the inventory-objects instead of creating.
+
+* refactored the _attributes partial for products in order to work with the new "set_properties=" method.
+
+* InventoryBase: added a named_scope called :by_properties (replaces the exists_by_properties extension-method fpr the inventories-association in ProductBase):
+  Now: Single SQL-Query instead of fetching every single property.
+
+* fixed bug in StateMachine caused by inheritance: declared 'observers' and 'inialstate' as class_inheritable_accessor
+
+* StateLogic: changed state-name from .downcase to .underscore
+
+* deleted unnecessary partials (TODO: more to delete!)
+
+* renamed cart_controller to carts_controller (ActiveRecord Model, recources!)
+
+* added a "init_opensteam_config" migration file, to create admin-uses and load fixtures (zones, tax_zones, shipping_rates, configuration)
+
+* added verification_value to credit_card_payment partials
+
+* deleted lib/cart_base.rb (not needed anymore, now Opensteam::Cart < Opensteam::Container::Base)
+
+
+
 *0.9.2*
 
 

data/README.rdoc

@@ -1,4 +1,4 @@
-= opensteam v0.9.1
+= opensteam v0.9.3
 
 * http://www.opensteam.net
 * http://rubyforge.org/projects/opensteam
@@ -26,13 +26,14 @@ see CHANGELOG File
 
 * Product Listing
 * Details-Page for Products
-* a Shopping-Cart (add, delete, increment/decrement quantity, checkout)
-* a Checkout-Process
-* an Admin-Backend:
-- create and configure Products and Properties
-- overview and process Orders, Shipments and Invoices
-- configure Admins and Customers
-* Profile-Page for Customers
+* ShoppingCart (add/update/delete items, increment/decrement quantity, checkout)
+* CheckoutProcess
+* AdminBackend
+* ActiveMerchant Integration
+* ShippingRates
+* Taxes
+* ProfilePage for Customers
+* Overview and process Orders, Shipments and Invoices
 
 
 === Generators
@@ -80,10 +81,14 @@ Goto /admin and configure your products
 == REQUIREMENTS:
 
 * rails (of course)
-* uuidtools gem (gem install uuidtools)
 
+* prawnto-plugin (used for pdf-export)
+  http://www.cracklabs.com/prawnto
 
+* ActiveMerchant gem (used for credit_card payment)
+  http://www.activemerchant.org/
 
+  
 == INSTALL:
 
 	sudo gem install opensteam
@@ -92,4 +97,8 @@ Goto /admin and configure your products
 == LICENSE:
 Copyright (C) DiamondDogs Webconsulting
 openSteam is licensed under the GNU General Public License (GPL) version 2
-see the LICENSE file for more information.
+see the LICENSE file for more information.
+
+All plugins in "vendor/plugins" belong to their respective owner. See their License files for more information.
+
+

data/generators/opensteam/opensteam_generator.rb

@@ -50,7 +50,7 @@ class OpensteamGenerator < Rails::Generator::NamedBase
       Find.find("./templates/"  ) do |f|
         ret = ffind_in_file(f, "<%%", "## TEMPLATE ##" )
         f = f.gsub(/^\.\/templates\//,'')
-        ret == :directory ? m.send( ret, f =~ /webshop/ ? f.gsub(/webshop/,"#{file_name}") : f ) : m.send(ret,f , f =~ /webshop/ ? f.gsub(/webshop/,"#{file_name}") : f )
+        ret == :directory ? m.send( ret, f =~ /webshop/ ? f.gsub(/webshop/,"#{file_name}") : f ) : m.send(ret,f , f =~ /webshop/ ? f.gsub(/webshop/,"#{file_name}") : f, :collision => :force )
       end
       
 
@@ -69,7 +69,9 @@ class OpensteamGenerator < Rails::Generator::NamedBase
   map.resources :orders, :belongs_to => [ :users ]
   map.resource :user_session
   
-  map.cart "/cart", :controller => 'cart', :action => 'index'
+  map.resource :cart
+  map.cart "/cart/*quantity", :controller => 'cart', :action => 'update', :conditions => { :method => :post }
+  
   map.order_state '/orders/state/*state', :controller => 'orders', :action => 'index'
   map.connect "/admin", :controller => 'admin', :action => 'index'
   map.show_cart_item '/#{file_name}/show_cart_item/:id', :controller => '#{file_name}', :action => 'show_cart_item'
@@ -88,17 +90,27 @@ class OpensteamGenerator < Rails::Generator::NamedBase
     admin.orders_sort "orders/sort/:sort", :controller => 'orders', :action => 'sort'
     admin.users_admins "users/type/admin", :controller => 'users', :action => 'index', :type => 'admin'
     admin.users_customers "users/type/customer", :controller => 'users', :action => 'index', :type => 'customer'
+    admin.payment_types "payment_types", :controller => "admin", :action => "payment_types"
     
-    admin.connect "users", :controller => 'users', :action => 'index' 
     admin.connect "orders", :controller => 'orders', :action => 'index' 
     admin.connect "invoices", :controller => 'invoices', :action => 'index' 
     admin.connect "shipments", :controller => 'shipments', :action => 'index'
     
+    admin.connect "tax_zones/filter", :controller => 'tax_zones', :action => 'filter', :conditions => { :method => :post }
+    admin.connect "users/filter", :controller => 'users', :action => 'filter', :conditions => { :method => :post }
+    admin.connect "tax_groups/filter", :controller => 'tax_groups', :action => 'filter', :conditions => { :method => :post }
+
+    admin.resources :configurations
+      
     admin.resources :inventories
     admin.resources :users, :has_many => [ :orders ]
     admin.resources :orders, :has_many => [ :shipments, :invoices ]
     admin.resources :shipments
     admin.resources :invoices
+    admin.resources :tax_zones
+    admin.resources :tax_groups
+    admin.resources :shipping_rate_groups
+    admin.connect "tax_rules/:action", :controller => "tax_rules"
     
     Opensteam::Find.find_product_tables.collect(&:to_sym).each do |m|
       if m.to_s.classify.constantize.column_names.include? m.to_s.classify.constantize.inheritance_column
@@ -127,6 +139,9 @@ class OpensteamGenerator < Rails::Generator::NamedBase
   map.admin "/admin", :controller=>"admin", :action=>"index"  
   map.administration "/admin", :controller=>"admin", :action=>"index"  
 
+  map.admin_products "/admin/products", :controller => "admin", :action => "products"
+  map.admin_properties "/admin/properties", :controller => "admin", :action => "properties"
+  map.toggle_admin_payment_type "/admin/toggle_payment_type/:id", :controller => "admin", :action => "toggle_payment_type"
 END_OPENSTEAM_ROUTES
 			
       map_namespaceroutes( administration_routes )
@@ -148,6 +163,15 @@ END_OPENSTEAM_ROUTES
         "#{incl}\n\n#{match}\n"
       end
 
+      
+      incl = "
+  config.after_initialize do
+    ActiveMerchant::Billing::Base.mode = :test
+  end"
+      gsub_file 'config/environment.rb', /(#{Regexp.escape(sentinel)})/mi do |match|
+        "#{match}\n\n#{incl}\n"
+      end
+    
 
     end
   end

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

@@ -0,0 +1,85 @@
+class Admin::ConfigurationsController < AdminController
+  # GET /configurations
+  # GET /configurations.xml
+  def index
+    @configurations = Configuration.find(:all)
+
+    respond_to do |format|
+      format.html # index.html.erb
+      format.xml  { render :xml => @configurations }
+    end
+  end
+
+  # GET /configurations/1
+  # GET /configurations/1.xml
+  def show
+    @configuration = Configuration.find(params[:id])
+
+    respond_to do |format|
+      format.html # show.html.erb
+      format.xml  { render :xml => @configuration }
+    end
+  end
+
+  # GET /configurations/new
+  # GET /configurations/new.xml
+  def new
+    @configuration = Configuration.new
+
+    respond_to do |format|
+      format.html # new.html.erb
+      format.xml  { render :xml => @configuration }
+    end
+  end
+
+  # GET /configurations/1/edit
+  def edit
+    @configuration = Configuration.find(params[:id])
+  end
+
+  # POST /configurations
+  # POST /configurations.xml
+  def create
+    @configuration = Configuration.new(params[:configuration])
+
+    respond_to do |format|
+      if @configuration.save
+        flash[:notice] = 'Configuration was successfully created.'
+        format.html { redirect_to( admin_configuration_path( @configuration) ) }
+        format.xml  { render :xml => @configuration, :status => :created, :location => @configuration }
+      else
+        format.html { render :action => "new" }
+        format.xml  { render :xml => @configuration.errors, :status => :unprocessable_entity }
+      end
+    end
+  end
+
+  # PUT /configurations/1
+  # PUT /configurations/1.xml
+  def update
+    @configuration = Configuration.find(params[:id])
+
+    respond_to do |format|
+      if @configuration.update_attributes(params[:configuration])
+        flash[:notice] = 'Configuration was successfully updated.'
+        format.html { redirect_to(admin_configuration_path( @configuration)) }
+        format.xml  { head :ok }
+      else
+        format.html { render :action => "edit" }
+        format.xml  { render :xml => @configuration.errors, :status => :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /configurations/1
+  # DELETE /configurations/1.xml
+  def destroy
+    @configuration = Configuration.find(params[:id])
+    @configuration.destroy
+
+    respond_to do |format|
+      format.html { redirect_to(admin_configurations_url) }
+      format.xml  { head :ok }
+    end
+  end
+end

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

@@ -61,7 +61,7 @@ class Admin::InventoriesController < AdminController
   # PUT /inventories/1.xml
   def update
     @inventory = Inventory.find(params[:id])
-
+    
     respond_to do |format|
       if @inventory.update_attributes(params[:inventory])
         flash[:notice] = 'Inventory was successfully updated.'

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

@@ -37,6 +37,10 @@ class Admin::InvoicesController < AdminController
     respond_to do |format|
       format.html # show.html.erb
       format.xml  { render :xml => @invoice.to_xml( :root => 'invoice' ) }
+      format.pdf { 
+        render :layout => false
+        prawnto( :filename => "order_#{@order.id}_invoice_#{@invoice.id}", :prawn => { :page_size => 'A4' } )            
+      }
     end
   end
   
@@ -45,7 +49,7 @@ class Admin::InvoicesController < AdminController
     @order = Opensteam::OrderBase::Order.find( params[:order_id] )
     @invoice = @order.invoices.new
     
-    if @order.order_items.all_invoiced?
+    if @order.items.all_invoiced?
       flash[:error] = "Cannot create invoice :  All order-items have an invoice!"
       redirect_to admin_order_path( @order )
     end
@@ -55,13 +59,18 @@ class Admin::InvoicesController < AdminController
   
   
   def create
+    unless params[:order_items]
+      flash[:error] = "You have to select order-items to create an invoice!"
+      redirect_to :action => :new
+      return 
+    end
+    
+    
     @order = Opensteam::OrderBase::Order.find( params[:order_id] )
     @invoice = @order.invoices.new( params[:invoice] )
     @address = @invoice.address
     
-    @order_items = @order.order_items.select { |o|
-      params[:order_items].keys.include?( o.id.to_s ) && params[:order_items][ o.id.to_s ] == "1"
-    }
+    @order_items = @order.items.find( params[:order_items] )
 
     @invoice.order_items << @order_items
     
@@ -96,8 +105,30 @@ class Admin::InvoicesController < AdminController
       end
     end
  
+  end
+ 
+
+  def update_price
+  
+    @order = Opensteam::OrderBase::Order.find( params[:invoice][:order_id] )
+
+    price = BigDecimal.new( 
+      params[:order_items] ? 
+        @order.items.find( params[:order_items] ).collect(&:total_price).sum.to_s :
+        "0.0" 
+    ) - BigDecimal.new( params[:invoice][:discount] )
+
+    price += BigDecimal.new( params[:shipping_rate] ? @order.shipping_rate.to_s : "0.0" )
+    
+    render :update do |page|
+      page["invoice_price"].value = price
+    end
+    
 
   end
+
+  
+
   
   private
   def set_sort_column

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

@@ -4,16 +4,16 @@ class Admin::OrdersController < AdminController
   before_filter :set_sort_column
     
   def index
-    save_filter("Order") if request.post?
+    save_filter( "Order" ) if request.post?
     @orders = apply_filter( "Order" )
-      
+
     if params[:user_id]
       @customer = Opensteam::UserBase::User.find( params[:user_id] )
-      @orders = ( @orders || Opensteam::OrderBase.Order ).by_user( params[:user_id ] )
+      @orders = ( @orders || Opensteam::OrderBase::Order ).by_user( params[:user_id ] )
     end
       
     @orders = ( @orders || Opensteam::OrderBase::Order ).order_by( @sort_column.order )
-      
+    
     if params[:sort]
       @orders.reverse! if session[:orders]
       session[:orders] = session[:orders] ? false : true
@@ -36,6 +36,7 @@ class Admin::OrdersController < AdminController
       format.xml  { render :xml => @order }
     end
   end
+
   
   
   

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

@@ -42,9 +42,12 @@ class Admin::ShipmentsController < AdminController
   
   def new
     @order = Opensteam::OrderBase::Order.find( params[:order_id] )
-    @shipment = @order.shipments.new
+    @shipment = @order.shipments.build do |s|
+      s.address = @order.shipping_address
+      s.shipping_rate = @order.shipping_rate
+    end
     
-    if @order.order_items.all_shipped?
+    if @order.items.all_shipped?
       flash[:error] = "Cannot create shipment :  All order items have been shipped!!"
       redirect_to admin_order_path( @order )
     end
@@ -58,7 +61,7 @@ class Admin::ShipmentsController < AdminController
     @shipment = @order.shipments.new( params[:shipment] )
     @address = @shipment.address
     
-    @order_items = @order.order_items.select { |o|
+    @order_items = @order.items.select { |o|
       params[:order_items].keys.include?( o.id.to_s ) && params[:order_items][ o.id.to_s ] == "1"
     }
 

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

@@ -0,0 +1,76 @@
+class Admin::ShippingRateGroupsController < AdminController
+
+  
+  ShippingRateGroup = Opensteam::ShipmentBase::ShippingRateGroup
+  
+  
+  
+  def index
+    @groups = ShippingRateGroup.find( :all, :include => [ :shipping_rates, :payment_additions ] )
+  end
+  
+  
+  def new
+    @group = ShippingRateGroup.new
+    
+    respond_to do |format|
+      format.html {}
+    end
+  end
+
+  def edit
+    @group = ShippingRateGroup.find( params[:id] )
+    
+    respond_to do |format|
+      format.html {}
+    end
+  end
+  
+  
+  def create
+    @group = ShippingRateGroup.new( params[:group] )
+    
+    respond_to do |format|
+      ret = @group.save
+      if ret && @group.errors.empty?
+        format.html { redirect_to :action => :index }
+      else
+        flash[:error] = "Could not save Group of ShippingRates"
+        format.html { render :action => :new }
+      end
+      
+    end
+  end
+
+  
+  def update
+    @group = ShippingRateGroup.find( params[:id] )
+    
+    params[:group][:existing_rates] ||= {}
+    
+    respond_to do |format|
+      if @group.update_attributes( params[:group] )
+        flash[:notice] = "Successfully updated ShippingRateGroup ##{@group.id}"
+        format.html { redirect_to :action => :index }
+      else
+        flash[:error] = "Error: Could not update ShippingRateGroup ##{@group.id}"
+        format.html { redirect_to :action => :edit }
+      end
+    end
+  end
+  
+  
+  def destroy
+    @group = ShippingRateGroup.find( params[:id] )
+    
+    respond_to do |format|
+      @group.destroy
+      format.html { redirect_to :action => :index }
+      format.xml { head :ok }
+    end
+
+  end
+  
+  
+  
+end