Commit graph

Select branches

Hide pull requests

HenryGBC-dcl-bug#3366-3426

aatish/dynamicweb-6213_alignment_fixes

changes-settings

design_membership

feature/nosystemd

feature/old_master

feature/vm_pricing

feature/yearly-subscription

hosting_translations

master

serialize

1.0.0

1.0.1

1.0.10

1.0.11

1.0.12

1.0.13

1.0.14

1.0.15

1.0.16

1.0.17

1.0.18

1.0.19

1.0.2

1.0.20

1.0.21

1.0.22

1.0.23

1.0.24

1.0.3

1.0.4

1.0.5

1.0.6

1.0.7

1.0.8

1.0.9

1.1

1.1.1

1.2

1.2.1

1.2.10

1.2.11

1.2.12

1.2.13

1.2.2

1.2.3

1.2.4

1.2.5

1.2.6

1.2.7

1.2.8

1.2.9

1.3

1.3.1

1.3.2

1.3.3

1.4

1.4.1

1.5

1.5.1

1.5.2

1.5.3

1.5.4

1.5.5

1.6

1.6.1

1.6.2

1.6.3

1.6.4

1.6.5

1.7

1.7.1

1.7.2

1.8

1.9

1.9.1

2.0

2.0.1

2.0.2

2.0.3

2.0.4

2.0.5

2.1

2.1.1

2.1.2

2.2

2.2.1

2.2.2

2.3

2.3.1

2.4

2.4.1

2.4.10

2.4.2

2.4.3

2.4.4

2.4.5

2.4.6

2.4.7

2.4.8

2.4.9

2.5

2.5.1

2.5.10

2.5.11

2.5.2

2.5.3

2.5.4

2.5.5

2.5.6

2.5.7

2.5.8

2.5.9

2.6

2.6.1

2.6.2

2.6.3

2.6.4

2.6.5

2.6.6

2.6.7

2.6.8

2.6.9

old-2.0

Mono Color

