Commit graph

572 commits

Author SHA1 Message Date
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