Commit graph

1221 commits

Author SHA1 Message Date
PCoder
2a694295ad Refactor payment.js 2018-09-23 17:00:48 +02:00
PCoder
fcfc56e132 Move csrf_token out of the form loop 2018-09-23 16:15:48 +02:00
PCoder
d6e4a86724 Append One time charge/Recurring only for generic payments 2018-09-23 13:34:26 +02:00
PCoder
9ec05e7df4 Merge billing and generic-payment forms and post values as get
parameters
2018-09-23 13:13:32 +02:00
PCoder
e94ecfe52c Change recurring and description to non-required fields + Change
amount to Floatfield
2018-09-23 12:49:57 +02:00
PCoder
332e7d6624 Add generic_payment_id field to HostingOrder migration and
reflect generic payments in adminsite
2018-09-23 12:39:06 +02:00
PCoder
c7edcdc8b1 Change description to CharField and set its height 2018-09-22 23:51:39 +02:00
PCoder
a7fa52490c Create GenericPaymentForm 2018-09-22 08:16:26 +02:00
PCoder
d7be223fcb Change margin bottom for vm terminate error 2018-09-08 12:39:12 +02:00
PCoder
304feb4f7b Update text 2018-09-08 10:46:07 +02:00
PCoder
e376f38baa Correct text 2018-09-08 10:33:00 +02:00
PCoder
84dae63968 Fix: ugettext_lazy doesn't like string format 2018-09-08 10:29:47 +02:00
PCoder
4914280868 Set text for vm terminate timeout 2018-09-08 10:14:57 +02:00
PCoder
a7afbec5b4 Fix flake8 error 2018-09-07 23:14:57 +02:00
PCoder
ff6df8cd58 Simplify logic 2018-09-07 23:11:46 +02:00
PCoder
8e7789462e Merge branch 'master' into bugfix/log_vm_terminate_errors 2018-09-07 22:43:29 +02:00
PCoder
8a30100488 Use price in stripe plan name too 2018-09-05 23:26:51 +02:00
PCoder
144a780105 Change text: 'Terminated VM can not ...' -> 'Terminated VMs can not ...' 2018-08-24 11:58:01 +02:00
PCoder
d7f171d710 Change DE translation (beenden instead of terminieren) 2018-08-24 11:07:50 +02:00
PCoder
4f745b607d Merge branch 'master' into task/5487/warn_users_before_terminating_vm 2018-08-24 10:58:24 +02:00
PCoder
e1263ce9b3 Add DE translation fo #5487 2018-08-23 19:40:16 +02:00
PCoder
4baa3a7095 Improve HostingOrder str representation 2018-08-23 09:18:55 +02:00
PCoder
4a1434c514 Make string representation of HostingOrder more readable 2018-08-23 09:07:12 +02:00
PCoder
f9584b4c82 Fix a bug when vm_template is None 2018-08-23 09:06:31 +02:00
PCoder
78e44332b5 Remove an unnecessary question mark 2018-08-22 23:16:26 +02:00
PCoder
af78631ec8 Update hosting's django.po 2018-08-22 23:13:49 +02:00
PCoder
29172a9df7 Use a separate class for warning block 2018-08-22 23:06:20 +02:00
PCoder
4425aa7c88 Change modal text 2018-08-22 22:57:32 +02:00
PCoder
b7ff519624 Reduce bottom padding further by 2px 2018-08-22 22:54:49 +02:00
PCoder
07837c8752 Reduce bottom padding 2018-08-22 22:51:22 +02:00
PCoder
1e5cf08273 Move the warning to the bottom 2018-08-22 22:47:49 +02:00
PCoder
7e790e7027 Add warning div 2018-08-22 22:36:29 +02:00
PCoder
929e7ead1c Add vm-terminate-warning style 2018-08-22 22:36:17 +02:00
PCoder
9c5363ef55 Merge branch 'master' into bugfix/show_meta_description_in_cms_page 2018-08-22 21:42:37 +02:00
PCoder
b69abf3edd Make CC brand 128 characters long 2018-08-21 14:42:01 +02:00
PCoder
8bf6440110 Delete old migrations 2018-08-21 14:41:16 +02:00
PCoder
768b8ca820 Change HostingOrder cc_brand field size to 35 chars 2018-08-21 14:06:58 +02:00
PCoder
770b5e080b Make UserCardDetail brand field 35 chars long 2018-08-21 13:24:54 +02:00
M.Ravi
9381327a12 Change author of various cms pages to ungleich glarus ag
(Being consistent)
2018-08-20 11:52:27 +02:00
PCoder
df10e84418 Add owner's email to the subject 2018-07-25 22:04:44 +02:00
PCoder
a5cdfab306 Send an email to admin if the VM is still there after 30 seconds
of the VM terminate calll
2018-07-25 21:54:15 +02:00
PCoder
59b020c0d4 Replace all occurrences of logger.info with logger.error 2018-07-25 21:41:05 +02:00
PCoder
33bd2e1760 Improve import_usercarddetails management command 2018-07-07 02:15:38 +02:00
PCoder
34ed51a643 Don't dissociate card if transaction fails 2018-07-07 02:03:42 +02:00
PCoder
0f26917f35 Fix PEP8 warning 2018-07-07 01:54:45 +02:00
PCoder
678167978c Add check to forbid user from deleting the last card 2018-07-07 01:50:46 +02:00
PCoder
ebcbb26276 Add another DE translation - UPDATE 2018-07-07 01:38:03 +02:00
PCoder
e18b8a527a Add missing DE translation 2018-07-07 01:35:52 +02:00
PCoder
e60b93d126 Add management command import_usercarddetails 2018-07-07 01:28:25 +02:00
PCoder
4c06a9e730 Add de translations by MalcolmA 2018-07-06 19:33:26 +02:00