PCoder
10dab1350a
Use refactored method clear_all_session_vars
2018-10-05 11:01:49 +02:00
PCoder
12eabc5f6c
Redirect user to product page on login
...
For the case when user is on product page and tries logging in
2018-10-05 08:58:57 +02:00
PCoder
ec70cd1c83
Pass product_id to ProductPaymentForm
2018-10-03 22:53:24 +02:00
PCoder
193b87bbb5
Use proper payment form
2018-10-03 09:36:43 +02:00
PCoder
ca18004819
Remove stale reference to product_id
2018-10-03 09:36:00 +02:00
PCoder
e1c91d886b
Use explicit index in plan name formatting
2018-10-03 09:35:20 +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
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
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
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
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
737681136f
Correct flake8 error
2018-09-26 21:23:46 +02:00
PCoder
4575ff60ec
Refactor validation code + Add product_id to context
2018-09-26 09:15:24 +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
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
730492089b
Modify PaymentOrderView to accomodate the new generic payment case (WIP)
2018-09-22 08:20:49 +02:00
PCoder
8a30100488
Use price in stripe plan name too
2018-09-05 23:26:51 +02:00
PCoder
34ed51a643
Don't dissociate card if transaction fails
2018-07-07 02:03:42 +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
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
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
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
f8dc2c6bbe
discount option added to calculator
2018-05-07 05:07:58 +05:30
Arvind Tiwari
a5bd8347e8
merged master
2018-04-21 21:01:42 +05:30
Arvind Tiwari
736253feda
refactor imports
2018-04-20 20:27:26 +05:30
Arvind Tiwari
3debf34118
remove vm creation to util function
2018-04-20 20:25:24 +05:30
PCoder
bd875ffe7d
Create hostingorder outside celery task
2018-04-18 23:50:52 +02:00
PCoder
c2513dc7c3
Show vat_percent and subtotal for vat exclusive case
2018-04-17 21:38:28 +02:00
PCoder
0b9c67166e
Rename variable name: disk_size -> ssd_size
2018-04-16 03:26:51 +02:00
PCoder
95daa37670
Use total_price for amout to be charged, always
2018-04-16 01:32:38 +02:00
PCoder
4148eff03e
Rename variable: amount_to_be_charged -> price
2018-04-16 01:31:16 +02:00
PCoder
d0276f22c1
Reorganize imports
2018-04-16 01:30:02 +02:00
PCoder
23bd0fa147
Pass context params to various landing templates
2018-04-15 21:03:31 +02:00
PCoder
63a12ffe06
Use updated get_vm_price method
2018-04-15 13:42:39 +02:00
Arvind Tiwari
ae2dea993d
remove whitespace
2018-04-04 02:27:30 +05:30
Arvind Tiwari
d843c34d68
modified cms integrate to support separate content for each domain
2018-04-03 22:41:29 +05:30
Arvind Tiwari
bc36849178
cms integration
2018-03-27 19:19:26 +05:30
Arvind Tiwari
6c27e0e6ff
redirect form view instead of url
2018-03-22 03:30:43 +05:30
Arvind Tiwari
883118e050
whydcl section style fix, footer style fix
2018-03-05 18:41:13 +05:30
Arvind Tiwari
d85e1c671b
All major DCL plugins added
2018-02-28 04:09:19 +05:30
Arvind Tiwari
e9e9da519b
fix flake8 warning
2018-02-23 19:05:45 +05:30
Arvind Tiwari
80ed92eece
merged master
2018-02-23 18:14:31 +05:30
M.Ravi
35d6fd8fd3
Remove datacenterlight/order-success urlconf, view and template as
...
we are not using it anymore
2018-02-22 17:53:51 +01:00
PCoder
3769e00c8c
Fix a PEP8 error
2018-02-20 19:22:28 +01:00
M.Ravi
3cdf915b86
Remove more classes related to Beta
2018-02-20 15:06:24 +01:00
M.Ravi
4f1c5d7c77
Remove BetaProgramView
2018-02-20 12:19:30 +01:00
Arvind Tiwari
909067e11f
removed vendor files from hosting and using the ones from dataccenterlight
2018-02-09 06:50:17 +05:30
Arvind Tiwari
fb6ddd3512
moved styles to common.css, removed more unused styles
2018-01-17 16:31:46 +05:30
Arvind Tiwari
157cc5ac5d
fix datacenterlight templates
2018-01-08 00:56:54 +05:30
PCoder
4dff4e07cb
Change minimum required RAM from 2GB to 1GB
2017-12-21 01:25:52 +01:00
M.Ravi
152c930180
Redirect explicitly to the payment page on dcl landing login
2017-10-12 22:50:54 +02:00
M.Ravi
4f6fd52ce8
Merge branch 'master' into task/3829/handle_landing_login_fail_in_same_page
2017-10-11 21:23:13 +02:00
Arvind Tiwari
f7e6c26a34
merged master
2017-10-11 01:28:35 +05:30
M.Ravi
09f67e46b9
glasfaser: Fix email to parameter
2017-10-10 21:22:11 +02:00
Arvind Tiwari
7410a73e60
from email removed direct dependency from post request
2017-10-11 00:36:17 +05:30
M.Ravi
1c67d66ff7
Merge remote-tracking branch 'mainRepo/master' into task/3829/handle_landing_login_fail_in_same_page
2017-10-10 19:22:37 +02:00
Arvind Tiwari
0616be9864
op text sections added, from email fixed
2017-10-10 20:58:11 +05:30
M.Ravi
8b36d9cba4
Create stripe customer if not exists
2017-10-08 21:01:25 +02:00
M.Ravi
b44948b277
Prefill cc info on landing for logged in case
...
Attention: We still support only one card
2017-10-08 20:21:20 +02:00
M.Ravi
86c931cde1
Remove prefixes for billing_address_forms
2017-10-08 19:24:58 +02:00
M.Ravi
cdbab541bc
Refactor billing_address_form for not logged in case
2017-10-08 17:29:10 +02:00
M.Ravi
5a2657e357
Create billing_address_form only for a logged user
2017-10-08 17:21:38 +02:00
M.Ravi
564f47cf8a
Handle login and billing address forms together in PaymentOrderView
2017-10-08 13:50:43 +02:00
M.Ravi
60b233f082
Fix flake8 warnings
2017-10-03 00:26:50 +02:00
M.Ravi
22af001489
Merge upstream master
2017-10-02 00:09:38 +02:00
M.Ravi
5bbfb54b79
Revert back to simple error message
2017-09-29 21:54:31 +02:00
M.Ravi
5393ffa10d
Small code reorganizing
2017-09-29 09:16:00 +02:00
M.Ravi
d06f5ffb00
datacenterlight/views: remove billing_address_id in call to
...
create_vm_task
2017-09-29 08:58:45 +02:00
M.Ravi
caad79304b
Pass subscription_id instead of subscription object
2017-09-29 08:40:43 +02:00
M.Ravi
f60a2c3482
Make correct icons load on dcl createvm error modal
2017-09-28 23:20:43 +02:00
M.Ravi
0202d5ba93
Add initial values for dcl billing form
2017-09-28 22:56:33 +02:00
PCoder
fcda0b5637
DCL payment page: Get form data from session on error
2017-09-29 01:25:22 +05:30
M.Ravi
c13015eabd
Refactor and correct some logic
2017-09-28 15:56:09 +02:00
Arvind Tiwari
abb7c38d75
translation fix
2017-09-28 18:27:26 +05:30
M.Ravi
46925c29c4
Add error detail to the message
2017-09-28 14:57:03 +02:00
Arvind Tiwari
b65bc3f1f5
merge master
2017-09-28 18:23:48 +05:30
M.Ravi
07aaa20efe
Fix issue : stripe user created every time for unauthenticated user
2017-09-28 14:46:56 +02:00
PCoder
39cb930326
Compute vm price on post of dcl index and set in session
2017-09-28 04:22:15 +05:30
PCoder
fccd75f1fc
Add missing imports
2017-09-28 03:46:05 +05:30
PCoder
06ef940b01
Merge upstream
2017-09-28 03:33:43 +05:30
Arvind Tiwari
88706b0088
merged master
2017-09-28 03:06:47 +05:30
Arvind Tiwari
2a99d053dc
text fixes
2017-09-26 03:42:10 +05:30
Arvind Tiwari
3c32abbf8e
dcl form added
2017-09-26 03:18:19 +05:30
Arvind Tiwari
63ea7dac37
datacenterlight invoice redesigned
2017-09-26 01:04:38 +05:30
PCoder
537e350c8c
Redirecting users on creation of accounts to my virtual machines page
2017-09-24 00:22:18 +05:30
PCoder
8781905fc6
Removed DataCenterLight PricingView
2017-09-23 21:24:42 +05:30
PCoder
93d36306fb
Removed total and price fields used in dcl flow
2017-09-23 13:21:01 +05:30
PCoder
b17af3bb09
Merge branch 'task/3736/refactor_compute_vm_price' into task/3730/refactor_price_parameter
2017-09-23 12:48:31 +05:30
PCoder
8de4a75107
Removed some occurrences of price
2017-09-23 12:48:21 +05:30
PCoder
99e5cf5587
Using refactored get_vm_price and get_vm_plan_name functions
2017-09-23 03:18:05 +05:30
M.Ravi
c362dccd0f
Handling payment error response by json
2017-09-22 21:30:42 +02:00
M.Ravi
a48188a190
datacenterlight: Added create vm modal and responding with json
2017-09-22 21:20:00 +02:00
M.Ravi
ab66d25abe
Removed some commented code
2017-09-22 13:54:20 +02:00
M.Ravi
0e5a27862a
Added base_url and fixed new account emails
2017-09-22 13:46:22 +02:00
M.Ravi
4c0c1ffb27
Do a user login after creation
2017-09-22 12:46:33 +02:00
M.Ravi
31f7c4a51a
Simplified code
2017-09-22 12:38:05 +02:00
M.Ravi
994ffaf117
Send account details in email
2017-09-22 12:01:09 +02:00
M.Ravi
f67b69d490
Formatted code and added condition to create user only if an email does not exist
2017-09-22 11:45:21 +02:00
M.Ravi
e5ad57d3f1
Resolved some issues
2017-09-21 14:29:49 +02:00
PCoder
e2cb70a697
first attempt at refatoring the user creating to order confirmaton page
2017-09-21 06:41:09 +05:30
Arvind Tiwari
6237469ab2
mobile order fixed
2017-09-13 01:55:58 +05:30
Arvind Tiwari
4d2903ca86
billing address save and get
2017-09-12 00:54:02 +05:30
Arvind Tiwari
7a4573f7ad
user logged in after signup on payment page
2017-09-09 02:10:25 +05:30
Arvind Tiwari
f2a04c20f2
form submit fix
2017-09-09 00:05:13 +05:30
Arvind Tiwari
de1895d2a0
billing address form fixed
2017-09-08 23:46:29 +05:30
Arvind Tiwari
aaf3bc18d8
landing_payment all sections arranged
2017-09-06 00:12:13 +05:30
Arvind Tiwari
046b716091
Merge branch 'master' into task/3756/landing_billing_page
2017-09-04 23:58:22 +05:30
Arvind Tiwari
979844e55b
hosting payment and datacenterlight payment files supported
2017-09-02 02:02:05 +05:30
Arvind Tiwari
cc5eaa4047
new template for datacenterlight/payment
2017-09-01 23:06:57 +05:30
Arvind Tiwari
5550867870
navbar link hash fixed, footer links fixed
2017-09-01 01:27:44 +05:30
Arvind Tiwari
3ed2399337
merge master
2017-09-01 00:39:01 +05:30
Arvind Tiwari
e94f9a5d2b
dropdown style fix
2017-08-31 23:42:18 +05:30
M.Ravi
5ffb2a2bb7
Improved the contact us email message subject & reformatted code
2017-08-30 10:04:19 +02:00
PCoder
1da04a05d1
Created send_plain_email_task celery task and calling it on contact send
2017-08-27 16:42:14 +05:30
PCoder
28bcef082c
Merged tiwariav/task/3657/contact_section into task/3740/contact_send_message
2017-08-27 16:41:39 +05:30
PCoder
16f000c723
dcl views.py: passing cc details to create_vm_task + reformatted code
2017-08-24 11:54:12 +05:30
PCoder
a964f2fb5b
Merged master into task/3701/enable_monthly_payments
2017-08-24 04:06:48 +05:30
PCoder
6484684ac5
Removed unncessary check for error for make_charge
2017-08-24 02:29:24 +05:30
PCoder
83df42b5df
Fixed checking active status of subscription + redirection to payment page on error
2017-08-22 00:07:58 +05:30
PCoder
506b5a904a
Added missing code from the merge
2017-08-21 01:54:55 +05:30
PCoder
339a6283cd
Removed unused imports
2017-08-19 03:32:30 +05:30
PCoder
6b7ae88f74
Merged master into task/3622/decouple_opennebula_dcl_flow
2017-08-19 03:24:22 +05:30
Pcoder
a80b0668a2
Merge pull request #432 from siarheipuhach/feature/task3637
...
task/3637/Added stripe failed payment error handler
2017-08-17 20:50:18 +02:00
PCoder
73721f16d2
Added ONEADMIN_USER_SSH_PUBLIC_KEY parameter to load oneadmin user's ssh key by default when creating VM via DCL flow
2017-08-15 02:29:01 +05:30
Siarhei Puhach
72ddfd96ab
Payment error was unified
2017-08-07 17:23:58 +03:00
Siarhei Puhach
a71ccbc566
Added error hash in url, added payment error handler to hosting/views
2017-08-07 17:02:47 +03:00
Siarhei Puhach
4cd3d6a4aa
Added stripe make_charge error handler
2017-08-07 13:36:21 +03:00
