amal/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
4452 commits 8 branches 146 tags 314 MiB
Commit graph

4452 commits

This branch
This branch
All branches
Author SHA1 Message Date
PCoder
38d074811a Link HostingBillLineItem to StripePlan 2019-04-20 12:41:30 +02:00
PCoder
c8e35e63f0 Update datacenterlight StripePlan further 
- Add field amount to stripeplan
    - Add field interval to stripeplan
 2019-04-20 12:22:51 +02:00
PCoder
4be098d07a Add stripe_plan_name field to datacenterlight's StripePlan model 2019-04-20 11:55:47 +02:00
PCoder
44ffd042a6 Obtain vm_id from multiple line items 
- Remove empty string from VM_IDs string
- If more than one is present, check all of them are the same
  If same return, the unique value
  Else return none, as we don't handle this case
 2019-04-20 10:00:53 +02:00
PCoder
9f13253475 Add missing braces 2019-04-20 09:49:26 +02:00
PCoder
ecfec9dd21 Handle invoice item in line items also 2019-04-20 08:57:13 +02:00
PCoder
0a22ced19c Update Changelog for 2.5.2 2019-04-20 07:47:27 +02:00
Mondi Ravi
077bd25d4b Merge branch 'feature/6561/fix-fetching-multiple-line-items-same-subscription' into 'master' 
Feature/6561/fix fetching multiple line items same subscription

See merge request ungleich-public/dynamicweb!695
 2019-04-20 07:44:20 +02:00
PCoder
2be59cb0c8 Add missing return value 2019-04-20 07:41:07 +02:00
PCoder
86d70a7f0b Count and log the number of invoices actually imported 2019-04-20 07:31:32 +02:00
PCoder
91695eaee4 Check if multiple line items belong to the same subscription 
We are just fine in this case to create a Monthly hosting bill
Also return None explicitly if MonthlyHostingBill is not created
 2019-04-20 07:23:16 +02:00
PCoder
0969c97eca Add missing string to debug code 2019-04-18 08:13:56 +02:00
PCoder
da3d462505 Update Changelog for 2.5.1 2019-04-17 08:50:29 +02:00
PCoder
4b0ffbbc5d Update Changelog 2019-04-13 21:22:09 +02:00
Mondi Ravi
c9fb034ebd Merge branch 'feature/monthly-invoices' into 'master' 
Feature/monthly invoices

See merge request ungleich-public/dynamicweb!689
 2019-04-13 21:18:36 +02:00
PCoder
c3842a5ed5 Get periods from line items in invoice detail also 2019-04-13 15:43:27 +02:00
PCoder
c5f72792d2 Show period of the first line item as the period of the invoice 2019-04-13 15:35:36 +02:00
PCoder
a3a2016cb4 Attempt period from line_items 2019-04-13 15:24:37 +02:00
PCoder
77669c962c Fix passing correct created value 2019-04-13 15:00:19 +02:00
PCoder
869f74e4e6 Fix typo 2019-04-13 14:43:39 +02:00
PCoder
a4427dd3af Set empty string for description if not available 2019-04-13 14:40:20 +02:00
PCoder
ed6059feaa Set unit amount to 0 if not available in Stripe response 2019-04-13 14:34:42 +02:00
PCoder
4a01036ab5 Attempt correction to gt dict to be passed for created greater than 2019-04-13 14:34:17 +02:00
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
Mondi Ravi
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
Mondi Ravi
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
Mondi Ravi
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
Mondi Ravi
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