Arvind Tiwari
|
d21e2a8abe
|
Merge pull request #618 from tiwariav/task/4297/cms_favicon
Task/4297 dcl cms favicon as page attribute
|
2018-04-20 20:59:17 +05:30 |
|
Arvind Tiwari
|
3d0505330c
|
Merge pull request #620 from tiwariav/bugfix/blog_top_menu
bugfix/ cms blog top menu
|
2018-04-20 20:58:59 +05:30 |
|
Arvind Tiwari
|
b660ac5ed4
|
merge master
|
2018-04-20 20:37:34 +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
|
74554f1c24
|
Merge pull request #622 from pcoder/task/4379/price_without_vat
Task/4379/Price without VAT
|
2018-04-20 19:04:10 +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
|
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
|
36c0b9a0a6
|
Differentiate price and total_price in hosting order_detail
|
2018-04-17 22:23:46 +02:00 |
|
PCoder
|
2ac1ac7d97
|
Add subtotal and VAT to hosting order detail too
|
2018-04-17 22:20:36 +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
|
a50fa77c8a
|
Update get_vm_price_with_vat: Return vat_percentage also
|
2018-04-17 21:36:08 +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
|
1e76864821
|
Get vm price and vat and pass it to context
|
2018-04-16 04:46:43 +02:00 |
|
PCoder
|
731fef8ad9
|
Show VAT details in hosting/order_details if it is set
|
2018-04-16 04:39:21 +02:00 |
|
PCoder
|
6cc40cb67f
|
virtual machine detail: show price upto 2 decimal places
|
2018-04-16 04:34:40 +02:00 |
|
PCoder
|
602ad1b2c0
|
Reformat code
|
2018-04-16 04:32:27 +02:00 |
|
PCoder
|
5738dc8e1b
|
Virtual machine detail: use hostingorder for obtaining the price,
rather than the serializer
|
2018-04-16 04:32:08 +02:00 |
|
PCoder
|
adbb8a269e
|
Hostingorders: limit amount to 2 decimal places
|
2018-04-16 04:16:57 +02:00 |
|
PCoder
|
b71fec7e61
|
Fix a bug: use vm_pricing instead of pricing
|
2018-04-16 04:00:48 +02:00 |
|
PCoder
|
b103772c0d
|
Pass vm_pricing if available when creating HostingOrder
|
2018-04-16 03:37:19 +02:00 |
|
PCoder
|
25c0694b6c
|
Use vm_pricing for creating HostingOrder
|
2018-04-16 03:36:56 +02:00 |
|
PCoder
|
a8339a23a9
|
Use get_vm_price_with_vat in hosting invoice
|
2018-04-16 03:27:54 +02:00 |
|
PCoder
|
0b9c67166e
|
Rename variable name: disk_size -> ssd_size
|
2018-04-16 03:26:51 +02:00 |
|
PCoder
|
85b8c50ef1
|
Use proper decimal arithmetic to compute price and vat
|
2018-04-16 03:25:36 +02:00 |
|
PCoder
|
c92bf30514
|
Associate HostingOrder and VMPricing
|
2018-04-16 03:23:09 +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
|
45fc0dbaac
|
Add .orig to .gitignore
|
2018-04-15 23:23:42 +02:00 |
|
PCoder
|
fc0bc52ea3
|
Rename model
DCLCalculatorPluginModel -> DCLCustomPricingModelModel
|
2018-04-15 23:19:18 +02:00 |
|