48be5a1191
xhtml nits
2012-10-15 10:28:31 -04:00
cf433386e8
starting to make it easier to put stripelib in test mode
2012-10-15 06:24:12 -07:00
51e17e6886
Merge branch 'master' of github.com:Gluejar/regluit
2012-10-14 21:52:43 -07:00
c16df417e6
Hello world of IPN
2012-10-14 21:16:15 -07:00
bda3211a76
user can manage their account credit card [ #37674369 ]
2012-10-14 23:41:17 -04:00
1c557e1488
fix reference to Donation Credit canceler
2012-10-14 22:08:34 -04:00
d8a30a733a
Add a log message for loading of keys in stripelib
2012-10-13 16:42:24 -07:00
f152bc97b1
Merge branch 'reuse_account'
...
Conflicts:
frontend/views.py
2012-10-13 16:19:45 -07:00
5bde0da8ca
[ #37716025 ] reuse a user's credit card
2012-10-13 13:45:46 -04:00
dbacb5a96d
max_amount, not amount before the authorization
2012-10-13 13:38:39 -04:00
b904cb1f28
Fixed a bug in the logging statement that had mismatched # of parameters
2012-10-13 08:23:07 -07:00
2ae6942f4f
better to not have logging of tokens
2012-10-13 00:48:46 -04:00
476ce46dab
display and notifications of acknowledgements
2012-10-12 23:45:09 -04:00
6a1646f749
fixed bad method signature
2012-10-12 22:25:48 -04:00
be3f989d36
although "up_or_down" not distinguished, should make it return what it says it is
2012-10-12 18:18:55 -04:00
7d21e60984
if view expects one acct peruser, dont give it multiple accounts! [ #36797599 ]
2012-10-12 16:03:50 -04:00
b0858ea12e
add a payment.manager.PaymentManager.retrieve_or_make_accounts
...
Made a change in make_account signature to allow for token=None
2012-10-12 07:44:50 -07:00
b281aca869
[ #37567927 ] enforce constraint of at most 1 active Account / user of given host
...
-> migration was missing before from an earlier commit -- add in now.
2012-10-11 16:36:24 -07:00
9d17f93fac
Now I have some tests to show how to trigger all of the stripe CardError except invalid_number, expired_card, and processing_error -- ones that we'll need to simulate in some other way
2012-10-08 13:08:28 -07:00
447b5973c2
Add ProcessorError
...
Start elaborating StripeClient testing
2012-10-06 09:51:43 -07:00
5df3ab23ab
Merge branch 'master' into relaunch_ry
2012-10-04 09:35:54 -07:00
75e0a4c534
clean up two loose ends
2012-10-03 17:36:17 -04:00
462011ed7e
add_pledge_badge was just a bug waiting to happen
2012-10-03 17:06:51 -04:00
f9e81d1741
syntax error fix
2012-10-03 09:24:04 -07:00
57dc500643
Revert "Revert "wired badge awarding into pledge modified and pledge complete signals""
...
This reverts commit 863055c305
2012-10-03 08:57:24 -04:00
863055c305
Revert "wired badge awarding into pledge modified and pledge complete signals"
...
This reverts commit 759e39f61d
2012-10-03 08:56:29 -04:00
65998ac219
this belongs with last commit
2012-10-02 23:51:25 -04:00
73910ae8a0
To get credit module working again, had to move some methods into an object that inherits from a base class
...
So now all payment processor specific methods are on a Processor
object,
2012-10-02 23:49:19 -04:00
7a1cf969ca
fixed circular import problems [finish #37053797 ]
2012-10-02 22:14:40 -04:00
e6b5146dff
the Stripe api keys for nonprofit partner should be gone
2012-10-02 12:06:38 -07:00
89b3b5c599
[ #37053797 ] reverting stripelib.py -- Sn tests run but django command test_stripe_charge fails: done so Eric can fix circular import issue:
...
>>> >>> >>> (regluitdj14)raymond-yees-computer:regluit raymondyee$ django-admin.py test_stripe_charge
Traceback (most recent call last):
File "/Users/raymondyee/.virtualenvs/regluitdj14/bin/django-admin.py", line 5, in <module>
management.execute_from_command_line()
File "/Users/raymondyee/.virtualenvs/regluitdj14/lib/python2.7/site-packages/django/core/management/__init__.py", line 443, in execute_from_command_line
utility.execute()
File "/Users/raymondyee/.virtualenvs/regluitdj14/lib/python2.7/site-packages/django/core/management/__init__.py", line 382, in execute
self.fetch_command(subcommand).run_from_argv(self.argv)
File "/Users/raymondyee/.virtualenvs/regluitdj14/lib/python2.7/site-packages/django/core/management/__init__.py", line 261, in fetch_command
klass = load_command_class(app_name, subcommand)
File "/Users/raymondyee/.virtualenvs/regluitdj14/lib/python2.7/site-packages/django/core/management/__init__.py", line 69, in load_command_class
module = import_module('%s.management.commands.%s' % (app_name, name))
File "/Users/raymondyee/.virtualenvs/regluitdj14/lib/python2.7/site-packages/django/utils/importlib.py", line 35, in import_module
__import__(name)
File "/Users/raymondyee/C/src/Gluejar/regluit/payment/management/commands/test_stripe_charge.py", line 2, in <module>
from regluit.payment import stripelib
File "/Users/raymondyee/C/src/Gluejar/regluit/payment/stripelib.py", line 10, in <module>
from regluit.payment.models import Account
File "/Users/raymondyee/C/src/Gluejar/regluit/payment/models.py", line 4, in <module>
from regluit.core.models import Campaign, Wishlist, Premium, PledgeExtra
File "/Users/raymondyee/C/src/Gluejar/regluit/core/models.py", line 998, in <module>
from regluit.payment.manager import PaymentManager
File "/Users/raymondyee/C/src/Gluejar/regluit/payment/manager.py", line 2, in <module>
from regluit.payment.models import Transaction, Receiver, PaymentResponse
ImportError: cannot import name Transaction
2012-10-02 12:02:45 -07:00
72a440383d
a django command to do a test charge
2012-10-02 11:49:17 -07:00
9b42c0ccd9
Merge branch 'master' into relaunch_ry
...
Conflicts:
requirements_versioned.pip
2012-10-02 10:18:24 -07:00
27d0a808e0
get rid of more paypal references
2012-10-02 10:16:34 -07:00
166afece62
made some changes to reduce the likelihood of circular import dependencies in stripe code.
...
Made sure there is a core_key table in campaidgn_starter sql
2012-10-01 16:38:51 -07:00
759e39f61d
wired badge awarding into pledge modified and pledge complete signals
2012-10-01 18:28:26 -04:00
9e048c44f5
Get rid of print statement
2012-09-28 10:12:25 -07:00
3b04ddb4a9
Merge branch 'relaunch' into relaunch_ry
2012-09-27 14:07:47 -07:00
880a9f14bd
now adding credit records in migration [start #36325665 ]
...
that wasn't so hard
2012-09-27 12:58:47 -04:00
4a10edce1d
[ #36469239 ] Now handles modifications where new amount > previous amount and cancellation of pledge
2012-09-27 09:32:29 -07:00
8bd7a5eb65
[deliver #36743191 ] move stripe implementation UI back to stripe.js
2012-09-26 15:03:46 -07:00
1ab2383fec
Reverting to using stripe.js on stripe/test as a stepping stone to changing fund_the_pledge.html
2012-09-26 13:52:36 -07:00
b75bb0c3a6
now adding credit records in migration [start #36325665 ]
...
that wasn't so hard
2012-09-26 13:52:21 -04:00
5833f8c0d3
Successfully able to modify transaction from $10 -> $5 in selenium script
2012-09-25 18:30:36 -07:00
1cbe62d573
Redirecting to pledge_complete works now -- though there's definitely clean up to do
2012-09-25 11:52:56 -07:00
d0be2f8761
[ #36469239 ] I can now get a transaction to work via stripelib.py now
2012-09-24 16:29:20 -07:00
ed6bb5f3e0
BROKEN CODE -- checked in while I switch to working on other branch
2012-09-24 11:30:21 -07:00
e8494864d4
This code is BROKEN -- but I'm committing this to capture current state of work -- problem is
...
global name 'stripe_token' is not defined
Exception Location: /Users/raymondyee/C/src/Gluejar/regluit/payment/stripelib.py in __init__, line 285
when you run the selenium test -- brings up issue of where to create Stripe account in PaymentManager abstraction
2012-09-21 17:40:33 -07:00
df4e434c45
Fold stripe2.py into stripelib.py
2012-09-21 11:24:42 -07:00
980bb218a0
stripe2.Execute actually charges the transaction -- NEED to do some more error checking
2012-09-18 17:56:38 -07:00
be45a27b45
moving transaction.host None -> PAYMENT_HOST_NONE
...
a few typos (t->transaction, missing host)
skeleton for stripe2.py -- the module to implement various methods used by payment.manager
2012-09-18 17:01:07 -07:00
ebb2144055
Responding to Eric's comment: yes Account.date_created should have auto_now_add not auto_add
...
I modified migration and model.
2012-09-18 08:16:12 -07:00
6a650affc8
Now recording pledge as such -- and not charging immediately.
...
running into exception at https://github.com/Gluejar/regluit/blob/relaunch_ry/payment/manager.py#L554-- have to start implementing a baseclass for stripelib to handle pledge modification
2012-09-17 16:56:07 -07:00
69e959a0c8
fleshing out of payment.models.Account
2012-09-17 14:55:28 -07:00
f08206c5d0
got rid of repeated line (thanks, Eric -- fd1887ea44 (commitcomment-1865176) )
2012-09-17 10:54:39 -07:00
fd1887ea44
[ #36028929 ] Work to pull out relevant fields in stripe Customer and Charge model with goal of figuring out which to add to payment.models.{Account | Transaction}
2012-09-14 17:00:21 -07:00
c545173793
First pass at payment.models.Account
2012-09-13 16:43:54 -07:00
2ab1f8c7ea
Now creating a charge based on token
2012-09-11 15:17:37 -07:00
bcceaa719b
integrating stripe into fund_the_pledge
2012-09-10 13:17:30 -07:00
3417c6372c
Allow for passing in card instead of customer for creating stripe charge
2012-09-10 07:23:03 -07:00
b8c0c8f98e
Remove remnants of balanced and wepay that I missed earlier
2012-09-07 13:47:15 -07:00
f639aa02dd
Merge branch 'newpayment' into relaunch
...
Conflicts:
frontend/views.py
payment/manager.py
2012-09-07 13:46:09 -07:00
6762c7d3f2
not really supposed to use Decimal.NaN changed to Decimal('NaN')
2012-09-07 14:40:00 -04:00
101cf1e7a0
Removed references to wepay and balanced
2012-09-07 11:31:49 -07:00
0c9d71e4d6
introduce PledgeExtra data object to simplify method calls
2012-09-07 09:46:38 -04:00
790969745e
authorize method has changed
2012-09-07 09:45:43 -04:00
4d4e61d338
donation modification now works [ #21784207 ]
2012-09-06 16:55:32 -04:00
d63063b740
add missing notification for donation pledges
2012-09-06 13:27:34 -04:00
d14548f3af
not sure how I missed this bug
2012-09-06 11:36:52 -04:00
8eeadc99d3
woo hoo, credit and donation scaffolding works end to end [ #21784207 ]
2012-09-06 01:01:17 -04:00
bcbc75ed3d
More analysis of what we need to figure out still about stripe.
2012-09-05 16:11:32 -07:00
e8e6a51068
added a bit of handling of stripe Transfers
2012-08-31 22:59:22 -07:00
cc8c075842
show error from bad card with stripe call
2012-08-31 11:19:05 -07:00
c20e6299bb
off to a great start this morning [ #16582483 ]
2012-08-31 11:05:00 -04:00
7afedcd0b6
ack_link now considers anonymous [ #16582483 ]
2012-08-31 10:58:57 -04:00
94270f33c6
add in credi processing; overhaul the PledgeView forms and partition authorize fn in Manager
...
also removed unused target, lists, ack-link,
2012-08-31 03:16:04 -04:00
f299d9ecf7
rip out paypal and amazon code
2012-08-31 03:12:15 -04:00
618eda4aa5
eliminate db skew between prod and relaunch
2012-08-31 02:49:04 -04:00
5ac4976950
Basic test for creating Customer, a charge, and then deleting Customer
2012-08-30 16:51:59 -07:00
e44052712c
Now able to wrap stripe functionality in a StripeClient object that is tied to a specific api_key. We use separate api_key for Gluejar and for partner non-profit
2012-08-30 09:24:42 -07:00
55d170e798
trivial change to try to trigger the display of the latest commit in github for newpayment
2012-08-29 08:22:35 -07:00
bd48fdb437
Adding stripe payment tag use
2012-08-29 07:34:20 -07:00
ec9c6d8fc0
add keys for partner non-profit in stripelib
2012-08-27 07:49:43 -07:00
214bc4b9e5
A pass to get a charge iframe show up for wepay
2012-08-20 15:19:27 -07:00
6c4f98095f
First pass at balancedpayment prototype
2012-08-17 22:57:56 -07:00
e81a25b1bd
Now documenting more of what we need to do next with stripe if we go for a fullblown implementation
2012-08-16 17:24:18 -07:00
0d88a395cb
First pass at stripe prototype --> /stripe/test will now let you type in a test credit card and display resulting stripeToken
2012-08-16 14:11:32 -07:00
10560fb36b
merge credit into relaunch
2012-08-14 21:15:31 -04:00
5362c202bb
added management command to create credits, balance notification [ #21784207 ]
2012-08-07 14:12:50 -04:00
daf0636c5f
back end for credit system [ #21784207 ]
2012-08-06 22:52:45 -04:00
da0f4970c2
improving data flow of acks throughout system
2012-08-06 15:44:43 -04:00
b2161d8936
having acks variables works better if you actually pass them through all stages of the data flow
2012-08-06 13:34:51 -04:00
b041430731
front end for new pledge page, plus just enough back end that it displays
2012-08-01 08:52:39 -04:00
5855593c5b
adding support for acknowledgement fields throughout data pipeline
2012-07-23 08:31:57 -04:00
ef005bbef1
added fields for supporter acknowledgement to class Transaction
2012-07-23 08:12:40 -04:00
1097c7891b
verify signature for amazon payment return
2012-07-11 21:27:24 -07:00
1764cd62d6
small optimization of supporter count
2012-07-07 16:38:23 -04:00
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
dfe17f94fa
[finish #31637107 ] refactored transaction summary code, now considers pending and other transactions
2012-06-21 23:20:58 -04:00
eec03bd568
unused code
2012-06-21 23:20:58 -04:00
25268b34bc
[ #29500707 ] Logging an error when an attempt to cancel a transaction does not succeed
2012-06-15 16:59:51 -04:00
60434b24ad
removing one redundant notice in pledge modify
2012-06-15 13:48:05 -04:00
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
9058327370
Modify checkStatus to handle the scenario in which we pass in transactions to check on
2012-06-13 08:35:18 -04:00
56b6ed57cb
Adding better error/exception handling to the amazon payment return URL
2012-06-12 14:52:53 -04:00
54e0ce8644
Slight change in amazon.py to avoid circular imports
2012-06-08 15:40:13 -04:00
3d07e09424
Merge branch 'master' into fps
...
Conflicts:
payment/manager.py
2012-06-08 15:02:57 -04:00
ef1338f7ce
Removing extra cancel operations as part of payment checkStatus
2012-06-01 13:42:48 -04:00
3b7e57ad2a
Fixing bug in payment checkStatus code to test for multiple active transactions per campaign
2012-06-01 13:16:52 -04:00
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
79bdcf3f5c
commenting
2012-05-29 21:16:01 -04:00
1c5264d8a1
removing reference to payment_processor context variable, made irrelevant now that we have transaction.host
2012-05-29 21:01:17 -04:00
48481bd819
improving ple pledge_modified
2012-05-29 20:50:53 -04:00
40d0397bc8
Document the new modification argument for payment.manager.PaymentManager.authorize
2012-05-29 15:16:21 -07:00
88d6955685
Name error --> transaction should be t
2012-05-29 11:41:36 -07:00
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
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
93aa8d54f2
The selenium test is now working again
2012-05-18 15:06:35 -07:00
1ca930440c
certain test views that should be on only if DEBUG = True
2012-05-17 13:54:09 -07:00
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
eric
Raymond Yee
Andromeda Yelton
Jason
Raymond Yee
icellama21