codenotifier - Potion Store: revision 65

Revision: 65

Author: andykim78

Date: 13 Jan 2008 11:51:12

Changes:

It seems to work okay with Rails 2 so far.

* Google Checkout buyers get the license key right away instead of having to wait for the email
* Google Checkout notifications are properly authenticated now
* Migrated to Google4r 1.0.2
* More countries added to CC checkout. Way more.
* Insert dash into japanese zipcode if it's not already there. I can't believe PayPal doesn't do this already.
* "optional" string taken out even on non-completed orders
* Label tag added for "Name on License" field on forms
* Brian Cooke's Rails 2 patch applied

Files:
added: /trunk/vendor/gems/google4r-checkout-1.0.2/test/unit/address_test.rb (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2/test/unit/checkout_command_xml_generator_test.rb (try)
modified: /trunk/app/views/store/order/_form_countries.rhtml (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2/test/unit (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2/test/unit/us_country_area_test.rb (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2/test/unit/tax_table_test.rb (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2/test/unit/checkout_command_test.rb (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2/test/unit/chargeback_amount_notification_test.rb (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2/var/cacert.pem (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2/test/unit/cancel_order_command_test.rb (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2/test/unit/shipping_adjustment_test.rb (try)
added: /trunk/vendor/plugins/will_paginate/test/fixtures/schema.rb (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2/test/unit/world_area_test.rb (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2/test/unit/charge_amount_notification_test.rb (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2/test/unit/deliver_order_command_test.rb (try)
modified: /trunk/db/migrate/001_create_tables.rb (try)
added: /trunk/vendor/plugins/will_paginate/test/lib/load_fixtures.rb (try)
added: /trunk/vendor/plugins/will_paginate (try)
modified: /trunk/app/views/admin/orders/index.rhtml (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2/test/unit/callback_handler_test.rb (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2/test/unit/postal_area_test.rb (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2/lib/google4r/checkout (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2/lib/google4r/checkout/commands.rb (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2 (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2/test/unit/send_buyer_message_command_test.rb (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2/test/integration (try)
modified: /trunk/app/controllers/store/notification_controller.rb (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2/test/unit/area_test.rb (try)
added: /trunk/vendor/plugins/will_paginate/test/fixtures/reply.rb (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2/test/unit/archive_order_command_test.rb (try)
added: /trunk/vendor/plugins/will_paginate/test/fixtures (try)
added: /trunk/vendor/plugins/will_paginate/test/fixtures/users.yml (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2/lib/google4r/checkout/frontend.rb (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2/test (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2/test/unit/tax_rule_test.rb (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2/test/unit/order_state_change_notification_test.rb (try)
modified: /trunk/test/functional/admin_products_controller_test.rb (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2/test/unit/authorization_amount_notification_test.rb (try)
added: /trunk/vendor/plugins/will_paginate/lib (try)
added: /trunk/vendor/plugins/will_paginate/test/pagination_test.rb (try)
added: /trunk/vendor/plugins/will_paginate/test/fixtures/developers_projects.yml (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2/lib/google4r/checkout.rb (try)
modified: /trunk/app/helpers/admin/products_helper.rb (try)
added: /trunk/vendor/plugins/will_paginate/LICENSE (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2/lib (try)
added: /trunk/vendor/plugins/will_paginate/Rakefile (try)
modified: /trunk/app/controllers/admin/orders_controller.rb (try)
added: /trunk/vendor/plugins/will_paginate/test/boot.rb (try)
added: /trunk/vendor/plugins/will_paginate/test/lib (try)
added: /trunk/vendor/plugins/will_paginate/lib/will_paginate.rb (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2/test/unit/command_test.rb (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2/test/unit/us_state_area_test.rb (try)
added: /trunk/vendor/plugins/will_paginate/lib/will_paginate/finder.rb (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2/LICENSE (try)
modified: /trunk/app/views/order_mailer/thankyou_html.rhtml (try)
added: /trunk/vendor/plugins/will_paginate/test/helper.rb (try)
deleted: /trunk/vendor/plugins/google4r
added: /trunk/vendor/gems/google4r-checkout-1.0.2/lib/google4r (try)
added: /trunk/vendor/plugins/will_paginate/init.rb (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2/test/unit/marketing_preferences_test.rb (try)
modified: /trunk/app/views/store/order/thankyou.rhtml (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2/init.rb (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2/test/unit/notification_acknowledgement_test.rb (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2/test/unit/merchant_calculation_result_test.rb (try)
modified: /trunk/ChangeLog (try)
modified: /trunk/test/fixtures/products.yml (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2/test/unit/risk_information_notification_test.rb (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2/test/unit/delivery_method_test.rb (try)
modified: /trunk/app/views/store/order/new.rhtml (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2/test/unit/new_order_notification_test.rb (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2/test/unit/merchant_code_test.rb (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2/test/unit/pickup_shipping_test.rb (try)
added: /trunk/vendor/plugins/will_paginate/test/array_pagination_test.rb (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2/README (try)
modified: /trunk/app/helpers/admin/orders_helper.rb (try)
modified: /trunk/test/unit/order_test.rb (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2/test/unit/flat_rate_shipping_test.rb (try)
added: /trunk/vendor/plugins/will_paginate/lib/will_paginate/collection.rb (try)
added: /trunk/vendor/plugins/will_paginate/lib/will_paginate/view_helpers.rb (try)
modified: /trunk/app/controllers/admin_controller.rb (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2/lib/google4r/checkout/xml_generation.rb (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2/test/unit/refund_amount_notification_test.rb (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2/test/unit/private_data_parser_test.rb (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2/test/unit/frontend_test.rb (try)
added: /trunk/vendor/plugins/will_paginate/test/fixtures/replies.yml (try)
modified: /trunk/app/views/store/order/payment_cc.rhtml (try)
added: /trunk/vendor/plugins/will_paginate/test/fixtures/project.rb (try)
modified: /trunk/config/store.yml (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2/test/unit/merchant_calculation_callback_test.rb (try)
added: /trunk/vendor/plugins/will_paginate/test/fixtures/topic.rb (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2/test/unit/anonymous_address_test.rb (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2/test/unit/us_zip_area_test.rb (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2/test/unit/add_tracking_data_command_test.rb (try)
modified: /trunk/config/environment.rb (try)
added: /trunk/vendor/plugins/will_paginate/test (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2/lib/google4r/checkout/shared.rb (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2/test/integration/checkout_command_test.rb (try)
modified: /trunk/config/environments/development.rb (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2/test/unit/add_merchant_order_number_command_test.rb (try)
added: /trunk/vendor/plugins/will_paginate/lib/will_paginate (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2/test/unit/refund_order_command_test.rb (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2/test/unit/charge_order_command_test.rb (try)
modified: /trunk/app/views/admin/orders/_form.rhtml (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2/test/unit/notification_handler_test.rb (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2/test/unit/merchant_code_result_test.rb (try)
modified: /trunk/app/views/admin/index.rhtml (try)
modified: /trunk/test/unit/order_mailer_test.rb (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2/test/unit/item_test.rb (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2/test/unit/merchant_calculation_results_test.rb (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2/test/unit/shopping_cart_test.rb (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2/test/unit/authorize_order_command_test.rb (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2/test/unit/order_adjustment_test.rb (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2/lib/google4r/checkout/notifications.rb (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2/CHANGES (try)
modified: /trunk/app/views/store/order/payment_gcheckout.rhtml (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2/test/unit/unarchive_order_command_test.rb (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2/lib/google4r/checkout/merchant_calculation.rb (try)
added: /trunk/vendor/plugins/will_paginate/test/lib/activerecord_test_case.rb (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2/test/unit/merchant_calculated_shipping_test.rb (try)
modified: /trunk/app/helpers/admin/charts_helper.rb (try)
added: /trunk/vendor/gems/google4r-checkout-1.0.2/var (try)
modified: /trunk/app/controllers/store/order_controller.rb (try)
added: /trunk/vendor/plugins/will_paginate/test/fixtures/user.rb (try)
added: /trunk/vendor/plugins/will_paginate/test/lib/activerecord_test_connector.rb (try)
modified: /trunk/app/models/line_item.rb (try)
added: /trunk/vendor/plugins/will_paginate/test/fixtures/developer.rb (try)
added: /trunk/vendor/plugins/will_paginate/test/console (try)
added: /trunk/vendor/plugins/will_paginate/test/fixtures/projects.yml (try)
added: /trunk/vendor/plugins/will_paginate/test/fixtures/admin.rb (try)
modified: /trunk/test/fixtures/line_items.yml (try)
modified: /trunk/app/models/order.rb (try)
added: /trunk/vendor/plugins/will_paginate/test/finder_test.rb (try)
modified: /trunk/test/fixtures/orders.yml (try)
added: /trunk/vendor/plugins/will_paginate/test/fixtures/topics.yml (try)
modified: /trunk/vendor/plugins/activerecord_foreign_key_extensions/lib/active_record_extensions.rb (try)
added: /trunk/vendor/plugins/will_paginate/README (try)
modified: /trunk/app/controllers/application.rb (try)
added: /trunk/vendor/plugins/will_paginate/lib/will_paginate/core_ext.rb (try)

Diff:

/trunk/test/functional/admin_products_controller_test.rb

/trunk/app/helpers/admin/products_helper.rb

...... @@ -1,2 +1,2 @@

1 module ProductsHelper

1 module Admin::ProductsHelper

2 2 end

/trunk/test/fixtures/products.yml

/trunk/app/helpers/admin/orders_helper.rb

...... @@ -1,2 +1,2 @@

1 module OrdersHelper

1 module Admin::OrdersHelper

2 2 end

/trunk/test/unit/order_test.rb

/trunk/test/unit/order_mailer_test.rb

...... @@ -6,5 +6,5 @@
6 6 CHARSET = "utf-8"

7 7

8 fixtures :orders

8 fixtures :orders, :products, :line_items

9 9 include ActionMailer::Quoting

10 10
/trunk/app/helpers/admin/charts_helper.rb

...... @@ -1,2 +1,2 @@

1 module ChartsHelper

1 module Admin::ChartsHelper

2 2 end

......	@@ -51,5 +51,5 @@
51	51	num_products = Product.count
52	52
53		post :create, {:product => {}}, {:logged_in => true}
	53	post :create, {:product => {:code => "product_new_1", :name => "New Product v1"}}, {:logged_in => true}
54	54
55	55	assert_response :redirect
......	@@ -80,4 +80,6 @@
80	80	}
81	81
	82	LineItem.destroy_all
	83
82	84	post :destroy, {:id => @first_id}, {:logged_in => true}
83	85	assert_response :redirect

......	@@ -1,5 +1,4 @@
1	1	# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
2	2	first:
3		id: 1
4	3	code: "TEST1"
5	4	name: "Test product 1"
......	@@ -11,5 +10,4 @@
11	10	active: 1
12	11	second:
13		id: 2
14	12	code: "TEST2"
15	13	name: "Test product 2"

......	@@ -2,8 +2,8 @@
2	2
3	3	class OrderTest < Test::Unit::TestCase
4		fixtures :orders
	4	fixtures :orders, :line_items, :products
5	5
6	6	def setup
7		@order = Order.find(1)
	7	@order = orders(:first)
8	8	end
9	9

......	@@ -41,4 +41,8 @@
41	41	return make_license(self.product.code, self.order.licensee_name, self.quantity)
42	42	end
	43
	44	def license_url
	45	return self.product.license_url_scheme + '://' + self.license_key rescue nil
	46	end
43	47
44	48	end

......	@@ -1,8 +1,15 @@
1	1	# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
2	2	first:
3		id: 1
4		order_id: 1
5		product_id: 1
	3	order: first
	4	product: first
6	5	quantity: 1
7	6	unit_price: 100
8	7	license_key: "AB-0000000001"
	8
	9	taxed:
	10	order: taxed
	11	product: first
	12	quantity: 1
	13	unit_price: 100
	14	license_key: "AB-0000000001"
	15

......	@@ -1,2 +1,2 @@
1		module ProductsHelper
	1	module Admin::ProductsHelper
2	2	end

......	@@ -1,2 +1,2 @@
1		module OrdersHelper
	1	module Admin::OrdersHelper
2	2	end

......	@@ -6,5 +6,5 @@
6	6	CHARSET = "utf-8"
7	7
8		fixtures :orders
	8	fixtures :orders, :products, :line_items
9	9	include ActionMailer::Quoting
10	10

......	@@ -1,2 +1,2 @@
1		module ChartsHelper
	1	module Admin::ChartsHelper
2	2	end

......	@@ -1,16 +1,53 @@
1	1	COUNTRY_MAPPING = {
2		'AI' => 'Anguilla', 'AR' => 'Argentina', 'AU' => 'Australia', 'AT' => 'Austria', 'BE' => 'Belgium',
3		'BR' => 'Brazil', 'CA' => 'Canada', 'CL' => 'Chile', 'CN' => 'China', 'CR' => 'Costa Rica', 'CY' => 'Cyprus',
4		'CZ' => 'Czech Republic', 'DK' => 'Denmark', 'DO' => 'Dominican Republic', 'EC' => 'Ecuador', 'EE' => 'Estonia',
5		'FI' => 'Finland', 'FR' => 'France', 'DE' => 'Germany', 'GR' => 'Greece', 'HK' => 'Hong Kong',
6		'HU' => 'Hungary', 'IS' => 'Iceland', 'IN' => 'India', 'IE' => 'Ireland', 'IL' => 'Israel',
7		'IT' => 'Italy', 'JM' => 'Jamaica', 'JP' => 'Japan', 'LV' => 'Latvia', 'LT' => 'Lithuania',
8		'LU' => 'Luxembourg', 'MY' => 'Malaysia', 'MT' => 'Malta', 'MX' => 'Mexico', 'NL' => 'Netherlands',
9		'NZ' => 'New Zealand', 'NO' => 'Norway', 'PL' => 'Poland', 'PT' => 'Portugal', 'SG' => 'Singapore',
10		'SK' => 'Slovakia', 'SI' => 'Slovenia', 'ZA' => 'South Africa', 'KR' => 'South Korea', 'ES' => 'Spain',
11		'SE' => 'Sweden', 'CH' => 'Switzerland', 'TW' => 'Taiwan', 'TH' => 'Thailand', 'TR' => 'Turkey',
12		'GB' => 'United Kingdom', 'US' => 'United States', 'UY' => 'Uruguay', 'VE' => 'Venezuela'}
	2	"US" => "United States", "AL" => "Albania", "DZ" => "Algeria", "AD" => "Andorra", "AO" => "Angola",
	3	"AI" => "Anguilla", "AG" => "Antigua and Barbuda", "AR" => "Argentina", "AM" => "Armenia",
	4	"AW" => "Aruba", "AU" => "Australia", "AT" => "Austria", "AZ" => "Azerbaijan Republic",
	5	"BS" => "Bahamas", "BH" => "Bahrain", "BB" => "Barbados", "BE" => "Belgium", "BZ" => "Belize",
	6	"BJ" => "Benin", "BM" => "Bermuda", "BT" => "Bhutan", "BO" => "Bolivia",
	7	"BA" => "Bosnia and Herzegovina", "BW" => "Botswana", "BR" => "Brazil",
	8	"VG" => "British Virgin Islands", "BN" => "Brunei", "BG" => "Bulgaria", "BF" => "Burkina Faso",
	9	"BI" => "Burundi", "KH" => "Cambodia", "CA" => "Canada", "CV" => "Cape Verde",
	10	"KY" => "Cayman Islands", "TD" => "Chad", "CL" => "Chile", "C2" => "China", "CO" => "Colombia",
	11	"KM" => "Comoros", "CK" => "Cook Islands", "CR" => "Costa Rica", "HR" => "Croatia",
	12	"CY" => "Cyprus", "CZ" => "Czech Republic", "CD" => "Democratic Republic of the Congo",
	13	"DK" => "Denmark", "DJ" => "Djibouti", "DM" => "Dominica", "DO" => "Dominican Republic",
	14	"EC" => "Ecuador", "SV" => "El Salvador", "ER" => "Eritrea", "EE" => "Estonia", "ET" => "Ethiopia",
	15	"FK" => "Falkland Islands", "FO" => "Faroe Islands", "FM" => "Federated States of Micronesia",
	16	"FJ" => "Fiji", "FI" => "Finland", "FR" => "France", "GF" => "French Guiana",
	17	"PF" => "French Polynesia", "GA" => "Gabon Republic", "GM" => "Gambia", "DE" => "Germany",
	18	"GI" => "Gibraltar", "GR" => "Greece", "GL" => "Greenland", "GD" => "Grenada",
	19	"GP" => "Guadeloupe", "GT" => "Guatemala", "GN" => "Guinea", "GW" => "Guinea Bissau",
	20	"GY" => "Guyana", "HN" => "Honduras", "HK" => "Hong Kong", "HU" => "Hungary", "IS" => "Iceland",
	21	"IN" => "India", "ID" => "Indonesia", "IE" => "Ireland", "IL" => "Israel", "IT" => "Italy",
	22	"JM" => "Jamaica", "JP" => "Japan", "JO" => "Jordan", "KZ" => "Kazakhstan", "KE" => "Kenya",
	23	"KI" => "Kiribati", "KW" => "Kuwait", "KG" => "Kyrgyzstan", "LA" => "Laos", "LV" => "Latvia",
	24	"LS" => "Lesotho", "LI" => "Liechtenstein", "LT" => "Lithuania", "LU" => "Luxembourg",
	25	"MG" => "Madagascar", "MW" => "Malawi", "MY" => "Malaysia", "MV" => "Maldives", "ML" => "Mali",
	26	"MT" => "Malta", "MH" => "Marshall Islands", "MQ" => "Martinique", "MR" => "Mauritania",
	27	"MU" => "Mauritius", "YT" => "Mayotte", "MX" => "Mexico", "MN" => "Mongolia", "MS" => "Montserrat",
	28	"MA" => "Morocco", "MZ" => "Mozambique", "NA" => "Namibia", "NR" => "Nauru", "NP" => "Nepal",
	29	"NL" => "Netherlands", "AN" => "Netherlands Antilles", "NC" => "New Caledonia",
	30	"NZ" => "New Zealand", "NI" => "Nicaragua", "NE" => "Niger", "NU" => "Niue",
	31	"NF" => "Norfolk Island", "NO" => "Norway", "OM" => "Oman", "PW" => "Palau", "PA" => "Panama",
	32	"PG" => "Papua New Guinea", "PE" => "Peru", "PH" => "Philippines", "PN" => "Pitcairn Islands",
	33	"PL" => "Poland", "PT" => "Portugal", "QA" => "Qatar", "CG" => "Republic of the Congo",
	34	"RE" => "Reunion", "RO" => "Romania", "RU" => "Russia", "RW" => "Rwanda",
	35	"VC" => "Saint Vincent and the Grenadines", "WS" => "Samoa", "SM" => "San Marino",
	36	"ST" => "S

......	@@ -1,5 +1,4 @@
1	1	# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
2	2	first:
3		id: 1
4	3	coupon_id:
5	4	status: "C"
......	@@ -21,3 +20,26 @@
21	20	failure_code: 0
22	21	failure_reason: ""
23		transaction_number: "012123AAAAJDHHDGUTQWQOOA1"
24	22	\ No newline at end of file
	23	transaction_number: "012123AAAAJDHHDGUTQWQOOA1"
	24
	25	taxed:
	26	coupon_id:
	27	status: "C"
	28	email: "test@test.com"
	29	order_time: "2007-07-01 12:00:00+08:00"
	30	first_name: "Princess"
	31	licensee_name: "Barf the Mog"
	32	last_name: "Vespa"
	33	company: "Druid Royal Family"
	34	address1: "c/o Dot Matrix"
	35	address2: "1 Royal Palace"
	36	city: "Druidia City"
	37	state: "CA"
	38	zipcode: "90035"
	39	country: "US"
	40	payment_type: "Visa"
	41	ccnum: "XXXXXXXXXXXXXXXX3456"
	42	comment: "Don't call"
	43	failure_code: 0
	44	failure_reason: ""
	45	transaction_number: "012124AAAAJDHHDGUTQWQOOA1"
	46
25	47	\ No newline at end of file