Commit graph

888 commits

Author SHA1 Message Date
M.Ravi
859ccd54a6 Remove some more commented code and console logs 2017-10-12 19:06:26 +02:00
M.Ravi
1b14598cc9 Create Stripe elements only stripe key is defined 2017-10-12 00:43:55 +02:00
Arvind Tiwari
3e6084a1b1 translation fix 2017-10-11 00:30:32 +05:30
Arvind Tiwari
452089e103 translation fix 2017-10-10 21:38:49 +05:30
Arvind Tiwari
5e8b34d39c Update hosting favicon to dcl favicon 2017-10-06 01:02:14 +05:30
Arvind Tiwari
fc68715bcb Merge pull request #507 from tiwariav/task/3811/create_vm_page_text
task/3811 create vm page lead text added
2017-10-04 01:00:03 +05:30
Arvind Tiwari
242f4edf8c Merge pull request #513 from tiwariav/bugfix/stripe_customer_id
bugfix/stripe_customer_id
2017-10-04 00:05:27 +05:30
Arvind Tiwari
0ba6bca06b Merge pull request #508 from tiwariav/task/3823/hosting_favicon
task/3823 hosting favicon link fixed
2017-10-03 23:42:57 +05:30
Arvind Tiwari
7e380267b7 Update payment.css 2017-10-03 21:49:51 +05:30
Arvind Tiwari
96d8f8358f Merge pull request #512 from tiwariav/bugfix/card_input
Bugfix/hosting_card_input
2017-10-03 21:39:44 +05:30
Arvind Tiwari
c410e2cbc5 stripe_customer_id retrieved from request.user relation 2017-10-03 21:35:08 +05:30
Arvind Tiwari
bfbf4d87cc Merge pull request #503 from tiwariav/task/3785/my_bills_page
Task/3785 update my bills page
2017-10-03 21:31:27 +05:30
Arvind Tiwari
315ce92a78 post request attributes changed 2017-10-03 21:24:35 +05:30
Arvind Tiwari
0263964705 stripe_id used instead of id 2017-10-03 21:04:25 +05:30
Arvind Tiwari
2e34d404ea translation 2017-10-03 18:25:32 +05:30
Arvind Tiwari
e4837b063c alignment fix 2017-10-03 18:18:18 +05:30
M.Ravi
60b233f082 Fix flake8 warnings 2017-10-03 00:26:50 +02:00
M.Ravi
44b5d9bb3a hosting order: Add price to vm context 2017-10-02 23:17:37 +02:00
M.Ravi
7680e5aa25 Update hosting django.po 2017-10-02 00:13:28 +02:00
M.Ravi
22af001489 Merge upstream master 2017-10-02 00:09:38 +02:00
M.Ravi
68cbfdd393 Update translation and fix loginmixin required for dashboard view 2017-10-01 23:06:51 +02:00
M.Ravi
cf45a9ac75 Add messages to some hosting templates 2017-10-01 20:39:55 +02:00
M.Ravi
06b1ce9e72 Update error message 2017-10-01 20:32:51 +02:00
M.Ravi
167eaf2a0c Add forbidden_view method adds the message and redirects to the same path 2017-10-01 20:17:03 +02:00
M.Ravi
9e8d930a3b Refactor messages to includes/_messages.html 2017-10-01 20:16:05 +02:00
Arvind Tiwari
1fb7511292 favicon link changed 2017-09-30 17:08:40 +05:30
Arvind Tiwari
c6173ed2e6 lead text added 2017-09-30 16:53:44 +05:30
M.Ravi
6ef8a03de7 Respond with JSON 2017-09-30 01:02:59 +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
1dfe1d7cf8 Redirect to my virtual machines page if any error 2017-09-29 21:53:02 +02:00
M.Ravi
4b8d68fc8e Reuse price parameter 2017-09-29 09:35:45 +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
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
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
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
Arvind Tiwari
9c69c4cb25 Update landing-page.css 2017-09-28 19:14:13 +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
b65bc3f1f5 merge master 2017-09-28 18:23:48 +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