vendor/plugins/will_paginate/LICENSE vendor/plugins/will_paginate/README vendor/plugins/will_paginate/Rakefile vendor/plugins/will_paginate/init.rb vendor/plugins/will_paginate/lib/will_paginate.rb vendor/plugins/will_paginate/lib/will_paginate/collection.rb vendor/plugins/will_paginate/lib/will_paginate/core_ext.rb vendor/plugins/will_paginate/lib/will_paginate/finder.rb vendor/plugins/will_paginate/lib/will_paginate/view_helpers.rb vendor/plugins/will_paginate/test/array_pagination_test.rb vendor/plugins/will_paginate/test/boot.rb vendor/plugins/will_paginate/test/console vendor/plugins/will_paginate/test/finder_test.rb vendor/plugins/will_paginate/test/fixtures/admin.rb vendor/plugins/will_paginate/test/fixtures/developer.rb vendor/plugins/will_paginate/test/fixtures/developers_projects.yml vendor/plugins/will_paginate/test/fixtures/project.rb vendor/plugins/will_paginate/test/fixtures/projects.yml vendor/plugins/will_paginate/test/fixtures/replies.yml vendor/plugins/will_paginate/test/fixtures/reply.rb vendor/plugins/will_paginate/test/fixtures/schema.rb vendor/plugins/will_paginate/test/fixtures/topic.rb vendor/plugins/will_paginate/test/fixtures/topics.yml vendor/plugins/will_paginate/test/fixtures/user.rb vendor/plugins/will_paginate/test/fixtures/users.yml vendor/plugins/will_paginate/test/helper.rb vendor/plugins/will_paginate/test/lib/activerecord_test_case.rb vendor/plugins/will_paginate/test/lib/activerecord_test_connector.rb vendor/plugins/will_paginate/test/lib/load_fixtures.rb vendor/plugins/will_paginate/test/pagination_test.rb @@ -17,7 +17,7 @@ class Admin::OrdersController < ApplicationController licensee_name ~* '%#{q}.*' OR id ~* '#{q}')" end - @order_pages, @orders = paginate :orders, :per_page => 100, :conditions => conditions, :order => 'order_time DESC' + @orders = Order.paginate :page => (params[:page] || 1), :per_page => 100, :conditions => conditions, :order => 'order_time DESC' respond_to do |format| format.html # index.rhtml @@ -110,14 +110,14 @@ class Admin::OrdersController < ApplicationController def cancel @order = Order.find(params[:id]) @order.status = 'X' - @order.update() + @order.save redirect_to :action => 'show', :id => @order.id end def uncancel @order = Order.find(params[:id]) @order.status = 'C' - @order.update() + @order.save redirect_to :action => 'show', :id => @order.id end @@ -146,7 +146,7 @@ class Admin::OrdersController < ApplicationController end return true end - rescue + rescue Exception => e return false end end app/controllers/admin/orders_controller.rb @@ -49,37 +49,37 @@ class AdminController < ApplicationController def revenue_summary_amount revenue_summary() @type = "amount" - render_partial "revenue_summary" + render :partial => "revenue_summary" end def revenue_summary_quantity revenue_summary() @type = "quantity" - render_partial "revenue_summary" + render :partial => "revenue_summary" end def revenue_summary_percentage revenue_summary() @type = "percentage" - render_partial "revenue_summary" + render :partial => "revenue_summary" end def revenue_history_days @type = "30 Day" @chart = OpenFlashChart.swf_object(500, 170, '/admin/charts/revenue_history_days') - render_partial "revenue_history" + render :partial => "revenue_history" end def revenue_history_weeks @type = "26 Week" @chart = OpenFlashChart.swf_object(500, 170, '/admin/charts/revenue_history_weeks') - render_partial "revenue_history" + render :partial => "revenue_history" end def revenue_history_months @type = "12 Month" @chart = OpenFlashChart.swf_object(500, 170, '/admin/charts/revenue_history_months') - render_partial "revenue_history" + render :partial => "revenue_history" end # Coupon actions @@ -218,7 +218,7 @@ class AdminController < ApplicationController @product_revenue[name] << row["revenue"] @product_quantity[name] << row["quantity"] orders = row["orders"] - total += row["revenue"] + total = total.to_f + row["revenue"].to_f end @num_orders << orders @revenue << total @@ -232,7 +232,7 @@ class AdminController < ApplicationController if @revenue[i].to_f == 0 @product_percentage[product] << 0 else - @product_percentage[product] << @product_revenue[product][i] / @revenue[i].to_f * 100 + @product_percentage[product] << @product_revenue[product][i].to_f / @revenue[i].to_f * 100.0 end end end @@ -255,7 +255,7 @@ class AdminController < ApplicationController @month_estimate = 0 @year_estimate = 0 - daily_avg = last_n_days_revenue(90) / 90.0 + daily_avg = last_n_days_revenue(90).to_f / 90.0 # Calculate a very simple sales projection. # Takes the average daily sales from the last 90 days to extrapolate the sales @@ -264,7 +264,7 @@ class AdminController < ApplicationController days_in_current_month = Date.civil(today.year, today.month, -1).day if result != nil and result.length > 0 - @month_estimate = last_n_days_revenue(today.day) + daily_avg * (days_in_current_month - today.day) + @month_estimate = last_n_days_revenue(today.day).to_f + daily_avg * (days_in_current_month - today.day) @year_estimate = daily_avg * 365 end end app/controllers/admin_controller.rb @@ -1,3 +1,4 @@ + class Store::OrderController < ApplicationController layout "store" @@ -66,7 +67,6 @@ class Store::OrderController < ApplicationController # Handle Paypal orders if params[:payment_type] == 'paypal' - res = Paypal.express_checkout(:amount => String(@order.total), :cancelURL => url_for(:action => 'index'), :returnURL => url_for(:action => 'confirm_paypal'), app/controllers/store/order_controller.rb @@ -1,2 +1,2 @@ -module ChartsHelper +module Admin::ChartsHelper end app/helpers/admin/charts_helper.rb @@ -1,2 +1,2 @@ -module OrdersHelper +module Admin::OrdersHelper end app/helpers/admin/orders_helper.rb @@ -1,2 +1,2 @@ -module ProductsHelper +module Admin::ProductsHelper end app/helpers/admin/products_helper.rb @@ -20,7 +20,7 @@ class Order < ActiveRecord::Base attr_accessor :paypal_token, :paypal_payer_id attr_accessor :skip_cc_validation attr_writer :promo_coupons - + validates_presence_of :payment_type def validate @@ -49,7 +49,7 @@ class Order < ActiveRecord::Base errors.add('licensee_name', msg= 'must be at least 8 characters long') end end - + def total return round_money(total_before_applying_coupons() - coupon_amount()) end @@ -249,7 +249,7 @@ class Order < ActiveRecord::Base self.line_items.delete(litem) else litem.quantity = quantity - litem.update + litem.save if !litem.new_record? end end end @@ -262,7 +262,7 @@ class Order < ActiveRecord::Base litem = self.line_item_with_product_id(product_id) next if litem == nil litem.unit_price = item_prices[product_id] - litem.update + litem.save if !litem.new_record? end end @@ -325,13 +325,15 @@ class Order < ActiveRecord::Base # The following is needed because MediaTemple puts in two ip addresses in the REMOTE_ADDR for some reason ip_address = request.env['REMOTE_ADDR'] ip_address = ip_address.split(',')[0] if ip_address.count(",") != 0 - + ip_address = "127.0.0.1" if ip_address == "::1" + cc_year = self.cc_year.to_s if cc_year.length == 2 cc_year = '20' + cc_year elsif cc_year.length == 1 cc_year = '200' + cc_year end + res = Paypal.directcharge(:firstName => self.first_name, :lastName => self.last_name, :ip => ip_address, app/models/order.rb @@ -22,7 +22,7 @@ table tr td { padding-right:10px; } </div> <div class="clear"></div> <div id="rsummary"> - <%= render_partial "revenue_summary" %> + <%= render :partial => "revenue_summary" %> </div> </div> @@ -35,6 +35,6 @@ table tr td { padding-right:10px; } </div> <div class="clear"></div> <div id="rhistory"> - <%= render_partial "revenue_history" %> + <%= render :partial => "revenue_history" %> </div> </div> app/views/admin/index.rhtml @@ -1,4 +1,4 @@ -<% if @order -%> +<% if @order && !@order.new_record? -%> <%= form.hidden_field :id %> <%= form.hidden_field :status %> <% end -%> app/views/admin/orders/_form.rhtml @@ -1,9 +1,7 @@ <h1>Orders</h1> <div class="pagination"> - <%= link_to 'Prev', { :page => @order_pages.current.previous, :params => params } if @order_pages.current.previous %> - <%= pagination_links(@order_pages, {:params => params}) %> - <%= link_to 'Next', { :page => @order_pages.current.next, :params => params } if @order_pages.current.next %> + <%= will_paginate @orders %> </div> <table id="orders" class="list"> @@ -45,9 +43,7 @@ </table> <div class="pagination"> - <%= link_to 'Prev', { :page => @order_pages.current.previous, :params => params } if @order_pages.current.previous %> - <%= pagination_links(@order_pages, {:params => params}) %> - <%= link_to 'Next', { :page => @order_pages.current.next, :params => params } if @order_pages.current.next %> + <%= will_paginate @orders %> </div> <br /> app/views/admin/orders/index.rhtml @@ -58,7 +58,7 @@ <p>- <%=$STORE_PREFS['company_name']%></p> <div class="d"></div> - <%= render :partial => '../store/order/receipt', :order => @order %> + <%= render :partial => '/store/order/receipt', :order => @order %> <% if coupons && coupons.length > 0 -%> <div class="d"></div> app/views/order_mailer/thankyou_html.rhtml @@ -27,6 +27,9 @@ Rails::Initializer.run do |config| # Use the database for sessions instead of the file system # (create the session table with 'rake db:sessions:create') # config.action_controller.session_store = :active_record_store + + # If wanting Rails 2 with cookie store: + config.action_controller.session = { :session_key => "_roobasoft_store_session", :secret => "u'@R4@ck{Ikwjhum}&QHoJ,{cvrlyOZ11" } # Use SQL instead of Active Record's schema dumper when creating the test database. # This is necessary if your schema can't be completely dumped by the schema dumper, @@ -40,6 +43,10 @@ Rails::Initializer.run do |config| # config.active_record.default_timezone = :utc # See Rails::Configuration for more options + + config.load_paths += Dir["#{RAILS_ROOT}/vendor/gems/**"].map do |dir| + File.directory?(lib = "#{dir}/lib") ? lib : dir + end end # Add new inflection rules using the following format config/environment.rb @@ -8,9 +8,6 @@ config.cache_classes = false # Log error messages when you accidentally call methods on nil. config.whiny_nils = true -# Enable the breakpoint server that script/breakpointer connects to -config.breakpoint_server = true - # Show full error reports and disable caching config.action_controller.consider_all_requests_local = true config.action_controller.perform_caching = false config/environments/development.rb @@ -12,6 +12,9 @@ google_analytics_account: "" include_mint: false paypal_express_checkout_header_image: "https://www.mycompany.com/images/mylogo.png" +# Google checkout? +allow_google_checkout: false + # Email addresses support_email: "support@mycompany.com" sales_email: "sales@mycompany.com" config/store.yml @@ -95,9 +95,9 @@ class CreateTables < ActiveRecord::Migration end def self.down - remove_foreign_key_constraint "line_items", :foreign_key => "order_id" - remove_foreign_key_constraint "line_items", :foreign_key => "product_id" - remove_foreign_key_constraint "orders", :foreign_key => "coupon_id" + remove_foreign_key_constraint "line_items", "line_items_ibfk_order_id" + remove_foreign_key_constraint "line_items", "line_items_ibfk_product_id" + remove_foreign_key_constraint "orders", "orders_ibfk_coupon_id" drop_table :list_subscribers drop_table :line_items db/migrate/001_create_tables.rb @@ -1,8 +1,15 @@ # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html first: - id: 1 - order_id: 1 - product_id: 1 + order: first + product: first quantity: 1 unit_price: 100 license_key: "AB-0000000001" + +taxed: + order: taxed + product: first + quantity: 1 + unit_price: 100 + license_key: "AB-0000000001" + test/fixtures/line_items.yml @@ -1,6 +1,5 @@ # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html first: - id: 1 coupon_id: status: "C" email: "test@test.com" @@ -20,4 +19,27 @@ first: comment: "Don't call" failure_code: 0 failure_reason: "" - transaction_number: "012123AAAAJDHHDGUTQWQOOA1" \ No newline at end of file + transaction_number: "012123AAAAJDHHDGUTQWQOOA1" + +taxed: + coupon_id: + status: "C" + email: "test@test.com" + order_time: "2007-07-01 12:00:00+08:00" + first_name: "Princess" + licensee_name: "Barf the Mog" + last_name: "Vespa" + company: "Druid Royal Family" + address1: "c/o Dot Matrix" + address2: "1 Royal Palace" + city: "Druidia City" + state: "CA" + zipcode: "90035" + country: "US" + payment_type: "Visa" + ccnum: "XXXXXXXXXXXXXXXX3456" + comment: "Don't call" + failure_code: 0 + failure_reason: "" + transaction_number: "012124AAAAJDHHDGUTQWQOOA1" + \ No newline at end of file test/fixtures/orders.yml @@ -1,6 +1,5 @@ # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html first: - id: 1 code: "TEST1" name: "Test product 1" price: 100 @@ -10,7 +9,6 @@ first: license_url_scheme: "x-test-product-fixture" active: 1 second: - id: 2 code: "TEST2" name: "Test product 2" price: 150 test/fixtures/products.yml @@ -50,7 +50,7 @@ class AdminProductsControllerTest < Test::Unit::TestCase def test_should_create_product num_products = Product.count - post :create, {:product => {}}, {:logged_in => true} + post :create, {:product => {:code => "product_new_1", :name => "New Product v1"}}, {:logged_in => true} assert_response :redirect assert_redirected_to :controller => 'admin/products' , :action => 'show' @@ -79,6 +79,8 @@ class AdminProductsControllerTest < Test::Unit::TestCase Product.find(@first_id) } + LineItem.destroy_all + post :destroy, {:id => @first_id}, {:logged_in => true} assert_response :redirect assert_redirected_to :controller => 'admin/products', :action => 'index' test/functional/admin_products_controller_test.rb @@ -5,7 +5,7 @@ class OrderMailerTest < Test::Unit::TestCase FIXTURES_PATH = File.dirname(__FILE__) + '/../fixtures' CHARSET = "utf-8" - fixtures :orders + fixtures :orders, :products, :line_items include ActionMailer::Quoting def setup test/unit/order_mailer_test.rb @@ -1,10 +1,10 @@ require File.dirname(__FILE__) + '/../test_helper' class OrderTest < Test::Unit::TestCase - fixtures :orders + fixtures :orders, :line_items, :products def setup - @order = Order.find(1) + @order = orders(:first) end def test_status_description test/unit/order_test.rb @@ -37,18 +37,8 @@ module ActiveRecord class PostgreSQLAdapter < AbstractAdapter def foreign_key_constraints(table, name = nil) - # sql = "SELECT conname, pg_catalog.pg_get_constraintdef(oid) AS consrc FROM pg_catalog.pg_constraint WHERE contype='f' " - #sql += "AND conrelid = (SELECT oid FROM pg_catalog.pg_class WHERE relname='#{table}')" - - # Modified to the following 2 lines from the advice of - # http://wiki.rubyonrails.org/rails/pages/Foreign+Key+Schema+Dumper+Plugin - - sql = "SELECT f.conname, pg_get_constraintdef(f.oid) AS consrc FROM pg_class t, pg_constraint f " - sql += "WHERE f.conrelid = t.oid AND f.contype = 'f' AND t.relname = '#{table}'" - - # NOTE: There is also discussion in the mentioned link about code supporting more - # postgres foreign relationships - # -AK + sql = "SELECT conname, pg_catalog.pg_get_constraintdef(oid) AS consrc FROM pg_catalog.pg_constraint WHERE contype='f' " + sql += "AND conrelid = (SELECT oid FROM pg_catalog.pg_class WHERE relname='#{table}')" query(sql,name).collect do |row| if row[1] =~ /FOREIGN KEY \((.+)\) REFERENCES (.+)\((.+)\)(?: ON UPDATE (\w+))?(?: ON DELETE (\w+))?/ @@ -63,10 +53,11 @@ module ActiveRecord execute "ALTER TABLE #{table_name} DROP CONSTRAINT #{constraint_name}" end - alias old_default_value default_value + # Fails with no menthod 'default_value' in rails2 + # alias old_default_value default_value def default_value(value) return ":now" if value =~ /^now\(\)|^\('now'::text\)::(date|timestamp)/i - return old_default_value(value) + #return old_default_value(value) end end @@ -165,9 +156,9 @@ module ActiveRecord constraint_name = options[:name] || "#{table_name}_ibfk_#{foreign_key}" # oracle chokes on constraints longer than 30 chars - if adapter_name =~ /^(oci|oracle)$/i - constraint_name = 'c'+Digest::SHA1.hexdigest(constraint_name)[0,29] - end + if adapter_name =~ /^(oci|oracle)$/i + constraint_name = 'c'+Digest::SHA1.hexdigest(constraint_name)[0,29] + end sql = "ALTER TABLE #{table_name} ADD CONSTRAINT #{constraint_name} FOREIGN KEY (#{foreign_key}) REFERENCES #{reference_table} (#{reference_column})" vendor/plugins/activerecord_foreign_key_extensions/lib/active_record_extensions.rb 240619099a4c3e130128b0d4e9f808b24fad0c56 Andy Kim andy@potionfactory.com http://github.com/potionfactory/potionstore/commit/18615d796daf694874b6d42baaeecc1fb9ea5aa9 18615d796daf694874b6d42baaeecc1fb9ea5aa9 2008-01-09T02:25:44-08:00 2008-01-09T02:25:44-08:00 Brian's Rails 2 patch applied 58d422e7d771e9ed2421ca3acc9ee2340d5025f7 Andy Kim andy@potionfactory.com