Commit graph

4271 commits

Author SHA1 Message Date
PCoder
3a489f5be0 Update Changelog for 2.4 2018-10-18 07:44:07 +02:00
Pcoder
961bf2e46f
Merge pull request #672 from pcoder/task/5681/offer-512mb-ram
Allow admin to lower the minimum RAM for a calculator instance to 512 MB
2018-10-18 07:21:40 +02:00
PCoder
c36554b4d1 Round total_price also to 2 decimal places 2018-10-18 06:58:18 +02:00
PCoder
270c610111 Correct the min value of RAM
Based on what is set by the admin in the backend
2018-10-17 09:56:42 +02:00
PCoder
3ebf932422 Adjust hosting calculator form validation
For 512 MB RAM offer
2018-10-17 09:29:08 +02:00
PCoder
814163e58e Add minRAM js code for hosting also 2018-10-17 09:11:37 +02:00
PCoder
0d767e74a9 Merge branch 'master' into task/5681/offer-512mb-ram 2018-10-17 07:57:07 +02:00
PCoder
5a52ae1a1d Update Changelog for 2.3.1 2018-10-17 07:47:34 +02:00
Pcoder
6612a7debd
Merge pull request #673 from pcoder/bugfix/show_correct_vat
Round VAT percent to 2 decimal places
2018-10-17 07:40:22 +02:00
PCoder
8929a26714 Round VAT percent to 2 decimal places 2018-10-17 07:27:28 +02:00
PCoder
0e9f8ce906 Cleanup unnecessary code 2018-10-16 09:01:00 +02:00
PCoder
b7cc7b08ce Update calculator min RAM input js validation 2018-10-16 08:58:12 +02:00
PCoder
26970ece92 Set default RAM step to 1
We later change this according to minRam set in the backend
2018-10-16 08:55:08 +02:00
PCoder
42d6f38f0c Merge branch 'master' into task/5681/offer-512mb-ram 2018-10-08 07:56:57 +02:00
PCoder
27ee5ca5ac Update Changelog for 2.3 2018-10-08 07:28:04 +02:00
Pcoder
733fb9fc43
Merge pull request #670 from pcoder/task/5690/redirect-on-payment-error
Task/5690/redirect on payment error
2018-10-06 07:59:40 +02:00
PCoder
5770c231ee Fix flake8 warnings 2018-10-06 07:47:40 +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
806726614e Clear all session variables before loading DCLCalculatorPlugin 2018-10-05 10:37:23 +02:00
PCoder
5d9b2ee41a Refactor clearing all session variables 2018-10-05 10:36:20 +02:00
PCoder
2fbee916cc Correct help text for product slug field 2018-10-05 09:37:57 +02:00
PCoder
1dafa592a2 Update Changelog 2018-10-05 09:23:39 +02:00
Pcoder
e557a777c3
Merge pull request #666 from pcoder/task/5690/generic-payment-page
Task/5690/generic payment page
2018-10-05 09:16:08 +02:00
PCoder
f4579595c3 Add newline character to end of file 2018-10-05 09:05:47 +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
e3ec67d32c ProductPaymentForm: Set input fields input-no-border style 2018-10-05 08:58:10 +02:00
PCoder
8758cd1cd8 Add style input-no-border 2018-10-05 08:57:20 +02:00
PCoder
1100d61b5d Fix flake8 warnings 2018-10-03 23:17:25 +02:00
PCoder
b3e3af1c1a Make ProductPaymentForm's recurring field hidden 2018-10-03 22:54:45 +02:00
PCoder
ec70cd1c83 Pass product_id to ProductPaymentForm 2018-10-03 22:53:24 +02:00
PCoder
74ec39498e Update GenericProduct
Remove url field
Make slug mandatory
2018-10-03 09:58:49 +02:00
PCoder
e4bfdec0b6 Update ProductPaymentForm's validation 2018-10-03 09:38:49 +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
27a92780a6 Add amount label + Reset textarea height 2018-10-03 08:38:20 +02:00
PCoder
8a2734fa0e Show GenericPaymentForm labels 2018-10-03 08:36:21 +02:00
PCoder
97693f0bb3 Format code 2018-10-03 08:27:22 +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
530bbcd5f6 Create ProductPaymentForm from GenericPaymentForm 2018-10-03 08:18:45 +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
e3bd963600 Test product_slug url (wip) 2018-10-02 10:02:44 +02:00
PCoder
e47f4f05b4 Handler if product_slug is given (wip) 2018-10-02 10:02:02 +02:00
PCoder
3bad37c605 Make GenericProduct slug unique 2018-10-02 10:00:59 +02:00
PCoder
930333357e GenericProduct: Remove image field and add slug field 2018-10-02 09:27:38 +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