• a3a8227007 Check if subscription metadata update response does not have errors PCoder 2018-04-19 01:08:52 +02:00
• 791f48513a Organize imports PCoder 2018-04-19 01:07:59 +02:00
• 8a659c153e Set VM_ID metadata to the created subscription PCoder 2018-04-19 00:52:38 +02:00
• 1a7412f8ff stripe_utils: Add set_subscription_metadata method PCoder 2018-04-19 00:51:55 +02:00
• bd875ffe7d Create hostingorder outside celery task PCoder 2018-04-18 23:50:52 +02:00
• 4e3211b62f Make total and subtotal texts bold PCoder 2018-04-18 21:37:12 +02:00
• 36c0b9a0a6 Differentiate price and total_price in hosting order_detail PCoder 2018-04-17 22:23:46 +02:00
• 2ac1ac7d97 Add subtotal and VAT to hosting order detail too PCoder 2018-04-17 22:20:36 +02:00
• 4c21110c00 Remove fuzzy and python-format PCoder 2018-04-17 21:47:02 +02:00
• a454cd2522 Update datacenterlight's django.po PCoder 2018-04-17 21:38:53 +02:00
• c2513dc7c3 Show vat_percent and subtotal for vat exclusive case PCoder 2018-04-17 21:38:28 +02:00
• a50fa77c8a Update get_vm_price_with_vat: Return vat_percentage also PCoder 2018-04-17 21:36:08 +02:00
• e4e7d93275 Fix flake8 errors PCoder 2018-04-17 20:50:41 +02:00
• b3d36c1be3 Reformat code M.Ravi 2018-04-17 18:12:45 +02:00
• d15a4da840 Check if child plugin instances exist before looping over them M.Ravi 2018-04-17 18:03:10 +02:00
• 8b5b353e59 Reformat code and give proper name to comic urlconf M.Ravi 2018-04-17 17:15:23 +02:00
• 80a568b2b3 Remove unwanted /comic/... urlconf M.Ravi 2018-04-17 17:14:39 +02:00
• 7d211b3333 Modify PostListViewUngleich: Filter posts by category if specified M.Ravi 2018-04-17 16:17:25 +02:00
• ff1d4f1a6f Rename tags to category, because thats how we filter posts by M.Ravi 2018-04-17 16:15:49 +02:00
• ee35fbd784 Attempt to filter blogs by category PCoder 2018-04-17 11:49:01 +02:00
• b218ee1662 Add urlconfs for comic PCoder 2018-04-17 11:47:56 +02:00
• 3fca9dbb0d Fix a bug creating hostingorder PCoder 2018-04-16 05:03:48 +02:00
• 1e76864821 Get vm price and vat and pass it to context PCoder 2018-04-16 04:46:43 +02:00
• 731fef8ad9 Show VAT details in hosting/order_details if it is set PCoder 2018-04-16 04:39:21 +02:00
• 6cc40cb67f virtual machine detail: show price upto 2 decimal places PCoder 2018-04-16 04:34:40 +02:00
• 602ad1b2c0 Reformat code PCoder 2018-04-16 04:32:27 +02:00
• 5738dc8e1b Virtual machine detail: use hostingorder for obtaining the price, rather than the serializer PCoder 2018-04-16 04:31:42 +02:00
• adbb8a269e Hostingorders: limit amount to 2 decimal places PCoder 2018-04-16 04:16:38 +02:00
• b71fec7e61 Fix a bug: use vm_pricing instead of pricing PCoder 2018-04-16 04:00:48 +02:00
• b103772c0d Pass vm_pricing if available when creating HostingOrder PCoder 2018-04-16 03:37:19 +02:00
• 25c0694b6c Use vm_pricing for creating HostingOrder PCoder 2018-04-16 03:36:56 +02:00
• a8339a23a9 Use get_vm_price_with_vat in hosting invoice PCoder 2018-04-16 03:27:54 +02:00
• 0b9c67166e Rename variable name: disk_size -> ssd_size PCoder 2018-04-16 03:26:51 +02:00
• 85b8c50ef1 Use proper decimal arithmetic to compute price and vat PCoder 2018-04-16 03:25:36 +02:00
• c92bf30514 Associate HostingOrder and VMPricing PCoder 2018-04-16 03:23:09 +02:00
• c5029d8752 Update datacenterlight's django.po PCoder 2018-04-16 01:47:55 +02:00
• 95daa37670 Use total_price for amout to be charged, always PCoder 2018-04-16 01:32:38 +02:00
• 4148eff03e Rename variable: amount_to_be_charged -> price PCoder 2018-04-16 01:31:16 +02:00
• d0276f22c1 Reorganize imports PCoder 2018-04-16 01:30:02 +02:00
• 1b37eed53d Include pricing_name in the email sent to admin PCoder 2018-04-16 01:29:07 +02:00
• 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 PCoder 2018-04-16 01:26:19 +02:00
• 6d6a8ea597 Refactor: reuse final_price variable PCoder 2018-04-16 01:24:21 +02:00
• 903336a46f Show 2 upto decimal places in order detail PCoder 2018-04-16 00:59:42 +02:00
• ec753eb0d5 Improve string representation of VMPricing PCoder 2018-04-16 00:50:34 +02:00
• 68032ec184 Update migration file PCoder 2018-04-16 00:49:55 +02:00
• 1cb3fa80cf Improve logger error PCoder 2018-04-16 00:29:43 +02:00
• 896984ef1f Set vm_pricing context from plugins value PCoder 2018-04-16 00:29:23 +02:00
• 665fa7479b Add 0019_auto_20180415_2129.py PCoder 2018-04-15 23:32:14 +02:00
• 09a03783b7 Merge branch 'master' into task/4379/price_without_vat PCoder 2018-04-15 23:27:36 +02:00
• 465431d858 Add DCLCustomPricingPlugin PCoder 2018-04-15 23:24:15 +02:00
• 45fc0dbaac Add .orig to .gitignore PCoder 2018-04-15 23:23:42 +02:00
• fc0bc52ea3 Rename model PCoder 2018-04-15 23:18:22 +02:00
• 6575ff1afe Increase decimal_places for all VMPricing fields PCoder 2018-04-15 23:07:50 +02:00
• 069ba34f94 Remove old migration file PCoder 2018-04-15 23:07:07 +02:00
• d296ce72cb Register VMPricing with admin site PCoder 2018-04-15 21:37:51 +02:00
• 40b984be15 Update order_detail landing template PCoder 2018-04-15 21:04:06 +02:00
• 23bd0fa147 Pass context params to various landing templates PCoder 2018-04-15 21:03:31 +02:00
• 957cec00a0 Add get_vm_price_with_vat method PCoder 2018-04-15 20:59:31 +02:00
• e9a883bf2e Fix a bug: use ssd_unit_price instead of sdd_unit_price PCoder 2018-04-15 20:57:10 +02:00
• 962c96067f Add get_vm_pricing_by_name VMPricing method PCoder 2018-04-15 20:55:39 +02:00
• 63a12ffe06 Use updated get_vm_price method PCoder 2018-04-15 13:42:39 +02:00
• 558e187e11 Update text: including/excluding VAT PCoder 2018-04-15 13:39:41 +02:00
• c738888ab2 Set vm unit price parameters from the passed context PCoder 2018-04-15 13:39:01 +02:00
• aa55c1e868 Update main.js to compute total from the unitprice's defined in the window context PCoder 2018-04-15 13:37:06 +02:00
• 82a2014fa5 Pass vm_pricing context from default VMPricing object PCoder 2018-04-15 13:34:55 +02:00
• 74393ac6ac Optimize imports PCoder 2018-04-15 13:32:53 +02:00
• 283a0d25d1 Update get_vm_price method to use pricing defined in VMPricing PCoder 2018-04-15 13:31:55 +02:00
• 3f4156ed8e Update Changelog PCoder 2018-04-13 20:52:58 +02:00
• 4cea97c5d6
  Merge pull request #617 from pcoder/bugfix/load_blog_on_all_domains Pcoder 2018-04-13 20:48:58 +02:00
