Commit Graph

157 Commits (15ea12534aaaa1f261d955bf4f86d53a7270b42d)

Author SHA1 Message Date
eric 1764cd62d6 small optimization of supporter count 2012-07-07 16:38:23 -04:00
Raymond Yee 275d127e29 If we're canceling a campaign, record the reason in the transaction.reason as "UNSUCCESSFUL CAMPAIGN" (by default) 2012-06-29 11:11:42 -07:00
eric dfe17f94fa [finish #31637107] refactored transaction summary code, now considers pending and other transactions 2012-06-21 23:20:58 -04:00
eric eec03bd568 unused code 2012-06-21 23:20:58 -04:00
Raymond Yee 25268b34bc [#29500707] Logging an error when an attempt to cancel a transaction does not succeed 2012-06-15 16:59:51 -04:00
Raymond Yee 60434b24ad removing one redundant notice in pledge modify 2012-06-15 13:48:05 -04:00
Raymond Yee 2b7da6e91e First attempt to place the notices properly coming from a pledge modify -- inside payment.manager.cancel_related_transaction -- but current problem is now that we get too many notices 2012-06-15 11:38:38 -04:00
Raymond Yee 9058327370 Modify checkStatus to handle the scenario in which we pass in transactions to check on 2012-06-13 08:35:18 -04:00
Jason 56b6ed57cb Adding better error/exception handling to the amazon payment return URL 2012-06-12 14:52:53 -04:00
Raymond Yee 54e0ce8644 Slight change in amazon.py to avoid circular imports 2012-06-08 15:40:13 -04:00
Raymond Yee 3d07e09424 Merge branch 'master' into fps
Conflicts:
	payment/manager.py
2012-06-08 15:02:57 -04:00
Jason ef1338f7ce Removing extra cancel operations as part of payment checkStatus 2012-06-01 13:42:48 -04:00
Jason 3b7e57ad2a Fixing bug in payment checkStatus code to test for multiple active transactions per campaign 2012-06-01 13:16:52 -04:00
Jason 886280fe21 Adding modifications to payment/pledge modification code. The modify funciton will not cancel the existing pre-approval unless it is fully approved by the user via the co-branded API 2012-06-01 13:13:37 -04:00
Andromeda Yelton 79bdcf3f5c commenting 2012-05-29 21:16:01 -04:00
Andromeda Yelton 1c5264d8a1 removing reference to payment_processor context variable, made irrelevant now that we have transaction.host 2012-05-29 21:01:17 -04:00
Andromeda Yelton 48481bd819 improving ple pledge_modified 2012-05-29 20:50:53 -04:00
Raymond Yee 40d0397bc8 Document the new modification argument for payment.manager.PaymentManager.authorize 2012-05-29 15:16:21 -07:00
Raymond Yee 88d6955685 Name error --> transaction should be t 2012-05-29 11:41:36 -07:00
Andromeda Yelton 2563dda3e5 creating signal for pledge_modified and moving you_have_pledged to signals framework so they interact properly -- at most one sent 2012-05-29 08:54:57 -04:00
Raymond Yee 272d795ded Renaming the current functionality that has been named "cancel" to be "nevermind" because that functionality arose to support users changing their mind
The new PledgeCancel is a placeholder for the functionality I will build next to let users actually cancel existing transactions
Finally, I use  the setting.PAYMENT_PROCESSOR to set the default value of Transaction.host ('paypal' or 'amazon')
2012-05-18 16:59:48 -07:00
Raymond Yee 93aa8d54f2 The selenium test is now working again 2012-05-18 15:06:35 -07:00
Raymond Yee 1ca930440c certain test views that should be on only if DEBUG = True 2012-05-17 13:54:09 -07:00
Raymond Yee 3a6b6e038d First pass at handling the situation in which user interrupts Amazon pledge 2012-05-16 18:16:06 -07:00
eric a6e685618c resolve conflicts 2012-05-15 22:54:23 -04:00
eric 8fd4edbe42 wired pledged_charged notice [finish #28493739] 2012-05-15 22:47:57 -04:00
Raymond Yee 4d9873ccb5 Get rid of an FPS key 2012-05-15 17:46:01 -07:00
Jason 65a7df298d Adding secure IPN url for amazon payments 2012-05-15 16:52:05 -04:00
Jason 7a38bdf91c Merging master -> fps 2012-05-15 16:16:39 -04:00
Raymond Yee b07d6c267d Customize paymentReason for amazon -- in Paypal, we don't have it wired up anywhere yet 2012-05-14 10:15:40 -07:00
Raymond Yee 10db4d0e60 a fab command for pushing keys to ry-dev
corrected a typo in payment/manager.py
2012-05-11 18:54:21 -07:00
Raymond Yee 7b5c2feb35 Added logging on whether loading of FPS keys successful 2012-05-11 11:14:43 -07:00
Jason 55e388b4a3 Adding dynamic module selection for payment modules. Dynamic IPN selection for amazon payments. Bug Fixes 2012-05-11 07:19:13 -04:00
Raymond Yee 9aa586181e Wrapping the import of FPS keys in amazon.py so that things won't die if it gets imported before the database gets set up -- these changes don't break amazon functionality on ry's laptop and hopefully will be ok for jenkins. 2012-05-10 08:08:58 -07:00
Raymond Yee 090d36de66 [#29272807] implemented storage of FPS_* keys in the db 2012-05-09 17:16:49 -07:00
Jason e09418a7a2 Updating paypal code to use common global transaciton status, fixing bugs in paypal interface with abstract payment manager class 2012-05-04 10:30:05 -04:00
Raymond Yee c83aa8615a Removing django-merchant dependency 2012-05-03 10:58:08 -07:00
Raymond Yee 4219149132 Small tweaks to get rid of remnants of PayPal IPN_* variables -- I can now use campaign_admin to actually move fake amazon bucks. Still some IPN_* stuff remaining to clean up. 2012-04-26 19:31:55 +00:00
Raymond Yee 061f656e63 Merge branch 'jkace' of github.com:Gluejar/regluit into fps
Also fixed things so that regluit.test.campaigntest.support_campaign runs for Amazon without error -- though I still need to confirm that the status of transactions properly handled
Next up:  see whether this works for PayPal too.

Conflicts:
	frontend/views.py
2012-04-25 13:10:53 -07:00
Raymond Yee 709cb4ce41 now stuck on the status of an ACTIVE transaction in amazon in campaign_test 2012-04-24 18:03:57 -07:00
Raymond Yee 85797b11a7 incorporating host settings for FPSConnection 2012-04-23 17:12:36 -07:00
Raymond Yee b6e0369b1c Attempting to do a real testpayment 2012-04-23 13:54:37 -07:00
icellama21 df2dc3a8ca Fixing bugs where amazon transaction status REFUNDED was not being set, or was overwriten by PaymentDetails 2012-04-23 15:37:25 -04:00
icellama21 337a692995 Adding redirect to pledge cancel and complete URLs when using amazon payment API 2012-04-23 15:24:16 -04:00
icellama21 b4e424b9f5 Cleaning up amazon IPN logging messages 2012-04-23 15:09:43 -04:00
icellama21 883ec1ce56 Adding uniform logging and boto exception handling to amazon payment code 2012-04-23 15:03:32 -04:00
icellama21 931599f831 Adding PreapprovalDetails for amazon FPS payment system 2012-04-23 14:34:51 -04:00
Raymond Yee 0d3765aa27 Fixed spelling of TRANSACITON_STATUS_COMPLETE_PRIMARY 2012-04-21 16:10:13 -07:00
icellama21 b1dbf8642f Adding payment amazon module - IPN, Refund, Cancel, PaymentDetails support 2012-04-21 01:11:16 -04:00
icellama21 05fa8d83a8 Updating payment manager update_payment for amazon compatibility, fixing status code bugs 2012-04-21 01:10:56 -04:00