Commit graph

5155 commits

Author SHA1 Message Date
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
PCoder
e2c86116b2 Use username for opennebula related tasks 2020-03-05 15:27:18 +05:30
PCoder
45af92e049 Update Changelog for 2.10.2b 2020-02-25 19:40:10 +05:30
PCoder
42fb55dee1 Don't use encoded bytes and its str representation as uid
(Refer redmine #7764)
2020-02-25 19:19:40 +05:30
PCoder
2cbf146ebc Change button to a href 2020-02-25 14:40:54 +05:30
PCoder
c058138044 Update Changelog for 2.10.2 2020-02-04 17:07:14 +05:30
PCoder
f45f8dd51f Remove unused method round_up 2020-02-04 11:27:59 +05:30
PCoder
dd2eae68e6 Use math round to round amount to 2 decimal places 2020-02-04 11:20:17 +05:30
PCoder
e322e58246 Use appropriate stripe_coupon_id 2020-02-04 09:06:10 +05:30
PCoder
3ca1a45217 Add stripe_coupon_id to VMPricing 2020-02-04 08:57:54 +05:30
PCoder
c315030b06 Add vm base price to missing places 2020-02-03 12:29:14 +05:30
PCoder
e6de90e431 Set vm base price in js also 2020-02-03 12:07:50 +05:30
PCoder
00b434efb9 Read VM_BASE_PRICE from env 2020-02-03 11:37:30 +05:30
PCoder
5d977f32d3 Update Changelog for 2.10.1 2020-02-02 22:52:11 +05:30
PCoder
3061c1483c Switch bold between Recurring text and value 2020-02-02 22:37:29 +05:30
PCoder
f68549d80d Add DE translations by moep 2020-02-02 22:33:13 +05:30
PCoder
b607575c8c Switch bold for description title and description text 2020-02-02 22:29:01 +05:30
PCoder
368db61a2f Remove padding left 2020-02-02 22:11:26 +05:30
PCoder
359a633047 Fix mobile view 2020-02-02 22:00:22 +05:30
PCoder
1630dc195b Reduce header font size 2020-02-02 21:52:48 +05:30
PCoder
f0f8af2367 Change col-sm-8 to col-sm-9 to spread content further on desktop view 2020-02-02 21:39:51 +05:30
PCoder
a5d393ad20 Right align prices 2020-02-02 13:21:01 +05:30
PCoder
70a3620598 Fix getting product from plan_name 2020-02-02 13:09:27 +05:30
PCoder
42a4a77c02 Show product name 2020-02-02 12:42:19 +05:30
PCoder
e094930d6e Show product name in invoices list if product is not a VM 2020-02-02 12:39:19 +05:30
PCoder
c0683d9f53 Show prices to two decimal places 2020-02-02 10:57:14 +05:30
PCoder
fc8c4579fb Show prices to two decimals 2020-02-02 10:41:51 +05:30
PCoder
9f86f44569 Add missing divs 2020-02-02 10:29:33 +05:30
PCoder
ffde015c31 Fix divs 2020-02-02 10:26:13 +05:30
PCoder
c765698a0f Add two columns for pricing 2020-02-02 10:16:45 +05:30
PCoder
44dee625b4 Add some DE translations 2020-02-01 20:24:55 +05:30
PCoder
88a39ef85a Update Changelog for 2.10 2020-02-01 15:23:42 +05:30
PCoder
8fe689d993 Update some DE translations 2020-02-01 15:23:26 +05:30
PCoder
b103cff0a6 Dont round_up discount (is obtained from subtraction) 2020-02-01 13:54:29 +05:30
PCoder
c43afb7c59 Use round_up method 2020-02-01 13:47:29 +05:30
PCoder
2058c660c0 Retrieve only one invoice 2020-02-01 13:15:03 +05:30
PCoder
23b25002ae Take users to invoice url instead of orders
Orders need a VAT alignment fix
2020-02-01 13:00:10 +05:30
PCoder
b645f9894b Open invoice in a new window 2020-02-01 12:25:56 +05:30
PCoder
9d21181073 Get stripe invoice obj correctly 2020-02-01 12:23:47 +05:30
PCoder
d8482c52f9 Get invoice correctly 2020-02-01 12:20:13 +05:30
PCoder
918d2b17e1 Change invoice url 2020-02-01 12:13:56 +05:30
PCoder
e6f00abd71 Do not round 2020-02-01 09:17:24 +05:30
PCoder
838163bd59 Make total price consistent 2020-02-01 09:15:12 +05:30