3a6b6e038d
First pass at handling the situation in which user interrupts Amazon pledge
2012-05-16 18:16:06 -07:00
a6e685618c
resolve conflicts
2012-05-15 22:54:23 -04:00
8fd4edbe42
wired pledged_charged notice [finish #28493739 ]
2012-05-15 22:47:57 -04:00
4d9873ccb5
Get rid of an FPS key
2012-05-15 17:46:01 -07:00
65a7df298d
Adding secure IPN url for amazon payments
2012-05-15 16:52:05 -04:00
7a38bdf91c
Merging master -> fps
2012-05-15 16:16:39 -04:00
b07d6c267d
Customize paymentReason for amazon -- in Paypal, we don't have it wired up anywhere yet
2012-05-14 10:15:40 -07:00
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
7b5c2feb35
Added logging on whether loading of FPS keys successful
2012-05-11 11:14:43 -07:00
55e388b4a3
Adding dynamic module selection for payment modules. Dynamic IPN selection for amazon payments. Bug Fixes
2012-05-11 07:19:13 -04:00
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
090d36de66
[ #29272807 ] implemented storage of FPS_* keys in the db
2012-05-09 17:16:49 -07:00
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
c83aa8615a
Removing django-merchant dependency
2012-05-03 10:58:08 -07:00
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
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
709cb4ce41
now stuck on the status of an ACTIVE transaction in amazon in campaign_test
2012-04-24 18:03:57 -07:00
85797b11a7
incorporating host settings for FPSConnection
2012-04-23 17:12:36 -07:00
b6e0369b1c
Attempting to do a real testpayment
2012-04-23 13:54:37 -07:00
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
337a692995
Adding redirect to pledge cancel and complete URLs when using amazon payment API
2012-04-23 15:24:16 -04:00
b4e424b9f5
Cleaning up amazon IPN logging messages
2012-04-23 15:09:43 -04:00
883ec1ce56
Adding uniform logging and boto exception handling to amazon payment code
2012-04-23 15:03:32 -04:00
931599f831
Adding PreapprovalDetails for amazon FPS payment system
2012-04-23 14:34:51 -04:00
0d3765aa27
Fixed spelling of TRANSACITON_STATUS_COMPLETE_PRIMARY
2012-04-21 16:10:13 -07:00
b1dbf8642f
Adding payment amazon module - IPN, Refund, Cancel, PaymentDetails support
2012-04-21 01:11:16 -04:00
05fa8d83a8
Updating payment manager update_payment for amazon compatibility, fixing status code bugs
2012-04-21 01:10:56 -04:00
cf5bb82b23
Adding payment transaction CREATED, FAILED status, fixing typo
2012-04-21 01:09:33 -04:00
3796002824
Adding amazon ipn to payment URLs
2012-04-21 01:09:03 -04:00
91090c60ac
Updating test views to use amazon return URL
2012-04-21 01:08:49 -04:00
8ffbd49230
Adding stub for local status in paypal-paymentdetails
2012-04-21 01:08:29 -04:00
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
d370091db7
Adding amazon FPS return view, execute and preapproval support
2012-04-18 16:22:00 -04:00
125582eebd
Adding new amazon payment module
2012-04-18 12:51:54 -04:00
03e9947189
Adding basic amazon FPS Pay function
2012-04-18 11:53:13 -04:00
697fb826b4
Continuing to take apart the responses from Amazon FPS in response to a PAY operation
2012-04-16 20:58:00 -07:00
f012f011d2
More RY figuring out basics of FPS
2012-04-16 07:00:46 -07:00
86ed171cf3
Now I understand more of the status message that comes back after an attempted authorization at Amazon
2012-04-11 16:02:28 -07:00
491bad5c14
Simplified structure of URLs for testfps to:
...
urlpatterns += patterns('',
(r'^fps/', include(amazon_fps_obj.urls)),
url(r'^testfps/$', 'regluit.payment.views.testfps', name='app_offsite_amazon_fps'),
)
2012-04-11 13:51:20 -07:00
b808ddbed0
Added URLs needed for the return from Amazon authorization.
...
Also forgot to put keys in prod.py
2012-04-11 10:37:41 -07:00
00511e4730
First pass at trying to integrate Amazon fps
2012-04-11 09:51:18 -07:00
723f329e20
PayPal doesn't like iso formatted times using offsets if the offsets are different, as when the two timestamps are on the opposite side of a daylight savings shift. --> switch to sending Zulu time (time formatted in UTC with Z suffix)
2012-03-26 15:02:26 -07:00
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
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
9629e23b21
[ #22755723 ] First step: adding premium field to Transaction model.
...
MIGRATION REQUIRED
2012-03-20 15:05:29 -07:00
5823c0e2de
[ #23019867 ] At this point, a supporter can change the pledge amount to a smaller amount (no new PayPal transaction required) or a larger amount (a new PayPal transaction is required and the old transaction is canceled.)
...
I've not implemented the storage of the premium yet -- that's coming next.
I've not implemented straight out cancellation of a pledge yet.
More UI refinement needed, especially around encouraging supporters not to decrease (or cancel) a pledge and refinements to help people know that they have made a modification.
2012-03-20 14:10:21 -07:00
46ca784030
[ #23019867 ] First pass at allow for pledges to be modified
2012-03-19 16:32:37 -07:00
744693f178
1) Fix an error in which I wasn't checking properly that the pledge_complete page should allow only the pledging user to see the results.
...
2) Now tests.campaigntest.support_campaign takes us all the way through pledging for the first campaign
2012-03-19 11:46:41 -07:00
9199f78606
test/campaigntests.py has a BasicGuiTest.testFrontPage, which tests whether the Learn More link will toggle the description panel.
...
paypal/tests.py: made loginSandbox drop the test parameter and callable from outside of paypal/tests.py -- now, for example, from test/campaigntests.py
settings/dev.py: added LIVE_SERVER_TEST_URL, UNGLUEIT_TEST_USER, UNGLUEIT_TEST_PASSWORD -- parameters useful for selenium-based live server testing
the beginnings of test/campaigntests.support_campaign() -- a selenium script to drive automated pledging to campaign for testing purposes
2012-03-14 15:06:29 -07:00
29ff11af94
Missed a datetime import needed for timedelta
2012-03-12 15:55:14 -07:00
Raymond Yee
eric
Jason
Raymond Yee
icellama21