Commit Graph

306 Commits

Author SHA1 Message Date
PCoder 903ef48c75 Format cc month to 2 decimal places 2019-07-09 19:03:09 +05:30
PCoder 59c45492a9 Add expiry year and month in the settings and order payment pages 2019-07-09 18:40:41 +05:30
PCoder dfb16f0c25 Save new user's hosting key only in that case 2019-07-03 05:13:02 +05:30
PCoder 670c2b18a9 Set user_hosting_key's user to the newly created user 2019-07-01 23:09:42 +05:30
PCoder c285e1d9eb Set respective order_confirm_url for landing vs hosting flows
For hosting flow also take the user to add_ssh_key after payment
2019-07-01 20:30:06 +05:30
PCoder 207c3a6c6c Skip SSH key page for generic products page 2019-07-01 08:57:39 +05:30
PCoder 79eba3b70c Remove add SSH key form in order confirmation related code 2019-07-01 08:28:28 +05:30
PCoder 47fd9a8f28 Adjust urls in datacenterlight/hosting apps urls/views after refactor 2019-07-01 08:09:37 +05:30
PCoder f502e53845 Add basic implementation of AskSSHKeyView 2019-07-01 06:45:48 +05:30
PCoder feeb102f92 Do SSH key validation only if the user doesn't have an existing key and
the user has input some value in the add ssh key field
2019-06-25 03:48:29 +02:00
PCoder 9ee1b7c124 Make public_key form params mandatory only if existing keys do not exist 2019-06-25 02:25:17 +02:00
PCoder ecc26d14e5 Show previous keys if exist in order confirmation 2019-06-24 17:24:35 +02:00
PCoder 87f5bf3dcc Pass UserHostingKeyForm to the context of OrderConfirmationView 2019-06-24 04:32:27 +02:00
aatish 1bfb710ee6 Change datacenterlight.ch message form to send email to support@ungleich.ch 2018-11-11 17:01:19 +01:00
PCoder c36554b4d1 Round total_price also to 2 decimal places 2018-10-18 06:58:18 +02:00
PCoder 42d6f38f0c Merge branch 'master' into task/5681/offer-512mb-ram 2018-10-08 07:56:57 +02:00
PCoder 5985ded36f Obtain product_slug from session
Obtaining slug from kwargs won't work in OrderConfirmation page
because we do not set the kwargs for that page. To resolve this,
I add the product_slug to the generic_payment_details dict in the
session
2018-10-06 07:31:41 +02:00
PCoder 2b7d4bbef5 Redirect to product page on error 2018-10-05 11:10:10 +02:00
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