Arvind Tiwari
|
3b3b73a2ce
|
alignment calculator plugin
|
2018-04-25 15:08:28 +05:30 |
|
Arvind Tiwari
|
3bf064a017
|
add calculator placeholder to cms_integration
|
2018-04-25 14:52:25 +05:30 |
|
Arvind Tiwari
|
a5bd8347e8
|
merged master
|
2018-04-21 21:01:42 +05:30 |
|
Arvind Tiwari
|
564f7a5be8
|
merge migrations
|
2018-04-20 20:36:28 +05:30 |
|
Arvind Tiwari
|
275ea47e41
|
merge master
|
2018-04-20 20:30:45 +05:30 |
|
Arvind Tiwari
|
71a37972d3
|
Merge remote-tracking branch 'ungleich/master'
|
2018-04-20 20:29:09 +05:30 |
|
Arvind Tiwari
|
736253feda
|
refactor imports
|
2018-04-20 20:27:26 +05:30 |
|
Arvind Tiwari
|
3debf34118
|
remove vm creation to util function
|
2018-04-20 20:25:24 +05:30 |
|
Arvind Tiwari
|
8f6260b063
|
Update _calculator_form.html
|
2018-04-20 17:54:23 +05:30 |
|
Arvind Tiwari
|
1e97d0ba38
|
Update cms_plugins.py
|
2018-04-20 17:51:46 +05:30 |
|
Arvind Tiwari
|
a25bcc807f
|
change header slider to container fluid
|
2018-04-20 17:04:02 +05:30 |
|
Arvind Tiwari
|
da13903ba2
|
remove padding
|
2018-04-20 16:42:50 +05:30 |
|
M.Ravi
|
fae1c7fbeb
|
Update hosting_order in a pythonic way
|
2018-04-19 07:26:34 +02:00 |
|
PCoder
|
80c3ac5346
|
Improve create_vm_task test
|
2018-04-19 01:09:25 +02:00 |
|
PCoder
|
a3a8227007
|
Check if subscription metadata update response does not have errors
|
2018-04-19 01:08:52 +02:00 |
|
PCoder
|
791f48513a
|
Organize imports
|
2018-04-19 01:07:59 +02:00 |
|
PCoder
|
8a659c153e
|
Set VM_ID metadata to the created subscription
|
2018-04-19 00:52:38 +02:00 |
|
PCoder
|
bd875ffe7d
|
Create hostingorder outside celery task
|
2018-04-18 23:50:52 +02:00 |
|
PCoder
|
4e3211b62f
|
Make total and subtotal texts bold
|
2018-04-18 21:37:12 +02:00 |
|
PCoder
|
4c21110c00
|
Remove fuzzy and python-format
|
2018-04-17 21:47:02 +02:00 |
|
PCoder
|
a454cd2522
|
Update datacenterlight's django.po
|
2018-04-17 21:38:53 +02:00 |
|
PCoder
|
c2513dc7c3
|
Show vat_percent and subtotal for vat exclusive case
|
2018-04-17 21:38:28 +02:00 |
|
PCoder
|
e4e7d93275
|
Fix flake8 errors
|
2018-04-17 20:50:41 +02:00 |
|
M.Ravi
|
d15a4da840
|
Check if child plugin instances exist before looping over them
|
2018-04-17 18:03:14 +02:00 |
|
PCoder
|
3fca9dbb0d
|
Fix a bug creating hostingorder
|
2018-04-16 05:03:48 +02:00 |
|
PCoder
|
b103772c0d
|
Pass vm_pricing if available when creating HostingOrder
|
2018-04-16 03:37:19 +02:00 |
|
PCoder
|
0b9c67166e
|
Rename variable name: disk_size -> ssd_size
|
2018-04-16 03:26:51 +02:00 |
|
PCoder
|
c5029d8752
|
Update datacenterlight's django.po
|
2018-04-16 01:48:39 +02:00 |
|
PCoder
|
95daa37670
|
Use total_price for amout to be charged, always
|
2018-04-16 01:32:38 +02:00 |
|
PCoder
|
4148eff03e
|
Rename variable: amount_to_be_charged -> price
|
2018-04-16 01:31:16 +02:00 |
|
PCoder
|
d0276f22c1
|
Reorganize imports
|
2018-04-16 01:30:02 +02:00 |
|
PCoder
|
1b37eed53d
|
Include pricing_name in the email sent to admin
|
2018-04-16 01:29:07 +02:00 |
|
PCoder
|
8e28756bd8
|
Check if we have total_price (indicates that we have VAT excluded
price);hence,use it as final_price. if not use the previous casei and use it as final_price. If not use the preivous case
|
2018-04-16 01:27:42 +02:00 |
|
PCoder
|
6d6a8ea597
|
Refactor: reuse final_price variable
|
2018-04-16 01:24:21 +02:00 |
|
PCoder
|
903336a46f
|
Show 2 upto decimal places in order detail
|
2018-04-16 00:59:42 +02:00 |
|
PCoder
|
ec753eb0d5
|
Improve string representation of VMPricing
|
2018-04-16 00:50:34 +02:00 |
|
PCoder
|
68032ec184
|
Update migration file
|
2018-04-16 00:49:55 +02:00 |
|
PCoder
|
1cb3fa80cf
|
Improve logger error
|
2018-04-16 00:29:43 +02:00 |
|
PCoder
|
896984ef1f
|
Set vm_pricing context from plugins value
|
2018-04-16 00:29:23 +02:00 |
|
PCoder
|
665fa7479b
|
Add 0019_auto_20180415_2129.py
|
2018-04-15 23:32:14 +02:00 |
|
PCoder
|
09a03783b7
|
Merge branch 'master' into task/4379/price_without_vat
|
2018-04-15 23:27:36 +02:00 |
|
PCoder
|
465431d858
|
Add DCLCustomPricingPlugin
|
2018-04-15 23:24:15 +02:00 |
|
PCoder
|
fc0bc52ea3
|
Rename model
DCLCalculatorPluginModel -> DCLCustomPricingModelModel
|
2018-04-15 23:19:18 +02:00 |
|
PCoder
|
6575ff1afe
|
Increase decimal_places for all VMPricing fields
|
2018-04-15 23:07:50 +02:00 |
|
PCoder
|
069ba34f94
|
Remove old migration file
|
2018-04-15 23:07:07 +02:00 |
|
PCoder
|
d296ce72cb
|
Register VMPricing with admin site
|
2018-04-15 21:37:51 +02:00 |
|
PCoder
|
40b984be15
|
Update order_detail landing template
|
2018-04-15 21:04:06 +02:00 |
|
PCoder
|
23bd0fa147
|
Pass context params to various landing templates
|
2018-04-15 21:03:31 +02:00 |
|
PCoder
|
962c96067f
|
Add get_vm_pricing_by_name VMPricing method
|
2018-04-15 20:55:39 +02:00 |
|
PCoder
|
63a12ffe06
|
Use updated get_vm_price method
|
2018-04-15 13:42:39 +02:00 |
|
PCoder
|
558e187e11
|
Update text: including/excluding VAT
|
2018-04-15 13:39:41 +02:00 |
|
PCoder
|
c738888ab2
|
Set vm unit price parameters from the passed context
|
2018-04-15 13:39:01 +02:00 |
|
PCoder
|
aa55c1e868
|
Update main.js to compute total from the unitprice's defined in the window context
|
2018-04-15 13:37:06 +02:00 |
|
PCoder
|
82a2014fa5
|
Pass vm_pricing context from default VMPricing object
|
2018-04-15 13:34:55 +02:00 |
|
PCoder
|
74393ac6ac
|
Optimize imports
|
2018-04-15 13:32:53 +02:00 |
|
Arvind Tiwari
|
00be159285
|
Merge pull request #621 from tiwariav/task/4376/cms_promo_section_link_color
Task/4376 cms promo link color
|
2018-04-13 18:44:51 +05:30 |
|
Arvind Tiwari
|
ca480ce9c8
|
darker shade for hover
|
2018-04-13 16:23:17 +05:30 |
|
Arvind Tiwari
|
479d6fbd4f
|
change promo link color
|
2018-04-13 15:45:06 +05:30 |
|
PCoder
|
0ea9051de1
|
Change the name of the DCL Calculator Plugin
DCL Caclulator Plugin -> DCL Calculator Section Plugin
Note: We do not change the plugin name itself because it causes
data loss
|
2018-04-12 08:38:14 +02:00 |
|
PCoder
|
3e1d5ba0e2
|
Improve string representation of VMPricing object
|
2018-04-12 08:03:19 +02:00 |
|
PCoder
|
d50f282057
|
Add create_vm_pricing management command
|
2018-04-12 08:01:43 +02:00 |
|
PCoder
|
588f513f2a
|
Remove initial VMPricing code from migration
|
2018-04-12 07:59:04 +02:00 |
|
Arvind Tiwari
|
c0c2dc5c37
|
larger image used in email
|
2018-04-12 09:26:30 +05:30 |
|
Arvind Tiwari
|
ebba6d3795
|
cms page extension favicon
|
2018-04-12 08:56:24 +05:30 |
|
PCoder
|
1116812a99
|
Correct hdd price in VMPricing init
|
2018-04-09 21:40:03 +02:00 |
|
PCoder
|
76c9b20cc9
|
Add VMPricing init migration
|
2018-04-09 21:34:09 +02:00 |
|
PCoder
|
4d6fdf2de9
|
Add DCLCalculatorPluginModel and VMPricing models
|
2018-04-09 21:32:53 +02:00 |
|
PCoder
|
b9d44b510f
|
Merge branch 'master' into task/4379/price_without_vat
|
2018-04-09 21:20:24 +02:00 |
|
PCoder
|
dd30542f9f
|
Use DCLCalculatorPluginModel in DCLCalculatorPlugin
|
2018-04-09 21:18:50 +02:00 |
|
PCoder
|
c7afbb32c0
|
Add DCLCalculatorPluginModel
|
2018-04-09 21:18:18 +02:00 |
|
PCoder
|
d07cc41d0a
|
Update VMPricing and add get_default_pricing class method
|
2018-04-09 21:17:48 +02:00 |
|
Arvind Tiwari
|
a7db7e05b0
|
Merge pull request #615 from tiwariav/bugfix/4427/fix_navbar_logo_repeat
bugfix/4427 fix navbar logo repeat
|
2018-04-09 03:27:29 +05:30 |
|
Arvind Tiwari
|
f30719f320
|
Merge pull request #613 from pcoder/bugfix/footer_links
Bugfix/footer links
|
2018-04-09 03:27:09 +05:30 |
|
Arvind Tiwari
|
6e95e3d885
|
merge master
|
2018-04-09 03:09:05 +05:30 |
|
Arvind Tiwari
|
ff1908d2e6
|
added navbar-transparent styles to glasfaser.css
|
2018-04-09 01:52:49 +05:30 |
|
Arvind Tiwari
|
fb7ccff584
|
remove old migrations from squashed migration
|
2018-04-09 01:11:45 +05:30 |
|
PCoder
|
30d7785700
|
Redirect to DCL home on hosting footer for all domains
|
2018-04-08 08:36:00 +02:00 |
|
PCoder
|
c3dff3155e
|
Redirect the contact link to dcl always
|
2018-04-08 00:29:39 +02:00 |
|
PCoder
|
178ff8da38
|
CMS home page can now be accessed at /cms/ for all sites
|
2018-04-07 13:13:55 +02:00 |
|
PCoder
|
c6e3963303
|
Update footer links in dcl _footer.html
|
2018-04-07 12:55:32 +02:00 |
|
PCoder
|
ffe4eb4123
|
Use REDIRECT_TO_CMS and MULTISITE_CMS_FALLBACK to construct
/hosting footer urls
|
2018-04-07 10:25:27 +02:00 |
|
PCoder
|
28de423a14
|
Add VMPricing model
|
2018-04-06 00:51:44 +02:00 |
|
Arvind Tiwari
|
35decd208c
|
merged master
|
2018-04-04 18:41:43 +05:30 |
|
Arvind Tiwari
|
7c13def3a2
|
header btn link fix
|
2018-04-04 17:55:19 +05:30 |
|
Arvind Tiwari
|
ae2dea993d
|
remove whitespace
|
2018-04-04 02:27:30 +05:30 |
|
Arvind Tiwari
|
fe3fcb5100
|
flake8 fix
|
2018-04-03 22:51:04 +05:30 |
|
Arvind Tiwari
|
d843c34d68
|
modified cms integrate to support separate content for each domain
|
2018-04-03 22:41:29 +05:30 |
|
Arvind Tiwari
|
1e6fb26051
|
hosting login footer fix
|
2018-04-01 18:45:36 +05:30 |
|
PCoder
|
fb29bd0128
|
[DCL] Add DE translations by Sanghee
|
2018-03-31 01:28:56 +02:00 |
|
PCoder
|
aa9becdfe7
|
Reduce space between content and your dcl team
|
2018-03-31 00:09:49 +02:00 |
|
PCoder
|
bf4f2f0f87
|
Correct a translation and add new translation
|
2018-03-30 23:47:27 +02:00 |
|
PCoder
|
07d15a8144
|
Include password reset link in the text
|
2018-03-30 23:46:29 +02:00 |
|
PCoder
|
74e69ff313
|
Add some space between account details and activate email linkpacebetween account details and activate email link
|
2018-03-30 23:45:11 +02:00 |
|
PCoder
|
b64fe2cb1c
|
Attempt to fix user activation html email template
|
2018-03-30 23:02:44 +02:00 |
|
Arvind Tiwari
|
141c6a7c0f
|
Update common.css
|
2018-03-29 01:24:18 +05:30 |
|
Arvind Tiwari
|
1402c7fde1
|
footer padding fix
|
2018-03-29 01:19:10 +05:30 |
|
Arvind Tiwari
|
368fe0d08f
|
merge master
|
2018-03-29 01:04:26 +05:30 |
|
Arvind Tiwari
|
29a2ee098b
|
fix related name for placeholder fields
|
2018-03-29 00:58:08 +05:30 |
|
Arvind Tiwari
|
2b27d56e54
|
cmsintegrate management command
|
2018-03-29 00:43:38 +05:30 |
|
Arvind Tiwari
|
8fc605f5b5
|
merge
|
2018-03-27 21:10:21 +05:30 |
|