Commit Graph

4248 Commits

Author SHA1 Message Date
PCoder 72c16713a7 Update .po of datacenterlight 2018-09-26 22:37:32 +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 fcc113e9d9 Add locale_date class to date fields so that we can localize 2018-09-26 22:06:14 +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 efae2b1d9a Update Changelog 2018-09-26 21:17:35 +02:00
Pcoder 31e8467f20
Merge pull request #667 from pcoder/bugfix/corrections_by_malcolm
Bugfix/corrections by malcolm

- virutal -> virtual
- some DE corrections
2018-09-26 21:11:13 +02:00
PCoder 4feeec23d4 Correct spelling: virutal -> virtual 2018-09-26 20:50:19 +02:00
PCoder ca578ecf56 Merge branch 'master' of https://github.com/MalcolmA/dynamicweb into MalcolmA-master 2018-09-26 20:46:54 +02:00
PCoder b021a8ed6e Remove filer dependency in migration 2018-09-26 09:29:10 +02:00
PCoder 99b11f013f Remove old migration 2018-09-26 09:25:03 +02:00
PCoder 1f990b1ab7 Update migration 2018-09-26 09:24:47 +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 508360472a Add amount/recurring form fields validation 2018-09-26 09:14:11 +02:00
PCoder 48ba6a6166 Remove disabled on amount/recurring fields 2018-09-26 09:13:45 +02:00
PCoder 10e8f0a820 Show product name in hosting order detail 2018-09-26 09:10:15 +02:00
PCoder 5df2080f92 Reset amount and recurring fields on error 2018-09-26 09:09:12 +02:00
PCoder 9ff20491bd Merge branch 'master' into task/5690/generic-payment-page 2018-09-25 23:25:22 +02:00
PCoder ce2ac4524c Update Changelog for release 2.2.1 2018-09-25 22:49:31 +02:00
Pcoder 5d5408eb8c
Merge pull request #665 from pcoder/manage_navbar_login
Change DCLNavbarPlugin to show login option only if set
2018-09-25 22:43:10 +02:00
PCoder c9ac959ff6 Change DCLNavbarPlugin to show login option only if set 2018-09-25 22:29:58 +02:00
PCoder d54bf84b1e Format code 2018-09-25 02:20:57 +02:00
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