mravi/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
5075 commits 59 branches 86 tags 315 MiB
Commit graph

1311 commits

Author SHA1 Message Date
PCoder
e01b27835e Make subscription exclusive of VAT + Add VAT separately to subscription 2020-01-24 14:11:55 +05:30
PCoder
a00a9f6ff0 Show invoices directly from stripe 2020-01-20 12:07:32 +05:30
PCoder
9212c02cd7 Check vat_validation_status exists in dict before using it 2020-01-10 19:47:49 +05:30
PCoder
ed1a4fc1a6 Merge remote-tracking branch 'mainRepo/master' into feature/VAT_number 2020-01-01 00:21:35 +05:30
PCoder
0bca5113ca Fix unwanted char 2020-01-01 00:10:56 +05:30
PCoder
7423a80670 Use correct variable 2019-12-31 22:50:46 +05:30
PCoder
ca5724f10f Fix error message 2019-12-31 18:36:38 +05:30
PCoder
2378410f2d Compare country for creating new tax id 2019-12-31 18:22:57 +05:30
PCoder
9078e46196 Add log 2019-12-31 18:08:09 +05:30
PCoder
3ca7e89f4f Show VAT for eu countries only 2019-12-31 17:28:11 +05:30
PCoder
b567b01362 For CH we don't care whether VAT is validated or not 2019-12-26 20:51:11 +05:30
PCoder
12975565a5 More bugfix 2019-12-26 20:09:28 +05:30
PCoder
d62986c91f Bugfix: use correct total price after discount 2019-12-26 20:05:55 +05:30
PCoder
fcdabd8dc3 Set vat validation status in more places 2019-12-26 19:55:28 +05:30
PCoder
a5c7865811 Save validation status 2019-12-26 19:37:57 +05:30
PCoder
7eed04ec73 Remove one log too many 2019-12-26 19:16:26 +05:30
PCoder
cbf2f05d70 Use the latest billing address as the default one 2019-12-26 18:54:17 +05:30
PCoder
c6147c887c More logging + improve ba string repr 2019-12-26 18:34:26 +05:30
PCoder
064ea5be2f More logging 2019-12-26 18:26:30 +05:30
PCoder
32d9f06c18 Add logger messages 2019-12-26 18:22:08 +05:30
PCoder
6d0a7f7049 Improve stripe_customer_id 2019-12-26 18:06:22 +05:30
PCoder
ad52338653 Save billing addresses 2019-12-26 14:27:16 +05:30
PCoder
d8c03a4364 Add missing param 2019-12-26 14:21:18 +05:30
PCoder
9aff248d31 Use correct billingaddress 2019-12-26 14:19:07 +05:30
PCoder
99e70d95c4 VAT number validation in settings 2019-12-26 13:31:15 +05:30
PCoder
7d9ab322c9 Remove vat_validate_on session var 2019-12-26 12:38:00 +05:30
PCoder
242dbb2479 Bugfix: pass param 2019-12-26 11:50:15 +05:30
PCoder
9310f72cf9 Save tax id in billing address even if no StripeCustomer 2019-12-26 11:30:01 +05:30
PCoder
74d1bbb6d3 Add missing customer save call 2019-12-26 11:09:14 +05:30
PCoder
6fd0659c88 Another missing param 2019-12-26 11:02:58 +05:30
PCoder
4560c8bf83 Bugfix: Pass parameter name 2019-12-26 11:00:24 +05:30
PCoder
0e40ca6044 Also validate vat in order confirmation get 2019-12-26 10:55:01 +05:30
PCoder
c393902396 Save address form in payment post itself 2019-12-26 10:54:26 +05:30
PCoder
825e716625 Update tax_id fields of billing_addresses which belong to supplied user only 2019-12-26 10:51:50 +05:30
PCoder
0d208d2bd9 Take billing_address_id in validate_vat_number 2019-12-26 10:50:53 +05:30
PCoder
52201c0aa1 Clear billing_address_id session var also 2019-12-26 10:49:45 +05:30
PCoder
0b8315ca76 Remove wrong filter 2019-12-25 23:20:48 +05:30
PCoder
4a40438edc Also handle ch_vat 2019-12-25 23:10:18 +05:30
PCoder
908c2e055c Also clear vat_validation_status from session 2019-12-25 22:48:57 +05:30
PCoder
4491a52bd9 Check if vat_validation_status is in session 2019-12-25 22:45:55 +05:30
PCoder
b15ece7088 Validate VAT number only if it is set 2019-12-25 22:40:57 +05:30
PCoder
3b654f1c49 Correct++ 2019-12-25 22:35:41 +05:30
PCoder
752b61a852 Correct the way to get the first object 2019-12-25 22:33:56 +05:30
PCoder
110459b38d Show vat error in payment page 2019-12-25 22:27:14 +05:30
PCoder
de0fe77779 Bugfix: pass correct param 2019-12-25 22:22:08 +05:30
PCoder
785f99311d Handle invalid VAT number case 2019-12-25 21:02:43 +05:30
PCoder
1b243822a9 Bugfix: remove unnecessary self param 2019-12-25 20:20:43 +05:30
PCoder
1400d27afa Handle tax_id creation 2019-12-25 20:11:15 +05:30
PCoder
8ebd12c420 Add missing vat_number while saving billing address 2019-12-25 10:32:37 +05:30
PCoder
6eb4b03afe Merge remote-tracking branch 'origin/master' into feature/VAT_number 2019-12-25 08:15:22 +05:30
PCoder
31905695c9 Add vertical spacing for mobile style 2019-12-24 19:00:17 +05:30
PCoder
7b7f8fb191 Set the calculator's post action url explicitly 2019-12-24 17:57:24 +05:30
PCoder
3b7183fc63 Set js in correct file 2019-12-24 10:49:12 +05:30
PCoder
3a0fe87a8e Use correct comparison format 2019-12-24 10:42:47 +05:30
PCoder
f1821954eb Set js for non transparent navbar always 2019-12-24 10:37:24 +05:30
PCoder
3b6e5d448b Add show non transparent navbar always option 2019-12-24 09:06:17 +05:30
PCoder
b919b6cfbd Fix wrong indentation 2019-12-21 08:51:11 +05:30
PCoder
f566aa8a2e Make VAT number a part of billing address 2019-12-21 08:43:34 +05:30
PCoder
c9de757bc7 Merge remote-tracking branch 'mainRepo/master' into feature/VAT_number 2019-12-21 08:19:23 +05:30
PCoder
ed74504270 Bugfix: Swiss VAT wrongly being applied to non EU customers 2019-12-18 19:33:44 +05:30
PCoder
24edf05e7a Save vat_number after payment is submitted 2019-12-17 23:57:15 +05:30
PCoder
6ea486b527 Initialize vat number in payment forms 2019-12-17 23:48:05 +05:30
PCoder
5e97d70a5e Save VAT number 2019-12-17 22:52:22 +05:30
PCoder
0f3acf5db4 Change order_detail and invoice_detail templates to show VAT number 2019-12-17 22:51:54 +05:30
PCoder
6666e40ec4 Remove unused imports 2019-12-14 11:00:37 +05:30
PCoder
7442cbd9ca Print appropriate message 2019-12-14 10:56:14 +05:30
PCoder
991908c37e Fix obtianing active customers only 2019-12-14 10:52:20 +05:30
PCoder
70f0fed63f Add all_customers management command 2019-12-14 10:18:39 +05:30
PCoder
744e76c5df Change price 
15 CHF -> 10.5 CHF
 2019-12-09 17:47:47 +05:30
