Commit graph

3310 commits

Author SHA1 Message Date
M.Ravi
6ef8a03de7 Respond with JSON 2017-09-30 01:02:59 +02:00
M.Ravi
4334dfaa44 Update utils django.po 2017-09-29 22:36:38 +02:00
M.Ravi
43e6fc45e2 Add de translations 2017-09-29 22:19:26 +02:00
M.Ravi
b04f9ea1ec Update hosting django.po 2017-09-29 22:12:02 +02:00
M.Ravi
00341e014c Update hosting django.po 2017-09-29 22:02:53 +02:00
M.Ravi
4bf73db14f Update datacenterlight django.po 2017-09-29 22:01:28 +02:00
M.Ravi
5bbfb54b79 Revert back to simple error message 2017-09-29 21:54:31 +02:00
M.Ravi
1dfe1d7cf8 Redirect to my virtual machines page if any error 2017-09-29 21:53:02 +02:00
M.Ravi
e6869612d8 Update resend activation link email text 2017-09-29 21:45:30 +02:00
M.Ravi
4b8d68fc8e Reuse price parameter 2017-09-29 09:35:45 +02:00
M.Ravi
5393ffa10d Small code reorganizing 2017-09-29 09:16:00 +02:00
M.Ravi
5c99dd4da7 hosting/views: remove billing_address_id in call to create_vm_task 2017-09-29 09:07:38 +02:00
M.Ravi
d06f5ffb00 datacenterlight/views: remove billing_address_id in call to
create_vm_task
2017-09-29 08:58:45 +02:00
M.Ravi
61a4060e10 datacenterlight/tests: remove billing_address_id in call to
create_vm_task
2017-09-29 08:55:30 +02:00
M.Ravi
483aa493bb Remove billing_address_id as it is no more used 2017-09-29 08:51:58 +02:00
M.Ravi
ac37349aef Refactor code and pass subscription_id instead of obj 2017-09-29 08:50:03 +02:00
M.Ravi
313ba9d502 Refactor set_subscription_id - use stripe subscription id instead of obj 2017-09-29 08:42:17 +02:00
M.Ravi
caad79304b Pass subscription_id instead of subscription object 2017-09-29 08:40:43 +02:00
M.Ravi
f29a3ad0e6 Pass subscription_id to create_vm_task instead of the object 2017-09-29 08:39:20 +02:00
M.Ravi
5783e42171 Refactor code and add following fixes
- create_vm_task receiving stripe_subscription_id instead of object
    - Fix: use BillingAddress instead of UserBillingAddress in
    HostingOrder, HostingPlan
    - Remove DictDotLookup class
2017-09-29 08:37:25 +02:00
M.Ravi
4ce1ff073a Some more modal styles 2017-09-28 23:31:29 +02:00
M.Ravi
f60a2c3482 Make correct icons load on dcl createvm error modal 2017-09-28 23:20:43 +02:00
M.Ravi
9cab43f051 Update modal with html from server 2017-09-28 23:03:22 +02:00
M.Ravi
0202d5ba93 Add initial values for dcl billing form 2017-09-28 22:56:33 +02:00
PCoder
fcda0b5637 DCL payment page: Get form data from session on error 2017-09-29 01:25:22 +05:30
PCoder
4efc1b4943 Merge branch 'master' into bugfix/stripe_error 2017-09-28 23:43:21 +05:30
M.Ravi
03442398c2 Handle message create vm request in js 2017-09-28 17:31:29 +02:00
M.Ravi
c13015eabd Refactor and correct some logic 2017-09-28 15:56:09 +02:00
Arvind Tiwari
9c69c4cb25 Update landing-page.css 2017-09-28 19:14:13 +05:30
Arvind Tiwari
519a74e834 logo update 2017-09-28 19:08:25 +05:30
Arvind Tiwari
d751aa6d63 padding fix 2017-09-28 18:48:21 +05:30
Arvind Tiwari
7bd61f708c Merge branch 'master' into task/3785/my_bills_page 2017-09-28 18:38:49 +05:30
Arvind Tiwari
ba366eed77 merge master 2017-09-28 18:37:33 +05:30
M.Ravi
57f0757fa3 Update datacenterlight django.po 2017-09-28 15:00:44 +02:00
Arvind Tiwari
abb7c38d75 translation fix 2017-09-28 18:27:26 +05:30
M.Ravi
46925c29c4 Add error detail to the message 2017-09-28 14:57:03 +02:00
Arvind Tiwari
b65bc3f1f5 merge master 2017-09-28 18:23:48 +05:30
M.Ravi
4add1af933 Fix flake8 warnings 2017-09-28 14:49:17 +02:00
M.Ravi
07aaa20efe Fix issue : stripe user created every time for unauthenticated user 2017-09-28 14:46:56 +02:00
PCoder
e110fd10f2 Update Changelog 2017-09-28 05:06:30 +05:30
Pcoder
ed459c827b Merge pull request #493 from pcoder/tiwariav-task/3756/landing_billing_page
Tiwariav task/3756/landing billing page
2017-09-27 23:32:05 +00:00
PCoder
3ceaf0192f Fix flake8 warnings 2017-09-28 04:57:40 +05:30
PCoder
39cb930326 Compute vm price on post of dcl index and set in session 2017-09-28 04:22:15 +05:30
PCoder
e215a85a4d dcl order confirmation: add code to show button on modal 2017-09-28 04:14:35 +05:30
PCoder
fccd75f1fc Add missing imports 2017-09-28 03:46:05 +05:30
PCoder
06ef940b01 Merge upstream 2017-09-28 03:33:43 +05:30
Arvind Tiwari
f0a49ef075 translations 2017-09-28 03:12:03 +05:30
Arvind Tiwari
88706b0088 merged master 2017-09-28 03:06:47 +05:30
Arvind Tiwari
4379cebbed default 'card' translated 2017-09-28 03:05:47 +05:30
Pcoder
e0c9764e4e Merge pull request #505 from tiwariav/bugfix/order_details
Bugfix/ order details page
2017-09-27 21:26:36 +00:00