• 7d05ab5f5f
  Update Changelog Arvind Tiwari 2018-04-13 18:53:21 +05:30
• 00be159285
  Merge pull request #621 from tiwariav/task/4376/cms_promo_section_link_color Arvind Tiwari 2018-04-13 18:44:51 +05:30
• 9cf89f6481
  Merge pull request #619 from tiwariav/task/4367/dcl_email_logo_resolution Arvind Tiwari 2018-04-13 18:44:20 +05:30
• 403f9b5a08 change logo in hosting emails Arvind Tiwari 2018-04-13 17:55:08 +05:30
• 5b8b40f967 restore ungleich style Arvind Tiwari 2018-04-13 17:49:27 +05:30
• 2536f94058 django parler config fix Arvind Tiwari 2018-04-13 17:44:00 +05:30
• ca480ce9c8 darker shade for hover Arvind Tiwari 2018-04-13 16:23:17 +05:30
• 479d6fbd4f change promo link color Arvind Tiwari 2018-04-13 15:45:06 +05:30
• 5679289329 replaced cms_menu with static menu Arvind Tiwari 2018-04-12 22:24:50 +05:30
• 0ea9051de1 Change the name of the DCL Calculator Plugin PCoder 2018-04-12 08:38:10 +02:00
• 3e1d5ba0e2 Improve string representation of VMPricing object PCoder 2018-04-12 08:03:12 +02:00
• d50f282057 Add create_vm_pricing management command PCoder 2018-04-12 08:01:43 +02:00
• 588f513f2a Remove initial VMPricing code from migration PCoder 2018-04-12 07:59:04 +02:00
• c0c2dc5c37 larger image used in email Arvind Tiwari 2018-04-12 09:26:30 +05:30
• ebba6d3795 cms page extension favicon Arvind Tiwari 2018-04-12 08:56:24 +05:30
• be72b9628c Add djangocms_blog namespace and urls M.Ravi 2018-04-10 13:21:58 +02:00
• 1116812a99 Correct hdd price in VMPricing init PCoder 2018-04-09 21:40:03 +02:00
• 76c9b20cc9 Add VMPricing init migration PCoder 2018-04-09 21:34:09 +02:00
• 4d6fdf2de9 Add DCLCalculatorPluginModel and VMPricing models PCoder 2018-04-09 21:32:53 +02:00
• b9d44b510f Merge branch 'master' into task/4379/price_without_vat PCoder 2018-04-09 21:20:24 +02:00
• dd30542f9f Use DCLCalculatorPluginModel in DCLCalculatorPlugin PCoder 2018-04-09 21:18:50 +02:00
• c7afbb32c0 Add DCLCalculatorPluginModel PCoder 2018-04-09 21:18:18 +02:00
• d07cc41d0a Update VMPricing and add get_default_pricing class method PCoder 2018-04-09 21:17:48 +02:00
• d53e70be2c
  Update Changelog 1.6.5 Arvind Tiwari 2018-04-09 03:30:37 +05:30
• a7db7e05b0
  Merge pull request #615 from tiwariav/bugfix/4427/fix_navbar_logo_repeat Arvind Tiwari 2018-04-09 03:27:29 +05:30
• f30719f320
  Merge pull request #613 from pcoder/bugfix/footer_links Arvind Tiwari 2018-04-09 03:27:09 +05:30
• a306f59327
  Update mixins.py Arvind Tiwari 2018-04-09 03:12:41 +05:30
• d1347afaff update changelog Arvind Tiwari 2018-04-09 03:10:32 +05:30
• 6e95e3d885 merge master Arvind Tiwari 2018-04-09 03:09:05 +05:30
• 79b5ff6e2c
  Merge pull request #616 from tiwariav/bugfix/4396/ungleich_favicon Arvind Tiwari 2018-04-09 03:08:03 +05:30
• 5dd29bb09e
  Update mixins.py Arvind Tiwari 2018-04-09 03:02:50 +05:30