PCoder
d8172d6bb2 Fix vat_country 2019-12-07 19:42:46 +05:30
PCoder
3b0e479a70 Use country specific vats for dcl vm buy flow 2019-12-07 19:26:21 +05:30
PCoder
67d38df047 Correction by Sanghee: Benusername -> Benutzername 2019-11-16 20:41:24 +05:30
_moep_
f82ed81b33 add german translation 2019-11-16 08:30:44 +01:00
PCoder
1ff577ddcd Update django.po 2019-11-15 23:06:29 +05:30
PCoder
15ef20dbc1 Fix yearly email 2019-11-15 22:58:47 +05:30
PCoder
93527fdc02 Update datacenterlight's django.po 2019-11-15 20:22:14 +05:30
PCoder
b790676940 Update datacenterlight's django.po 2019-11-15 20:07:26 +05:30
PCoder
435cfa46a6 Change interval to year for that case in order confirmation 2019-11-15 19:57:53 +05:30
PCoder
e493a9f3d1 Allow creating yearly/monthly Stripe plans 2019-11-15 19:47:11 +05:30
PCoder
3599f0bff4 Show VAT elegantly 2019-11-15 13:11:11 +05:30
PCoder
76c2b9d16c Fix bug: change arg name 2019-11-15 12:23:44 +05:30
PCoder
44a20a5029 Apply country specific VAT rates for Generic Products 2019-11-15 11:58:15 +05:30
PCoder
270a03e7c5 Improve deleteuser 
Do not delete order, bill and vm_detail
 2019-11-04 17:09:40 +05:30
PCoder
4174c6226f Remove pprint (does not seem to help) 2019-11-04 12:19:25 +05:30
PCoder
7aec4dd938 Convert dict to json and then dump + fix checking None on FileField 2019-11-04 12:15:57 +05:30
PCoder
6faa8b82e8 Remove unwanted logger/print statements 2019-11-04 12:10:22 +05:30
PCoder
72741f2188 Fix bugs 
- Use correct attribute created_at instead of created_on
- Convert yet another date to str (missed earlier)
 2019-11-04 11:59:48 +05:30
