|
|
4f25086a63
|
Only generate bill if no overlap
|
2020-03-01 15:47:27 +01:00 |
|
|
|
be2b0a8855
|
Fix a few errors on preview billing rework
Another WIP commit to sync with laptop, do not forget to rebase!
|
2020-03-01 12:23:04 +01:00 |
|
Nico Schottelius
|
4115eed2a8
|
+migration
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
|
2020-02-29 17:58:10 +01:00 |
|
Nico Schottelius
|
5c33bc5c02
|
support creating disks
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
|
2020-02-29 17:57:57 +01:00 |
|
Nico Schottelius
|
6a38e4e0a4
|
add url for importing disk image
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
|
2020-02-29 17:00:13 +01:00 |
|
Nico Schottelius
|
bcbd6f6f83
|
Introduce disk->image relationship
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
|
2020-02-29 16:45:52 +01:00 |
|
|
|
e319d1d151
|
WIP revamped bill logic
|
2020-02-29 09:08:55 +01:00 |
|
|
|
af1265003e
|
Define custom fields and serializer for MatrixServiceProduct
|
2020-02-28 16:26:45 +01:00 |
|
|
|
eaa483e018
|
Commit forgottem uncloud_vm migrations
|
2020-02-28 15:08:45 +01:00 |
|
|
|
181005ad6c
|
Cleanup VMProduct serializer, add name field to VMProduct
|
2020-02-28 15:08:00 +01:00 |
|
|
|
b3bbfafa04
|
Introduce custom ProductViewSet preventing customer from updating
products
|
2020-02-28 14:57:45 +01:00 |
|
|
|
33cc2b2111
|
Add uncloud_storage template app
|
2020-02-28 14:48:01 +01:00 |
|
|
|
3b87a47430
|
Add initial ungleich_service app with MatrixServiceProduct shell
|
2020-02-28 14:46:33 +01:00 |
|
|
|
b5a242f176
|
Merge branch 'master' into fnux-hacks
|
2020-02-28 14:06:29 +01:00 |
|
|
|
1cb1de4876
|
Add (broken) charge method to payment method endpoint
|
2020-02-28 11:10:31 +01:00 |
|
|
|
c0512e54b0
|
Add handle-overdue-bills
|
2020-02-28 10:18:24 +01:00 |
|
|
|
e12575e1de
|
Commit forgotten migration on Orders (Float->Decimal)
|
2020-02-28 09:59:13 +01:00 |
|
|
|
adb57c55ca
|
Revamp generate-bills logic to avoid overlapping
|
2020-02-28 09:58:01 +01:00 |
|
Nico Schottelius
|
89215e47b6
|
phase in mac
|
2020-02-28 09:34:29 +01:00 |
|
|
|
37ed126bc1
|
Create payment on strip charging
|
2020-02-28 09:26:18 +01:00 |
|
|
|
4bed53c8a8
|
Wire charge-negative-balance to payment methods
|
2020-02-28 09:10:36 +01:00 |
|
|
|
059791e2f2
|
Add initial generate-bills and charge-negative-balance uncloud-pay
commands
|
2020-02-28 08:59:32 +01:00 |
|
|
|
ef5e7e8035
|
Quickly wire vm creation to orders
|
2020-02-28 07:26:34 +01:00 |
|
|
|
b1649a6228
|
Remove product resolution from /order endpoint
|
2020-02-28 07:25:56 +01:00 |
|
|
|
0e28e50bac
|
Revert "Commit WIP changes for /order, if needed at any point"
This reverts commit 83794a1781a1b84506100b39a6997882c654b4f3.
|
2020-02-28 07:25:18 +01:00 |
|
|
|
38d3a3a5d3
|
Commit WIP changes for /order, if needed at any point
|
2020-02-28 07:25:18 +01:00 |
|
|
|
809a55e1dd
|
Wire VMProduct creation to order
|
2020-02-28 07:25:18 +01:00 |
|
|
|
b2fe5014d8
|
Make recurring_period an Enum, VMProduct a Product, initial wire for
order
|
2020-02-28 07:25:05 +01:00 |
|
|
|
1dd3324275
|
Wiring initial user balance
|
2020-02-28 07:24:51 +01:00 |
|
|
|
36fcff5149
|
Add initial structure for payment methods
|
2020-02-28 07:24:51 +01:00 |
|
Nico Schottelius
|
288a65f219
|
++update
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
|
2020-02-27 15:29:15 +01:00 |
|
Nico Schottelius
|
bd6008462d
|
add template for uncloud_net
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
|
2020-02-27 15:29:05 +01:00 |
|
Nico Schottelius
|
70a4fe4d90
|
order: serialize all fields
|
2020-02-27 12:45:54 +01:00 |
|
Nico Schottelius
|
e89fb45f9c
|
Merge remote-tracking branch 'origin/fnux-hacks'
|
2020-02-27 12:43:24 +01:00 |
|
|
|
1ff5702ce3
|
Expose Order model
|
2020-02-27 12:42:24 +01:00 |
|
Nico Schottelius
|
b722f30ea5
|
++doc
|
2020-02-27 12:42:09 +01:00 |
|
|
|
f5eadd6ddb
|
Move user view to uncloud_pay
|
2020-02-27 12:38:04 +01:00 |
|
Nico Schottelius
|
1445acb77a
|
Merge remote-tracking branch 'origin/fnux-hacks'
|
2020-02-27 12:36:40 +01:00 |
|
Nico Schottelius
|
7bf4f2adb2
|
--debug
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
|
2020-02-27 12:36:33 +01:00 |
|
Nico Schottelius
|
a9aac39486
|
Create a vmsnapshot + associated order
|
2020-02-27 12:31:20 +01:00 |
|
|
|
225f20c91b
|
Fix typo in payment source model
|
2020-02-27 12:21:52 +01:00 |
|
|
|
b9b605f407
|
Add ADMIN endpoints for bills and payments
|
2020-02-27 12:21:25 +01:00 |
|
|
|
f358acca05
|
Fix payment creation
|
2020-02-27 12:11:13 +01:00 |
|
Nico Schottelius
|
41a5eae879
|
cleanup views/vmsnapshot
|
2020-02-27 12:09:29 +01:00 |
|
Nico Schottelius
|
657dfc541e
|
Merge remote-tracking branch 'origin/fnux-hacks'
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
|
2020-02-27 12:06:02 +01:00 |
|
Nico Schottelius
|
fd648ade65
|
++cleanup
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
|
2020-02-27 12:02:41 +01:00 |
|
|
|
06ab21c577
|
Fix python errors on latest hack commits => make runserver happy again
|
2020-02-27 11:59:28 +01:00 |
|
Nico Schottelius
|
11d629bb51
|
[uncloud_api] completely remove it
|
2020-02-27 11:42:42 +01:00 |
|
Nico Schottelius
|
aa59b05a2d
|
cleanup urls
|
2020-02-27 11:40:36 +01:00 |
|
Nico Schottelius
|
a58a361254
|
Move snapshot to _pay and _vm
|
2020-02-27 11:36:50 +01:00 |
|
Nico Schottelius
|
1ca247148c
|
[uncloud_pay] add "prototype"
|
2020-02-27 11:21:38 +01:00 |
|
Nico Schottelius
|
c0bf4d96c4
|
++ debian/devuan notes
|
2020-02-26 21:13:30 +01:00 |
|
Nico Schottelius
|
df851bee08
|
Merge branch 'master' of code.ungleich.ch:nico/meow-pay
|
2020-02-26 11:16:46 +01:00 |
|
Nico Schottelius
|
0b60765e2b
|
in between commit
|
2020-02-26 11:16:42 +01:00 |
|
Nico Schottelius
|
bd3d21faa9
|
add thoughts for health checking
|
2020-02-25 22:04:04 +01:00 |
|
Nico Schottelius
|
c7ded96658
|
vmhosts, restructure urls, etc.
|
2020-02-25 22:01:55 +01:00 |
|
Nico Schottelius
|
d4b170f813
|
phase in vmhost
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
|
2020-02-25 20:53:12 +01:00 |
|
Nico Schottelius
|
446c13b77c
|
fix/simplify syncvm
|
2020-02-25 19:23:39 +01:00 |
|
Nico Schottelius
|
defe36bfb6
|
Merge branch 'master' of code.ungleich.ch:nico/meow-pay
|
2020-02-25 18:28:19 +01:00 |
|
Nico Schottelius
|
e790063d5a
|
Merge remote-tracking branch 'ahmed/master' into ahmed_merge
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
|
2020-02-25 18:19:55 +01:00 |
|
Nico Schottelius
|
cc3d2f2d42
|
in-between-commit
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
|
2020-02-25 18:15:22 +01:00 |
|
|
|
d658b9635d
|
Replace (vmid,uuid) with id in VM model + Add last_host and graphics in VM model + Fixed retrieve view in uncloud.opennebula
|
2020-02-25 21:03:20 +05:00 |
|
Nico Schottelius
|
7d1c8df84d
|
++ postgres requirement
|
2020-02-25 14:20:03 +01:00 |
|
Nico Schottelius
|
cc9e5905eb
|
update
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
|
2020-02-25 14:12:23 +01:00 |
|
|
|
c7252cde53
|
Introduced local settings in meow-pay/uncloud django app
|
2020-02-25 13:09:54 +05:00 |
|
|
|
a72bc142a6
|
Fixed issues in opennebula/views.py + syncvm now behaves correctly and print users which are not in ldap as per their email address
|
2020-02-25 11:50:49 +05:00 |
|
|
|
739bd72526
|
Migration fixed + opennebula/views.py fixed
|
2020-02-23 23:00:42 +05:00 |
|
Nico Schottelius
|
15b0fe3dc9
|
fix migrations the ugly way
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
|
2020-02-23 18:11:14 +01:00 |
|
Nico Schottelius
|
50df7050d6
|
vmhost: add status field
|
2020-02-23 17:46:30 +01:00 |
|
Nico Schottelius
|
734c406245
|
Extend uncloud VM models
|
2020-02-23 17:43:06 +01:00 |
|
|
|
b3e505d37c
|
migration fix
|
2020-02-23 21:34:22 +05:00 |
|
Nico Schottelius
|
8c6e4eee00
|
-- merge conflict
|
2020-02-23 17:20:28 +01:00 |
|
Nico Schottelius
|
2900844f63
|
Merge remote-tracking branch 'ahmed/master'
|
2020-02-23 17:17:08 +01:00 |
|
Nico Schottelius
|
46921c43ad
|
update ldap, update syncvm
|
2020-02-23 17:11:05 +01:00 |
|
Nico Schottelius
|
edbfb7964e
|
[ldap] bind with admin to get attributes
|
2020-02-23 16:52:30 +01:00 |
|
|
|
e4f2f446f5
|
Merge branch 'nico/meow-pay-master' into HEAD
|
2020-02-23 20:25:35 +05:00 |
|
Nico Schottelius
|
e2b5b5d102
|
opennebula -> router
|
2020-02-23 15:33:26 +01:00 |
|
Nico Schottelius
|
cee45b5227
|
-typo
|
2020-02-23 15:09:58 +01:00 |
|
Nico Schottelius
|
94633d6cc8
|
move uncloud a layer up
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
|
2020-02-23 14:07:37 +01:00 |
|
