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
410f1cb9ec
Merge branch 'relaunch_ry'
2012-10-04 14:09:51 -07:00
5df3ab23ab
Merge branch 'master' into relaunch_ry
2012-10-04 09:35:54 -07:00
5ca4d5c4c8
improving layout of premium addition
2012-10-04 12:08:40 -04:00
fd487b02b9
adding video instructions, clarifying premiums, etc.
2012-10-04 10:59:31 -04:00
8cba33675c
whoops, save button needs to be visible prelaunch
2012-10-04 11:12:20 -03:00
b5148f39fc
Merge pull request #33 from Gluejar/pledged_badges
...
clean up two loose ends; gotta see what jenkins thinks of it
2012-10-03 17:38:02 -07:00
04002e40a2
jenkins build errors suggest some environments evaluate module attributes differently
2012-10-03 20:35:05 -04:00
75e0a4c534
clean up two loose ends
2012-10-03 17:36:17 -04:00
c26532c0fd
Merge branch 'master' of https://github.com/Gluejar/regluit
2012-10-03 17:08:54 -04:00
75207afb4c
Merge branch 'pledged_badges'
2012-10-03 17:08:00 -04:00
462011ed7e
add_pledge_badge was just a bug waiting to happen
2012-10-03 17:06:51 -04:00
e99a88c103
Merge branch 'pledged_badges' of github.com:Gluejar/regluit into pledged_badges
2012-10-03 16:28:51 -04:00
d439106cf4
badge outline to thin gray
2012-10-03 16:20:43 -04:00
4ea8dbdfac
anonymity needs to adhere to whole pledge and be communicated clearly regardless of amount if we're doing badges
2012-10-03 16:02:51 -04:00
3312a9108a
anonymous pledges shouldn't add badge
2012-10-03 16:01:02 -04:00
2cdb945812
finishing new layout
2012-10-03 13:44:33 -04:00
757a3469b5
let's use css for borders
2012-10-03 13:15:46 -04:00
f9e81d1741
syntax error fix
2012-10-03 09:24:04 -07:00
113148d6a9
swapped badges, deleted empty badge, added title to edit icon
2012-10-03 12:17:23 -04:00
98b32a4092
Merge branch 'master' into production
2012-10-03 08:54:41 -07:00
ae857b3c8f
restyle badges and edit profile function
2012-10-03 10:59:57 -04:00
deb67de0b8
Revert "try this placement of the star"
...
This reverts commit e4cccc277f
2012-10-03 08:57:35 -04: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
6a6c249c83
f[inish #37068821 ] selectable 0.4.0 and later incompatible with earlier code
...
see
http://django-selectable.readthedocs.org/en/version-0.5.2/releases.html .
In general, we can't blithely update our imported modules without
reading the release notes.
2012-10-02 18:47:52 -04:00
ceebcb690d
step one: fix media links [ #37068821 ]
2012-10-02 18:12:44 -04:00
aafbeebfb6
Merge branch 'master' into production
2012-10-02 14:18:25 -07:00
665fef9058
Merge branch 'master' of github.com:Gluejar/regluit
2012-10-02 14:07:17 -07:00
5b41103005
Merge pull request #31 from Gluejar/update_manage_campaign
...
Update manage campaign
2012-10-02 13:33:57 -07:00
68615b3b3d
Merge branch 'update_manage_campaign'
2012-10-02 13:08:55 -07: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
1dad4342c9
remove acknowledgements from premium display
2012-10-02 14:42:39 -04:00
e4cccc277f
try this placement of the star
2012-10-02 14:17:26 -04:00
5b19d7e765
Merge branch 'pledged_badges' of github.com:Gluejar/regluit into pledged_badges
2012-10-02 13:52:58 -04:00
bf5e81b9a8
Merge branch 'master' into relaunch_ry
2012-10-02 10:52:04 -07:00
75f2ad0b46
Merge pull request #28 from Gluejar/campaign_relaunch
...
fixing bug: successful campaigns were relaunchable.
2012-10-02 10:48:41 -07:00
1b5a0d4bf3
Merge branch 'relaunch_ry' of https://github.com/Gluejar/regluit into relaunch_ry
2012-10-02 13:28:47 -04:00
f9b48f2911
Revert "Revert "made some changes to reduce the likelihood of circular import dependencies in stripe code.""
...
This reverts commit 3abd95d482
2012-10-02 13:28:15 -04: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
3abd95d482
Revert "made some changes to reduce the likelihood of circular import dependencies in stripe code."
...
This reverts commit 166afece62
2012-10-01 20:05:35 -04: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
Raymond Yee
Andromeda Yelton
eshellman