Commit graph

4679 commits

Author SHA1 Message Date
PCoder
94c7873397 Fix getting line_items 2019-04-13 13:50:09 +02:00
PCoder
8816793803 Add Line item 2019-04-13 13:42:04 +02:00
PCoder
061ef7d036 Fetch invoices whose date is greater than given date only 2019-04-13 12:54:57 +02:00
PCoder
9ee21b9bc3 Allow admin to see invoices 2019-04-13 12:37:37 +02:00
PCoder
3bf4f4dca7 Merge branch 'master' into feature/monthly-invoices 2019-04-13 12:13:38 +02:00
d1d161ac49 Merge branch 'feature/enhance-logging' into 'master'
Feature/enhance logging

See merge request ungleich-public/dynamicweb!693
2019-04-13 12:08:44 +02:00
PCoder
f50af4f2aa Improve log formatting 2019-04-13 12:04:18 +02:00
PCoder
4cf7b93ee2 Create logs directory 2019-04-13 12:02:48 +02:00
PCoder
fefcdb5647 Pass correct key email 2019-04-12 09:10:19 +02:00
PCoder
c232f4c1da Fix error in obtaining customuser for mab 2019-04-12 08:41:05 +02:00
PCoder
6a7b5459ce Allow admin to list invoices 2019-04-12 08:14:52 +02:00
PCoder
b34425d24b Merge branch 'opennebula-5.8.1/misc' 2019-04-11 02:13:23 +02:00
PCoder
f8458f369d Update Changelog 2.5 2019-04-11 02:12:24 +02:00
19e03f218a Merge branch 'opennebula-5.8.1/misc' into 'master'
Revert back to old serializer code

See merge request ungleich-public/dynamicweb!692
2019-04-11 02:05:45 +02:00
PCoder
7f9ada60ee Revert back to old serializer code 2019-04-11 01:58:51 +02:00
3ba37207d1 Merge branch 'opennebula-5.8.1/get-ips' into 'master'
Opennebula 5.8.1/get ips

See merge request ungleich-public/dynamicweb!691
2019-04-11 01:52:06 +02:00
PCoder
5f8cc2199b Change vm_pool infoextended to retrieve VMs in any state except DONE 2019-04-11 01:39:06 +02:00
PCoder
3f75fac158 Make use of the infoextended method where needed 2019-04-11 01:05:34 +02:00
67d39a905d Merge branch 'bugfix/upgrade_to_opennebula_5.8.1' into 'master'
Bugfix/upgrade to opennebula 5.8.1

See merge request ungleich-public/dynamicweb!690
2019-04-09 09:22:50 +02:00
PCoder
a8caa035c0 Set configuration to empty string if not available 2019-04-09 09:12:09 +02:00
PCoder
5b7d1301cf Return cores as int 2019-04-09 08:56:10 +02:00
PCoder
fa018739c9 Change cores to float before multiplication 2019-04-09 07:47:36 +02:00
PCoder
6a5a5ed160 Check template_id attr exists within template 2019-04-09 07:43:06 +02:00
PCoder
85b251d2e6 Check if the template VM serializer object has template attr 2019-04-09 07:40:06 +02:00
PCoder
9f58fdd456 Wrong multiplication to string instead of number 2019-04-09 00:26:59 +02:00
PCoder
316496b969 More fix for vcpu 2019-04-09 00:22:39 +02:00
PCoder
78738e8175 Change cores to SerializerMethodField and obtain it from cpu 2019-04-09 00:16:28 +02:00
PCoder
8c04acaff8 Check if user has stripecustomer attr 2019-04-06 14:07:26 +02:00
PCoder
92b2504f1e Paginate invoice list view by 10 items on each page 2019-04-05 00:09:52 +02:00
PCoder
5987962414 Add VM ID to invoices list 2019-04-04 23:50:49 +02:00
PCoder
3f3f47888d Fix missing codes 2019-04-04 23:20:11 +02:00
PCoder
73f7831744 Attempt to show IP address instead of invoice number 2019-04-04 23:14:24 +02:00
PCoder
6d4af0c193 Fix getting number of mabs of a user 2019-04-04 08:10:16 +02:00
PCoder
a59cd86fee Fix error: get mab using customer and not email 2019-04-04 07:59:38 +02:00
PCoder
8dfee2bd83 Show invoices only if the user's invoice were imported
Else fallback to orders url as before
2019-04-04 07:55:56 +02:00
PCoder
316646465d Use invoice's username and email 2019-04-04 07:46:28 +02:00
PCoder
bb7107fe80 Remove erroneous space before filter param 2019-04-04 07:28:50 +02:00
PCoder
0c4e0f1070 Show period in invoices page 2019-04-04 07:14:12 +02:00
PCoder
8b6619f788 Invoice pdf generation: use invoice number and not id 2019-04-04 06:52:34 +02:00
PCoder
d4d31dced9 Attempt invoice pdf with invoice_id instead of pk 2019-04-04 06:50:13 +02:00
PCoder
f50e5dcaa4 Add ADMIN_EMAIL setting 2019-04-04 06:49:46 +02:00
PCoder
f907837f04 dashboard: Link 'My bills' to invoices 2019-04-04 06:43:47 +02:00
PCoder
e58dcbb44c hosting urls: Change invoices/<pk>/ to invoice/<pk> 2019-04-04 06:41:23 +02:00
PCoder
8f4a02738f Revert back to old price values 2019-04-04 00:15:04 +02:00
PCoder
ef1bdee9a7 Remove more autoformatting 2019-04-04 00:05:45 +02:00
PCoder
13f84a8580 Add missing endif 2019-04-04 00:05:20 +02:00
PCoder
baf62f1924 Simplify showing total price 2019-04-03 23:54:52 +02:00
PCoder
f1a7958f03 Use correct class 2019-04-03 23:34:26 +02:00
PCoder
903fee4db1 Fix more autoformatting issues 2019-04-03 23:31:52 +02:00
PCoder
d00e84a4b6 Fix bug related to proper alignment 2019-04-03 23:24:56 +02:00