Commit Graph

123 Commits (de6b8555d1b7429d851c9f8344697cc64229d488)

Author SHA1 Message Date
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
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
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
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
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
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
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 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
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 05fa8d83a8 Updating payment manager update_payment for amazon compatibility, fixing status code bugs 2012-04-21 01:10:56 -04:00
icellama21 e8b2619207 Adding payment transaction local_status, local IPN functions, separating payment execute and finish, and updates to the amazon FPS payment system 2012-04-20 15:59:08 -04:00
icellama21 d370091db7 Adding amazon FPS return view, execute and preapproval support 2012-04-18 16:22:00 -04:00
icellama21 03e9947189 Adding basic amazon FPS Pay function 2012-04-18 11:53:13 -04:00
Raymond Yee 0e61d7477a [#22756079] Changed name of constants (e.g., IPN_PAY_STATUS_ACTIVE to IPN_PREAPPROVAL_STATUS_ACTIVE to make the meaning of these constants clearer
Also fixed an error in how I'm using transaction management in regluit.test.campaigntest.support_campaign
2012-03-23 11:28:09 -07:00
Raymond Yee ffb7c8cd33 [#23019867] I believe this commit implements the rest of the pledge changing functionality and works as far as I can tell so far.
The one part I don't get yet is why the regluit.test.campaigntest.support_campaign script can successfully drive the browser to create a transction and then
change that pledge to create 2 transactions in total -- and yet until regluit.payment.manager.PaymentManager.check_status is run twice, there seems to be only
one transaction visible to the script.

Does this have to do with Django transactions?  I don't know yet.
2012-03-21 15:06:56 -07:00
Raymond Yee 46ca784030 [#23019867] First pass at allow for pledges to be modified 2012-03-19 16:32:37 -07:00
Raymond Yee a252f9d173 [#22561067] Implemented regluit.utils.localdatetime.now is by default datetime.datetime.now() (in Django 1.3) and django.utils.timezone.now() in Django 1.4+
One overrides regluit.utils.localdatetime._now to do "time travel" -- useful for testing scenarios requiring time changes (such as Campaigns)
Get rid of call references to datetime.datetime.now() or utcnow() and datetime.date.today() in favor of regluit.utils.localdatetime.now() and date_today().
2012-03-09 00:45:39 +00:00
Raymond Yee 9130aa8b4a The approved flag from IPNs for Preapprovals now captured properly. 2012-01-11 22:46:59 +00:00
Raymond Yee 712b803334 PreapprovalDetails now capturing approved flag
partial work on IPN to capture approved flag
2012-01-11 13:47:56 -08:00
Raymond Yee 7202e97f19 Allow for PaymentManager.checkStatus() to receive specific list of Transaction to process 2012-01-11 11:50:08 -08:00
Raymond Yee 25bc05050a Starting to refactor PaymentManager.checkStatus() to be able to handle transactions we pass in....first step is to factor out methods to handle Preapprovals vs Payments 2012-01-11 11:12:12 -08:00
Raymond Yee c5c9951c3d Fixed a bug in PaymentManager.checkStatus() -- I was appending statuses for recipients in the wrong place 2012-01-11 10:43:12 -08:00
Raymond Yee 54f2411ab9 Put in a basic page for a pledge completion. 2012-01-10 17:15:39 -08:00
Raymond Yee 01f5664bf5 Some very basic functionality associated with cancel_url, including the ability to try again on the pledge. 2012-01-10 15:26:04 -08:00
Raymond Yee 3abd29f225 First pass at passing in campaign id into cancel_url (which is now calculated in payment/manager.py) 2012-01-10 12:16:04 -08:00
Raymond Yee be67d9e14f Allow modifications if the amount is equal to max amount (not just less)
Fixed a small typo in the comments for payment.views
2012-01-06 10:32:52 -05:00
icellama21 e9d293199c Fixing bug in paypal checkStatus to separate preapproval max_amount from current amount 2012-01-05 12:56:20 -05:00
icellama21 b0b6d83f75 Adding payment code for refund and modification of existing transactions 2012-01-05 01:42:05 -05:00
Raymond Yee eb147b3cd4 Added support for incomplete and completed payments in the PaymentManger query function 2012-01-03 14:49:37 -05:00
Andromeda Yelton 1f29f7538d authorized_list was scanning ALL transactions, not just those in the transaction list passed into the function 2012-01-02 10:47:36 -05:00
Raymond Yee a757f6f99b Versions that include movement to utcnow() and changing what comes out PaymentManager.checkStatus() -- but payment to primary recipient is now broken. Need to investigate 2011-12-22 20:34:24 -05:00
Raymond Yee 21c009998a Starting to display more information about recipients tied to transactions 2011-12-21 18:33:36 -05:00
Raymond Yee 17d4acceab changed PaymentManager.cancel to PaymentManager.cancel_transaction and added PaymentManager.cancel_campaign to parallel other methods in PaymentManager
morphing the campaign_admin view towards being able to push all the campaigns through the various states
2011-12-21 17:32:08 -05:00
Raymond Yee c3c0249b42 Added a PaymentManager.finish_campaign()
Fixed a small bug in which r['status'] is None and being attached as a text node in PaymentManager.checkStatus()
2011-12-21 12:31:58 -05:00
Raymond Yee 75fceed7c5 Now display the campaigns with three different types of transactions: ACTIVE, INCOMPLETE, COMPLETED on the campaign_admin view 2011-12-20 20:36:27 -05:00
Raymond Yee c055767173 set the expiry date based on the campaign deadline. There is a setting PREAPPROVAL_PERIOD_AFTER_CAMPAIGN for specifying how many days after the campaign deadline should we ask for a preapproval deadline. I've put in 90 days. 2011-12-20 14:56:01 -05:00
Raymond Yee bad343e3d2 views.py: wiring in the email address of partnering non-profit
payment/manager.py: wire in the email address of the campaign recipient and the Gluejar commission rate
move the Gluejar commission rate to dev.py/prod.py
2011-12-19 18:34:30 -05:00
Jason c2c3168e5a Updating payment code to support delayed chained payments. Adding entry points for delayed execution of payments. Creating common parent class for all paypal transactions to more accurately track metadata 2011-12-14 08:30:37 -05:00
Raymond Yee 5a27dae1d1 Allow the number of days in the past to be configured for PaymentManager.checkStatus (while keeping default of 3 days for now) 2011-12-08 09:13:23 -08:00
Jason 0d6bc2f68a Adding prepaymentdetails api, enhanced error checking for paymentdetails API 2011-12-06 09:36:18 -05:00
Jason 58eb67e0aa Adding code to support embedded payments 2011-11-22 06:14:58 -05:00
Andromeda Yelton c139e4dcfc adding option for supporters to pledge anonymously 2011-11-01 17:08:09 -04:00
Jason f049e5ec91 Implementing check of paypal PAY transaction using PaymentDetails 2011-10-27 04:05:21 -04:00
Jason 9a6a3d260a Adding unique tracking ID to paypal payments 2011-10-27 02:35:46 -04:00
Raymond Yee 8cab4dc425 First pass integration of preapproval into campaign pledge form 2011-10-18 16:27:20 -07:00
Raymond Yee 38166177c4 First cut of PaymentDetails
small fix to explicitly calculate URI of PayPalIPN url pattern
update status of a PAY transaction to CREATED instead of leaving as None
2011-10-14 10:52:17 -07:00
Raymond Yee 47a17e6888 The receiver status should be IPN_TXN_STATUS_COMPLETED if the transaction is complete,, I think. 2011-10-13 15:12:11 -07:00
Raymond Yee e0f1ef50cc Rewrote pledging to a campaign to integrate the testview into logic of CampaignFormView directly.
Allow configuration of where PayPal should return after transaction is completed.
2011-10-13 14:13:37 -07:00
Raymond Yee c0bd998732 First attempt to write out transactions associated with Campaign 2011-10-13 10:28:23 -07:00
Raymond Yee 711546f414 First pass at incorporating status into Campaign 2011-10-07 20:11:57 -07:00
Raymond Yee 68b94f768f Changes in progress to the model 2011-10-07 14:17:54 -07:00
Raymond Yee d67d77a9a0 Changed currency amounts to DecimalField in core and payment
Added south migrations to payment
Changed print statements to logger.info in payment
Added primitive paymentcomplete page in payment
2011-10-05 17:56:20 -07:00
Jason ed1732b4ec Adding cancel,dispute,chargeback support, chained payments, user/list APIs, bug fixes 2011-10-01 08:01:40 -04:00
Jason 42cf499a6c Adding Pre-approved payments 2011-09-29 03:50:07 -04:00
Jason 37b46d01c2 Adding pledge payment support 2011-09-27 08:48:11 -04:00