PCoder
a002711885
Update system dependency on libldap24 for archlinux
2022-02-22 11:00:53 +05:30
Nico Schottelius
ee3b20227e
++helm ideas
2022-02-15 09:39:25 +01:00
Nico Schottelius
a8001e36b0
Add index, allowed hosts
2022-01-30 14:47:01 +01:00
Nico Schottelius
ba9bf94d8e
Add support for onetimeprice and productordering
2022-01-30 13:00:58 +01:00
Nico Schottelius
f08269640d
cleanup commit, introduction of onetimeprice
2022-01-30 10:11:22 +01:00
Nico Schottelius
686d2c2b1e
Switch to FormView for displaying the order
2022-01-16 17:13:59 +01:00
Nico Schottelius
e910556952
Implement first part of the form
2022-01-16 00:31:59 +01:00
Nico Schottelius
1e69722f4b
in between commit: html bug
...
- "range" is great in theory, but does not show actual nummber
- "number" does not allow float
Need to go back to text
2022-01-15 23:57:55 +01:00
Nico Schottelius
8952ef0b3a
Improving on 3.0.0 / adding productorder link based on slug
2022-01-15 00:26:35 +01:00
Nico Schottelius
d3b6d28ae6
Add ProductOrderView
2022-01-14 22:23:39 +01:00
Nico Schottelius
69e564cba6
v3: seed timeframes, begin order definition
2022-01-02 21:01:03 +01:00
Nico Schottelius
42e200b564
v3: link product to resource
2022-01-02 19:34:55 +01:00
Nico Schottelius
27462a4d0d
v3: start app
2022-01-02 18:29:35 +01:00
Nico Schottelius
e1c2e22e64
fresh start v3
...
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
2022-01-02 17:13:01 +01:00
Nico Schottelius
c2c921663f
++ uncloud_v4 test
2022-01-02 13:34:16 +01:00
Nico Schottelius
e726795495
++ stuff
2022-01-01 23:35:22 +01:00
Nico Schottelius
5b170ed521
cleanup and get login working again
2021-12-26 21:19:03 +01:00
Nico Schottelius
33d56bf083
Cleanup: get uncloud running again
2021-12-26 20:36:31 +01:00
Nico Schottelius
bf81ded5bf
k8s cleanup
2021-12-25 22:27:25 +01:00
Nico Schottelius
2599df6408
k8s: phase in first version
...
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
2021-12-19 23:18:50 +01:00
Nico Schottelius
924484198e
Add nginx to our image
2021-12-19 22:56:34 +01:00
Nico Schottelius
35773a2f3b
add .dockerignore
2021-12-18 22:13:16 +01:00
Nico Schottelius
7782aeb470
Merge branch 'master' of code.ungleich.ch:uncloud/uncloud
2021-12-18 21:50:27 +01:00
Nico Schottelius
da7010369d
.env -> .env-sample and do not add .env to git
2021-12-18 21:50:00 +01:00
Nico Schottelius
d57169343e
Fix docker build
2021-12-18 21:48:24 +01:00
Nico Schottelius
82742b8195
uncloud: prepare update to Django 4
2021-12-11 10:06:59 +01:00
Nico Schottelius
f0b3f7e52b
Add script for fixing ldap / newer openssl versions
2021-12-11 10:05:21 +01:00
Nico Schottelius
00d50a368a
Merge branch 'master' of code.ungleich.ch:uncloud/uncloud
2021-12-11 10:00:20 +01:00
Nico Schottelius
e6fbe3f7be
oca is onl named oca, not python-oca
2021-12-11 09:59:06 +01:00
Nico Schottelius
07d7f5e4ae
Add build script
2021-12-05 11:20:01 +01:00
Nico Schottelius
6ef3c0d016
Fix Debian Dockerfile: required libsasl2-dev
2021-12-05 11:13:21 +01:00
Nico Schottelius
174479f6d7
Add 2nd dockerfile for debian based systems
...
To move forward while ldap doesn't build
2021-12-05 11:11:34 +01:00
Nico Schottelius
df7b36c623
Update requirements.txt for newer python versions
2021-12-05 10:09:30 +01:00
Nico Schottelius
71fce1242e
Add initial Dockerfile
2021-12-05 10:07:14 +01:00
5f4b10cb82
NextCloud Integration
2021-09-10 09:58:42 +02:00
02ad7a9441
LDAP Integration
2021-08-24 14:25:28 +02:00
8ca5b2d104
Add the Pricing Page and update the pricing model
2021-08-17 19:05:44 +02:00
eb86c7e189
Update index.html
2021-08-16 16:50:20 +02:00
2e05ebbf67
Test Full cycle and fix some issues
2021-08-16 10:46:59 +02:00
1aeb757e22
Task #9530 bills that include vat per month in html or pdf format
2021-08-13 10:06:13 +02:00
1c3d3efb3a
List all the credit cards and the ability to add more cards
2021-08-12 12:28:19 +02:00
7986b825a7
Task #9611 : Add support for writing DNS entries matrix.ungleich.cloud and matrix.0co2.cloud
2021-08-09 09:43:11 +02:00
5bb0c4cdda
Add the invoice template
2021-08-04 12:03:55 +02:00
030a0cd501
Implement the Success page of the order
2021-08-02 11:24:19 +02:00
5564400ef8
Refactor the Payment Model and Handle Order Confirmation Page
2021-07-31 10:26:15 +02:00
94dac8110e
Task #9532 Handle the UI of the login and Signup pages
...
Task #9535 Handle the UI of the Checkout Page
2021-07-30 10:13:50 +02:00
4a0987766d
Change backgroud image
2021-07-30 10:13:38 +02:00
20ce755303
Task #9534 Handle the UI of the Home Screen
2021-07-30 10:13:25 +02:00
c4f7913cb1
Task #9553 Handle Environment Variables
2021-07-30 10:13:11 +02:00
8287e73f6b
Merge branch 'master' into 'master'
...
- Implement a complete cycle for buying a Matrix Chat Host
See merge request uncloud/uncloud!11
2021-07-19 16:36:11 +02:00
b7aa1c6971
- Added PricingPlan Model
...
- Implement a complete cycle for buying a Matrix Chat Host
- Refactor the Payement cycle and stripe related methods
2021-07-19 16:36:10 +02:00
Nico Schottelius
e205d8d07c
Merge branch 'master' of code.ungleich.ch:uncloud/uncloud
2021-06-20 11:58:23 +02:00
Nico Schottelius
a463bcf7bd
Late commits
2021-06-20 11:51:27 +02:00
Nico Schottelius
d872357dd1
Fix login -> move to bootstrap5
2021-05-25 20:22:18 +02:00
Nico Schottelius
485f08e25c
Cleanup views
2021-05-25 19:55:33 +02:00
Nico Schottelius
745abc48ef
Add balance if user is logged in
2021-05-25 19:55:13 +02:00
Nico Schottelius
49f52fd41d
[bootstrap] update to bootstrap5
2021-02-13 18:50:28 +01:00
Nico Schottelius
c8ce7dbb40
do not touch local_settings.py on deploy
2021-01-17 15:54:16 +01:00
Nico Schottelius
a920887100
++bridge update
2021-01-17 15:53:30 +01:00
Nico Schottelius
6b9b15e663
Add deploy.sh
2021-01-17 15:47:37 +01:00
Nico Schottelius
48ce21f833
integrate bootstrap
2021-01-01 13:25:52 +01:00
Nico Schottelius
6c15d2086e
implement balance getting
2021-01-01 12:41:54 +01:00
Nico Schottelius
1b06d8ee03
[credit card] implement payment
2020-12-29 01:43:33 +01:00
Nico Schottelius
e225bf1cc0
implement credit card listing
2020-12-28 23:35:34 +01:00
Nico Schottelius
e2c4a19049
Less verbose
2020-12-26 14:48:10 +01:00
Nico Schottelius
74749bf07c
fix templating
2020-12-26 14:45:28 +01:00
Nico Schottelius
93e5d39c7b
moving vpn to direct configuration
2020-12-26 14:42:53 +01:00
Nico Schottelius
18d4c99571
[doc] workers need access to the database
2020-12-26 13:42:20 +01:00
Nico Schottelius
e51edab2f5
cleanup/in between commit
2020-12-26 11:22:51 +01:00
Nico Schottelius
f7c68b5ca5
Rename template
2020-12-25 17:33:01 +01:00
Nico Schottelius
6efedcb381
hackish way of registering works
2020-12-25 17:29:17 +01:00
Nico Schottelius
df4c0c3060
in between commit to update for cc tests
2020-12-25 10:31:42 +01:00
Nico Schottelius
8dd4b712fb
[views] add index view for uncloud
2020-12-25 10:11:13 +01:00
Nico Schottelius
50a395c8ec
sort requirements.txt
2020-12-25 10:10:57 +01:00
Nico Schottelius
663d72269a
[wireguard] verify key length
2020-12-25 10:08:34 +01:00
Nico Schottelius
a0fbe2d6ed
[wireguard] add unique constrain for keys in pool
2020-12-24 17:26:53 +01:00
Nico Schottelius
858aabb5ba
Return value from validation
2020-12-20 22:03:43 +01:00
Nico Schottelius
ece2bca831
add new /sizes endpoint
2020-12-20 21:45:47 +01:00
Nico Schottelius
cdab685269
[vpn/doc] update docs
2020-12-20 19:37:12 +01:00
Nico Schottelius
689375a2fe
Fix the config task
2020-12-20 19:17:03 +01:00
Nico Schottelius
8f83679c48
test cleaning tasks in a task fails:
...
[2020-12-20 18:01:50,264: WARNING/ForkPoolWorker-7] Pruning UncloudTask object (571ffc76-8b40-4cb6-9658-87030834bc6c)...
[2020-12-20 18:01:50,265: ERROR/ForkPoolWorker-7] Task uncloud.tasks.cleanup_tasks[f9fb1480-f122-41c9-bec1-3d6d0f92a22e] raised unexpected: RuntimeError('Never call result.get() within a task!\nSee http://docs.celeryq.org/en/latest/userguide/tasks.html#task-synchronous-subtasks\n ')
Traceback (most recent call last):
File "/home/nico/vcs/uncloud/venv/lib/python3.8/site-packages/celery/app/trace.py", line 405, in trace_task
R = retval = fun(*args, **kwargs)
File "/home/nico/vcs/uncloud/venv/lib/python3.8/site-packages/celery/app/trace.py", line 697, in __protected_call__
return self.run(*args, **kwargs)
File "/home/nico/vcs/uncloud/uncloud/tasks.py", line 13, in cleanup_tasks
print(res.get())
File "/home/nico/vcs/uncloud/venv/lib/python3.8/site-packages/celery/result.py", line 209, in get
assert_will_not_block()
File "/home/nico/vcs/uncloud/venv/lib/python3.8/site-packages/celery/result.py", line 37, in assert_will_not_block
raise RuntimeError(E_WOULDBLOCK)
RuntimeError: Never call result.get() within a task!
See http://docs.celeryq.org/en/latest/userguide/tasks.html#task-synchronous-subtasks
2020-12-20 19:01:37 +01:00
Nico Schottelius
5e870f04b1
++celery/tasks
2020-12-20 18:36:46 +01:00
Nico Schottelius
63191c0a88
Remove $ that is not needed in python...
2020-12-20 13:24:55 +01:00
Nico Schottelius
03c0b34446
++config vpn server
2020-12-20 13:00:36 +01:00
Nico Schottelius
1922a0d92d
++routing tests
2020-12-20 12:54:02 +01:00
Nico Schottelius
2e6c72c093
wireguard/celery fixes
2020-12-20 12:45:36 +01:00
Nico Schottelius
b3626369a2
--syntax error
2020-12-20 12:24:35 +01:00
Nico Schottelius
179baee96d
fix celery task routes syntax error
2020-12-20 12:22:50 +01:00
Nico Schottelius
054886fd9c
begin phasing in config of vpn via cdist
2020-12-20 12:20:54 +01:00
Nico Schottelius
e2b36c8bca
celery test
2020-12-13 19:50:36 +01:00
Nico Schottelius
372fe800cd
fill in template values for settings
2020-12-13 19:06:22 +01:00
Nico Schottelius
16f3adef93
[doc] ++requirements alpine
2020-12-13 18:56:47 +01:00
Nico Schottelius
2d62388eb1
phasing in celery
...
for configuring the vpn server
2020-12-13 18:34:43 +01:00
Nico Schottelius
aec79cba74
[vpn] include vpn server public key
2020-12-13 18:05:48 +01:00
Nico Schottelius
cd19c47fdb
[vpn] implement creating vpns
2020-12-13 17:59:35 +01:00
Nico Schottelius
cf948b03a8
++vpn network
2020-12-13 13:28:43 +01:00
Nico Schottelius
5716cae900
[vpn] add selector for size
2020-12-13 11:43:49 +01:00
Nico Schottelius
10d5a72c5a
[refactor] cleaning up uncloud_net for Wireguardvpn
2020-12-13 11:38:41 +01:00
Nico Schottelius
074cffcbd7
Add selection for vpnnetworkreservations
2020-12-09 21:20:33 +01:00
Nico Schottelius
7f32d05cd4
begin phasing in vpn support [poc]
2020-12-09 20:22:33 +01:00
Nico Schottelius
0fd5ac18cd
do not import pay->auth
...
Try to keep common things in the "uncloud" module
2020-12-06 11:53:37 +01:00
Nico Schottelius
ad0c2f1e9d
Merge branch 'master' of code.ungleich.ch:uncloud/uncloud
2020-11-17 11:47:53 +01:00
Nico Schottelius
0b1c2cc168
Cleanup code so that *most* test work again
...
Still need to solve the downgrade test
2020-11-15 15:43:11 +01:00
4845ab1e39
Create account using api
...
Registration and change_email is backed by ldap
2020-11-14 14:50:43 +05:00
Nico Schottelius
ecc9e6f734
[reverseDNS] add basic logic
2020-10-25 22:43:34 +01:00
Nico Schottelius
20c7c86703
restructure to move uncloudnetwork into core
2020-10-25 21:00:30 +01:00
Nico Schottelius
8959bc6ad5
various updates
2020-10-25 13:52:36 +01:00
Nico Schottelius
0cd8a3a787
++update ungleich_provider
2020-10-11 22:36:01 +02:00
Nico Schottelius
bbc7625550
phase in configuration - move address to base
2020-10-11 22:32:08 +02:00
Nico Schottelius
fe4e200dc0
Begin phasing in the uncloudprovider
2020-10-11 17:45:25 +02:00
Nico Schottelius
e03cdf214a
update VAT importer
2020-10-08 19:54:04 +02:00
Nico Schottelius
50fd9e1f37
++work
2020-10-07 00:54:56 +02:00
Nico Schottelius
2e74661702
Fix first test case / billing
2020-10-06 23:14:32 +02:00
Nico Schottelius
c26ff253de
One step furter to allow saving of orders w/o explicit recurringperiod
2020-10-06 19:21:37 +02:00
Nico Schottelius
9623a77907
Updating for products/recurring periods
2020-10-06 18:53:13 +02:00
Nico Schottelius
c435639241
gitignore some tests
2020-10-06 16:13:03 +02:00
Nico Schottelius
992c7c551e
Make recurring period a database model
...
- For easier handling (foreignkeys, many2many)
- For higher flexibility (users can define their own periods)
2020-10-06 15:46:22 +02:00
Nico Schottelius
58883765d7
[tests] back to 5 working tests!
2020-09-28 23:16:17 +02:00
Nico Schottelius
8d8c4d660c
Can order a generic product now
2020-09-28 21:59:35 +02:00
Nico Schottelius
c32499199a
Add JSON support for product description
2020-09-28 21:34:24 +02:00
Nico Schottelius
c6bacab35a
Phasing out Product model
...
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
2020-09-28 20:59:08 +02:00
Nico Schottelius
1aead50170
remove big mistake: orders from product
...
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
2020-09-28 20:44:50 +02:00
Nico Schottelius
d8a7964fed
Continue to refactor for shifting logic into the order
2020-09-09 00:35:55 +02:00
Nico Schottelius
077c665c53
++update
2020-09-03 17:16:18 +02:00
Nico Schottelius
f7274fe967
Adding logic to order to find out whether its closed
2020-09-03 16:38:51 +02:00
Nico Schottelius
1c7d81762d
begin splitting bill record creation function
2020-09-02 16:02:28 +02:00
Nico Schottelius
18f9a3848a
Implement ending/replacing date logic
2020-08-27 22:00:54 +02:00
Nico Schottelius
9211894b23
implement basic logic for updating a recurring order
...
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
2020-08-27 14:45:37 +02:00
Nico Schottelius
b8b15704a3
begin testing bill sums
...
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
2020-08-25 21:53:25 +02:00
Nico Schottelius
ab412cb877
Test that creating products w/o correct billing address fails
2020-08-25 21:31:12 +02:00
Nico Schottelius
7b83efe995
[pay] make sample products more modular
2020-08-25 21:11:28 +02:00
Nico Schottelius
4d5ca58b2a
[tests] cleanup old tests
...
Finally manage.py tests runs through
2020-08-25 20:40:33 +02:00
Nico Schottelius
f693dd3d18
++notes
2020-08-09 21:10:43 +02:00
Nico Schottelius
5ceaaf7c90
bill cleanup, note next step
2020-08-09 14:52:42 +02:00
Nico Schottelius
2b29e300dd
[product] migrate orders to ManyToManyField
2020-08-09 14:44:29 +02:00
Nico Schottelius
8df1d8dc7c
begin refactor product to user orders instead of single order
...
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
2020-08-09 14:38:10 +02:00
Nico Schottelius
ef02cb61fd
Refine tests for bills, multiple bills
2020-08-09 12:34:25 +02:00
Nico Schottelius
70c450afc8
fix tests for Product()
...
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
2020-08-09 11:44:22 +02:00
Nico Schottelius
0dd1093812
add sample products and improve testing for Product
2020-08-09 11:02:45 +02:00
Nico Schottelius
6a928a2b2a
Fix tests for billing
2020-08-09 10:18:15 +02:00
Nico Schottelius
89519e48a9
Various updates
2020-08-09 10:14:49 +02:00
Nico Schottelius
e169b8c1d1
Implement the whole billing logic
...
The major part has been written!
2020-08-09 10:14:31 +02:00
Nico Schottelius
d7c0c40926
first bill generation works
...
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
2020-08-09 00:37:27 +02:00
Nico Schottelius
fd39526350
Improve billing address testing
2020-08-08 23:02:24 +02:00
Nico Schottelius
78d1de9031
Remove orderrecord
...
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
2020-08-08 22:37:00 +02:00
Nico Schottelius
db1a69561b
pass first 2 bill tests
...
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
2020-08-08 22:31:43 +02:00
Nico Schottelius
9bf0a99f6a
uncloud pay cleanups
...
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
2020-08-08 22:20:49 +02:00
Nico Schottelius
c9be8cc50b
orders only have 1 price
...
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
2020-08-08 21:54:44 +02:00
Nico Schottelius
8da6a1e19c
update models/new django
...
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
2020-08-08 21:54:07 +02:00
Nico Schottelius
ff8fdb76b1
++ test
2020-08-08 19:30:25 +02:00
Nico Schottelius
9b00ef11fb
++stuff
2020-08-04 18:56:36 +02:00
Nico Schottelius
d2bd6ba200
[test] update for uncloud_net
2020-08-04 12:41:15 +02:00
Nico Schottelius
165dacb7bf
update to use new JSONFIELD
...
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
2020-08-04 12:01:44 +02:00
Nico Schottelius
ee79877a27
+migrations
...
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
2020-08-04 11:40:34 +02:00
Nico Schottelius
2ce667e8c7
model changes
...
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
2020-08-04 11:26:42 +02:00
Nico Schottelius
e563780142
Add some sample VMs
2020-08-02 00:55:07 +02:00
Nico Schottelius
66233a1ce5
[doc] more cleanup
2020-08-01 23:44:10 +02:00
Nico Schottelius
9d5d8657cb
[doc] Move install and co. into the main documentation
2020-08-01 23:42:36 +02:00
Nico Schottelius
a091079677
in between commit
...
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
2020-08-01 23:20:14 +02:00
Nico Schottelius
c9a941e290
[vm] add disks inlined to VMs
2020-08-01 18:48:51 +02:00
Nico Schottelius
f7b14bf507
cleanup migrations
...
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
2020-08-01 18:38:38 +02:00
Nico Schottelius
ed40b21d16
[doc] begin describe replacing orders
2020-08-01 18:31:27 +02:00
Nico Schottelius
880e4d046b
[vm] cleanup
2020-08-01 18:30:40 +02:00
Nico Schottelius
cbd5a08ae7
make price a real property of order
...
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
2020-08-01 18:27:12 +02:00
Nico Schottelius
64780bfc6c
[models] update / doc
2020-08-01 16:29:24 +02:00
Nico Schottelius
9c1b4ab275
[db] add migration for vmdiskproduct
2020-08-01 16:29:11 +02:00
Nico Schottelius
2771a7518a
[doc] cleanup
2020-08-01 16:28:19 +02:00
Nico Schottelius
9b3493a661
[doc] integrate vpn into manual
2020-08-01 16:24:21 +02:00
Nico Schottelius
932ac06cea
begin doc in views
2020-08-01 14:05:56 +02:00
Nico Schottelius
05a897db70
+whitespace
2020-08-01 14:05:50 +02:00
Nico Schottelius
011096f152
[bootstrap user] remove syntax errors
2020-08-01 14:05:36 +02:00
Nico Schottelius
55ba61e36b
[urls] remove obsolete comment
2020-08-01 14:05:26 +02:00
Nico Schottelius
1265e23750
[doc] add bootstrap
2020-08-01 14:05:12 +02:00
Nico Schottelius
bc0c77a393
add sql migration for opennebula
...
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
2020-08-01 14:03:22 +02:00
Nico Schottelius
bdba3bffe2
[opennebula] turn VM into a product
2020-08-01 14:02:54 +02:00
Nico Schottelius
3745a0e2b1
[doc] ignore generated files
2020-08-01 13:24:51 +02:00
Nico Schottelius
7ce28b0b60
Begin new uncloud manual
2020-08-01 13:07:44 +02:00
Nico Schottelius
662e706eab
begin to fix bill view
2020-06-21 23:54:57 +02:00
Nico Schottelius
11de455d23
begin to add pdf view of bill into admin
2020-06-21 23:46:26 +02:00
Nico Schottelius
126d9da764
Use quantity instead of usage_count
2020-06-21 16:42:55 +02:00
Nico Schottelius
8a17ee6de5
Include BillRecords in the admin
2020-06-21 16:08:00 +02:00
Nico Schottelius
721472b416
Fix constraint to active = True
2020-06-21 14:45:05 +02:00
Nico Schottelius
424ceafbb8
Enhance make-admin to allow making superuser
2020-06-21 14:44:55 +02:00
Nico Schottelius
1e68539ed8
remove uuid primary key
...
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
2020-06-21 14:35:12 +02:00
Nico Schottelius
3ef19610f3
add script to reset migrations
...
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
2020-06-21 14:34:48 +02:00
Nico Schottelius
8decfe1b16
Phase in admin, remove uuid from bills
2020-06-21 13:46:54 +02:00
Nico Schottelius
662845128f
++ billing details
2020-06-20 23:47:26 +02:00
Nico Schottelius
95011c2058
Add readme for billing
2020-06-20 22:15:15 +02:00
Nico Schottelius
a3f3ca8cf9
in the middle of restructering
2020-05-24 13:45:03 +02:00
Nico Schottelius
5d1eaaf0af
Add new models backup - before major refactoring
2020-05-24 12:46:11 +02:00
Nico Schottelius
bcd141730d
convert recurring period into an integerfield
...
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
2020-05-23 23:38:34 +02:00
Nico Schottelius
15535433e8
begin to change to day based differences
...
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
2020-05-23 23:32:45 +02:00
Nico Schottelius
18b862c2e1
fix syntax errors
2020-05-23 23:08:59 +02:00
Nico Schottelius
b8652c921e
Merge branch 'master' of code.ungleich.ch:uncloud/uncloud
2020-05-23 21:33:04 +02:00
Nico Schottelius
8bbcc5df5f
++dev
2020-05-23 21:32:56 +02:00
Nico Schottelius
0202f80a37
in between pay commit
2020-05-23 21:23:06 +02:00
Nico Schottelius
caedf874e4
[vpn] add tests
2020-05-20 21:00:08 +02:00
Nico Schottelius
f17f9060b0
[config] add path to chrome
2020-05-17 23:34:13 +02:00
Nico Schottelius
04fac71a85
Merge branch 'master' of code.ungleich.ch:uncloud/uncloud
...
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
2020-05-17 22:38:49 +02:00
Nico Schottelius
ef76304bae
+ old stuff
2020-05-17 22:35:25 +02:00
Nico Schottelius
ec447e0dc4
Add support for primary address in user.
...
Closes #35
Fixes #35
2020-05-10 21:47:44 +02:00
Nico Schottelius
ca2065a94d
gitignore for local settings
2020-05-10 14:37:20 +02:00
Nico Schottelius
dc7a465a8c
Fix exception if first order does not have billing address
2020-05-10 14:22:09 +02:00
65440ab2ef
Add depends_on relation on orders
2020-05-08 16:47:32 +02:00
d794b24c86
Make VM order-able again
2020-05-08 16:31:33 +02:00
df059fb00d
Speed-up CI with pre-built image, add resources directory
2020-05-08 12:15:40 +02:00
67af7b5465
Add missing billnico migration
2020-05-08 11:43:01 +02:00
beb5bd7ee4
Fix existing uncloud_pay tests
2020-05-08 11:33:59 +02:00
9574d69f4c
Move VAT rate CSV out of archive/
2020-05-08 11:23:09 +02:00
74e2168529
Fix floating-point issue on bills ( Fix #31 )
2020-05-08 11:13:11 +02:00
444d6ded28
Move AMOUNT_* and COUNTRIES to uncloud_pay/init.py
2020-05-08 10:56:03 +02:00
cbba1f4169
Add admin bill generation endpoint
2020-05-08 10:42:04 +02:00
d47c94ba84
Implement non-destructive order updates
2020-05-08 10:07:44 +02:00
89e853b490
Add order termination logic
2020-05-08 09:31:46 +02:00
Nico Schottelius
1b97fc8fc7
Merge branch 'master' of code.ungleich.ch:uncloud/uncloud
2020-05-07 20:22:49 +02:00
Nico Schottelius
41a2f18453
In between commit
2020-05-07 20:22:42 +02:00
a086d46136
Allow bill download from admin bill endpoint
2020-05-07 15:45:04 +02:00
ae2bad5754
Generate bill PDFs from /my/bill
2020-05-07 15:38:49 +02:00
3874165189
Fix bill generation
2020-05-07 14:24:04 +02:00
56d98cbb55
Implement Orders/Bills permissions, unpaid bill views
2020-05-07 13:12:38 +02:00
718abab9d2
Add make-admin command to uncloud_auth
2020-05-07 12:45:06 +02:00
268e08c4db
Adapt README for SQLite
2020-05-07 12:31:59 +02:00
b8ac99acb6
On more small commit to fix README formatting
2020-05-07 12:25:05 +02:00
221d98af4b
Inline CI badges
2020-05-07 12:24:17 +02:00
ebd4e6fa1b
Add fancy CI badges to README
2020-05-07 12:23:17 +02:00
b512d42058
Add devel environment setup instructions
2020-05-07 12:21:49 +02:00
1245c191c0
Adapt CI to new structure
2020-05-07 12:13:48 +02:00
95d43f002f
Move django-based uncloud to top-level
2020-05-07 12:12:35 +02:00
0560063326
Add description field to Orders
2020-05-07 12:08:18 +02:00
db3c29d17e
Fix admin order creation
2020-05-07 12:05:26 +02:00
892b2b6f13
Revert "Disable vat validator to get project back running"
...
This reverts commit 1cf20a2cb6 .
2020-05-07 12:03:28 +02:00
Nico Schottelius
aa8ade4730
Add readme about identifiers
2020-05-05 16:01:47 +02:00
Nico Schottelius
594f1a9b69
+hacks
2020-05-05 15:19:50 +02:00
Nico Schottelius
e3b28354fe
++notes
2020-05-05 15:19:04 +02:00
Nico Schottelius
99a18232aa
VMs now properly set their pricing
2020-05-02 23:44:20 +02:00
Nico Schottelius
c835c874d5
[BREAKING] make Order a stand-alone version
...
I think that while the idea of an Orderrecord is good, we might get
away / have a simpler implementation if we only use orders and
reference them where needed.
I saved the previous Order model for easy rollback, if my assumption
is wrong.
2020-05-02 22:48:05 +02:00
Nico Schottelius
028f1ebe6e
Entry point /beta/vm/ works for creating VM + order
2020-05-02 22:03:34 +02:00
Nico Schottelius
9ef5309b91
+db migrations for pay/vm
...
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
2020-05-02 21:21:29 +02:00
Nico Schottelius
4097c2ce13
BillingAddress: make mget_preferred_address a classmethod
2020-05-02 21:20:14 +02:00
Nico Schottelius
736fe27493
Add issues.org as a shortcut for registering issues
2020-05-02 20:45:19 +02:00
Nico Schottelius
7d708cfbb6
Fix empty vat number bug
2020-05-02 20:42:09 +02:00
Nico Schottelius
927fb20671
Versionise API and cleanups
2020-05-02 20:31:36 +02:00
Nico Schottelius
eea654a9f8
Phase in new beta/vm view for creating vms + orders + bills
2020-05-02 19:15:48 +02:00
Nico Schottelius
2cda6441f4
Refactor secret / local settings handling
2020-05-02 00:16:29 +02:00
Nico Schottelius
62d9ccbbef
[vpn] begin to introduce save() method
...
The save() and delete() method will create/manage the orders
2020-04-27 18:25:44 +02:00
Nico Schottelius
1cf20a2cb6
Disable vat validator to get project back running
2020-04-27 18:25:27 +02:00
94932edebe
Add user admin endpoint, import from LDAP
2020-04-18 15:11:52 +02:00
a15952862a
Make VM order-able again
2020-04-18 15:11:46 +02:00
cec4263621
Merge branch 'vat-handling' into 'master'
...
VAT support handling
See merge request uncloud/uncloud!7
2020-04-18 11:57:16 +02:00
f61b91dab2
Catch any exception from VIES VAT check
2020-04-18 11:51:13 +02:00
b3afad5d5d
Compute VAT rate and amount on bill generation
2020-04-18 11:43:55 +02:00
3a03717b12
Split bills between orders of the same billing address
2020-04-18 11:21:11 +02:00
db9ff5d18b
Display allr elevant values on Bill serializer/page
2020-04-18 10:43:23 +02:00
a49fe6ff51
Properly wire billing addresses to uncloud_service
2020-04-18 10:40:11 +02:00
dd0c1cba94
Remove legacy ungleich_service migrations
2020-04-18 10:39:57 +02:00
c0e12884e1
Sync migrations - again!
2020-04-18 09:38:12 +02:00
9bbe3b3b56
Adapt uncloud_pay tests to support billing addresses
2020-04-18 09:26:34 +02:00
e6eba7542b
Minor fixes, DB sync after rebase
2020-04-18 09:26:21 +02:00
0522927c50
Start wiring BillingAddresses to bills & orders
2020-04-18 09:13:52 +02:00
3fa1d5753e
Minimal VAT validation on billing address registration
2020-04-18 09:13:04 +02:00
c6ca94800e
Add BillingAddress structure to users
2020-04-18 09:13:04 +02:00
ad187c02da
Import VAT rates "importer" from dynamicweb
2020-04-18 09:13:04 +02:00
7afb3f8793
Merge branch 'uncloud-product-activation' into 'master'
...
Handle product activation on payment
See merge request uncloud/uncloud!6
2020-04-18 09:08:32 +02:00
86775af4c8
Fix product activation tests after rebase
2020-04-18 09:02:33 +02:00
83d2cd465d
Sync migrations after rebase
2020-04-18 08:42:50 +02:00
b6c976b722
Commit autp-generated migrations (missing from master?)
2020-04-18 08:36:41 +02:00
d1e993140c
Add simple product activation test
2020-04-18 08:36:41 +02:00
c57780fb4d
Add naive GenericServiceProduct
2020-04-18 08:36:41 +02:00
83a0ca0e4e
Adapt billing tests to product activation structure
2020-04-18 08:35:22 +02:00
5d5bf486b5
Initial product activation implementation
2020-04-18 08:34:41 +02:00
839bd5f8a9
Merge branch 'vm-ordering-disk' into 'master'
...
Wire disk images to VM creation/ordering, make Order records transparents
See merge request uncloud/uncloud!4
2020-04-18 08:32:07 +02:00
aa0702faba
Add chromium to path on CI environment
2020-04-13 12:06:03 +02:00
9a57153c4e
Commit missing migrations
2020-04-13 12:02:49 +02:00
f5897ed4b1
Adapt recurring price of VM and Matrix to new scheme
2020-04-13 12:00:59 +02:00
14f59430bb
Restore Order.add_record, used by uncloud_pay tests
2020-04-13 11:54:41 +02:00
05f8f1f6c0
Fix dependency issue in CI job
2020-04-13 11:40:19 +02:00
1a58508f8b
Rename ungleich_service into uncloud_service
2020-04-13 11:39:49 +02:00
e67bd03997
Migration fix after rebase
2020-04-13 11:19:18 +02:00
a4cc4304f9
Adapt managed service to create VMDiskProduct
2020-04-13 11:19:18 +02:00
d3b7470294
Wire disk images to VM creation/ordering
2020-04-13 11:19:18 +02:00
a7e9f3c09d
Move Order.add_record to save hook in abstract Product
2020-04-13 10:42:44 +02:00
Nico Schottelius
ff133e81b7
[vpn] update to show reservations, create wireguard config
2020-04-12 22:55:22 +02:00
Nico Schottelius
85b4d70592
[vpn] make a vpn creat-able!
...
[15:40] line:~% http -a nicoschottelius:$(pass ungleich.ch/nico.schottelius@ungleich.ch ) http://localhost:8000/net/vpn/ network_size=48 wireguard_public_key=$(wg genkey | wg pubkey)
HTTP/1.1 201 Created
Allow: GET, POST, HEAD, OPTIONS
Content-Length: 206
Content-Type: application/json
Date: Sun, 12 Apr 2020 13:40:26 GMT
Server: WSGIServer/0.2 CPython/3.7.3
Vary: Accept
X-Content-Type-Options: nosniff
X-Frame-Options: DENY
{
"extra_data": null,
"network": "2a0a:e5c1:203::",
"order": null,
"owner": 30,
"status": "PENDING",
"uuid": "8f977a8f-e06a-4346-94ae-8f525df58b7b",
"wireguard_public_key": "JvCuUTZHm9unasJkGsLKN0Bf/hu6ZSIv7dnIGPyJ6xA="
}
2020-04-12 15:40:39 +02:00
Nico Schottelius
b55254b9b1
Merge branch 'master' of code.ungleich.ch:uncloud/uncloud
2020-04-12 14:28:39 +02:00
Nico Schottelius
bc033a9087
Merge branch 'master' of code.ungleich.ch:uncloud/uncloud
2020-04-12 11:36:51 +02:00
Nico Schottelius
05f38d157e
add a discounter function to the product model
2020-04-12 11:35:37 +02:00
Nico Schottelius
bab59b1879
Merge branch 'master' of code.ungleich.ch:uncloud/uncloud
2020-04-11 21:37:50 +02:00
Nico Schottelius
50b8b7a5f6
in-between commit
2020-04-11 21:37:36 +02:00
f1bba63f6f
Merge branch 'yearly-billing' into 'master'
...
Implement yearly billing, general billing tests
See merge request uncloud/uncloud!5
2020-04-11 21:37:13 +02:00
276c7e9901
Set VM order starting date on creation
2020-04-09 14:52:56 +02:00
3a37343a73
Set default value for vpnnetworkreservation, rebuild migrations
2020-04-09 14:28:46 +02:00
3588ae88f9
Merge branch 'master' into HEAD
2020-04-09 14:10:01 +02:00
Nico Schottelius
9431f11284
++notes
2020-04-09 12:09:38 +02:00
Nico Schottelius
e64c2b8ddb
Merge branch 'master' of code.ungleich.ch:uncloud/uncloud
2020-04-09 12:08:17 +02:00
Nico Schottelius
d9473e8f33
++ doc
2020-04-09 12:08:11 +02:00
cb3346303b
Fix typo in migration dependencies for uncloud_pay
2020-04-09 12:06:05 +02:00
Nico Schottelius
7d892daff9
[db] stay on psql+socket
2020-04-09 11:59:49 +02:00
Nico Schottelius
08b9886ce3
Remove sample secret key in secrets_sample
...
No need to worry, this was just a testing key
2020-04-09 11:59:25 +02:00
d6bdf5c991
Merge branch 'sync-old-meowpay-patches' into 'master'
...
Revamped payment pipeline (imported from nico/mew-cloud)
See merge request uncloud/uncloud!3
2020-04-09 11:31:49 +02:00
cc7056c87c
Remove old Stripe settings from secrets_sample.py
2020-04-08 17:55:48 +02:00
a8b81b074b
Remove user view from uncloud_pay
2020-04-08 17:40:44 +02:00
89c705f7d2
Set one payment method as primary, allow updates
2020-04-08 17:22:53 +02:00
f2a797874a
Merge branch 'master' into stripe-js
2020-04-08 17:08:09 +02:00
Nico Schottelius
d3f2a3e071
in between commit
...
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
2020-04-08 16:24:39 +02:00
Nico Schottelius
3d2f8574d3
[db] use tcp -> support ssh
2020-04-08 13:09:17 +02:00
Nico Schottelius
1838eaf7dd
Merge branch 'master' of code.ungleich.ch:uncloud/uncloud
2020-04-08 12:07:11 +02:00
Nico Schottelius
8986835c7e
Add readme for postgresql support
2020-04-08 12:03:18 +02:00
Nico Schottelius
938f0a3390
update to work on different computer
...
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
2020-04-07 19:45:16 +02:00
Nico Schottelius
913e992a48
[vpn] fix urls
2020-04-06 22:30:01 +02:00
Nico Schottelius
096f7e05c0
[migration] new models for uncloud_net
2020-04-06 22:29:41 +02:00
Nico Schottelius
06c4a5643c
[doc] move readme to subdir
2020-04-06 22:08:29 +02:00
Nico Schottelius
198aaea48a
Remove unused ldaptest
2020-04-06 22:06:48 +02:00
Nico Schottelius
d537e9e2f0
[doc] add new readme's
2020-04-06 22:06:34 +02:00
Nico Schottelius
5d084a5716
phase in vpn
...
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
2020-04-03 19:27:49 +02:00
Nico Schottelius
8fb3ad7fe8
inline all pictures
2020-04-03 18:51:09 +02:00
Nico Schottelius
c44faa7a73
Begin to include bill output
2020-04-03 18:41:17 +02:00
Nico Schottelius
fa0ca2d9c1
Merge remote-tracking branch 'meowpaylocal/master'
2020-04-02 19:31:57 +02:00
Nico Schottelius
7a6c8739f6
Rename / prepare for merge with uncloud repo
2020-04-02 19:31:03 +02:00
Nico Schottelius
833d570472
sync .gitignore
2020-04-02 19:30:47 +02:00
Nico Schottelius
3cf3439f1c
Move all files to _etc_based
2020-04-02 19:29:08 +02:00
Nico Schottelius
23203ff418
vmsnapshot progress
2020-03-22 20:55:11 +01:00
Nico Schottelius
9961ca0446
add new migrations
...
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
2020-03-22 18:59:59 +01:00
Nico Schottelius
105142f76a
Add template for creating VMs
2020-03-22 18:52:31 +01:00
Nico Schottelius
08fe3e689e
Add debug to opennebula, create VM disks from opennebula correctly
2020-03-22 17:30:55 +01:00
Nico Schottelius
10c5257f90
Introduce "extra_data" jsonfield
2020-03-21 11:59:04 +01:00
Nico Schottelius
a32f7522b5
Relate VM to disks and snapshots
2020-03-18 15:43:01 +01:00
Nico Schottelius
4b4cbbf009
Also list snapshots for a VM
2020-03-18 15:19:06 +01:00
Nico Schottelius
c6a9bd4363
Make balance a user attribute + decimalfield
2020-03-18 14:53:26 +01:00
Nico Schottelius
cd01f62fde
Move user view to uncloud_auth
2020-03-18 14:36:40 +01:00
Nico Schottelius
2f1aee8181
Can create a VMSnapshot w/ order (bugs to be removed)
2020-03-17 19:53:14 +01:00
Nico Schottelius
6a382fab23
[vmhost] add used_ram_in_gb
2020-03-17 19:07:00 +01:00
Nico Schottelius
b9473c1803
++ fix opennebula migration
2020-03-17 16:03:41 +01:00
Nico Schottelius
cc2efa5c14
Remove old opennebula view, remove vmid field
2020-03-17 15:40:08 +01:00
Nico Schottelius
5d840de55c
[opennebula] refresh formula, cleanup vm import/migration to uncloud
2020-03-17 15:39:24 +01:00
Nico Schottelius
9f4b927c74
Introduce mirations to ungleich_service to make tests work
2020-03-17 14:50:28 +01:00
Nico Schottelius
55bd42fe64
List all VMs for admins
2020-03-17 14:50:14 +01:00
Nico Schottelius
8634d667d5
update requirements for graphing
2020-03-17 14:49:59 +01:00
Nico Schottelius
ac7ea86668
rename opennebula commands
2020-03-17 14:49:49 +01:00
Nico Schottelius
8356404fe4
++ product readme
2020-03-17 14:49:36 +01:00
Nico Schottelius
723d2a99cc
add django…extensions to support "graph_models"
2020-03-17 13:30:48 +01:00
Nico Schottelius
8f4e7cca1b
add migrations to ungleich_service so tests don't fail
...
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
2020-03-17 12:46:02 +01:00
b15a12dc71
Missing import for DCLVMProductSerializer
2020-03-13 14:22:49 +05:00
923102af24
Fix DCLVMProductSerializer import following rebase
2020-03-09 13:17:40 +01:00
f4ebbb79ce
Add test coverage parsing to CI
2020-03-09 12:25:12 +01:00
122bc586b4
Disable 'old' broken/not-yet-implemented ungleich_vm tests
...
To make CI happy on merge requests from now on :-)
2020-03-09 12:25:12 +01:00
ae6548e168
Read database host and user from environment (used by CI pipeline)
2020-03-09 12:25:12 +01:00
0e4068cea8
Add minimal CI running django tests
2020-03-09 12:25:12 +01:00
623d3ae5c4
Fix various billing issues discovered by testing
2020-03-09 12:25:12 +01:00
fe0e6d98bf
Add simple tests for billing
2020-03-09 12:25:11 +01:00
41e35c1af0
Add missing migration and dependency to run tests
2020-03-09 12:25:11 +01:00
948391ab2e
Dump test placeholder for uncloud_pay
2020-03-09 12:25:11 +01:00
d089d06264
Initial yearly billing implementation
2020-03-09 12:25:11 +01:00
c086dbd357
Rebuild paymentmethod/stripe migrations from master
2020-03-09 12:25:11 +01:00
545727afe7
Move STRIPE_PUBLIC_KEY to secrets (i.e. local configuration)
2020-03-09 12:25:11 +01:00
7bbc729b87
Fix duplicates in payment method creation
2020-03-09 12:25:11 +01:00
b10cae472e
Fix migration dependencies after rebase
2020-03-09 12:25:11 +01:00
952cf8fd13
Remove unused empty migration
2020-03-09 12:25:11 +01:00
7e278228bd
Fix payment update updates
2020-03-09 12:25:11 +01:00
31507c0f1a
Fix error in stripe get_customer_id_for
2020-03-09 12:25:11 +01:00
7e58a8ace2
Fix generate-bills, remove debug print in charge method
2020-03-09 12:25:11 +01:00
a4fa0def4b
Fix dumb logic errors/typo from last commit
2020-03-09 12:25:11 +01:00
80fe28588e
Revamp stripe error handling
2020-03-09 12:25:11 +01:00
4e658d2d77
Remove legacy credit card support
2020-03-09 12:25:11 +01:00
5161a74354
Add STRIPE_PUBLIC_KEY setting
2020-03-09 12:25:11 +01:00
0e62ccff3b
Cleanup/reorder uncloud_pay views
2020-03-09 12:25:11 +01:00
bf83b750de
Replace legacy Stripe Charge API by Payment{setup, intent}
2020-03-09 12:24:14 +01:00
Nico Schottelius
47148454f6
s/_/-/ for bill id
2020-03-06 11:11:16 +01:00
Nico Schottelius
0032c272e7
Merge branch 'bill-id' of code.ungleich.ch:nico/meow-pay
2020-03-06 11:10:47 +01:00
Nico Schottelius
263125048d
Begin to introduce a DCL alike view for VMs
2020-03-06 11:10:20 +01:00
658262c599
Add human readable reference to bills
2020-03-06 09:39:41 +01:00
c41b55573a
Fix order link in BillRecordSerializer
2020-03-06 09:32:25 +01:00
4016c28c5f
Fix generate-bills
2020-03-06 09:17:31 +01:00
Nico Schottelius
aa8336b7e4
VM: def __str__
2020-03-05 23:55:33 +01:00
Nico Schottelius
0e6a6afd88
[opennebula] Fix fields/serializers
2020-03-05 23:18:07 +01:00
Nico Schottelius
efbe1c0596
Merge commands into the "vm" command
2020-03-05 17:52:01 +01:00
6c7f0e98b3
Rebuild paymentmethod/stripe migrations from master
2020-03-05 16:24:45 +01:00
Nico Schottelius
b8c2f80e45
[vmhost] add available_ram_in_gb and available_cores
2020-03-05 15:06:34 +01:00
Nico Schottelius
139aca6a61
Remove vms field from vmhost
...
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
2020-03-05 14:58:45 +01:00
Nico Schottelius
2a73f0e767
[migration] make vm name optional, use storage class choices
...
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
2020-03-05 14:22:56 +01:00
Nico Schottelius
66e224e926
[storage] move choices to uncloud_storage
2020-03-05 14:21:10 +01:00
Nico Schottelius
10f09c7115
add an old client hack (just for reference)
2020-03-05 14:15:33 +01:00
Nico Schottelius
ec7a2a3c3a
Correct pricing for VMProduct
2020-03-05 14:00:14 +01:00
b07df26eb2
Move STRIPE_PUBLIC_KEY to secrets (i.e. local configuration)
2020-03-05 11:51:08 +01:00
b958cc77ea
Fix duplicates in payment method creation
2020-03-05 11:45:37 +01:00
e9b6a6f277
Fix migration dependencies after rebase
2020-03-05 11:43:07 +01:00
546667d117
Remove unused empty migration
2020-03-05 11:39:48 +01:00
b88dfa4bfe
Fix payment update updates
2020-03-05 11:39:48 +01:00
d6ee806467
Fix error in stripe get_customer_id_for
2020-03-05 11:39:48 +01:00
a41184d83d
Fix generate-bills, remove debug print in charge method
2020-03-05 11:39:48 +01:00
2f70418f4d
Fix dumb logic errors/typo from last commit
2020-03-05 11:39:48 +01:00
21e1a3d220
Revamp stripe error handling
2020-03-05 11:39:48 +01:00
4cc19e1e6e
Remove legacy credit card support
2020-03-05 11:39:48 +01:00
08bf7cd320
Add STRIPE_PUBLIC_KEY setting
2020-03-05 11:39:48 +01:00
7e9f2ea561
Cleanup/reorder uncloud_pay views
2020-03-05 11:39:48 +01:00
929211162d
Replace legacy Stripe Charge API by Payment{setup, intent}
2020-03-05 11:39:48 +01:00
Nico Schottelius
cf17373b3f
Fix ahmed introduced migrations
...
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
2020-03-05 11:35:00 +01:00
Nico Schottelius
14a4fa8cc1
Merge remote-tracking branch 'ahmed/migrate-one-to-regular-vm'
2020-03-05 11:34:15 +01:00
Nico Schottelius
4fc1c36ae9
fix incorrect migrations from fnux-stable branch
...
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
2020-03-05 11:17:30 +01:00
371c5ccf00
Merge remote-tracking branch 'origin/fnux-hacks'
2020-03-04 12:12:22 +01:00
faca104459
Fix stripe import in uncloud_pay.models
2020-03-04 11:05:21 +01:00
9e8149135b
Move bill generation logic to Bill class, initial work for prepaid
2020-03-04 10:55:12 +01:00
02b287eff8
small cleaning
2020-03-04 14:44:41 +05:00
9aabc66e57
Pay: move some model-related methods from helpers to models
...
Otherwise we end up in circular dependency hell
2020-03-04 09:39:18 +01:00
a662b1fe29
Make migrate-one-vm-to-regular command idempotent
2020-03-04 13:25:46 +05:00
88c10e2e4a
improve readability
2020-03-03 23:53:45 +05:00
fea0568bb9
init commit
2020-03-03 23:46:39 +05:00
e0cb6ac670
Allow for charging customers
2020-03-03 18:16:25 +01:00
Nico Schottelius
ebc9238845
recreate all migrations
...
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
2020-03-03 17:50:52 +01:00
94a39ed81d
Properly wire stripe card to payment methods
2020-03-03 16:56:42 +01:00
5c2d2a5b94
Document relations for Orders and Managed Services
2020-03-03 13:14:51 +01:00
Nico Schottelius
e9ef2acb06
Add readme for objects
2020-03-03 12:15:05 +01:00
3846e49395
Fix migration issue introduced in previous merge
2020-03-03 11:40:37 +01:00
a849e642dd
Merge remote-tracking branch 'origin/master' into fnux-hacks
2020-03-03 11:36:08 +01:00
28407bf3e3
Quickly document OrderRecord class
2020-03-03 11:34:47 +01:00
Nico Schottelius
ea00e81b1e
Move all stripe stuff to stripe.py
2020-03-03 11:31:32 +01:00
53baf0d9f3
Fix typo in BillRecord
2020-03-03 11:29:57 +01:00
11e22f5001
Consistently use one_time_price instead of setup_fee
2020-03-03 11:27:35 +01:00
Nico Schottelius
e176ad0817
Remove second stripe key definition
2020-03-03 11:26:16 +01:00
Nico Schottelius
a50095f873
Merge remote-tracking branch 'origin/fnux-stable'
...
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
2020-03-03 11:23:29 +01:00
a40da40169
Add recurring_count to bills
2020-03-03 11:15:48 +01:00
2eaaad49db
Handle setup fee in bills
2020-03-03 10:59:21 +01:00
9fdf66ed74
Fix MatrixService ordering
2020-03-03 10:51:16 +01:00
b31aa72f84
Allow to select billing period when registering VM
2020-03-03 10:14:56 +01:00
5559d600c7
Move things around for readability in uncloud_pay models and serializer
2020-03-03 09:13:04 +01:00
4e51670a90
Expand recurring period billing logic for DD/MM/hh/month
2020-03-03 08:53:19 +01:00
4ad737ed90
Initial stripe playground
2020-03-02 22:29:50 +01:00
c651c4ddaa
Cleanup a bit BillRecord
2020-03-02 16:41:49 +01:00
531bfa1768
actual thing name is replaced by pseudo names
2020-03-02 19:20:12 +05:00
750d8c8cbf
Use fictional hostname for VMHost
2020-03-02 17:42:54 +05:00
0c3e6d10ae
Indentation/Spacing fixes
2020-03-02 17:20:30 +05:00
afdba3d7d9
Remove duplicate code
2020-03-02 17:17:30 +05:00
52e74c22cc
Merge branch 'nico/meow-pay-master' into HEAD
2020-03-02 17:05:23 +05:00
6c9c63e0da
Add sample clean() for model + Add tests for uncloud_vm
2020-03-02 16:54:36 +05:00
9e9018060e
Wire order records to bills, fix user balance
2020-03-02 10:46:04 +01:00
9e253d497b
Wrap VM creation in database transaction
2020-03-02 09:30:51 +01:00
81bd54116a
Add records to orders
2020-03-02 09:25:03 +01:00
8e41b894c0
Add OrderRecord model
2020-03-02 08:09:42 +01:00
Ahmed Bilal
3228b91038
Merge branch 'master' into 'master'
...
Merge nico/meow-pay into ahmedbilal/meow-pay
See merge request ahmedbilal/meow-pay!7
2020-03-02 07:17:04 +01:00
Ahmed Bilal
028fd6789f
++cleanup
...
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
2020-03-02 07:17:04 +01:00
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
033b1e846a
Merge branch 'nico/meow-pay-master' into HEAD
2020-02-27 14:35:52 +05:00
Nico Schottelius
c0bf4d96c4
++ debian/devuan notes
2020-02-26 21:13:30 +01:00
Ahmed Bilal
0a6fa031d3
Merge branch 'master' into 'master'
...
Merge nico/meow-pay into ahmedbilal/meow-pay
See merge request ahmedbilal/meow-pay!5
2020-02-26 11:31:18 +01:00
Ahmed Bilal
0c7ca1147a
fix migrations the ugly way
...
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
2020-02-26 11:31:17 +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
Ahmed Bilal
98f84f1cf5
Merge branch 'master' into 'master'
...
Merge nico/meow-pay into ahmedbilal/meow-pay
See merge request ahmedbilal/meow-pay!4
2020-02-23 17:23:57 +01: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
fa4d7a1d70
opennebula_hacks added i.e create one user and chown of vm
2020-02-23 21:00:18 +05: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
7b09f0a373
abk-hacks added
2020-02-23 19:18:51 +05: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
Nico Schottelius
1d1ae6fb3e
Force uniqueness on uuid
2020-02-23 11:59:09 +01:00
Nico Schottelius
f8c29aa1d6
add uuid() to opennebula VM
2020-02-23 11:55:57 +01:00
Nico Schottelius
fc4ec7b0f8
update readme + api
2020-02-23 11:42:15 +01:00
Nico Schottelius
f588691f0d
[opennebula] add json, add helper functions
2020-02-23 11:42:03 +01:00
Nico Schottelius
581865460b
Mess with migrations
2020-02-23 11:41:51 +01:00
Nico Schottelius
7f821b4d5a
add readme
2020-02-23 10:31:28 +01:00
Nico Schottelius
ce0da4b827
+ bracket
2020-02-23 09:44:55 +01:00
Nico Schottelius
de06b9ee22
Merge branch 'master' of code.ungleich.ch:nico/meow-pay
2020-02-23 09:18:27 +01:00
Nico Schottelius
26449d3159
++snapshot ideas
2020-02-23 09:18:16 +01:00
71a764ce1e
Move vm/{detail,list} under opennebula/vm/{detail,list} and make it admin accessible only + Created vm/list that list currently authenticated user's VMs
2020-02-22 15:49:00 +05:00
5f28e9630c
Remove unneccessary requirements from {repo_root}/requirements.txt + uncloud/secret_sample.py minor changes
2020-02-22 11:36:18 +05:00
Ahmed Bilal
2aa22803f4
Merge branch 'master' into 'master'
...
Merge nico/meow-pay into ahmedbilal/meow-pay
See merge request ahmedbilal/meow-pay!2
2020-02-22 07:32:52 +01:00
Ahmed Bilal
dc34c0ecd4
Merge nico/meow-pay into ahmedbilal/meow-pay
2020-02-22 07:32:52 +01:00
Nico Schottelius
4f4a4be839
good night commit - introducing status
2020-02-22 00:50:06 +01:00
Nico Schottelius
b1bb6bc314
Make products available via getattr
2020-02-22 00:22:42 +01:00
Nico Schottelius
b67f41cc35
Merge remote-tracking branch 'ahmed/master'
2020-02-21 22:04:26 +01:00
Nico Schottelius
dc5092be71
Add sample secrets
2020-02-21 21:41:51 +01:00
Nico Schottelius
4df7c761d3
++stuff
2020-02-21 20:51:04 +01:00
d61a7e670f
opennebula vm sync/query application added
2020-02-21 20:33:37 +05:00
5de973b204
Merge branch 'nico/meow-pay-master' into HEAD
2020-02-21 20:06:21 +05:00
Nico Schottelius
0708a1e1fd
add requirements.txt
2020-02-21 15:05:17 +01:00
Nico Schottelius
a5695ffa48
two more related user problems
...
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
2020-02-21 11:43:17 +01:00
Nico Schottelius
6ba224638a
fix migrations / custom user late introduce
...
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
2020-02-21 11:42:54 +01:00
Nico Schottelius
2cda4dd57b
[auth] add customer user model
...
Best practice
See
https://docs.djangoproject.com/en/3.0/topics/auth/customizing/#using-a-custom-user-model-when-starting-a-project
2020-02-21 11:32:41 +01:00
Nico Schottelius
c456355059
begin to introduce product
...
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
2020-02-21 10:41:22 +01:00
Nico Schottelius
118c66799c
++views/permissions
2020-02-20 19:38:43 +01:00
Nico Schottelius
f8182e00e8
import secrets
2020-02-20 19:38:30 +01:00
Nico Schottelius
9fd445e947
add ldap support + tutorial example
2020-02-20 18:58:07 +01:00
Nico Schottelius
254429db55
.gitignore & more
2020-02-20 16:55:01 +01:00
Nico Schottelius
e472d20ae0
hacking uncloud v202002
...
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
2020-02-20 16:52:50 +01:00
Nico Schottelius
315aaded41
Focus on creating a VPN as a first test case
2020-02-20 16:05:58 +01:00
Nico Schottelius
13292db39e
+old notes
2020-02-20 11:57:03 +01:00
Nico Schottelius
0a1ccadda2
+ldaptest
2020-02-20 11:56:47 +01:00
Nico Schottelius
8160d01471
Merge remote-tracking branch 'origin/master'
2020-02-20 11:51:14 +01:00
8c353f277c
is_order_valid added in helper.py
2020-02-20 15:23:15 +05:00
bb18f6b0e9
Flask-RESTful added in requirements.txt
2020-02-20 14:08:39 +05:00
00b35e0567
cleaned requirements.txt
2020-02-20 14:04:53 +05:00
9c7d458eec
use code from ungleich-common
2020-02-20 13:57:32 +05:00
Nico Schottelius
074efffaa7
++ hack
2020-02-20 09:44:30 +01:00
cee92f2e99
A lot of code moved to ungleich-common
2020-02-20 00:12:11 +05:00
ce709c3b6f
Add certificates option for etcd
2020-02-19 14:44:19 +05:00
519279ce6f
Update README.md
2020-02-19 13:13:39 +05:00
7b9a970307
Update README.md
2020-02-19 13:12:46 +05:00
5f1f451bc2
Added installation and getting started instructions in README.md
2020-02-19 13:12:07 +05:00
e37592bdc6
README.md updated and reorganized, Improved error handling for configparser and ldap manager, requirements.txt added
2020-02-19 11:59:54 +05:00
347843cb24
Sample config file added + uncloud dependency removed
2020-02-19 10:22:15 +05:00
Nico Schottelius
aa9548e753
+gitignore
...
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
2020-02-15 11:15:26 +01:00
Nico Schottelius
c1f384fb9a
so many notes&hacks!
2020-02-15 09:38:33 +01:00
Nico Schottelius
b38c9b6060
Ad capability to add and list hosts
2020-02-09 19:27:24 +01:00
Nico Schottelius
a80a279ba5
Add filtering support:
...
(venv) [12:54] diamond:uncloud% ./bin/uncloud-run-reinstall hack --product 'dualstack-vm' --os-image-name alpine311 --username nicocustomer --password '...' --hackprefix ~/vcs/uncloud/uncloud/hack/hackcloud/ --etcd-host etcd1.ungleich.ch --etcd-ca-cert ~/vcs/ungleich-dot-cdist/files/etcd/ca.pem --etcd-cert-cert ~/vcs/ungleich-dot-cdist/files/etcd/nico.pem --etcd-cert-key ~/vcs/ungleich-dot-cdist/files/etcd/nico-key.pem --list-orders --filter-order-key "status" --filter-order-regexp NEW
2020-02-09 12:54:52 +01:00
Nico Schottelius
5ef009cc9b
Begin to phase in features and processing orders
2020-02-09 12:12:15 +01:00
200a7672f2
make value_in_json=True
2020-01-27 14:55:26 +05:00
1a76d2b5f3
Many more changes
2020-01-27 13:40:57 +05:00
da54a59ca2
initial commit
2020-01-20 12:30:12 +05:00