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 |
|
PCoder
|
94f520be35
|
Add migration
|
2018-06-13 11:17:18 +02:00 |
|
PCoder
|
5748eecedb
|
Create field for storing os_templates_to_show
|
2018-06-13 11:16:49 +02:00 |
|
PCoder
|
cf00ff6bd8
|
Attempt to merge master into task/3747/multiple_cards_support
|
2018-06-12 08:16:11 +02:00 |
|
Arvind Tiwari
|
2d1805f11d
|
update fetchvmtemplates command
|
2018-05-24 04:14:53 +05:30 |
|
Arvind Tiwari
|
a4ca17e2ed
|
vm template prefix
|
2018-05-24 03:57:01 +05:30 |
|
Arvind Tiwari
|
8fb0d9a48a
|
order detail divider lines full width
|
2018-05-12 21:59:06 +05:30 |
|
Arvind Tiwari
|
3446dcc469
|
calculator translation
|
2018-05-12 21:48:57 +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
|
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
|
ccf55acbaf
|
Update navbar_dropdown.html
|
2018-05-01 04:36:29 +05:30 |
|
Arvind Tiwari
|
6ff03d8f48
|
Merge pull request #627 from tiwariav/task/dcl_calculator_on_non_cms_pages
Task/4527 dcl calculator on non-cms pages
|
2018-05-01 02:35:22 +05:30 |
|
Arvind Tiwari
|
86188b1fb0
|
Merge pull request #626 from tiwariav/task/4474/slider_padding
Task/4474 cms header slider padding
|
2018-04-30 23:52:23 +05:30 |
|
Arvind Tiwari
|
14548b2f01
|
flake8 refacoring
|
2018-04-25 17:26:31 +05:30 |
|
Arvind Tiwari
|
f66d768ecb
|
hosting payment page
|
2018-04-25 15:55:58 +05:30 |
|
Arvind Tiwari
|
3b3b73a2ce
|
alignment calculator plugin
|
2018-04-25 15:08:28 +05:30 |
|
Arvind Tiwari
|
3bf064a017
|
add calculator placeholder to cms_integration
|
2018-04-25 14:52:25 +05:30 |
|
Arvind Tiwari
|
a5bd8347e8
|
merged master
|
2018-04-21 21:01:42 +05:30 |
|