Commit graph

4997 commits

Author SHA1 Message Date
PCoder
1b29a23ede Remove default display none of one-time-payments div 2020-06-19 15:48:00 +05:30
PCoder
6b3ecfaff4 Use show/hide instead of toggle 2020-06-19 15:45:44 +05:30
PCoder
c4e7f99202 Add slideToggles to subscription/one-time-payments divs 2020-06-19 15:38:26 +05:30
PCoder
0dc9c6cdca Fix element id 2020-06-19 15:30:38 +05:30
PCoder
38109e175a Move js to correct place 2020-06-19 15:25:34 +05:30
PCoder
081f81c41c Begin handling click events 2020-06-19 13:13:26 +05:30
PCoder
ffae844ee5 Merge remote-tracking branch 'mainRepo/master' into 7894/show-one-time-payment-invoices 2020-06-19 12:40:52 +05:30
PCoder
1ce28964a6 Merge remote-tracking branch 'origin/master' into 7894/show-one-time-payment-invoices 2020-06-19 12:40:18 +05:30
PCoder
bc69cc49e5 Move opennebula specific code to celery to make it asynchronous 2020-06-11 15:20:42 +05:30
PCoder
a52215bb56 Update Changelog 2020-06-11 11:42:23 +05:30
PCoder
eadbebb796 Update Changelog for 2.11 2020-06-11 11:34:56 +05:30
PCoder
495e7d4022 Fix wrong constant name
settings.LDAP_MAX_UID_PATH -> settings.LDAP_MAX_UID_FILE_PATH
2020-06-11 11:29:53 +05:30
PCoder
81eee87fb9 Update Changelog for 2.10.8 2020-06-10 13:45:46 +05:30
PCoder
af36a49366 Revert back errors 2020-06-10 13:36:33 +05:30
PCoder
4bff49dab6 Refactor polling time to terminate VM 2020-06-10 12:27:59 +05:30
PCoder
6131270b1d Update Changelog for 2.10.7 2020-05-25 11:44:07 +05:30
PCoder
17a8efb0b6 Fix variable name 2020-05-25 11:33:58 +05:30
a665dbf9c8 Merge branch '8044/fix-modified-vm-templates' into 'master'
Handle updated templates

See merge request ungleich-public/dynamicweb!736
2020-05-25 07:52:35 +02:00
PCoder
c1473fa374 Handle updated templates 2020-05-25 11:10:41 +05:30
PCoder
ac1170a0f1 Remove wrong IL country code in vat_rates 2020-04-21 00:03:13 +05:30
PCoder
f9906781ba Remove wrong Ireland country code in vat rates 2020-04-21 00:02:21 +05:30
PCoder
7db3dc4222 Fix circular imports and correct hosting order link 2020-04-15 17:36:40 +05:30
PCoder
f089892c90 Remove duplicated html + add href link to order 2020-04-10 20:02:12 +05:30
PCoder
a395b7a4a6 Do not update ho -> doing so, crashes 2020-04-10 18:44:45 +05:30
PCoder
8443e03b1f Add ho values 2020-04-07 19:33:13 +05:30
PCoder
3aff4bb69a Fix bug 2020-04-07 19:22:45 +05:30
PCoder
84c3db7e52 Pass HostingOrder instance 2020-04-07 19:21:47 +05:30
PCoder
d35403311f Fix bug fetching variables 2020-04-07 19:16:55 +05:30
PCoder
8a3fa667a0 Fix bug 2020-04-07 18:57:20 +05:30
PCoder
132a5112fd Fix getting id 2020-04-07 18:46:05 +05:30
PCoder
b01f12c9ec Fix passing params to template filter 2020-04-07 18:41:43 +05:30
PCoder
4869fd51df Change to filter from simple 2020-04-07 18:35:25 +05:30
PCoder
4435eef077 Chanage tag to simple 2020-04-01 17:26:12 +05:30
PCoder
343a9440f0 Load invs_charge context from user's charges 2020-04-01 17:09:02 +05:30
PCoder
27aa0ea595 Create another div for onetime charges 2020-04-01 17:08:22 +05:30
PCoder
70264d592d Put contents for subscription in a div of its own 2020-04-01 17:07:44 +05:30
PCoder
d0be07ecd5 Add custom_tag get_line_item_from_hosting_order_charge 2020-04-01 17:07:10 +05:30
PCoder
cec7938c9c Add tabs for one time payments 2020-04-01 11:30:27 +05:30
PCoder
7072420ea5 Update Changelog for 2.10.6 2020-03-25 18:55:49 +05:30
1986978f9b Merge branch 'bugfix/nonetype-in-discount-name' into 'master'
Filter out None case for discount's name

See merge request ungleich-public/dynamicweb!735
2020-03-25 14:23:29 +01:00
PCoder
cb3ff73100 Filter out None case for discount's name 2020-03-25 18:47:00 +05:30
PCoder
46c33cf107 Update price to 11.5 CHF per month in intro emails 2020-03-24 12:34:26 +05:30
58680c1647 Merge branch 'introduce_base_price' into 'master-2.10.3b'
Introduce base price

See merge request ungleich-public/dynamicweb!734
2020-03-24 07:27:55 +01:00
PCoder
9d96ecefea Remove unwanted import 2020-03-18 12:44:18 +05:30
PCoder
580960548e Merge tag '2.10.2' into branch-2.10.3b
Introduce base price for VMs and let admins add stripe_coupon_id
2020-03-18 12:05:57 +05:30
PCoder
f539967a22 Set in_ldap even when resetting dummy credential 2020-03-06 00:01:27 +05:30
PCoder
b076debfee Update Changelog for 2.10.3b 2020-03-05 22:41:15 +05:30
PCoder
d21c5837f7 Change ldap credentials which was set to dummy during migration 2020-03-05 22:40:59 +05:30
PCoder
b9096de386 More replacements: use username instead of emails 2020-03-05 18:17:14 +05:30
PCoder
b44a7f98b5 Use username instead of email when creating VM 2020-03-05 15:55:44 +05:30