Commit graph

64 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
9e9018060e Wire order records to bills, fix user balance 2020-03-02 10:46:04 +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
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
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
b3bbfafa04 Introduce custom ProductViewSet preventing customer from updating
products
2020-02-28 14:57:45 +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
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