Mondi Ravi
b06c4d541f Feature/add userdump 2019-11-04 07:16:59 +01:00
PCoder
b6ec2ac95b Add missing cc expiry year month in payment page 2019-07-09 19:08:19 +05:30
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
d3e2074b16 Update DE translation 
Your VM is almost ready! => Deine VM ist fast fertig!
 2019-07-03 17:29:42 +05:30
PCoder
2a4fb8c8de Add DE translation 
Your VM is almost ready! => Ihre VM ist fast fertig!
 2019-07-03 16:57:00 +05:30
PCoder
69401a1cc6 Make messages for datacenterlight and add some DE translations 2019-07-03 16:52:08 +05:30
PCoder
b0548f4cfa Translate ssh key form title and subtitles 2019-07-03 16:51:29 +05:30
PCoder
6f49157ddd Update add_ssh_key subtitle 2019-07-03 16:27:12 +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
a20dbc1f96 Cleanup new_user_hosting_key_id session variable also 2019-07-01 23:08:35 +05:30
PCoder
d9a2c5216c Also remove order_confirm_url from session vars 2019-07-01 20:30:35 +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
5fcd0d6b18 Remove add SSH key form in the order confirmation 2019-07-01 08:18:10 +05:30
PCoder
9b73fa71dc Add datacenterlight add_ssh_key.html template file 2019-07-01 08:10:37 +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
d5d90e0790 Add datacenterlight url: /add-ssh-key 2019-07-01 06:43:49 +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
6d3b5f40c0 Merge remote-tracking branch 'mainRepo/master' into task/5509/add-keys-to-opennebula-user 2019-06-25 02:29:15 +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
08608c726f Code cleanup: remove updating ssh keys on live VMs 2019-06-25 02:11:57 +02:00
PCoder
39549d5e36 Close div 2019-06-24 19:07:11 +02:00
PCoder
a330dee9a1 Modify style 2019-06-24 18:58:44 +02:00
PCoder
ba7ff9e409 Adjust textarea styles 2019-06-24 18:39:25 +02:00
PCoder
04f1112b09 Add key in the text area 2019-06-24 18:26:45 +02:00
PCoder
ecc26d14e5 Show previous keys if exist in order confirmation 2019-06-24 17:24:35 +02:00
PCoder
110f29171d Update user ssh key in opennebula 2019-06-24 04:33:48 +02:00
PCoder
87f5bf3dcc Pass UserHostingKeyForm to the context of OrderConfirmationView 2019-06-24 04:32:27 +02:00
PCoder
108fbb09b0 Add ssh key form to order_detail page 
To ask for the SSH key at the time of confirming and placing the order.

The order does not proceed until the user provides a valid ssh key.
 2019-06-24 04:29:34 +02:00
William Colmenares
69ec7d2b46 reuse of the env variable in the base settings 2019-05-13 03:44:09 -04:00
William Colmenares
fda5118c39 Added otp verification 2019-05-12 21:34:54 -04:00
PCoder
219bfbda12 Use the correct email template 
For notifying the user about ssh key was successfully added
 2019-05-12 20:13:54 +02:00
PCoder
67d789ebdb Implement save_ssh_key_in_vm_template_task 
A celery task which first sends a power off signal to the VM with the
given ID and polls until it is powered off. Then, it updates the VM
template with the given ssh keys of the user and resumes it.

User is notified once the VM template has been updated.
 2019-05-12 19:13:22 +02:00
PCoder
0b85784fd3 No need to manage ssh keys after VM is created 
The ssh keys are added at the time the VM is created or later
 2019-05-11 01:56:00 +02:00
PCoder
6a1faa52e4 Set user's own ssh keys when creating VM 2019-05-11 00:25:49 +02:00
PCoder
1d70563ea2 Save user's key in opennebula 2019-05-10 09:19:42 +02:00
PCoder
729a813804 Flip the order of logging 2019-05-06 08:47:59 +02:00
PCoder
3f01145cd1 Add additional None checks 2019-05-06 08:30:50 +02:00
PCoder
0f777e66d8 Add entry to DeletedUser + fix code to delete user from opennebula 2019-05-06 08:08:51 +02:00
PCoder
5d3f769750 Merge remote-tracking branch 'mainRepo/master' into feature/delete-user 2019-05-06 07:08:10 +02:00
PCoder
d91a403680 Add bootstrap-3.3.4 local resources 2019-05-05 20:24:47 +02:00
PCoder
2b99ac1670 Add html5shiv-3.7.0.js, jquery-1.11.1.min.js, respond-1.4.2.min.js 2019-05-05 20:21:19 +02:00
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