sanghee
/
dynamicweb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
3,802 Commits 10 Branches 82 Tags 313 MiB
Commit Graph

889 Commits

Author SHA1 Message Date
Arvind Tiwari 86188b1fb0
Merge pull request #626 from tiwariav/task/4474/slider_padding 
Task/4474 cms header slider padding
 2018-04-30 23:52:23 +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 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
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