ungleich-public/dynamicweb
6
0
Fork 0
Code Issues 1 Pull requests 2 Projects Releases Wiki Activity
4643 commits 13 branches 148 tags 315 MiB
Commit graph

1128 commits

Author SHA1 Message Date
PCoder
2b118ff540 Correct spelling 2019-05-05 16:56:56 +02:00
PCoder
51100fd627 Add missing code 2019-04-29 00:53:06 +02:00
PCoder
0352096fa7 Call delete on Customer object 2019-04-29 00:17:59 +02:00
PCoder
a67284a89d Rename management command deteteuser -> deleteuser 2019-04-29 00:02:45 +02:00
PCoder
591614ade5 Remove user from opennebula also 2019-04-28 23:57:39 +02:00
PCoder
c8bd3f97c6 Add deleteuser management command 2019-04-28 23:14:14 +02:00
PCoder
c8e35e63f0 Update datacenterlight StripePlan further 
- Add field amount to stripeplan
    - Add field interval to stripeplan
 2019-04-20 12:22:51 +02:00
PCoder
4be098d07a Add stripe_plan_name field to datacenterlight's StripePlan model 2019-04-20 11:55:47 +02:00
PCoder
5f8cc2199b Change vm_pool infoextended to retrieve VMs in any state except DONE 2019-04-11 01:39:06 +02:00
PCoder
842766d0e2 Merge branch 'sanghee/dynamicweb-task/6059' 2019-01-31 21:21:49 +01:00
PCoder
16b5f1e5a4 Merge branch 'master' into 5151/gdpr_modal 2019-01-30 21:05:34 +01:00
sanghee
df368c715f changed topnav font into 400 by default 2018-11-13 21:21:46 +01:00
Aatish Neupane
1bfb710ee6 Change datacenterlight.ch message form to send email to support@ungleich.ch 2018-11-11 17:01:19 +01:00
PCoder
1feacc1770 Merge branch 'master' into 5151/gdpr_modal 2018-10-25 22:05:24 +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
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
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
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
8758cd1cd8 Add style input-no-border 2018-10-05 08:57:20 +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
8a2734fa0e Show GenericPaymentForm labels 2018-10-03 08:36:21 +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
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
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
f85ef714ab Pass instance context 
Also POST plugin_id as a form parameter to check enable_512mb_ram
case
 2018-10-01 07:50:18 +02:00
PCoder
24d719e4f1 Update migration 2018-09-29 07:37:23 +02:00
PCoder
5452c1c478 Merge master into task/5681/offer-512mb-ram 2018-09-28 08:36:35 +02:00
PCoder
db20e3cbe7 Add plus minus ram handler for 512MB option 2018-09-28 08:07:12 +02:00
PCoder
e1ce017ec8 Add migration 2018-09-27 22:48:23 +02:00
PCoder
b047ccdef1 Fix flake8 error 2018-09-27 22:33:24 +02:00
PCoder
56460ac8f0 Update migration 2018-09-27 22:16:05 +02:00
PCoder
d93861ca32 Set Devuan Ascii as default template 2018-09-27 22:14:42 +02:00
PCoder
a02c3c6973 Sort templates alphabetically 
And also select the chosen template as the default one
 2018-09-27 22:12:13 +02:00
PCoder
768f3532f7 Add default_selected_template field to DCLCalculatorPluginModel 2018-09-27 22:09:11 +02:00
PCoder
21084cdc9f Initialize minRam js variable from what is passed from backend 2018-09-27 09:07:28 +02:00
PCoder
12f139976d Simplify logic to set min_ram in the calculator form 2018-09-27 09:06:39 +02:00
PCoder
da21699212 Merge branch 'master' into task/5681/offer-512mb-ram 2018-09-26 23:10:17 +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
b7929a16e2 Update datacenterlight django.po 2018-09-26 22:45:09 +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
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
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
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
9ff20491bd Merge branch 'master' into task/5690/generic-payment-page 2018-09-25 23:25:22 +02:00
PCoder
c9ac959ff6 Change DCLNavbarPlugin to show login option only if set 2018-09-25 22:29:58 +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
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
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
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
76efc35324 Add enable_512mb_ram option in model/plugin 2018-09-22 06:44:37 +02:00
PCoder
8a30100488 Use price in stripe plan name too 2018-09-05 23:26:51 +02:00
PCoder
e230f2ac8c Merge master into 5151/gdpr_modal 2018-08-22 23:25:11 +02:00
PCoder
9c5363ef55 Merge branch 'master' into bugfix/show_meta_description_in_cms_page 2018-08-22 21:42:37 +02:00
PCoder
13876c24c1 Update doc 2018-08-22 00:42:50 +02:00
PCoder
f56933021f Also send an email if manage_ssh_key does not complete in time 2018-08-22 00:37:40 +02:00
PCoder
2ff7eaea65 Sleep additional 10 seconds before running manage_public_key 2018-08-22 00:25:59 +02:00
PCoder
893c8ed08b Fix imports 2018-08-22 00:14:17 +02:00
PCoder
3b07687d3e Refactor ping_ok from datacenterlight.utils to utils.hosting_utils 2018-08-22 00:12:14 +02:00
PCoder
a55587dbf3 Wait for VM to be pingable before doing a manage_public_key 2018-08-21 23:49:47 +02:00
PCoder
91021d7612 Add ping_ok utility method 2018-08-21 23:24:40 +02:00
M.Ravi
9381327a12 Change author of various cms pages to ungleich glarus ag 
(Being consistent)
 2018-08-20 11:52:27 +02:00
PCoder
069cd18268 Add gdpr banner to all base templates 2018-07-21 13:27:15 +02:00
PCoder
4dce0ee5bd Add gdpr banner to dcl template 2018-07-21 10:51:11 +02:00
PCoder
34ed51a643 Don't dissociate card if transaction fails 2018-07-07 02:03:42 +02:00
PCoder
8d42ca3200 Remove token parameter from stripe_utils.get_card_details 
and add additional paramters to uniquely identify a card
 2018-07-07 01:08:49 +02:00
PCoder
4c06a9e730 Add de translations by MalcolmA 2018-07-06 19:33:26 +02:00
PCoder
1f2743a65d Makemessages for datacenterlight, hosting and utils 2018-07-06 01:19:44 +02:00