PCoder
|
a90bec98ec
|
Make invoice for generic payment showable
|
2018-09-24 08:22:46 +02:00 |
|
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 |
|
Malcolm Anyakee
|
c891694dc0
|
Update Bugfix
Fixed bugs and fixed typo
|
2018-08-25 23:13:16 +02:00 |
|
PCoder
|
144a780105
|
Change text: 'Terminated VM can not ...' -> 'Terminated VMs can not ...'
|
2018-08-24 11:58:01 +02:00 |
|
PCoder
|
06d849c5ce
|
Merge branch 'master' into 5151/gdpr_modal
|
2018-08-24 11:10:59 +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
|
e230f2ac8c
|
Merge master into 5151/gdpr_modal
|
2018-08-22 23:25:11 +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
|
069cd18268
|
Add gdpr banner to all base templates
|
2018-07-21 13:27:15 +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 |
|
PCoder
|
1f2743a65d
|
Makemessages for datacenterlight, hosting and utils
|
2018-07-06 01:19:44 +02:00 |
|
PCoder
|
0db4a113e6
|
Add some styles and do not let user remove card if he has only one
|
2018-07-05 23:06:47 +02:00 |
|
PCoder
|
9035f98060
|
Update UserCardDetail get method
|
2018-07-05 09:58:57 +02:00 |
|
PCoder
|
8e742852a5
|
Show all cards in landing and hosting payment page
|
2018-07-04 02:03:08 +02:00 |
|
PCoder
|
c118e86230
|
Remove unused context parameters -- introduced during merge
|
2018-07-03 23:56:42 +02:00 |
|
PCoder
|
d98a683b2a
|
Do a get on UserCardDetail only when fingerprint, exp_month and exp_year are known
|
2018-07-03 23:23:02 +02:00 |
|
PCoder
|
9904a71d38
|
Rename usercarddetail migration
|
2018-07-03 22:34:59 +02:00 |
|
PCoder
|
c9d01ba95f
|
Fix some errors
|
2018-07-03 21:52:44 +02:00 |
|
PCoder
|
6d2b011925
|
Merge master into task/3747/multiple_cards_support
|
2018-07-03 21:29:04 +02:00 |
|
PCoder
|
44900f6a48
|
Rename OrderSpecifications to OrderDetail
|
2018-07-01 22:30:23 +02:00 |
|
PCoder
|
00cb1de75d
|
Add type to OrderSpecification string
|
2018-07-01 19:46:21 +02:00 |
|
PCoder
|
7f57ace92d
|
Set default and on_delete attributes
|
2018-07-01 19:23:05 +02:00 |
|
PCoder
|
900f014d92
|
Save order specifications in HostingOrder also
|
2018-07-01 18:33:10 +02:00 |
|
M.Ravi
|
5eff54cffe
|
Fix a bug -- json not imported; use JsonResponse instead of
HttpResponse
|
2018-06-27 12:34:57 +02:00 |
|
M.Ravi
|
2cd73b313a
|
Merge master into task/3934/move_hosting_order_out_of_celery_task
and resolve some conflicts
|
2018-06-27 12:09:05 +02:00 |
|
PCoder
|
fae9fce5c6
|
Remove unnecessary code
|
2018-06-12 11:15:17 +02:00 |
|
PCoder
|
6db38d7e29
|
Check card_id also for order confirmation
|
2018-06-12 11:14:36 +02:00 |
|
PCoder
|
86f0526773
|
Reformat code
|
2018-06-12 11:13:10 +02:00 |
|
PCoder
|
23630d4473
|
Move csrf_token call outside the for loop
|
2018-06-12 11:11:37 +02:00 |
|
PCoder
|
7494116468
|
Add missing import
|
2018-06-12 09:36:00 +02:00 |
|
PCoder
|
57eda62586
|
Update UserCardDetail migration
|
2018-06-12 08:28:46 +02:00 |
|
PCoder
|
cf00ff6bd8
|
Attempt to merge master into task/3747/multiple_cards_support
|
2018-06-12 08:16:11 +02:00 |
|
Arvind Tiwari
|
8fb0d9a48a
|
order detail divider lines full width
|
2018-05-12 21:59:06 +05:30 |
|
Arvind Tiwari
|
b09604d30f
|
add space befor CHF
|
2018-05-12 03:56:04 +05:30 |
|
Arvind Tiwari
|
f39f95e1f7
|
remove template filter from translation
|
2018-05-12 03:47:54 +05:30 |
|
Arvind Tiwari
|
20f1df8a70
|
blocktrans variable fix
|
2018-05-12 03:39:38 +05:30 |
|
Arvind Tiwari
|
39f7898259
|
edit order detail footer text
|
2018-05-12 03:15:07 +05:30 |
|
Arvind Tiwari
|
55889499df
|
order detail style fix
|
2018-05-12 02:47:27 +05:30 |
|
Arvind Tiwari
|
8044e0c2a0
|
calculator discount text modified
|
2018-05-11 17:47:27 +05:30 |
|
Arvind Tiwari
|
30deae5a20
|
strong color fix
|
2018-05-11 17:25:44 +05:30 |
|
Arvind Tiwari
|
a14407182f
|
font weight for discount name
|
2018-05-11 17:21:02 +05:30 |
|
Arvind Tiwari
|
73e3dce8d4
|
order detail page font format
|
2018-05-11 17:18:19 +05:30 |
|
Arvind Tiwari
|
f3ffbd96e5
|
translation fix
|
2018-05-10 21:26:47 +05:30 |
|
Arvind Tiwari
|
b351cb9aa0
|
translation fix
|
2018-05-10 21:25:38 +05:30 |
|
Arvind Tiwari
|
55cbe3244a
|
fix testing error
|
2018-05-07 09:14:31 +05:30 |
|
Arvind Tiwari
|
0fdb88b8aa
|
invoice discount amount fix
|
2018-05-07 07:50:32 +05:30 |
|
Arvind Tiwari
|
3d2ce27954
|
fix discount amount
|
2018-05-07 06:29:53 +05:30 |
|
Arvind Tiwari
|
eeed9b2e72
|
discount name in templates
|
2018-05-07 06:25:50 +05:30 |
|
Arvind Tiwari
|
2ff8c25034
|
exclude discount from total price
|
2018-05-07 06:11:44 +05:30 |
|
Arvind Tiwari
|
7a72cc02ab
|
translations
|
2018-05-07 05:22:05 +05:30 |
|
Arvind Tiwari
|
f8dc2c6bbe
|
discount option added to calculator
|
2018-05-07 05:07:58 +05:30 |
|
Arvind Tiwari
|
89ed869780
|
hosting calculator styles
|
2018-04-25 23:31:27 +05:30 |
|
Arvind Tiwari
|
0c4c945ec3
|
flake8 fix
|
2018-04-25 17:51:36 +05:30 |
|
Arvind Tiwari
|
91a65e88ec
|
hosting vm payment price fix
|
2018-04-25 16:08:05 +05:30 |
|
Arvind Tiwari
|
f66d768ecb
|
hosting payment page
|
2018-04-25 15:55:58 +05:30 |
|