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
M.Ravi
57f0757fa3
Update datacenterlight django.po
2017-09-28 15:00:44 +02:00
M.Ravi
46925c29c4
Add error detail to the message
2017-09-28 14:57:03 +02:00
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
Pcoder
e0c9764e4e
Merge pull request #505 from tiwariav/bugfix/order_details
...
Bugfix/ order details page
2017-09-27 21:26:36 +00:00
Arvind Tiwari
3ba1f191a3
show period if dates exist
2017-09-28 02:47:58 +05:30
Arvind Tiwari
df67fa3333
period added
2017-09-28 02:39:55 +05:30
PCoder
4e080c9afc
Invoice: Get VM name from id and configuration
2017-09-28 02:36:49 +05:30
Arvind Tiwari
858fdd5e3f
Update order_detail.html
2017-09-28 02:11:11 +05:30
Arvind Tiwari
7039ccd3b9
modal btn color changed
2017-09-28 02:09:03 +05:30
Arvind Tiwari
c103c916ef
Merge remote-tracking branch 'ungleich/master'
2017-09-28 02:06:24 +05:30
PCoder
5a43a38e19
Update Changelog
2017-09-28 01:57:17 +05:30
Pcoder
e4ba4f0dfc
Merge pull request #496 from pcoder/task/3730/refactor_price_parameter
...
Task/3730,3736/Refactor price parameters in dcl flow and compute vm price parameter
2017-09-27 20:25:46 +00:00
PCoder
5a2a134070
Merge upstream master
2017-09-28 01:35:09 +05:30
PCoder
edd79bcd32
Update Changelog
2017-09-28 01:19:26 +05:30
Pcoder
a0eada2e77
Merge pull request #500 from pcoder/task/3764/show_cancelled_vms_my_orders
...
Task/3764/show cancelled vms my orders
2017-09-27 19:47:17 +00:00
PCoder
3bc82907a9
Merge branch 'master' into task/3764/show_cancelled_vms_my_orders
2017-09-28 01:14:37 +05:30
M.Ravi
f1d273b9d0
.gitignore: remove .gitconfig
2017-09-27 13:47:28 +02:00
M.Ravi
172fffe7be
.gitignore: change .sql to *.sql
2017-09-27 13:13:16 +02:00
M.Ravi
aceaecc748
Add .gitconfig and .sql to .gitignore
2017-09-27 13:08:23 +02:00
Arvind Tiwari
fc6d600db3
Merge remote-tracking branch 'ungleich/master'
2017-09-27 02:15:47 +05:30
Arvind Tiwari
96933d50c8
Update Changelog
2017-09-27 00:46:14 +05:30
Arvind Tiwari
ce63d397be
Merge pull request #504 from tiwariav/task/3812/modal_weight_fix
...
Task/3812 modal font size and check icon weight fix
2017-09-27 00:42:37 +05:30
Arvind Tiwari
6ef5d2f777
typo fix
2017-09-27 00:08:14 +05:30
Arvind Tiwari
42985c28f1
using data.redirect to set redirect path on success
2017-09-26 22:58:56 +05:30
PCoder
e33e9cd1ae
Merge branch 'master' into tiwariav-task/3756/landing_billing_page
2017-09-26 12:20:56 +05:30
PCoder
c17604e5c1
Merge master into task/3730/refactor_price_parameter
2017-09-26 12:16:50 +05:30
PCoder
a9e8d8bb34
Merge branch 'master' into task/3764/show_cancelled_vms_my_orders
2017-09-26 12:09:09 +05:30
Arvind Tiwari
b782c6212a
Merge remote-tracking branch 'ungleich/master'
2017-09-26 02:53:25 +05:30
Arvind Tiwari
f35c3dbc10
modal check icon thinner, terminate modal text smaller
2017-09-26 02:38:31 +05:30
PCoder
543465e89b
Update Changelog for 1.2.3
2017-09-26 02:34:10 +05:30
PCoder
29a45e81bf
Include cdist 4.7.0 in requirements.txt
2017-09-26 02:24:17 +05:30
