PCoder
e1c91d886b
Use explicit index in plan name formatting
2018-10-03 09:35:20 +02:00
PCoder
8a2734fa0e
Show GenericPaymentForm labels
2018-10-03 08:36:21 +02:00
PCoder
495ac0c6d6
Use ProductPaymentForm instead of GenericPaymentForm
...
Only if product_id is in the session, which identifies that we are
coming here via product_slug
2018-10-03 08:19:33 +02:00
PCoder
1cdc9ea657
Clear product_id from session
2018-10-03 08:18:19 +02:00
PCoder
a4065c7e24
Handle product_slug
2018-10-03 07:55:56 +02:00
PCoder
e47f4f05b4
Handler if product_slug is given (wip)
2018-10-02 10:02:02 +02:00
PCoder
dd9e7dde35
Merge branch 'master' into task/5690/generic-payment-page
2018-10-02 09:01:46 +02:00
PCoder
f2f95c8559
Update min attribute according to minimum ram in the plugin
2018-10-01 08:56:45 +02:00
PCoder
c2dbbf0424
Update views.py to include 512mb ram case
...
RAM server side validation is as follows:
- pid is a mandatory parameter for a valid RAM, otherwise a
validation error is raised
- check if enable_512mb_ram is enabled. In this case, validate
if the input ram is either a whole number or 0.5 and in the range
0.5 <= value <= 200
- otherwise check ram is a whole number in the range
1 <= value <= 200
2018-10-01 07:52:28 +02:00
PCoder
f85ef714ab
Pass instance context
...
Also POST plugin_id as a form parameter to check enable_512mb_ram
case
2018-10-01 07:50:18 +02:00
PCoder
24d719e4f1
Update migration
2018-09-29 07:37:23 +02:00
PCoder
5452c1c478
Merge master into task/5681/offer-512mb-ram
2018-09-28 08:36:35 +02:00
PCoder
db20e3cbe7
Add plus minus ram handler for 512MB option
2018-09-28 08:07:12 +02:00
PCoder
e1ce017ec8
Add migration
2018-09-27 22:48:23 +02:00
PCoder
b047ccdef1
Fix flake8 error
2018-09-27 22:33:24 +02:00
PCoder
56460ac8f0
Update migration
2018-09-27 22:16:05 +02:00
PCoder
d93861ca32
Set Devuan Ascii as default template
2018-09-27 22:14:42 +02:00
PCoder
a02c3c6973
Sort templates alphabetically
...
And also select the chosen template as the default one
2018-09-27 22:12:13 +02:00
PCoder
768f3532f7
Add default_selected_template field to DCLCalculatorPluginModel
2018-09-27 22:09:11 +02:00
PCoder
21084cdc9f
Initialize minRam js variable from what is passed from backend
2018-09-27 09:07:28 +02:00
PCoder
12f139976d
Simplify logic to set min_ram in the calculator form
2018-09-27 09:06:39 +02:00
PCoder
da21699212
Merge branch 'master' into task/5681/offer-512mb-ram
2018-09-26 23:10:17 +02:00
PCoder
3075cffd77
Include product_id in generic payment Stripe plan name
2018-09-26 23:01:04 +02:00
PCoder
232022aaaf
Fix flake8 errors
2018-09-26 22:51:34 +02:00
PCoder
b7929a16e2
Update datacenterlight django.po
2018-09-26 22:45:09 +02:00
PCoder
6c03e3f712
Change generic payment subject and correct misplaced comma
...
Data Center LightConfirmation of your payment ->
Confirmation of your payment
2018-09-26 22:42:33 +02:00
PCoder
72c16713a7
Update .po of datacenterlight
2018-09-26 22:37:32 +02:00
PCoder
52d048a555
Add missing Cheers string in email
2018-09-26 22:35:11 +02:00
PCoder
3148dbccf8
Translate text + reformat
2018-09-26 22:31:06 +02:00
PCoder
84056a5b36
Correct generic payment email as per Sanghee's corrections
2018-09-26 22:21:59 +02:00
PCoder
1041284866
Refactor moment.js locale date code to virutal_machine_detail.js
2018-09-26 21:52:12 +02:00
PCoder
737681136f
Correct flake8 error
2018-09-26 21:23:46 +02:00
PCoder
41cba9daa3
Show product name in dcl order detail template
2018-09-26 09:15:49 +02:00
PCoder
4575ff60ec
Refactor validation code + Add product_id to context
2018-09-26 09:15:24 +02:00
PCoder
9ff20491bd
Merge branch 'master' into task/5690/generic-payment-page
2018-09-25 23:25:22 +02:00
PCoder
c9ac959ff6
Change DCLNavbarPlugin to show login option only if set
2018-09-25 22:29:58 +02:00
PCoder
51c5fa98dd
Save description and product_id
2018-09-25 02:14:11 +02:00
PCoder
ed7ffb355f
Server side validation of the POSTed product
2018-09-25 02:13:39 +02:00
PCoder
1988020006
Handle generic-payment-form POST
...
To return pricing based on user's selected product
2018-09-25 02:12:42 +02:00
PCoder
b348c93fee
Add product hidden input type
...
To distinguish generic-payment-form submit
2018-09-25 01:56:10 +02:00
PCoder
481f13d20c
Check key existence
2018-09-24 22:27:25 +02:00
PCoder
d99271f71d
Redirect users to orders after generic payment is successful
2018-09-23 17:19:24 +02:00
PCoder
ff993e32db
Revert back to POST parameters for billing-form method
2018-09-23 17:01:29 +02:00
PCoder
dd82bdc9da
Fix a flake8 error
2018-09-23 13:27:33 +02:00
PCoder
7f3b916c58
Reformat code
2018-09-23 13:26:48 +02:00
PCoder
d23624c525
Modify datacenterlight/views.py to includes various cases of generic payment
2018-09-23 13:15:26 +02:00
PCoder
bc3eaaa7eb
Move csrf_token out of form loop
2018-09-23 13:10:26 +02:00
PCoder
bce47032ab
Handle generic payment separately in order_detail.html
2018-09-23 13:03:47 +02:00
PCoder
730492089b
Modify PaymentOrderView to accomodate the new generic payment case (WIP)
2018-09-22 08:20:49 +02:00
PCoder
429dd10b75
Modify dcl landing_payment.html to accomodate the new generic
...
payment form
2018-09-22 08:17:46 +02:00
PCoder
76efc35324
Add enable_512mb_ram option in model/plugin
2018-09-22 06:44:37 +02:00
PCoder
8a30100488
Use price in stripe plan name too
2018-09-05 23:26:51 +02:00
PCoder
e230f2ac8c
Merge master into 5151/gdpr_modal
2018-08-22 23:25:11 +02:00
PCoder
9c5363ef55
Merge branch 'master' into bugfix/show_meta_description_in_cms_page
2018-08-22 21:42:37 +02:00
PCoder
13876c24c1
Update doc
2018-08-22 00:42:50 +02:00
PCoder
f56933021f
Also send an email if manage_ssh_key does not complete in time
2018-08-22 00:37:40 +02:00
PCoder
2ff7eaea65
Sleep additional 10 seconds before running manage_public_key
2018-08-22 00:25:59 +02:00
PCoder
893c8ed08b
Fix imports
2018-08-22 00:14:17 +02:00
PCoder
3b07687d3e
Refactor ping_ok from datacenterlight.utils to utils.hosting_utils
2018-08-22 00:12:14 +02:00
PCoder
a55587dbf3
Wait for VM to be pingable before doing a manage_public_key
2018-08-21 23:49:47 +02:00
PCoder
91021d7612
Add ping_ok utility method
2018-08-21 23:24:40 +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
069cd18268
Add gdpr banner to all base templates
2018-07-21 13:27:15 +02:00
PCoder
4dce0ee5bd
Add gdpr banner to dcl template
2018-07-21 10:51:11 +02:00
PCoder
34ed51a643
Don't dissociate card if transaction fails
2018-07-07 02:03:42 +02:00
PCoder
8d42ca3200
Remove token parameter from stripe_utils.get_card_details
...
and add additional paramters to uniquely identify a card
2018-07-07 01:08:49 +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
5cd62abc70
Refactor code
2018-07-05 20:36:43 +02:00
PCoder
1e214f7b21
Improve comment
2018-07-05 20:35:34 +02:00
PCoder
6b663d82a1
Remove unused variable
2018-07-05 20:35:00 +02:00
PCoder
faa0604fae
Remove redundant code
2018-07-05 09:58:07 +02:00
PCoder
8d7b01d7e2
Disable dissociating card on subscription failure
2018-07-05 09:57:47 +02:00
PCoder
e9ac699be8
Add card detail creation code in various landing cases
2018-07-05 09:57:18 +02:00
PCoder
ec0216790f
Remove redundant code
2018-07-05 09:55:45 +02:00
PCoder
9bf8992ff4
Landing flow: set/get token/card_id
2018-07-04 02:53:43 +02:00
PCoder
dc28186fe9
Add styles for landing payment choices
2018-07-04 02:03:50 +02:00
PCoder
8e742852a5
Show all cards in landing and hosting payment page
2018-07-04 02:03:08 +02:00
PCoder
3d8237a34a
Get and show all card details in the landing flow, if the user is logged in
2018-07-04 00:50:44 +02:00
PCoder
1c5ff1f9dd
Add UserCardDetail in the landing non-logged in flow
2018-07-03 23:22:10 +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
f48005166e
Fix bug getting VMTemplate object from vm_template_id
2018-07-01 18:42:11 +02:00
PCoder
900f014d92
Save order specifications in HostingOrder also
2018-07-01 18:33:10 +02:00
PCoder
5851277d9a
Reorganize imports
2018-07-01 16:36:41 +02:00
PCoder
43b3a63958
Reorganize imports
2018-07-01 16:25:02 +02:00
PCoder
081921e846
Merge master into task/3934/move_hosting_order_out_of_celery_task
2018-07-01 16:18:43 +02:00
PCoder
ef8e380ab7
Fix flake8 error
2018-07-01 11:22:42 +02:00
PCoder
c13af95017
Refactor code: get_primary_ip -> get_ipv6 and remove unwanted code
2018-07-01 11:07:39 +02:00
PCoder
8993a7bde1
Reorganize imports + format code
2018-07-01 11:05:23 +02:00
M.Ravi
f1e021e1e9
Improve comments
2018-06-27 12:24:53 +02:00
M.Ravi
88e6d9d216
Separate two error messages with a period
2018-06-27 12:24:16 +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
a3db7f2e1a
Merge branch 'master' into task/4890/ssh_key_manage_for_ipv6
2018-06-27 09:23:48 +02:00
PCoder
60260ccb08
Attempt to fix flake8 error
2018-06-27 09:06:28 +02:00
PCoder
6c2eabbe6a
Use the public ipv4 if it exists; otherwise use the ipv6 to do a
...
cdist cdist ssh configure
2018-06-27 00:01:55 +02:00
PCoder
70cac38f81
Move initialization of VMTemplates out of the plugin
2018-06-24 10:29:07 +02:00
PCoder
79e83b4480
Refactor show_vm_templates to DCLCalculatorPluginModel from VMPricing
2018-06-24 09:08:22 +02:00
PCoder
b872777bda
Filter context templates also by the ids that have been set for the calculator
2018-06-13 11:55:30 +02:00
