Commit graph

2110 commits

Author SHA1 Message Date
PCoder
9a0592ec4b Merge branch 'master' into task/3701/enable_monthly_payments 2017-08-20 01:36:45 +05:30
Arvind Tiwari
6764e1ccee Merge pull request #441 from tiwariav/task/3565/warning-color
task/3565 override bootstrap default danger color #a94442 -> #eb4d5c
2017-08-20 00:29:21 +05:30
PCoder
9c8bddb200 requirements.txt: Added celery, redis, django-celery-results 2017-08-19 08:41:36 +05:30
PCoder
d071a1b98a Merge branch 'master' into task/3701/enable_monthly_payments 2017-08-19 02:52:19 +05:30
Arvind Tiwari
8868aabf59 added .log to .gitignore 2017-08-19 02:42:50 +05:30
PCoder
35736ae593 Refactored some code 2017-08-18 01:49:27 +05:30
PCoder
7e1bfc9fab Removed a print 2017-08-18 00:47:34 +05:30
PCoder
fc70c30f21 Merged master into task/3701/enable_monthly_payments 2017-08-18 00:40:57 +05:30
Pcoder
a80b0668a2 Merge pull request #432 from siarheipuhach/feature/task3637
task/3637/Added stripe failed payment error handler
2017-08-17 20:50:18 +02:00
M.Ravi
3445579a8e Added 0042_hostingorder_subscription_id.py migration file 2017-08-17 18:36:14 +02:00
M.Ravi
fcaa5e31dd Added condition that the status should be 'active' for new subscription 2017-08-17 18:31:27 +02:00
M.Ravi
171a463261 Updated dcl views.py to create subscriptions instead of one time charge 2017-08-17 18:24:10 +02:00
M.Ravi
5fe6007ad2 Refactored code and added app as a parameter in get_stripe_plan_id 2017-08-17 18:21:53 +02:00
M.Ravi
b0b1b6091a Refactored code and added app as a parameter in get_stripe_plan_id 2017-08-17 18:17:52 +02:00
M.Ravi
ecbbe1eb6d Added subscription_id field and reformatted the code 2017-08-17 18:16:36 +02:00
M.Ravi
5c92e47ffe Added card that fails and a new test case to test failed payment 2017-08-17 16:42:32 +02:00
M.Ravi
0bc1766e4a Refactored tests and added test_subscribe_customer_to_plan 2017-08-17 15:32:13 +02:00
M.Ravi
ffd0d24f1a Refactored code 2017-08-17 13:23:49 +02:00
M.Ravi
3ef34d84a8 Added some comments and improved the test code 2017-08-17 13:02:39 +02:00
M.Ravi
1073b25a94 Refactored and added test_delete_unexisting_plan_should_fail 2017-08-17 12:43:42 +02:00
M.Ravi
2a348c40d1 Refactored code and added delete_stripe_plan method 2017-08-17 12:42:34 +02:00
M.Ravi
bba82e95d1 Cleaned up some unused code 2017-08-17 11:04:22 +02:00
PCoder
08c5485352 Added test_create_duplicate_plans_error_handling 2017-08-17 13:01:48 +05:30
PCoder
783ab5714c Improved get_or_create_plan and subscribe_customer_to_plan 2017-08-17 13:01:05 +05:30
PCoder
1a2b0e4e29 Added datacenterlight/migrations/0007_stripeplan.py migration file 2017-08-17 04:26:04 +05:30
PCoder
9d4085138a Added StripePlanTestCase 2017-08-17 04:25:07 +05:30
PCoder
974617badb Added get_or_create_plan and subscribe_customer_to_plan and get_stripe_plan_id_string functions to StripeUtils class 2017-08-17 04:23:38 +05:30
PCoder
fc1ddbdd3b Added StripePlan model 2017-08-17 04:22:23 +05:30
PCoder
94004a5443 Changed 1.0.23.1 to 1.0.24 in the Changelog 2017-08-16 03:30:21 +05:30
PCoder
270e70580f Updated Changelog for 1.0.24 2017-08-16 03:27:37 +05:30
Pcoder
2d7231caa0 Merge pull request #449 from pcoder/task/3687/stripe_customer_description
Added code to store customer's name in Stripe's description field.
2017-08-15 22:16:07 +02:00
Pcoder
c053c76186 Merge pull request #448 from pcoder/task/3699/add_oneadmin_ssh_key
Task/3699/Added oneadmin ssh key by default to the created VM via DCL flow
2017-08-15 20:08:52 +02:00
PCoder
999f5d8e2d Cleaned up a comment 2017-08-15 18:48:29 +05:30
PCoder
492f7553d8 Added test TestStripeCustomerDescription 2017-08-15 16:12:08 +05:30
PCoder
3be7fbe2ee Added name parameter for creating StripeCustomer and set description to this 2017-08-15 16:05:52 +05:30
PCoder
73721f16d2 Added ONEADMIN_USER_SSH_PUBLIC_KEY parameter to load oneadmin user's ssh key by default when creating VM via DCL flow 2017-08-15 02:29:01 +05:30
Pcoder
3b1cd200d6 Merge pull request #430 from amarynets/bugfix/add_customuser_parameter
Fixed `TypeError: get_anonymous_user_instance() takes 0 positional arguments but 1 was given`
2017-08-12 19:26:02 +02:00
Arvind Tiwari
dbb4c7b3f3 Update Changelog 2017-08-12 02:44:40 +05:30
Arvind Tiwari
f618ce8bdf fixes in changelog 2017-08-12 02:42:52 +05:30
Arvind Tiwari
3f37fdd77a Update Changelog 2017-08-12 02:42:11 +05:30
Arvind Tiwari
26903015fe corrected format for changelog 2017-08-12 02:39:04 +05:30
Arvind Tiwari
01156a335d update changelog 1.0.23 2017-08-12 02:33:37 +05:30
Arvind Tiwari
0efd844603 Update Changelog 2017-08-12 02:25:07 +05:30
Arvind Tiwari
dde18cc485 Merge pull request #443 from ungleich/task/3676/missing_card_holder_name_migration
Task/3676/Added migration file for missing card holder's name in utils_billing_…
2017-08-12 02:21:19 +05:30
Arvind Tiwari
2f832e6409 Update Changelog 2017-08-12 02:17:07 +05:30
Arvind Tiwari
7825114f5e Merge pull request #445 from tiwariav/bugfix/3683/hosting_footer
bugfix/3683 footer fix on hosting
2017-08-12 01:28:31 +05:30
ARvind Tiwari
07f92e754e fix for mobile 2017-08-12 01:18:14 +05:30
ARvind Tiwari
f8ce8f975f footer fix on hosting 2017-08-12 00:49:20 +05:30
Arvind Tiwari
fcc8c4718c Merge pull request #444 from tiwariav/bug/3677/ssh-key-modal
bugfix/3677 ssh modal key wrapping
2017-08-12 00:42:59 +05:30
Arvind Tiwari
4ab26b4bbd Merge pull request #440 from tiwariav/task/3619/lato-font
Task/3619 Lato font used in all stylesheets
2017-08-12 00:42:37 +05:30