Commit graph

4223 commits

Author SHA1 Message Date
PCoder
50e5fea339 Add GenericProduct model and associate it to HostingOrder 2018-09-25 02:20:31 +02:00
PCoder
67231275c7 Modify migration 2018-09-25 02:19:28 +02:00
PCoder
1228d3dbc6 Add product_name to GenericPaymentForm 2018-09-25 02:18:31 +02:00
PCoder
69a1d2df71 Add ajax call to fetch price/recurring
Based on selected production
2018-09-25 02:16:44 +02:00
PCoder
b63a572231 Register GenericProduct to adminsite 2018-09-25 02:14:37 +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
114dbd8242 Make recurring monthly and amount in chf explicit 2018-09-24 08:32:33 +02:00
PCoder
a90bec98ec Make invoice for generic payment showable 2018-09-24 08:22:46 +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
2a694295ad Refactor payment.js 2018-09-23 17:00:48 +02:00
PCoder
fcfc56e132 Move csrf_token out of the form loop 2018-09-23 16:15:48 +02:00
PCoder
d6e4a86724 Append One time charge/Recurring only for generic payments 2018-09-23 13:34:26 +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
9ec05e7df4 Merge billing and generic-payment forms and post values as get
parameters
2018-09-23 13:13:32 +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
e94ecfe52c Change recurring and description to non-required fields + Change
amount to Floatfield
2018-09-23 12:49:57 +02:00
PCoder
332e7d6624 Add generic_payment_id field to HostingOrder migration and
reflect generic payments in adminsite
2018-09-23 12:39:06 +02:00
PCoder
c7edcdc8b1 Change description to CharField and set its height 2018-09-22 23:51:39 +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
a7fa52490c Create GenericPaymentForm 2018-09-22 08:16:26 +02:00
PCoder
d7be223fcb Change margin bottom for vm terminate error 2018-09-08 12:39:12 +02:00
PCoder
304feb4f7b Update text 2018-09-08 10:46:07 +02:00
PCoder
e376f38baa Correct text 2018-09-08 10:33:00 +02:00
PCoder
84dae63968 Fix: ugettext_lazy doesn't like string format 2018-09-08 10:29:47 +02:00
PCoder
4914280868 Set text for vm terminate timeout 2018-09-08 10:14:57 +02:00
PCoder
ce2d34350f Update Changelog 2018-09-08 00:15:44 +02:00
Pcoder
743ce4ed70
Merge pull request #648 from pcoder/bugfix/log_vm_terminate_errors
Bugfix/log vm terminate errors
2018-09-08 00:09:59 +02:00
PCoder
a7afbec5b4 Fix flake8 error 2018-09-07 23:14:57 +02:00
PCoder
ff6df8cd58 Simplify logic 2018-09-07 23:11:46 +02:00
PCoder
7d4cf5c3c2 Fix flake8 error 2018-09-07 22:46:18 +02:00
PCoder
8e7789462e Merge branch 'master' into bugfix/log_vm_terminate_errors 2018-09-07 22:43:29 +02:00
PCoder
d601b987d2 Update Changelog 2018-09-06 01:15:21 +02:00
PCoder
c6ec2c062c Update Changelog for 2.2 2018-09-06 01:11:27 +02:00
Pcoder
c6612153e8
Merge pull request #663 from pcoder/bugfix/plan-with-price
Use price in stripe plan name too
2018-09-06 01:04:47 +02:00
PCoder
fc8f9993af Remove whitespace in Stripe plan 2018-09-06 00:52:55 +02:00
PCoder
b03cb073c2 Replace @ with a comma 2018-09-06 00:44:47 +02:00
PCoder
fdffe2389b Round price 2018-09-06 00:31:17 +02:00
PCoder
d8a532e7b0 Round discount to 2 decimal points also 2018-09-06 00:26:08 +02:00
PCoder
642153345c Round price, vat and discount to 2 decimal places 2018-09-06 00:18:04 +02:00
PCoder
8a30100488 Use price in stripe plan name too 2018-09-05 23:26:51 +02:00
PCoder
5f19a85a28 Update Changelog for 2.1.2 2018-08-30 10:10:31 +02:00