Commit graph

5175 commits

Author SHA1 Message Date
d739a4a50e Merge pull request 'Change admin email to dcl-orders for vm purchase' (#12) from change-email-address into master
Reviewed-on: ungleich-public/dynamicweb#12
2022-02-05 03:19:01 +00:00
PCoder
138fd519b7 Change admin email to dcl-orders for vm purchase 2022-02-05 08:30:58 +05:30
Nico Schottelius
8179ca4d22 Add support for docker build + docker release 2021-12-17 22:21:59 +01:00
Nico Schottelius
c0333212aa Begin updating for dockerisation 2021-12-17 22:02:20 +01:00
4861bee9d3 Merge branch 'master' into 'master'
Fix poland country code in eu_countries

See merge request ungleich-public/dynamicweb!749
2021-09-30 10:32:26 +02:00
5ce283318a Fix poland country code in eu_countries 2021-09-27 09:21:24 +02:00
79e96715b2 Merge branch 'issue/1/user-password-update' into 'master'
Issue/1/user password update

See merge request ungleich-public/dynamicweb!748
2021-08-30 15:20:27 +02:00
PCoder
47d5c63e3b Fix bad import 2021-08-30 18:38:58 +05:30
PCoder
d26f2b0f69 Normalize/convert ascii/ignore unicode characters for homeDirectory 2021-08-30 18:29:42 +05:30
7c2c3de1f6 Merge branch '9053/show-paid-invoices-only' into 'master'
Filter invoices by paid status

See merge request ungleich-public/dynamicweb!747
2021-03-29 03:59:48 +02:00
PCoder
1d48dfb93b Filter invoices by paid status 2021-03-29 07:23:58 +05:30
PCoder
63821813d4 Fix translations 2021-02-07 18:05:48 +05:30
PCoder
173c0fe9bf Update texts 2021-02-07 17:28:44 +05:30
PCoder
6279fa4e7b Fix missing escapes 2021-02-07 16:21:02 +05:30
PCoder
1fec2add72 Update Changelog for 3.2 2021-02-07 16:07:23 +05:30
PCoder
d46deaa23a Do not use UserCardDetail to save card 2021-02-07 15:58:03 +05:30
PCoder
a5c83dd589 Update order confirmation text to better prepared for payment dispute 2021-02-07 15:55:47 +05:30
PCoder
af09b343c0 Update Changelog for 3.1 2021-01-12 13:56:58 +05:30
PCoder
3b874901bc Update using correct card details 2021-01-12 13:40:03 +05:30
PCoder
640807eb62 Don't get card from local db 2021-01-12 13:39:11 +05:30
PCoder
21f762d6b8 Update Changelog for 3.0 2021-01-07 16:39:00 +05:30
9e640d0802 Merge branch '8691/check_vm_templates' into 'master'
8691/check vm templates

See merge request ungleich-public/dynamicweb!744
2021-01-07 12:06:02 +01:00
PCoder
c58302d90e Log error messages 2021-01-07 16:30:48 +05:30
PCoder
1e67bef4f5 Remove unwanted code/comments 2021-01-07 16:30:33 +05:30
PCoder
ec13a71866 Reformat code 2021-01-07 16:29:34 +05:30
PCoder
6c968fdbb8 Redirect to dcl payment
We no longer seem to use hosting payment
2021-01-02 09:03:02 +05:30
PCoder
44ebb71916 Also clear id_payment_method from session 2021-01-02 09:02:37 +05:30
PCoder
1d7c3f424c Don't send admin email if IncompletePaymentIntent lookup doesn't contain a value 2021-01-01 11:17:07 +05:30
PCoder
8deed169ca Fix redirect url
Take user to virtual_machines page if the user ordered a VM
2021-01-01 11:13:02 +05:30
PCoder
7cd485bc6d Fix issues on settings/card save/delete methods 2021-01-01 02:37:52 +05:30
PCoder
31c5336e18 Show cards directly from Stripe and dissociate using PaymentMethod 2021-01-01 01:59:41 +05:30
PCoder
36505db5a2 set default_payment_method 2021-01-01 01:35:59 +05:30
PCoder
e7462289f6 Just log IncompleteSubscription does not exist error
Do not compare with db and send admin error message
2021-01-01 01:03:08 +05:30
PCoder
9b84461a29 Add logger messages 2021-01-01 00:58:11 +05:30
PCoder
04003757dc Move log block to correct case 2021-01-01 00:43:28 +05:30
PCoder
e024a3a7a6 Do not create paymentintent for subscription 2021-01-01 00:34:35 +05:30
PCoder
ba3c5ddd1d Use different js code for one-time and subscriptions 2021-01-01 00:09:47 +05:30
PCoder
2c3d00f03f Pass correct stripe_customer_id 2021-01-01 00:09:20 +05:30
PCoder
d8a674da3d Remove unwanted code + doc 2021-01-01 00:08:58 +05:30
PCoder
9524e03762 Pass user param with request dict 2021-01-01 00:08:33 +05:30
PCoder
a32a5af5a3 Add code to differentiate between subscription and non-subscription in js 2021-01-01 00:07:23 +05:30
PCoder
9faf897818 Formatting and documentation 2020-12-31 22:46:15 +05:30
PCoder
6e6a57b304 Refactor price to charge => amount_to_charge
This is a common variable between the generic onetime and
subscription
2020-12-31 22:45:05 +05:30
PCoder
7b71ba55f2 Rename token to id_payment_method 2020-12-31 22:43:50 +05:30
PCoder
8c72b56f6c Use setup_future_usage='off_session' 2020-12-31 21:03:24 +05:30
PCoder
d2ebd3c473 Do card association 2020-12-31 20:53:02 +05:30
PCoder
b36afcb828 Simplify code for logged in one-time payments with SCA 2020-12-31 20:35:31 +05:30
PCoder
a823efd8e2 Add get_available_payment_methods 2020-12-31 20:01:52 +05:30
PCoder
13f5f576b5 Fix getting cc details from payment_methods 2020-12-31 17:23:43 +05:30
PCoder
2f98294eab Store dicts as json in db 2020-12-31 17:12:17 +05:30