Compare commits

...
Sign in to create a new pull request.

885 commits

Author SHA1 Message Date
Tomislav R
338ff38bbb Actual po 2022-05-16 11:37:30 +02:00
Tomislav R
66f3989c23 WIP removing ipv6onlyhosting.{net,ch} references 2022-05-16 11:08:14 +02:00
app@dynamicweb-production
a21b4d6e3f Change to dcl-orders for new vm 2022-03-23 10:46:12 +01:00
d739a4a50e Merge pull request 'Change admin email to dcl-orders for vm purchase' (#12) from change-email-address into master
Reviewed-on: ungleich-public/dynamicweb#12
2022-02-05 03:19:01 +00:00
PCoder
138fd519b7 Change admin email to dcl-orders for vm purchase 2022-02-05 08:30:58 +05:30
Nico Schottelius
8179ca4d22 Add support for docker build + docker release 2021-12-17 22:21:59 +01:00
Nico Schottelius
c0333212aa Begin updating for dockerisation 2021-12-17 22:02:20 +01:00
4861bee9d3 Merge branch 'master' into 'master'
Fix poland country code in eu_countries

See merge request ungleich-public/dynamicweb!749
2021-09-30 10:32:26 +02:00
5ce283318a Fix poland country code in eu_countries 2021-09-27 09:21:24 +02:00
79e96715b2 Merge branch 'issue/1/user-password-update' into 'master'
Issue/1/user password update

See merge request ungleich-public/dynamicweb!748
2021-08-30 15:20:27 +02:00
PCoder
47d5c63e3b Fix bad import 2021-08-30 18:38:58 +05:30
PCoder
d26f2b0f69 Normalize/convert ascii/ignore unicode characters for homeDirectory 2021-08-30 18:29:42 +05:30
7c2c3de1f6 Merge branch '9053/show-paid-invoices-only' into 'master'
Filter invoices by paid status

See merge request ungleich-public/dynamicweb!747
2021-03-29 03:59:48 +02:00
PCoder
1d48dfb93b Filter invoices by paid status 2021-03-29 07:23:58 +05:30
PCoder
63821813d4 Fix translations 2021-02-07 18:05:48 +05:30
PCoder
173c0fe9bf Update texts 2021-02-07 17:28:44 +05:30
PCoder
6279fa4e7b Fix missing escapes 2021-02-07 16:21:02 +05:30
PCoder
1fec2add72 Update Changelog for 3.2 2021-02-07 16:07:23 +05:30
PCoder
d46deaa23a Do not use UserCardDetail to save card 2021-02-07 15:58:03 +05:30
PCoder
a5c83dd589 Update order confirmation text to better prepared for payment dispute 2021-02-07 15:55:47 +05:30
PCoder
af09b343c0 Update Changelog for 3.1 2021-01-12 13:56:58 +05:30
PCoder
3b874901bc Update using correct card details 2021-01-12 13:40:03 +05:30
PCoder
640807eb62 Don't get card from local db 2021-01-12 13:39:11 +05:30
PCoder
21f762d6b8 Update Changelog for 3.0 2021-01-07 16:39:00 +05:30
9e640d0802 Merge branch '8691/check_vm_templates' into 'master'
8691/check vm templates

See merge request ungleich-public/dynamicweb!744
2021-01-07 12:06:02 +01:00
PCoder
c58302d90e Log error messages 2021-01-07 16:30:48 +05:30
PCoder
1e67bef4f5 Remove unwanted code/comments 2021-01-07 16:30:33 +05:30
PCoder
ec13a71866 Reformat code 2021-01-07 16:29:34 +05:30
PCoder
6c968fdbb8 Redirect to dcl payment
We no longer seem to use hosting payment
2021-01-02 09:03:02 +05:30
PCoder
44ebb71916 Also clear id_payment_method from session 2021-01-02 09:02:37 +05:30
PCoder
1d7c3f424c Don't send admin email if IncompletePaymentIntent lookup doesn't contain a value 2021-01-01 11:17:07 +05:30
PCoder
8deed169ca Fix redirect url
Take user to virtual_machines page if the user ordered a VM
2021-01-01 11:13:02 +05:30
PCoder
7cd485bc6d Fix issues on settings/card save/delete methods 2021-01-01 02:37:52 +05:30
PCoder
31c5336e18 Show cards directly from Stripe and dissociate using PaymentMethod 2021-01-01 01:59:41 +05:30
PCoder
36505db5a2 set default_payment_method 2021-01-01 01:35:59 +05:30
PCoder
e7462289f6 Just log IncompleteSubscription does not exist error
Do not compare with db and send admin error message
2021-01-01 01:03:08 +05:30
PCoder
9b84461a29 Add logger messages 2021-01-01 00:58:11 +05:30
PCoder
04003757dc Move log block to correct case 2021-01-01 00:43:28 +05:30
PCoder
e024a3a7a6 Do not create paymentintent for subscription 2021-01-01 00:34:35 +05:30
PCoder
ba3c5ddd1d Use different js code for one-time and subscriptions 2021-01-01 00:09:47 +05:30
PCoder
2c3d00f03f Pass correct stripe_customer_id 2021-01-01 00:09:20 +05:30
PCoder
d8a674da3d Remove unwanted code + doc 2021-01-01 00:08:58 +05:30
PCoder
9524e03762 Pass user param with request dict 2021-01-01 00:08:33 +05:30
PCoder
a32a5af5a3 Add code to differentiate between subscription and non-subscription in js 2021-01-01 00:07:23 +05:30
PCoder
9faf897818 Formatting and documentation 2020-12-31 22:46:15 +05:30
PCoder
6e6a57b304 Refactor price to charge => amount_to_charge
This is a common variable between the generic onetime and
subscription
2020-12-31 22:45:05 +05:30
PCoder
7b71ba55f2 Rename token to id_payment_method 2020-12-31 22:43:50 +05:30
PCoder
8c72b56f6c Use setup_future_usage='off_session' 2020-12-31 21:03:24 +05:30
PCoder
d2ebd3c473 Do card association 2020-12-31 20:53:02 +05:30
PCoder
b36afcb828 Simplify code for logged in one-time payments with SCA 2020-12-31 20:35:31 +05:30
PCoder
a823efd8e2 Add get_available_payment_methods 2020-12-31 20:01:52 +05:30
PCoder
13f5f576b5 Fix getting cc details from payment_methods 2020-12-31 17:23:43 +05:30
PCoder
2f98294eab Store dicts as json in db 2020-12-31 17:12:17 +05:30
PCoder
213b9a068e Fix attribute name 2020-12-31 17:07:51 +05:30
PCoder
33f741424d See inner values of incomplete_pm 2020-12-31 17:05:01 +05:30
PCoder
7309b8416c Handle any exception 2020-12-31 17:02:03 +05:30
PCoder
ff7b20b0dc Stripe id is not a dict 2020-12-31 16:59:22 +05:30
PCoder
37f82a48d5 More loggers 2020-12-31 16:55:05 +05:30
PCoder
8827bd15ba More loggers 2020-12-31 16:47:45 +05:30
PCoder
8e4b3ce96b Store charge id from payement intent result 2020-12-31 16:39:25 +05:30
PCoder
85757e01c9 Save charge id 2020-12-31 16:37:25 +05:30
PCoder
f48a5cfe71 Set completed_at value 2020-12-31 16:29:18 +05:30
PCoder
52d1fb6a0e Add logger + return 200 on success of webhook 2020-12-31 16:27:12 +05:30
PCoder
12c9140b3a Fix using correct payment intent id 2020-12-31 16:23:44 +05:30
PCoder
7db0594778 Update IncompletePaymentIntents to allow null subscription id and charge id 2020-12-31 16:12:22 +05:30
PCoder
87b85c43b4 More logger 2020-12-31 15:59:09 +05:30
PCoder
b2f0a45679 Add logger message 2020-12-31 15:56:08 +05:30
PCoder
9ae4b96968 Add hosting/migrations/0064_incompletepaymentintents.py 2020-12-31 15:43:46 +05:30
PCoder
9077eb0cf2 Implement webhook 2020-12-31 15:41:43 +05:30
PCoder
98b5d03d0b Refactor code for do_provisioning_generic 2020-12-31 15:40:46 +05:30
PCoder
f628046417 Add IncompletePaymentIntents model 2020-12-31 15:25:14 +05:30
PCoder
41de724904 Handle PaymentMethod type in set_default_card 2020-12-31 15:24:47 +05:30
PCoder
ba92c8e416 Do not pop billing address data from session in case of a payment failure
Instead pop id_payment_method
2020-12-31 11:05:32 +05:30
PCoder
42c9ec6f28 Handle js success/error messages 2020-12-31 10:32:25 +05:30
PCoder
c3286a68a5 Use payment method instead of token and PaymentIntent all over 2020-12-31 10:04:21 +05:30
PCoder
35cc9d4229 Log client secret 2020-12-24 20:07:31 +05:30
PCoder
e9c596de66 Test PaymentIntent for payment of generic onetime products 2020-12-24 20:03:46 +05:30
PCoder
ec1da8fbdf Use cents price for Stripe 2020-12-24 19:40:39 +05:30
PCoder
1c4f297775 Begin migrating to PaymentIntent 2020-12-24 19:34:06 +05:30
PCoder
acba77976d Add missing formatting identifier 2020-12-24 06:55:19 +05:30
PCoder
624cc45c12 Log error dict 2020-12-24 06:51:34 +05:30
PCoder
82359064cd Handle creation of correctly 2020-12-24 06:47:33 +05:30
PCoder
98628596f0 Add params to docstring 2020-12-24 06:25:37 +05:30
PCoder
39c8e35eca Add logger messages 2020-12-24 06:25:22 +05:30
PCoder
eefabe45b6 Login new users only for non-SCA generic subscription payments only 2020-12-23 20:41:31 +05:30
PCoder
968eaaf6a4 For generic payments, take users to invoice page after purchase 2020-12-23 20:40:20 +05:30
PCoder
6a7373523e Set default card before making payments 2020-12-23 20:39:41 +05:30
PCoder
080a45f39c Pop up stale card_id/token or billing_address_data in the paymentorder page 2020-12-23 20:38:42 +05:30
PCoder
c8519058c4 Fix new_user_hosting_key_id 2020-12-23 18:31:45 +05:30
PCoder
a03e2dc006 Return provisioning if set in do_provisioning 2020-12-23 18:10:17 +05:30
PCoder
c28bd9091a Add more logger 2020-12-23 17:53:19 +05:30
PCoder
c0aeac4dc7 Add some logger messages 2020-12-23 17:47:50 +05:30
PCoder
377d12b5a5 Create IncompleteSubscriptions only for SCA case 2020-12-23 17:47:37 +05:30
PCoder
d447f8d9e6 Add logging message 2020-12-23 17:26:40 +05:30
PCoder
799194152e Remove todo 2020-12-23 17:16:19 +05:30
PCoder
78b8191165 Implement invoice.payment_failed case 2020-12-23 17:10:23 +05:30
PCoder
a9778076d6 Clean session variables using real_request 2020-12-23 17:10:06 +05:30
PCoder
a99924b94c Rename do_create_vm to do_provisioning; and pass real_request 2020-12-23 17:09:27 +05:30
PCoder
41e993a3d9 Log variable value 2020-12-23 16:34:34 +05:30
PCoder
0c1b7b1885 Do clear session vars at the end 2020-12-23 14:33:32 +05:30
PCoder
480e38fbc9 Attempt fix for local variable 'card_details_dict' referenced before assignment 2020-12-23 14:19:52 +05:30
PCoder
4962b72d1a Add logging message 2020-12-23 14:19:22 +05:30
PCoder
70c8ed6825 Add debugging messages 2020-12-23 14:12:30 +05:30
PCoder
259c509113 Don't handle generic exception for the moment 2020-12-23 14:02:27 +05:30
PCoder
981e68aa4f Fix getting card_id and compare 2020-12-23 13:56:08 +05:30
PCoder
a4a5acd0e7 Fix string formatting issues 2020-12-23 13:46:34 +05:30
PCoder
812157b6c6 Move login code out of the refactored do_create_vm 2020-12-23 13:40:19 +05:30
PCoder
9d765fcb6e Fix wrong variable name billing_address 2020-12-23 13:10:29 +05:30
PCoder
f6f6482ce0 Add missing billing_address_data 2020-12-23 13:07:28 +05:30
PCoder
2baa77a7d4 Fix json loads issue 2020-12-23 13:00:05 +05:30
PCoder
de6bc06eaf Fix json loads for none 2020-12-23 12:50:21 +05:30
PCoder
a5f49cf8be Add debug messages 2020-12-23 12:41:46 +05:30
PCoder
c70753767f Load request object correctly and pass correct subscription object 2020-12-23 12:32:42 +05:30
PCoder
92bafed3b3 Fix getting stripe_subscription_obj 2020-12-23 12:09:19 +05:30
PCoder
b1dd9988ce Add missing subscription_id param 2020-12-23 12:03:17 +05:30
PCoder
95a1b8fa20 Make complete_at allow null 2020-12-23 11:52:41 +05:30
PCoder
50d9eb1c50 Fix UnboundLocalError: local variable 'stripe_onetime_charge' referenced before assignment 2020-12-23 11:26:52 +05:30
PCoder
1ed42e608c Add incompletesubscriptions migration file 2020-12-23 11:07:20 +05:30
PCoder
17c8f9ca18 Handle IncompleteSubscriptions in webhook 2020-12-23 10:59:21 +05:30
PCoder
c4c918d591 Prepare params from session to pass to do_create_vm 2020-12-23 09:26:01 +05:30
PCoder
20c6703236 Add a todo 2020-12-23 09:10:03 +05:30
PCoder
2a84d20f35 Add docstring 2020-12-23 09:09:53 +05:30
PCoder
9f49c664fa Make do_create_vm independent of session 2020-12-23 09:09:40 +05:30
PCoder
9e247cc556 Fix PEP warning 2020-12-23 09:08:08 +05:30
PCoder
ca7481cce0 Avoid request.user.is_authenticated() 2020-12-23 08:00:08 +05:30
PCoder
3e95a389bb Preparing a fix for TODO (wip) 2020-12-23 07:58:20 +05:30
PCoder
cda241893b Fix PEP warning 2020-12-23 07:57:54 +05:30
PCoder
cb7a1ed4f4 Implement provisioning of VM on invoice.paid webhook 2020-12-20 02:41:30 +05:30
PCoder
3389e69af1 WIP: Begin handling of invoice.paid webhook 2020-12-18 17:34:40 +05:30
PCoder
a63fac1a20 Set data at the client side according to success or error 2020-12-18 17:16:44 +05:30
PCoder
d0d5fb0196 Handle payment_intent requires SCA case 2020-12-18 16:47:45 +05:30
PCoder
0b0c932e5a Refactor code: show_error 2020-12-18 16:45:16 +05:30
PCoder
7fcf148cf4 Merge remote-tracking branch 'mainRepo/master' into 8393/show-SCA 2020-12-18 14:11:46 +05:30
PCoder
504681107a Remove unreachable code 2020-12-10 10:04:16 +05:30
PCoder
57b6b18243 Fix PEP warning 2020-12-10 10:04:04 +05:30
PCoder
22d3b1f83c Add vm_type to the log info 2020-12-10 09:05:04 +05:30
PCoder
01d8cc1b9b Use absolute paths 2020-12-10 08:56:34 +05:30
PCoder
785091e4ff Handle vm_id is None case 2020-12-10 08:40:40 +05:30
PCoder
890a83cfa6 Add check_vm_templates management command 2020-12-10 08:34:17 +05:30
PCoder
585e9cf146 Merge branch 'feature/fix-vm-after-celery-error' 2020-12-07 11:39:06 +05:30
PCoder
a0ab436d9a Update Changelog for 2.14 2020-12-07 11:36:34 +05:30
abfbc3b69a Merge branch 'feature/fix-vm-after-celery-error' into 'master'
Feature/fix vm after celery error

See merge request ungleich-public/dynamicweb!743
2020-12-07 06:31:31 +01:00
PCoder
7bcca15f0b Cleanup logging 2020-12-07 10:52:06 +05:30
PCoder
9d85c058da Fetch correct cred 2020-12-07 10:48:48 +05:30
PCoder
8c374af4ff More logging 2020-12-07 10:45:51 +05:30
PCoder
ff28c6e8e8 Add log message 2020-12-07 10:44:20 +05:30
PCoder
bbb51b71a6 Fix variable name 2020-12-07 10:40:55 +05:30
PCoder
591f5ff37b Fix key 2020-12-07 10:37:12 +05:30
PCoder
81ba834b01 Add missing arguments 2020-12-07 10:31:45 +05:30
PCoder
082c0b00af Implement fix_vm_after_celery_error 2020-12-07 09:53:14 +05:30
PCoder
17557fd4c9 Create refactored method handle_metadata_and_emails 2020-12-07 09:52:53 +05:30
PCoder
352c780287 Work in progress 2020-12-07 07:53:20 +05:30
PCoder
e9801eb9c4 Fix wrong logging 2020-12-03 09:48:08 +05:30
PCoder
e522ac0f61 Merge branch 'master' into 8393/show-SCA 2020-12-02 18:49:31 +05:30
PCoder
bf1aad82b8 Update Changelog for 2.13 2020-12-02 18:38:37 +05:30
555e13e631 Merge branch 'bugfix/8654/500-error-on-invoices' into 'master'
Bugfix/8654/500 error on invoices

See merge request ungleich-public/dynamicweb!742
2020-12-01 12:48:05 +01:00
PCoder
d980fb0000 Quote email in links 2020-12-01 17:13:09 +05:30
PCoder
e8b79d6951 Return emtpty string when plan is not set 2020-12-01 17:12:55 +05:30
PCoder
52362cd0ea In case of error, log it and return empty result 2020-12-01 17:12:29 +05:30
73cb003353 Merge branch '8593/escape-ssh-key-str' into 'master'
Escape ssh key before storing

See merge request ungleich-public/dynamicweb!741
2020-11-12 08:02:11 +01:00
PCoder
79cbfac092 Escape ssh key before storing 2020-11-12 12:12:46 +05:30
PCoder
2973ef3b1d Use correct variable 2020-10-11 17:24:33 +05:30
PCoder
81ec1125cb Capture both actions requires_action and requires_source_action 2020-10-11 17:21:15 +05:30
PCoder
4c7b9eaa52 Handle SCA in dcl flow 2020-10-11 17:11:20 +05:30
PCoder
676a358832 Add logger messages 2020-10-11 16:57:10 +05:30
PCoder
877553e442 Add logger message 2020-10-11 16:45:23 +05:30
PCoder
70bfef4738 Show SCA modal when required 2020-10-11 16:01:55 +05:30
PCoder
c2e2e1828f Update Changelog for 2.12.1 2020-07-21 23:08:32 +05:30
PCoder
08bf163d21 Remove multiple hl 2020-07-21 22:26:16 +05:30
PCoder
df301a18fc Set vat params 2020-07-21 22:23:07 +05:30
PCoder
ad5371a133 Update order confirmation template 2020-07-21 22:15:04 +05:30
PCoder
fb59ae4055 Add migration 2020-07-21 22:03:18 +05:30
PCoder
050309a68e Add exclude_vat_calculations field and add VAT only when this is set to False 2020-07-21 21:54:54 +05:30
18c494dfd7 Merge branch '8198/case-1/update-DE-VATRate' into 'master'
Create migration for DE VAT update for COVID-19

See merge request ungleich-public/dynamicweb!739
2020-07-01 01:13:55 +02:00
PCoder
c339c19cfd Fix date format bug 2020-07-01 01:21:57 +05:30
PCoder
58377319b9 Make migration reversible 2020-07-01 01:18:57 +05:30
PCoder
87a154bd0a Create migration 2020-07-01 00:47:59 +05:30
PCoder
49a9fdd842 Update Changelog for 2.12 2020-06-23 11:32:30 +05:30
PCoder
0c39336653 Sort invoices by created_at desc 2020-06-22 20:04:01 +05:30
PCoder
81fd129d48 Use css to hide div than js 2020-06-19 16:05:06 +05:30
PCoder
25255c862a Remove buggy # in dom element id 2020-06-19 15:50:24 +05:30
PCoder
1b29a23ede Remove default display none of one-time-payments div 2020-06-19 15:48:00 +05:30
PCoder
6b3ecfaff4 Use show/hide instead of toggle 2020-06-19 15:45:44 +05:30
PCoder
c4e7f99202 Add slideToggles to subscription/one-time-payments divs 2020-06-19 15:38:26 +05:30
PCoder
0dc9c6cdca Fix element id 2020-06-19 15:30:38 +05:30
PCoder
38109e175a Move js to correct place 2020-06-19 15:25:34 +05:30
PCoder
081f81c41c Begin handling click events 2020-06-19 13:13:26 +05:30
PCoder
ffae844ee5 Merge remote-tracking branch 'mainRepo/master' into 7894/show-one-time-payment-invoices 2020-06-19 12:40:52 +05:30
PCoder
1ce28964a6 Merge remote-tracking branch 'origin/master' into 7894/show-one-time-payment-invoices 2020-06-19 12:40:18 +05:30
PCoder
bc69cc49e5 Move opennebula specific code to celery to make it asynchronous 2020-06-11 15:20:42 +05:30
PCoder
a52215bb56 Update Changelog 2020-06-11 11:42:23 +05:30
PCoder
eadbebb796 Update Changelog for 2.11 2020-06-11 11:34:56 +05:30
PCoder
495e7d4022 Fix wrong constant name
settings.LDAP_MAX_UID_PATH -> settings.LDAP_MAX_UID_FILE_PATH
2020-06-11 11:29:53 +05:30
PCoder
81eee87fb9 Update Changelog for 2.10.8 2020-06-10 13:45:46 +05:30
PCoder
af36a49366 Revert back errors 2020-06-10 13:36:33 +05:30
PCoder
4bff49dab6 Refactor polling time to terminate VM 2020-06-10 12:27:59 +05:30
PCoder
6131270b1d Update Changelog for 2.10.7 2020-05-25 11:44:07 +05:30
PCoder
17a8efb0b6 Fix variable name 2020-05-25 11:33:58 +05:30
a665dbf9c8 Merge branch '8044/fix-modified-vm-templates' into 'master'
Handle updated templates

See merge request ungleich-public/dynamicweb!736
2020-05-25 07:52:35 +02:00
PCoder
c1473fa374 Handle updated templates 2020-05-25 11:10:41 +05:30
PCoder
ac1170a0f1 Remove wrong IL country code in vat_rates 2020-04-21 00:03:13 +05:30
PCoder
f9906781ba Remove wrong Ireland country code in vat rates 2020-04-21 00:02:21 +05:30
PCoder
7db3dc4222 Fix circular imports and correct hosting order link 2020-04-15 17:36:40 +05:30
PCoder
f089892c90 Remove duplicated html + add href link to order 2020-04-10 20:02:12 +05:30
PCoder
a395b7a4a6 Do not update ho -> doing so, crashes 2020-04-10 18:44:45 +05:30
PCoder
8443e03b1f Add ho values 2020-04-07 19:33:13 +05:30
PCoder
3aff4bb69a Fix bug 2020-04-07 19:22:45 +05:30
PCoder
84c3db7e52 Pass HostingOrder instance 2020-04-07 19:21:47 +05:30
PCoder
d35403311f Fix bug fetching variables 2020-04-07 19:16:55 +05:30
PCoder
8a3fa667a0 Fix bug 2020-04-07 18:57:20 +05:30
PCoder
132a5112fd Fix getting id 2020-04-07 18:46:05 +05:30
PCoder
b01f12c9ec Fix passing params to template filter 2020-04-07 18:41:43 +05:30
PCoder
4869fd51df Change to filter from simple 2020-04-07 18:35:25 +05:30
PCoder
4435eef077 Chanage tag to simple 2020-04-01 17:26:12 +05:30
PCoder
343a9440f0 Load invs_charge context from user's charges 2020-04-01 17:09:02 +05:30
PCoder
27aa0ea595 Create another div for onetime charges 2020-04-01 17:08:22 +05:30
PCoder
70264d592d Put contents for subscription in a div of its own 2020-04-01 17:07:44 +05:30
PCoder
d0be07ecd5 Add custom_tag get_line_item_from_hosting_order_charge 2020-04-01 17:07:10 +05:30
PCoder
cec7938c9c Add tabs for one time payments 2020-04-01 11:30:27 +05:30
PCoder
7072420ea5 Update Changelog for 2.10.6 2020-03-25 18:55:49 +05:30
1986978f9b Merge branch 'bugfix/nonetype-in-discount-name' into 'master'
Filter out None case for discount's name

See merge request ungleich-public/dynamicweb!735
2020-03-25 14:23:29 +01:00
PCoder
cb3ff73100 Filter out None case for discount's name 2020-03-25 18:47:00 +05:30
PCoder
46c33cf107 Update price to 11.5 CHF per month in intro emails 2020-03-24 12:34:26 +05:30
58680c1647 Merge branch 'introduce_base_price' into 'master-2.10.3b'
Introduce base price

See merge request ungleich-public/dynamicweb!734
2020-03-24 07:27:55 +01:00
PCoder
9d96ecefea Remove unwanted import 2020-03-18 12:44:18 +05:30
PCoder
580960548e Merge tag '2.10.2' into branch-2.10.3b
Introduce base price for VMs and let admins add stripe_coupon_id
2020-03-18 12:05:57 +05:30
PCoder
f539967a22 Set in_ldap even when resetting dummy credential 2020-03-06 00:01:27 +05:30
PCoder
b076debfee Update Changelog for 2.10.3b 2020-03-05 22:41:15 +05:30
PCoder
d21c5837f7 Change ldap credentials which was set to dummy during migration 2020-03-05 22:40:59 +05:30
PCoder
b9096de386 More replacements: use username instead of emails 2020-03-05 18:17:14 +05:30
PCoder
b44a7f98b5 Use username instead of email when creating VM 2020-03-05 15:55:44 +05:30
PCoder
e2c86116b2 Use username for opennebula related tasks 2020-03-05 15:27:18 +05:30
PCoder
45af92e049 Update Changelog for 2.10.2b 2020-02-25 19:40:10 +05:30
PCoder
42fb55dee1 Don't use encoded bytes and its str representation as uid
(Refer redmine #7764)
2020-02-25 19:19:40 +05:30
PCoder
2cbf146ebc Change button to a href 2020-02-25 14:40:54 +05:30
PCoder
c058138044 Update Changelog for 2.10.2 2020-02-04 17:07:14 +05:30
PCoder
f45f8dd51f Remove unused method round_up 2020-02-04 11:27:59 +05:30
PCoder
dd2eae68e6 Use math round to round amount to 2 decimal places 2020-02-04 11:20:17 +05:30
PCoder
e322e58246 Use appropriate stripe_coupon_id 2020-02-04 09:06:10 +05:30
PCoder
3ca1a45217 Add stripe_coupon_id to VMPricing 2020-02-04 08:57:54 +05:30
PCoder
c315030b06 Add vm base price to missing places 2020-02-03 12:29:14 +05:30
PCoder
e6de90e431 Set vm base price in js also 2020-02-03 12:07:50 +05:30
PCoder
00b434efb9 Read VM_BASE_PRICE from env 2020-02-03 11:37:30 +05:30
PCoder
5d977f32d3 Update Changelog for 2.10.1 2020-02-02 22:52:11 +05:30
PCoder
3061c1483c Switch bold between Recurring text and value 2020-02-02 22:37:29 +05:30
PCoder
f68549d80d Add DE translations by moep 2020-02-02 22:33:13 +05:30
PCoder
b607575c8c Switch bold for description title and description text 2020-02-02 22:29:01 +05:30
PCoder
368db61a2f Remove padding left 2020-02-02 22:11:26 +05:30
PCoder
359a633047 Fix mobile view 2020-02-02 22:00:22 +05:30
PCoder
1630dc195b Reduce header font size 2020-02-02 21:52:48 +05:30
PCoder
f0f8af2367 Change col-sm-8 to col-sm-9 to spread content further on desktop view 2020-02-02 21:39:51 +05:30
PCoder
a5d393ad20 Right align prices 2020-02-02 13:21:01 +05:30
PCoder
70a3620598 Fix getting product from plan_name 2020-02-02 13:09:27 +05:30
PCoder
42a4a77c02 Show product name 2020-02-02 12:42:19 +05:30
PCoder
e094930d6e Show product name in invoices list if product is not a VM 2020-02-02 12:39:19 +05:30
PCoder
c0683d9f53 Show prices to two decimal places 2020-02-02 10:57:14 +05:30
PCoder
fc8c4579fb Show prices to two decimals 2020-02-02 10:41:51 +05:30
PCoder
9f86f44569 Add missing divs 2020-02-02 10:29:33 +05:30
PCoder
ffde015c31 Fix divs 2020-02-02 10:26:13 +05:30
PCoder
c765698a0f Add two columns for pricing 2020-02-02 10:16:45 +05:30
PCoder
44dee625b4 Add some DE translations 2020-02-01 20:24:55 +05:30
PCoder
88a39ef85a Update Changelog for 2.10 2020-02-01 15:23:42 +05:30
PCoder
8fe689d993 Update some DE translations 2020-02-01 15:23:26 +05:30
PCoder
b103cff0a6 Dont round_up discount (is obtained from subtraction) 2020-02-01 13:54:29 +05:30
PCoder
c43afb7c59 Use round_up method 2020-02-01 13:47:29 +05:30
PCoder
2058c660c0 Retrieve only one invoice 2020-02-01 13:15:03 +05:30
PCoder
23b25002ae Take users to invoice url instead of orders
Orders need a VAT alignment fix
2020-02-01 13:00:10 +05:30
PCoder
b645f9894b Open invoice in a new window 2020-02-01 12:25:56 +05:30
PCoder
9d21181073 Get stripe invoice obj correctly 2020-02-01 12:23:47 +05:30
PCoder
d8482c52f9 Get invoice correctly 2020-02-01 12:20:13 +05:30
PCoder
918d2b17e1 Change invoice url 2020-02-01 12:13:56 +05:30
PCoder
e6f00abd71 Do not round 2020-02-01 09:17:24 +05:30
PCoder
838163bd59 Make total price consistent 2020-02-01 09:15:12 +05:30
PCoder
b1acd3f25b Convert VAT percent to CHF before calculations 2020-02-01 09:02:17 +05:30
PCoder
f4393426d3 Fix proper VAT values 2020-02-01 08:53:24 +05:30
PCoder
7a9b315e2e Add media query for device width less than 368px 2020-01-30 12:33:47 +05:30
PCoder
3141dc2793 Round price_with_vat 2020-01-30 11:52:29 +05:30
PCoder
3d51e4fe32 Update alignments 2020-01-30 11:39:54 +05:30
PCoder
f546c5cb4f Increase content space in order detail desktop view 2020-01-29 17:38:44 +05:30
PCoder
4128aeb64d Add line height for final price 2020-01-29 17:21:59 +05:30
PCoder
8ee4081f60 Fix round up calculations 2020-01-29 16:58:47 +05:30
PCoder
ad606c2c55 Correct calculation of total price 2020-01-29 16:50:05 +05:30
PCoder
a81fdc8ec1 Revert back to original vat calculation 2020-01-29 16:45:07 +05:30
PCoder
6132638faa Use correct vat 2020-01-29 16:32:07 +05:30
PCoder
48cc2b4939 Fix discount amount calculation after VAT 2020-01-29 16:19:56 +05:30
PCoder
1f79ccd490 Convert discount amount into CHF 2020-01-29 16:15:28 +05:30
PCoder
b8eca59e0d Fix design for showing prices excl and incl vat and discount 2020-01-29 16:04:03 +05:30
PCoder
970834cc38 Add parameters needed for displaying prices after discount, and vat 2020-01-29 16:03:13 +05:30
PCoder
24740438f7 get_vm_price_for_given_vat: Also return discount amount with vat 2020-01-29 16:02:26 +05:30
PCoder
cde6c51d4b Reset vat_validation_status when on payment page 2020-01-26 10:06:31 +05:30
PCoder
d1fd57b730 Correct the way we get amount from discount 2020-01-24 15:26:41 +05:30
PCoder
156930ab26 Add price_after_discount explicitly for showing in template 2020-01-24 15:24:46 +05:30
PCoder
112f3e17a9 Convert to decimal for type consistency 2020-01-24 15:03:07 +05:30
PCoder
38550ea75c Rearrange the way we show VAT and discount calculations 2020-01-24 15:00:16 +05:30
PCoder
e01b27835e Make subscription exclusive of VAT + Add VAT separately to subscription 2020-01-24 14:11:55 +05:30
PCoder
ec00785068 Update get_stripe_plan_id to make it compatible with excl_vat 2020-01-24 14:10:56 +05:30
PCoder
399f9ed6c9 Adjust hosting VM buy flow 2020-01-23 16:37:35 +05:30
PCoder
a82c4d556c Update Changelog for 2.9.5 2020-01-20 13:25:49 +05:30
PCoder
0b2a305f57 Fix pep warning 2020-01-20 12:09:49 +05:30
PCoder
a00a9f6ff0 Show invoices directly from stripe 2020-01-20 12:07:32 +05:30
PCoder
fd4f61bc5c Update Changelog for 2.9.4 2020-01-10 20:16:16 +05:30
PCoder
9212c02cd7 Check vat_validation_status exists in dict before using it 2020-01-10 19:47:49 +05:30
PCoder
5fe1c21b57 Update Changelog for 2.9.3 2020-01-05 12:56:17 +05:30
PCoder
f762cbe58c Update Changelog 2020-01-05 10:00:57 +05:30
PCoder
4b8b0b0540 Add stripe tax rate migration 2020-01-05 09:59:23 +05:30
PCoder
5468d5436c Add StripeTaxRate model 2020-01-05 09:57:54 +05:30
PCoder
96e50ddc8a Add vat rates for CY, IL and LI manually 2020-01-04 22:47:22 +05:30
PCoder
235904d784 Update Changelog for 2.9.2 2020-01-02 12:58:53 +05:30
PCoder
ceb7f9b0e6 Revert back to email 2020-01-02 12:34:42 +05:30
PCoder
7d7bd60a7f Error emails list is already a list 2020-01-02 12:27:26 +05:30
PCoder
b4a3c5e277 Send VM deleted message to error mail list 2020-01-02 12:17:57 +05:30
PCoder
5f81bc9091 Improve admin email for VM terminate 2020-01-02 12:07:55 +05:30
PCoder
690952156d Convert to str before joining 2020-01-01 02:04:55 +05:30
PCoder
f4e84f62a4 Save billing address only if billing_address exists 2020-01-01 01:28:35 +05:30
PCoder
0d27bac3a8 Update Changelog for 2.9.1 2020-01-01 00:54:03 +05:30
PCoder
251676ead8 Fix getting StripeCustomer from stripe_id 2020-01-01 00:52:11 +05:30
PCoder
2acb1fb418 Remove duplicate 2020-01-01 00:37:36 +05:30
PCoder
7130df9fd4 Update Changelog (add notes for deployment) 2020-01-01 00:36:22 +05:30
PCoder
18b04a70e6 Update Changelog for 2.9 2020-01-01 00:33:57 +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
efaf75615b Send email to admin on VAT number update 2020-01-01 00:01:44 +05:30
PCoder
d4bfcbef47 Use message as returned by stripe 2019-12-31 22:55:53 +05:30
PCoder
6674e70ded Compare vat numbers only 2019-12-31 22:54:12 +05:30
PCoder
8f2bd568db Restore billing address if VAT number is not valid 2019-12-31 22:53:32 +05:30
PCoder
0695d68903 Create StripeCustomer if not already created 2019-12-31 22:52:49 +05:30
PCoder
6ac6db8212 Get the last user billing address as the default address 2019-12-31 22:52:24 +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
aba3092207 Ignore spaces, hyphens and dots in vat number comparison 2019-12-31 15:57:50 +05:30
PCoder
7949ab274e Impove logging 2019-12-31 15:43:43 +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
7397be98a5 Remove message tags printed mistakenly 2019-12-26 20:40:50 +05:30
PCoder
398a255965 Change condition so as to show error messages in red 2019-12-26 20:36:54 +05:30
PCoder
3202c83c68 Show error messages in red 2019-12-26 20:32:01 +05:30
PCoder
2a760639f6 Set validation status to empty on error 2019-12-26 20:27:15 +05:30
PCoder
c142d743d1 Show only error message 2019-12-26 20:25:07 +05:30
PCoder
74921fcd4a Send the same error message as forwarded by Stripe 2019-12-26 20:21:01 +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
69996f536b Add vat_validation_status 2019-12-26 19:35:50 +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
9e87fa76c3 More logging 2019-12-26 18:47:40 +05:30
PCoder
f2d738ae62 Improve logging format 2019-12-26 18:40:06 +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
5ab0bf6993 Retrieve tax id if exists before creating a new one 2019-12-26 14:46:16 +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
364f5599e6 Correct the way we show vat error 2019-12-26 14:08:53 +05:30
PCoder
ec5bfb18b3 Replace parenthesis is template 2019-12-26 14:05:56 +05:30
PCoder
c3b22992ea Fix wrong elif syntax 2019-12-26 14:00:27 +05:30
PCoder
2038d719f0 Show status icon for pending and verified only 2019-12-26 13:58:50 +05:30
PCoder
b284ed70a6 Show error elegantly 2019-12-26 13:56:31 +05:30
PCoder
7eff6fc92c Use correct field 2019-12-26 13:52:14 +05:30
PCoder
262bf3e2f7 Force VAT validation on each save 2019-12-26 13:49:18 +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
fe6ade38eb Update vat_number validated field based on tax_id + save 2019-12-26 11:54:54 +05:30
PCoder
242dbb2479 Bugfix: pass param 2019-12-26 11:50:15 +05:30
PCoder
833dc9bdcb Change stripe_tax_id field to char + regenerate migrations 2019-12-26 11:41:29 +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
ca128dd8c4 Fix str formatting 2019-12-26 08:06:27 +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
8cc766b62f Update stripe to 2.41.0 to support tax id 2019-12-25 20:45:38 +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
8996254212 Save stripe tax id 2019-12-25 18:44:43 +05:30
PCoder
80f01aec07 Add steps to be followed for tax_id updated webhook 2019-12-25 12:36:47 +05:30
PCoder
127c83059f Add stub files from webhook app 2019-12-25 12:20:26 +05:30
PCoder
772c7557e3 Update Stripe version to 2.24.1 (supports webhook) 2019-12-25 12:09:43 +05:30
PCoder
55979f3701 Add webhook to installed apps + introduce some webhook constants 2019-12-25 12:09:04 +05:30
PCoder
f6832c090e Add webhooks/views.py 2019-12-25 12:07:42 +05:30
PCoder
cb065d36df Add webhook handling url 2019-12-25 12:07:09 +05:30
PCoder
50043f8283 Add webhook management command
Handles managing stripe webhooks
2019-12-25 12:03:58 +05:30
PCoder
c6db34efdd Add DateTimeField vat_number_validated_on 2019-12-25 11:00:04 +05:30
PCoder
92570ada7f Add VAT number to order detail (hosting) 2019-12-25 10:37:45 +05:30
PCoder
8ebd12c420 Add missing vat_number while saving billing address 2019-12-25 10:32:37 +05:30
PCoder
e48ae6a39d Update migration to make vat_number non mandatory 2019-12-25 08:31:40 +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
6e17742d03 Update Changelog for 2.8.2 2019-12-24 18:02:14 +05:30
PCoder
7b7f8fb191 Set the calculator's post action url explicitly 2019-12-24 17:57:24 +05:30
PCoder
3ff9f25a7f Update Changelog for 2.8.1 2019-12-24 12:44:50 +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
8409acf02d Add missing vat_number field 2019-12-21 10:10:32 +05:30
PCoder
32cfdea68c Add missing vat_number field to user billing address 2019-12-21 10:05:58 +05:30
PCoder
e3078f3ea9 Add migration 2019-12-21 08:52:43 +05:30
PCoder
2d66ae6783 Improve BillingAddress string representation
Include VAT number if available
2019-12-21 08:52:09 +05:30
PCoder
202a514b1b Set empty default value for vat_number 2019-12-21 08:51:43 +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
0c82525b7f Update Changelog for 2.8 2019-12-20 09:44:36 +05:30
ed22a2261e Extend ModelBackend instead of rolling our own 2019-12-19 14:03:25 +05:00
PCoder
3f012b7514 Remove duplicate LDAP_SERVER variable 2019-12-18 22:12:09 +05:30
PCoder
36d16ddd72 Update Changelog 2019-12-18 21:40:23 +05:30
PCoder
034d2971cd Remove duplicate import 2019-12-18 21:33:02 +05:30
PCoder
4ef4eaf785 Merge branch 'master' into ldap_integration 2019-12-18 21:22:57 +05:30
aa26458a8c Make greetings in dashboard font-weight equal to 300 2019-12-18 19:39:41 +05:00
PCoder
a8cc07d95f Update Changelog for 2.7.3 2019-12-18 19:36:22 +05:30
PCoder
ed74504270 Bugfix: Swiss VAT wrongly being applied to non EU customers 2019-12-18 19:33:44 +05:30
b382d9709f removed redundant migrations 2019-12-18 16:28:26 +05:00
PCoder
e2615de907 Merge remote-tracking branch 'mainRepo/ldap_integration' into ldap_integration 2019-12-18 16:26:12 +05:30
PCoder
78f901c48a Simplify migrations 2019-12-18 16:24:27 +05:30
b29ff91b46 utils/migration/0007 removed 2019-12-18 15:43:28 +05:00
6c3f01003f remove search_base + fixed issue pointed out by mravi that results in different username in db and ldap 2019-12-18 15:19:47 +05:00
75b08cfbf8 Change password in db only if password change in ldap is successfull 2019-12-18 12:52:46 +05:00
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
568d874476 Add initial value for the vat_number field in the settings 2019-12-17 23:32:49 +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
cdaf498487 Remove default for CharField (introduced unwantedly) 2019-12-17 22:09:34 +05:30
PCoder
3efd6087e2 Add vat_number migration file 2019-12-17 22:08:55 +05:30
PCoder
e11882685f Add vat_number field to CustomUser 2019-12-17 22:07:57 +05:30
PCoder
33120d14f3 Modify billing address form and signup forms to include vat_number 2019-12-17 21:35:02 +05:30
PCoder
490ceec47d Add france metropolitan vat rate 2019-12-17 21:34:17 +05:30
PCoder
c4013178f5 Update Changelog 2019-12-17 18:45:39 +05:30
PCoder
69061c016b Improve string representation of the billing address 2019-12-17 18:45:29 +05:30
PCoder
922fea3bf4 Add vat rates for AD, TK, IS 2019-12-17 18:41:47 +05:30
a8149edba5 Make greeting in dashboard a little bigger and increase margin 2019-12-16 20:17:26 +05:00
f9a9a24516 Show username in navbar and setting. Show greeting in dashboard for user's name 2019-12-16 12:54:59 +05:00
PCoder
c1137c26a1 Don't track ldap max uid file 2019-12-14 19:48:48 +05:30
PCoder
9c96f2447c Uncomment password change call 2019-12-14 19:47:01 +05:30
PCoder
eda766dc6c Check if we get correct opennebula user id 2019-12-14 19:19:23 +05:30
b52f2de8d7 now using hash func from utils.ldap_manager 2019-12-14 14:29:45 +05:00
PCoder
859249b894 Update Changelog 2019-12-14 11:20:47 +05:30
146e9faf53 Merge branch 'feature/all_customers_mgmt_command' into 'master'
Feature/all customers mgmt command

See merge request ungleich-public/dynamicweb!723
2019-12-14 06:48:46 +01:00
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
2a1932e052 Added validator to allow only letters + spaces + hyphen, Normalizing usernames to ASCII 2019-12-13 20:37:30 +05:00
b4995336c6 username would consist of only alphanumerics, ldap fields are encoded in utf-8 2019-12-13 17:52:00 +05:00
c96aff16af username check added for ldap 2019-12-13 15:05:27 +05:00
37a3d21e0c cleanup, ldap3 added to requirements.txt 2019-12-12 22:19:10 +05:00
PCoder
49453cacd4 Merge remote-tracking branch 'mainRepo/master' into ldap_integration 2019-12-12 21:33:49 +05:30
PCoder
9970bd9925 Remove user for db 2019-12-12 21:33:37 +05:30
PCoder
fbfc1152b8 Remove unknown or unspecified country option 2019-12-12 17:42:18 +05:30
db1da3af4c use python-dotenv instead of django-dotenv 2019-12-10 23:01:07 +05:00
3b9322b929 init commit 2019-12-10 22:53:50 +05:00
PCoder
a09f95d619 Update Changelog 2019-12-09 19:37:31 +05:30
PCoder
cc027c2497 Add eu vat code 2019-12-09 18:07:46 +05:30
PCoder
fcc671a707 Fix >= for first_vm_id_after_eu_vat 2019-12-09 18:07:19 +05:30
PCoder
a6695a103f Refactor PRE_EU_VAT_RATE + fix >= for first_vm_id_after_eu_vat 2019-12-09 18:06:14 +05:30
PCoder
744e76c5df Change price
15 CHF -> 10.5 CHF
2019-12-09 17:47:47 +05:30
PCoder
d2d9eafa41 Fix using wrongly copy/pasted variable 2019-12-09 15:20:05 +05:30
PCoder
d0398ddec2 Set after_eu_vat_intro for hosting VM buy flow 2019-12-09 15:15:21 +05:30
PCoder
52717c2ce7 EU VAT for hosting flow 2019-12-09 15:09:05 +05:30
PCoder
e334b01ad4 Fix the way we get variables 2019-12-09 14:44:31 +05:30
PCoder
73b590f480 Set EU VAT context for invoice_detail 2019-12-09 14:42:12 +05:30
PCoder
e940b468c4 Retrieve VM_ID as str 2019-12-09 13:24:14 +05:30
PCoder
d864f82e0f Make invoice EU VAT compatible 2019-12-09 12:30:49 +05:30
PCoder
d8172d6bb2 Fix vat_country 2019-12-07 19:42:46 +05:30
PCoder
b33271ce7d Make vat_rate Decimal before Decimal operations 2019-12-07 19:38:33 +05:30
PCoder
3b0e479a70 Use country specific vats for dcl vm buy flow 2019-12-07 19:26:21 +05:30
PCoder
b759471274 Add /year text for yearly products 2019-12-04 01:17:46 +05:30
PCoder
cc5d82ccac Allow None value for billing_reason 2019-11-28 13:59:03 +05:30
bed57786d7 Merge branch 'update-customuser-to-store-stripe-import-remarks' into 'master'
Update customuser to store stripe import remarks

See merge request ungleich-public/dynamicweb!720
2019-11-28 09:14:04 +01:00
PCoder
b683a5ac44 Save import remark 2019-11-28 13:38:45 +05:30
PCoder
a2635e6fb9 Update customuser add stripe import remark 2019-11-28 12:51:02 +05:30
PCoder
987efe8f99 Move separator within loop 2019-11-28 12:35:32 +05:30
PCoder
9a84fc899e Add a line separator when fetching more than 1 stripe bill 2019-11-28 12:10:50 +05:30
PCoder
3d28b17c71 Update Changelog for 2.6.10 2019-11-16 20:44:30 +05:30
PCoder
67d38df047 Correction by Sanghee: Benusername -> Benutzername 2019-11-16 20:41:24 +05:30
_moep_
49ef761b2e translate it, too 2019-11-16 08:45:47 +01:00
_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
dc507396eb Update Changelog for 2.6.9 2019-11-15 22:16:11 +05:30
PCoder
aec2002a9f Update django.po 2019-11-15 22:11:15 +05:30
PCoder
7dd57fb116 Fix old order detail page 2019-11-15 22:04:37 +05:30
PCoder
530e47586e Fix month name 2019-11-15 21:23:04 +05:30
PCoder
e726f953a4 Improve yearly recurring date text 2019-11-15 21:13:08 +05:30
PCoder
5697e313df Improve yearly recurring date text 2019-11-15 21:11:26 +05:30
PCoder
1e57eb5fae Handle TypeError raised in an invoice for generic product
Case: No VM_ID exists and hence int(vm_id) raises TypeError
2019-11-15 21:10:48 +05:30
PCoder
a423dd9f49 Correct invoice for yearly subscription 2019-11-15 20:43:58 +05:30
PCoder
6eef592cd8 Add migration file 2019-11-15 20:28:00 +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
3bf2654b50 Update ProductPaymentForm for yearly subscription 2019-11-15 19:45:35 +05:30
PCoder
f0b604c6dc Update Generic product model to include product_subscription_interval 2019-11-15 19:40:53 +05:30
PCoder
a33a344b40 Update Changelog for 2.6.8 2019-11-15 17:08:05 +05:30
PCoder
871cccc2ae Add UK VAT manually 2019-11-15 16:55:39 +05:30
PCoder
89418ca008 Add Greece VAT rate 2019-11-15 13:47:24 +05:30
PCoder
f6feb88708 Revert back starts with logic 2019-11-15 13:32:49 +05:30
PCoder
5954093999 Add France VAT rate 2019-11-15 13:32:04 +05:30
PCoder
069556d9b6 Add monaco vat rate 2019-11-15 13:31:21 +05:30
PCoder
f5372ecd1e Fix bug: use country startswith instead of exact matching
Countries like FR are represented as FR
MC
2019-11-15 13:20:24 +05:30
PCoder
3599f0bff4 Show VAT elegantly 2019-11-15 13:11:11 +05:30
PCoder
efe411933f Missing float conversions 2019-11-15 12:41:27 +05:30
PCoder
940eaf3a07 Process prices as floats 2019-11-15 12:39:03 +05:30
PCoder
d399fe6e79 Handle DoesNotExist better 2019-11-15 12:24:39 +05:30
PCoder
582e952187 Convert VAT rate to decimal to be consistent 2019-11-15 12:24:24 +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
e0b2a0b6e2 Add CH VAT rate 2019-11-15 11:25:50 +05:30
PCoder
7040d908dd Add import_vat_rates management command 2019-11-15 11:03:09 +05:30
PCoder
b3dd57f189 Add vatrates migration 2019-11-15 11:02:45 +05:30
PCoder
7038a36b4d Add vat_rates csv 2019-11-15 11:02:11 +05:30
PCoder
c56d6bd627 Add VATRates model 2019-11-15 11:01:49 +05:30
PCoder
2d916936d6 Update Changelog 2019-11-04 17:17:27 +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
c29193f6c8 Fix bugs
- fetch_stripe_bills:
    - fix wrong assigment of strign to num_invoice_created variable
    - return None (do not handle the case) if we don't have an order
2019-11-04 12:05:57 +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
PCoder
b35a1a9e9b Update Changelog 2019-11-04 11:50:57 +05:30
0372e3d2cf Merge branch 'feature/add-userdump' into 'master'
Feature/add userdump

See merge request ungleich-public/dynamicweb!716
2019-11-04 07:16:59 +01:00
b06c4d541f Feature/add userdump 2019-11-04 07:16:59 +01:00
7e398cf7b1 Merge branch 'bugfix/stripe-amount-can-be-negative' into 'master'
Make HostingBillLineAmount accept negative values

See merge request ungleich-public/dynamicweb!715
2019-10-26 17:58:53 +02:00
PCoder
6638d376b8 Make HostingBillLineAmount accept negative values 2019-10-26 10:32:49 +05:30
PCoder
6d8782415f Fix number formatting for price in invoice details 2019-10-08 06:33:52 +05:30
PCoder
80c1f8314b Update Changelog 2019-09-24 10:38:11 +05:30
PCoder
cc03c11c4a Improve admin email logging 2019-09-24 10:34:04 +05:30
PCoder
8cd7a69162 Convert lazy loaded string to str 2019-09-24 09:44:45 +05:30
PCoder
4dd49051b4 Update Changelog for 2.6.4 2019-09-15 09:38:36 +05:30
PCoder
e4e074ea8d Add explanatory text indicating puffy username on OpenBSD VMs 2019-09-15 09:12:36 +05:30
PCoder
41692b1929 Update Changelog for 2.6.3 2019-08-28 22:13:15 +05:30
5646e370ec Merge branch '7032/bugfix_existing_key' into 'master'
7032/bugfix existing key

See merge request ungleich-public/dynamicweb!712
2019-08-28 18:36:51 +02:00
PCoder
dbd6685c43 Update Changelog 2019-08-27 14:34:26 +05:30
07db974931 Merge branch '7070/fix_opennebula_error' into 'master'
Use opennebula user credentials to find if vm belongs to user

See merge request ungleich-public/dynamicweb!713
2019-08-27 10:58:11 +02:00
PCoder
b2d597232c Use opennebula user credentials to find if vm belongs to user 2019-08-27 11:13:38 +05:30
PCoder
7684687dbc Remove commented code 2019-08-26 16:13:31 +05:30
PCoder
8b8c93d23e Filter distinct public keys only 2019-08-26 16:02:08 +05:30
PCoder
97d83abffe Comment out code that denied adding the same key 2019-08-26 16:01:34 +05:30
55f55b6885 Merge branch '7068/remove-public-prefix' into 'master'
7068/remove public prefix

See merge request ungleich-public/dynamicweb!711
2019-08-22 05:11:54 +02:00
PCoder
7bc2c8eebe Update Changelog for 2.6.2 2019-08-22 08:40:14 +05:30
PCoder
b50a543148 Remove public- prefix shown in django/node/rails hosting pages 2019-08-22 08:38:19 +05:30
PCoder
39699da8ee Update Changelog for 2.6.1 2019-07-09 21:34:00 +05:30
85978aef20 Merge branch '6941/show_card_expiry_year_month' into 'master'
6941/show card expiry year month

See merge request ungleich-public/dynamicweb!710
2019-07-09 18:00:57 +02:00
PCoder
728fd5850b Update hosting django.po -- add "Expiry" -> Gültig bis 2019-07-09 21:21:22 +05:30
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
fe44908868 Add expiry year and month to get_all_cards_list 2019-07-09 18:47:54 +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
3c63f26d31 Update Changelog for 2.6 2019-07-03 20:59:48 +05:30
20a5e51cad Merge branch 'task/5509/improve-asking-ssh-key' into 'master'
Task/5509/improve asking ssh key

See merge request ungleich-public/dynamicweb!709
2019-07-03 16:56:30 +02:00
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
44921014a2 Get the correct opennebula user id 2019-07-03 07:09:44 +05:30
PCoder
921d832f9e Make user in UserHostingKey model nullable 2019-07-03 06:44:31 +05:30
PCoder
dfb16f0c25 Save new user's hosting key only in that case 2019-07-03 05:13:02 +05:30
PCoder
26fab27c3f Set new_user_hosting_key_id session variable to track newly created key 2019-07-01 23:17:27 +05:30
PCoder
ddaa320628 Set user foreign key to be blank allowing null values 2019-07-01 23:11:49 +05:30
PCoder
32de20aaba Set unon authenticated user to NONE 2019-07-01 23:11:14 +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
8efe978b23 Don't make SSHKeyCreateView with LoginRequiredMixin 2019-07-01 21:01:41 +05:30
PCoder
561178e473 Set success_url from session and call super post method 2019-07-01 20:48:34 +05:30
PCoder
c8c5bb763a Remove Add SSH key form in "Order Confirm" page related code
(not needed)
2019-07-01 20:36:13 +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
c35bc79c5c Set success_url based on flow: hosting vs landing 2019-07-01 20:28:26 +05:30
PCoder
207c3a6c6c Skip SSH key page for generic products page 2019-07-01 08:57:39 +05:30
PCoder
2c74eae3f9 Remove commented code 2019-07-01 08:56:43 +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
b6eb72af7d Refactor SSHKeyCreateView to utils
Common between hosting/datacenterlight apps
2019-07-01 08:08:43 +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
59a78dd8bb Merge branch 'task/5509/add-keys-to-opennebula-user' into 'master'
Save user's key in opennebula

See merge request ungleich-public/dynamicweb!704
2019-06-25 14:00:44 +02:00
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
34c917acc2 Add SSH form to hosting VM buy flow also 2019-06-25 03:10:50 +02:00
PCoder
85f7d73442 Code cleanup: Remove ssh_key_added_to_vm email templates 2019-06-25 02:32:19 +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
0cf5e541cc Code cleanup: remove VM poweroff/resume methods + styles + html code 2019-06-25 02:24:14 +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
1e68ecb047 Confirm order button close: Redirect only to url specified 2019-06-24 04:31:29 +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
PCoder
151983ff59 Update Changelog for 2.5.11 2019-06-11 01:09:45 +02:00
3f8bc1b842 Merge branch 'william' into 'master'
fix translation Learn more -> Lerne mehr

See merge request ungleich-public/dynamicweb!708
2019-06-11 00:58:20 +02:00
e5f317281f fix translation Learn more -> Lerne mehr 2019-06-10 18:25:18 -04:00
cb244e78a1 Merge branch 'feature/reversedns/check-users-vm-against-opennebula' into 'master'
Feature/reversedns/check users vm against opennebula

See merge request ungleich-public/dynamicweb!707
2019-06-10 15:01:46 +02:00
PCoder
1ebfc8b2dc Don't use VirtualMachineSerializer for obtaining users_vms 2019-06-10 14:51:40 +02:00
PCoder
c99e943ebc Use oneadmin_client to update a user's ssh key 2019-06-10 09:23:48 +02:00
PCoder
496178f44c Check if VM belongs to user against opennebula backend 2019-06-08 04:40:16 +02:00
PCoder
63a78a537e Use infoextended for fallback case also 2019-06-08 04:25:55 +02:00
6ac9d2fb1e Merge branch 'william' into 'master'
updated for read vm realm

See merge request ungleich-public/dynamicweb!706
2019-05-16 22:40:18 +02:00
5ad871f124 updated for read vm realm 2019-05-16 16:35:44 -04:00
PCoder
0cada8668a Update Changelog for 2.5.10 2019-05-16 22:10:41 +02:00
c469948901 Merge branch 'william' into 'master'
Add view to check if the vm belongs to a user (for ungleich-cli)

See merge request ungleich-public/dynamicweb!705
2019-05-16 22:01:21 +02:00
a82ecbe4d5 fix typho in check_vm 2019-05-16 13:34:13 -04:00
ce630573e0 Remove print statement & correct code return 2019-05-16 13:33:31 -04:00
PCoder
94d5c34152 [hosting/bill] Skip creating MHB for invoices that have been imported already 2019-05-13 21:15:38 +02:00
69ec7d2b46 reuse of the env variable in the base settings 2019-05-13 03:44:09 -04:00
PCoder
72ea362d01 Remove duplicated blocktrans in txt email template 2019-05-13 08:01:11 +02:00
PCoder
caa01f344f Change poweroff to poweroff_hard
Issue with poweroff:

Executing poweroff not always seems to work. Sometimes, the VM is tries
to SHUTDOWN but times out. poweroff-hard seems to poweroff all the time.
2019-05-13 07:56:46 +02:00
PCoder
9fd396363f Center the add ssh key nicely 2019-05-13 07:13:49 +02:00
5e2e906f48 include pyotp in requeriments 2019-05-12 21:35:28 -04:00
fda5118c39 Added otp verification 2019-05-12 21:34:54 -04:00
1faf46cc1b added validation to heck if the user is the one allowed to access 2019-05-12 21:34:10 -04:00
PCoder
641c556bb6 Simplify code 2019-05-12 21:16:46 +02:00
PCoder
f2af1f8708 Rename button id 2019-05-12 21:15:48 +02:00
PCoder
bbe0017fa0 Add missing return statements for error 2019-05-12 21:15:15 +02: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
a44d50dd69 Fix wrong comparing of public_key object with a string value 2019-05-12 19:56:14 +02:00
PCoder
e7c334924d Make update_type a parameter with 1 as default
0: Replace the template
1: Merge the new template
2019-05-12 19:55:24 +02:00
PCoder
d38edb0dfa Add url for AddSshKeyToVMView 2019-05-12 19:22:10 +02:00
PCoder
69049a9321 Add poweroff and resume methods 2019-05-12 19:21:52 +02:00
PCoder
09ab9a714d Add AddSshKeyToVMView 2019-05-12 19:21:19 +02:00
PCoder
0104a804c2 Do not allow comma in SSH key name 2019-05-12 19:20:35 +02:00
PCoder
c9c91b1ecb JS code to handle the add ssh key functionality 2019-05-12 19:19:40 +02:00
PCoder
61127e56ca Update virtual_machine_detail.html template
To show the Add SSH key button and the modal that pops up after clicking
it.
2019-05-12 19:16:53 +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
7e538bf37b Add ssh_key_added_to_vm.{html,txt} email templates 2019-05-12 19:12:34 +02:00
PCoder
3133bde0e9 Don't set the key in the live template 2019-05-11 09:15:08 +02:00
PCoder
b189371a7b Call get_all_active_vmids to get the active vmids 2019-05-11 02:38:16 +02:00
PCoder
7f6d4c1c53 Refactor get_all_vmids -> get_all_active_vmids
We now get this info from opennebula
2019-05-11 02:23:51 +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
65c9ccb671 Use save_key_in_opennebula_user and save_key_in_vm_template 2019-05-11 01:54:35 +02:00
PCoder
3602bb0eb7 Add save_key_in_vm_template and get_all_vmids methods 2019-05-11 01:46:28 +02:00
PCoder
5146daa680 Use SSH_PUBLIC_KEY within CONTEXT 2019-05-11 00:31:25 +02:00
PCoder
6a1faa52e4 Set user's own ssh keys when creating VM 2019-05-11 00:25:49 +02:00
PCoder
85136d80cc Pass the opennebula user id as the object id 2019-05-10 23:57:52 +02:00
PCoder
c92b8c6fac one. is appended by oca 2019-05-10 23:51:05 +02:00
PCoder
1d70563ea2 Save user's key in opennebula 2019-05-10 09:19:42 +02:00
PCoder
cd47af23f1 Update Changelog 2019-05-10 07:22:21 +02:00
PCoder
5c92aa713b Update cdist version 4.7.0 -> 5.0.1 2019-05-10 07:00:54 +02:00
b8ca7286f2 Add view to check if the vm belongs to a user 2019-05-09 01:34:18 -04:00
PCoder
fa66d48323 Update Changelog for 2.5.9 2019-05-09 00:15:27 +02:00
10be0e472d Merge branch 'bugfix/6669/opennebula-vm-query-takes-long' into 'master'
Bugfix/6669/opennebula vm query takes long

See merge request ungleich-public/dynamicweb!703
2019-05-09 00:09:41 +02:00
bebf1f94d7 Correct spelling mistake 2019-05-09 00:06:57 +02:00
PCoder
d5dc5df1f2 Add doc 2019-05-09 00:06:22 +02:00
PCoder
8afed25d04 Merge branch 'master' into bugfix/6669/opennebula-vm-query-takes-long 2019-05-08 23:58:04 +02:00
9c8bc2e982 Merge branch 'bugfix/increase-configuration-length' into 'master'
Increase configuration length in VMDetail to 128 chars

See merge request ungleich-public/dynamicweb!702
2019-05-08 23:52:52 +02:00
PCoder
f0dfcccd96 Increase configuration length in VMDetail to 128 chars 2019-05-08 23:42:03 +02:00
PCoder
927d4a029c Do not search for VM details like 'ID={vm_id}'
Query takes a long time and not ideal
2019-05-08 22:43:26 +02:00
PCoder
f837e2b206 Add deleteuser management command 2019-05-07 06:36:25 +02:00
PCoder
d8b95abb39 Check private key is true 2019-05-06 08:48:26 +02:00
PCoder
729a813804 Flip the order of logging 2019-05-06 08:47:59 +02:00
a63d9098d4 Merge branch 'feature/delete-user' into 'master'
Feature/delete user

See merge request ungleich-public/dynamicweb!701
2019-05-06 08:33:43 +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
c40331fcc1 Add deleteduser model 2019-05-06 08:07:26 +02:00
PCoder
ba88bbf6bd Add migration to change user_id to customuser_id in legacy code
Pertains to djangocms_blog
2019-05-06 08:04:57 +02:00
PCoder
5d3f769750 Merge remote-tracking branch 'mainRepo/master' into feature/delete-user 2019-05-06 07:08:10 +02:00
PCoder
6b8ecd7c9b Merge branch 'remove-maxcdn-dependency' 2019-05-05 21:17:56 +02:00
PCoder
05786418e4 Update Changelog for 2.5.7 2019-05-05 21:16:12 +02:00
5073b35205 Merge branch 'remove-maxcdn-dependency' into 'master'
Remove code.jquery.com and maxcdn.bootstrapcdn.com dependencies

See merge request ungleich-public/dynamicweb!700
2019-05-05 21:05:32 +02:00
PCoder
e6ff78b37d Correct the contents of font-awesome-4.1.0 min css file 2019-05-05 20:49:16 +02:00
PCoder
f8768e8a8a Fix font-awesome css file location 2019-05-05 20:34:13 +02:00
PCoder
d91a403680 Add bootstrap-3.3.4 local resources 2019-05-05 20:24:47 +02:00
PCoder
dca11c1b26 Remove code.jquery.com and maxcdn.bootstrapcdn.com dependencies
Use local resources instead
2019-05-05 20:23:02 +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
43e6383342 Update Changelog for 2.5.6 2019-05-05 17:45:43 +02:00
PCoder
3b41f2a149 Check if the page is IPv6.Blog and load header img accordingly 2019-05-05 17:42:15 +02:00
PCoder
2b118ff540 Correct spelling 2019-05-05 16:56:56 +02:00
PCoder
b629ad5105 Merge branch 'master' into feature/delete-user 2019-05-05 13:52:06 +02:00
PCoder
829261af88 Revert back djangocms-blog version to 0.9.0 2019-05-05 13:42:09 +02:00
PCoder
498418c669 Remove header block that causes the blog title to appear 2019-05-04 14:35:52 +02:00
PCoder
87ef84e981 Update Changelog for 2.5.5 2019-05-04 14:13:11 +02:00
83ce6e82eb Merge branch 'bugfix/remove-category-string' into 'master'
Use the modified djangocms_blog module to remove Category - blah ...

See merge request ungleich-public/dynamicweb!699
2019-05-04 14:07:45 +02:00
PCoder
167ce9e4c1 Use the modified djangocms_blog module to remove Category - blah ... 2019-05-04 13:20:13 +02:00
PCoder
532b7dee9e Update Changelog for 2.5.4 2019-05-04 12:49:06 +02:00
c7ebcb00cd Merge branch 'feature/blog-by-category' into 'master'
Set the title and header via GET params

See merge request ungleich-public/dynamicweb!698
2019-05-04 12:44:32 +02:00
PCoder
3afa969206 Set the title and header via GET params 2019-05-04 09:40:09 +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
71d1e6e3c9 Add delete method for UserHostingKey 2019-04-28 23:13:54 +02:00
PCoder
1ccb4e9790 Correct the way we get periods for invoices list 2019-04-22 11:40:00 +02:00
PCoder
965cc3adf9 Show correct period start and period end in invoice list
Previously, we used to take the first element in the bill line
item, for invoice start and end date. However, it can be faulty in
cases where the first item does not represent a VM itself (which
we are sure has a monthly subscription and a correct start and end
dates)
2019-04-22 11:08:59 +02:00
PCoder
a5188a7ab0 Update Changelog for 2.5.3 2019-04-20 20:00:40 +02:00
PCoder
3a7c209b80 Fallback to Stripe plan name for product description if its set 2019-04-20 19:54:46 +02:00
PCoder
212648a1c5 Merge branch 'feature/6561/show-multiple-line-items' 2019-04-20 19:14:41 +02:00
PCoder
dad4f42dc3 Do not add vm_conf to details if it is None 2019-04-20 19:13:34 +02:00
3c4494f35c Merge branch 'feature/6561/show-multiple-line-items' into 'master'
Feature/6561/show multiple line items

See merge request ungleich-public/dynamicweb!697
2019-04-20 19:00:09 +02:00
PCoder
21eb88ef62 Add get_vm_config_from_stripe_id stripe util function 2019-04-20 18:53:20 +02:00
PCoder
0b99a0cbec Fix getting users email and password from the request object 2019-04-20 18:52:34 +02:00
PCoder
a1a85e6c18 Style the invoice detail page for multiline items 2019-04-20 18:52:01 +02:00
PCoder
2ae0c8629b Add CSS styles for multi line invoice table 2019-04-20 18:51:23 +02:00
PCoder
a811e9f83d Add helper methods in HostingBillLineItem 2019-04-20 18:50:46 +02:00
PCoder
e782d27739 Attempt to show relevant lines when we have more than 1 line item 2019-04-20 15:20:55 +02:00
PCoder
3fbc4528d9 Merge branch 'feature/6561/link-billlineitem-with-stripeplan' 2019-04-20 14:13:47 +02:00
PCoder
aff197c1b5 Fix getting StripePlan by plan_id and not name 2019-04-20 14:12:45 +02:00
c0c938e65c Merge branch 'feature/6561/link-billlineitem-with-stripeplan' into 'master'
Feature/6561/link billlineitem with stripeplan

See merge request ungleich-public/dynamicweb!696
2019-04-20 13:56:05 +02:00
PCoder
c592c0768e Extract stripe plan from invoice and set it to MHB
If the plan does not exist, it implies that it was created in the
dashboard. So, we create it in the backend also.
2019-04-20 12:48:18 +02:00
PCoder
38d074811a Link HostingBillLineItem to StripePlan 2019-04-20 12:41:30 +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
44ffd042a6 Obtain vm_id from multiple line items
- Remove empty string from VM_IDs string
- If more than one is present, check all of them are the same
  If same return, the unique value
  Else return none, as we don't handle this case
2019-04-20 10:00:53 +02:00
PCoder
9f13253475 Add missing braces 2019-04-20 09:49:26 +02:00
PCoder
ecfec9dd21 Handle invoice item in line items also 2019-04-20 08:57:13 +02:00
PCoder
0a22ced19c Update Changelog for 2.5.2 2019-04-20 07:47:27 +02:00
077bd25d4b Merge branch 'feature/6561/fix-fetching-multiple-line-items-same-subscription' into 'master'
Feature/6561/fix fetching multiple line items same subscription

See merge request ungleich-public/dynamicweb!695
2019-04-20 07:44:20 +02:00
PCoder
2be59cb0c8 Add missing return value 2019-04-20 07:41:07 +02:00
PCoder
86d70a7f0b Count and log the number of invoices actually imported 2019-04-20 07:31:32 +02:00
PCoder
91695eaee4 Check if multiple line items belong to the same subscription
We are just fine in this case to create a Monthly hosting bill
Also return None explicitly if MonthlyHostingBill is not created
2019-04-20 07:23:16 +02:00
PCoder
0969c97eca Add missing string to debug code 2019-04-18 08:13:56 +02:00
PCoder
da3d462505 Update Changelog for 2.5.1 2019-04-17 08:50:29 +02:00
PCoder
4b0ffbbc5d Update Changelog 2019-04-13 21:22:09 +02:00
c9fb034ebd Merge branch 'feature/monthly-invoices' into 'master'
Feature/monthly invoices

See merge request ungleich-public/dynamicweb!689
2019-04-13 21:18:36 +02:00
PCoder
c3842a5ed5 Get periods from line items in invoice detail also 2019-04-13 15:43:27 +02:00
PCoder
c5f72792d2 Show period of the first line item as the period of the invoice 2019-04-13 15:35:36 +02:00
PCoder
a3a2016cb4 Attempt period from line_items 2019-04-13 15:24:37 +02:00
PCoder
77669c962c Fix passing correct created value 2019-04-13 15:00:19 +02:00
PCoder
869f74e4e6 Fix typo 2019-04-13 14:43:39 +02:00
PCoder
a4427dd3af Set empty string for description if not available 2019-04-13 14:40:20 +02:00
PCoder
ed6059feaa Set unit amount to 0 if not available in Stripe response 2019-04-13 14:34:42 +02:00
PCoder
4a01036ab5 Attempt correction to gt dict to be passed for created greater than 2019-04-13 14:34:17 +02:00
PCoder
94c7873397 Fix getting line_items 2019-04-13 13:50:09 +02:00
PCoder
8816793803 Add Line item 2019-04-13 13:42:04 +02:00
PCoder
061ef7d036 Fetch invoices whose date is greater than given date only 2019-04-13 12:54:57 +02:00
PCoder
9ee21b9bc3 Allow admin to see invoices 2019-04-13 12:37:37 +02:00
PCoder
3bf4f4dca7 Merge branch 'master' into feature/monthly-invoices 2019-04-13 12:13:38 +02:00
d1d161ac49 Merge branch 'feature/enhance-logging' into 'master'
Feature/enhance logging

See merge request ungleich-public/dynamicweb!693
2019-04-13 12:08:44 +02:00
PCoder
f50af4f2aa Improve log formatting 2019-04-13 12:04:18 +02:00
PCoder
4cf7b93ee2 Create logs directory 2019-04-13 12:02:48 +02:00
PCoder
fefcdb5647 Pass correct key email 2019-04-12 09:10:19 +02:00
PCoder
c232f4c1da Fix error in obtaining customuser for mab 2019-04-12 08:41:05 +02:00
PCoder
6a7b5459ce Allow admin to list invoices 2019-04-12 08:14:52 +02:00
PCoder
b34425d24b Merge branch 'opennebula-5.8.1/misc' 2019-04-11 02:13:23 +02:00
PCoder
f8458f369d Update Changelog 2.5 2019-04-11 02:12:24 +02:00
19e03f218a Merge branch 'opennebula-5.8.1/misc' into 'master'
Revert back to old serializer code

See merge request ungleich-public/dynamicweb!692
2019-04-11 02:05:45 +02:00
PCoder
7f9ada60ee Revert back to old serializer code 2019-04-11 01:58:51 +02:00
3ba37207d1 Merge branch 'opennebula-5.8.1/get-ips' into 'master'
Opennebula 5.8.1/get ips

See merge request ungleich-public/dynamicweb!691
2019-04-11 01:52:06 +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
3f75fac158 Make use of the infoextended method where needed 2019-04-11 01:05:34 +02:00
67d39a905d Merge branch 'bugfix/upgrade_to_opennebula_5.8.1' into 'master'
Bugfix/upgrade to opennebula 5.8.1

See merge request ungleich-public/dynamicweb!690
2019-04-09 09:22:50 +02:00
PCoder
a8caa035c0 Set configuration to empty string if not available 2019-04-09 09:12:09 +02:00
PCoder
5b7d1301cf Return cores as int 2019-04-09 08:56:10 +02:00
PCoder
fa018739c9 Change cores to float before multiplication 2019-04-09 07:47:36 +02:00
PCoder
6a5a5ed160 Check template_id attr exists within template 2019-04-09 07:43:06 +02:00
PCoder
85b251d2e6 Check if the template VM serializer object has template attr 2019-04-09 07:40:06 +02:00
PCoder
9f58fdd456 Wrong multiplication to string instead of number 2019-04-09 00:26:59 +02:00
PCoder
316496b969 More fix for vcpu 2019-04-09 00:22:39 +02:00
PCoder
78738e8175 Change cores to SerializerMethodField and obtain it from cpu 2019-04-09 00:16:28 +02:00
PCoder
8c04acaff8 Check if user has stripecustomer attr 2019-04-06 14:07:26 +02:00
PCoder
92b2504f1e Paginate invoice list view by 10 items on each page 2019-04-05 00:09:52 +02:00
PCoder
5987962414 Add VM ID to invoices list 2019-04-04 23:50:49 +02:00
PCoder
3f3f47888d Fix missing codes 2019-04-04 23:20:11 +02:00
PCoder
73f7831744 Attempt to show IP address instead of invoice number 2019-04-04 23:14:24 +02:00
PCoder
6d4af0c193 Fix getting number of mabs of a user 2019-04-04 08:10:16 +02:00
PCoder
a59cd86fee Fix error: get mab using customer and not email 2019-04-04 07:59:38 +02:00
PCoder
8dfee2bd83 Show invoices only if the user's invoice were imported
Else fallback to orders url as before
2019-04-04 07:55:56 +02:00
PCoder
316646465d Use invoice's username and email 2019-04-04 07:46:28 +02:00
PCoder
bb7107fe80 Remove erroneous space before filter param 2019-04-04 07:28:50 +02:00
PCoder
0c4e0f1070 Show period in invoices page 2019-04-04 07:14:12 +02:00
PCoder
8b6619f788 Invoice pdf generation: use invoice number and not id 2019-04-04 06:52:34 +02:00
PCoder
d4d31dced9 Attempt invoice pdf with invoice_id instead of pk 2019-04-04 06:50:13 +02:00
PCoder
f50e5dcaa4 Add ADMIN_EMAIL setting 2019-04-04 06:49:46 +02:00
PCoder
f907837f04 dashboard: Link 'My bills' to invoices 2019-04-04 06:43:47 +02:00
PCoder
e58dcbb44c hosting urls: Change invoices/<pk>/ to invoice/<pk> 2019-04-04 06:41:23 +02:00
PCoder
8f4a02738f Revert back to old price values 2019-04-04 00:15:04 +02:00
PCoder
ef1bdee9a7 Remove more autoformatting 2019-04-04 00:05:45 +02:00
PCoder
13f84a8580 Add missing endif 2019-04-04 00:05:20 +02:00
PCoder
baf62f1924 Simplify showing total price 2019-04-03 23:54:52 +02:00
PCoder
f1a7958f03 Use correct class 2019-04-03 23:34:26 +02:00
PCoder
903fee4db1 Fix more autoformatting issues 2019-04-03 23:31:52 +02:00
PCoder
d00e84a4b6 Fix bug related to proper alignment 2019-04-03 23:24:56 +02:00
PCoder
47422a99af Fix more autoformatting related errors 2019-04-03 23:11:59 +02:00
PCoder
ddd3cebc39 Fix blocktrans reformatted mistakenly 2019-04-03 23:09:57 +02:00
PCoder
ef09ae4dab Obtaing pricing from order 2019-04-03 23:07:37 +02:00
PCoder
3ed5823c93 Add missing self.object initializer 2019-04-03 23:04:35 +02:00
PCoder
76e3d95135 Use invoice_number of invoice pk 2019-04-03 22:59:39 +02:00
PCoder
d07f3d7eba Add missing object param 2019-04-03 22:59:01 +02:00
PCoder
7de2129a00 Implement get invoice 2019-04-03 22:49:45 +02:00
PCoder
ba6fa531db Correct the name of the layout 2019-04-03 22:49:25 +02:00
PCoder
d37a2de6eb Add utility functions 2019-04-03 22:48:56 +02:00
PCoder
94586c854a Add invoice detail 2019-04-03 22:48:23 +02:00
PCoder
ba9e554881 Implement get_object for invoice detail + url fix 2019-04-03 21:52:07 +02:00
PCoder
247bbe622f Add missing invoice_number argument to MHB create 2019-04-03 21:29:49 +02:00
PCoder
e843a6f857 Make invoicelistview not inherit OrderHostingListView 2019-04-03 21:16:19 +02:00
PCoder
def5a3a011 Add invoice urls 2019-04-03 20:34:04 +02:00
PCoder
dbe3b2558c Create an InvoiceListView 2019-04-03 20:31:54 +02:00
PCoder
71832f8afc invoices.html: Replace all order instances by invoice 2019-04-03 20:31:24 +02:00
PCoder
de3734bf20 Add total_in_chf utility method 2019-04-03 20:29:33 +02:00
PCoder
147fd0fe5e Add invoices.html 2019-04-03 20:29:06 +02:00
PCoder
5c31417a37 Convert timestamp to int 2019-04-03 19:34:57 +02:00
PCoder
cc6afa8d2a Fix datetime issue: pass unix timestamp instead of datetime 2019-04-03 19:22:27 +02:00
PCoder
a690ef421f Fix variable name 2019-04-03 09:24:25 +02:00
PCoder
2c3146111f Fix getting subscription id 2019-04-03 09:20:38 +02:00
PCoder
8e1e3e4157 Correct variable names 2019-04-03 09:12:14 +02:00
PCoder
12b8a77862 Fix issues and also include subscription_id 2019-04-03 09:03:58 +02:00
PCoder
444f79eab7 Remove unwanted logger code 2019-04-03 07:35:43 +02:00
PCoder
66ffbf38aa Handle if VM_ID metadata is not set 2019-04-03 07:32:18 +02:00
PCoder
dbf3b92c06 Add logging and verbosity 2019-04-03 07:08:39 +02:00
PCoder
c85a4f3796 Catch error from stripe call 2019-04-03 06:59:05 +02:00
PCoder
033db01810 Correct error in getting lines data count 2019-04-03 06:51:19 +02:00
PCoder
3eaa53ca78 Use stdout instead of logger 2019-04-03 06:36:28 +02:00
PCoder
b7dd4acb07 Correct the way of getting VM_ID meta data 2019-04-03 06:33:28 +02:00
PCoder
6f1449836a Fix a bug: use starting_after if its defined 2019-04-03 06:27:54 +02:00
PCoder
b1566c4c61 Get the last monthly hosting bill 2019-04-03 06:22:49 +02:00
PCoder
0bc8c35031 Add migration 2019-04-03 06:13:12 +02:00
PCoder
6d42f88be1 Complete implementation of fetch_stripe_bills 2019-04-03 06:12:48 +02:00
PCoder
8dc00c9dd9 Add management command 2019-04-02 09:18:46 +02:00
PCoder
0e84081880 Add monthlyhostingbill model + code 2019-04-02 09:18:15 +02:00
PCoder
46c3bb1ce4 Update Changelog for 2.4.10 2019-02-14 20:56:12 +01:00
437dfb1ce2 Merge branch 'task/6451/change_phone_number' into 'master'
Change phone numbers on DG, gdpr and others

See merge request ungleich-public/dynamicweb!688
2019-02-14 20:49:16 +01:00
PCoder
a00c4a1e44 Change phone numbers on DG, gdpr and others
(044) 534-66-22 -> +41 55 505 6266
2019-02-14 20:33:31 +01:00
PCoder
52deeb1180 Update Changelog for 2.4.9 2019-02-01 23:34:53 +01:00
cc0eb9a741 Merge branch 'fix_blog_gdpr_styles' into 'master'
Fix blog gdpr styles

See merge request ungleich-public/dynamicweb!687
2019-02-01 23:28:53 +01:00
PCoder
93a86a3c48 Add GDPR banner to digitalglarus 2019-02-01 09:04:18 +01:00
PCoder
3f4a209661 Apply style to paragraph 2019-02-01 08:58:17 +01:00
PCoder
a44ff74dc6 Override default styles 2019-02-01 08:53:48 +01:00
PCoder
6421552673 Change modal button style 2019-02-01 08:42:45 +01:00
PCoder
dbe362e22b Add paragraph styling 2019-02-01 08:31:57 +01:00
PCoder
9f7ccd7170 Modify modal button styles 2019-02-01 08:29:20 +01:00
PCoder
6164b80e3d ++ styles 2019-02-01 08:24:14 +01:00
PCoder
205dde453a More style fixes 2019-02-01 08:19:07 +01:00
PCoder
bb2f3e6a6f Fix translation error 2019-02-01 00:59:54 +01:00
PCoder
5c4af17b45 Change translations 2019-02-01 00:57:20 +01:00
PCoder
9277208b16 More styles 2019-02-01 00:48:52 +01:00
PCoder
596bddb323 Add styles by Sanghee 2019-01-31 23:23:51 +01:00
PCoder
8ec32e4a5e Add missing styles 2019-01-31 22:58:23 +01:00
PCoder
2ae3e695e8 Add styles 2019-01-31 22:43:56 +01:00
PCoder
541b08584c Update Changelog for 2.4.8 2019-01-31 21:24:36 +01:00
PCoder
842766d0e2 Merge branch 'sanghee/dynamicweb-task/6059' 2019-01-31 21:21:49 +01:00
PCoder
f730f4c00d Update Changelog 2019-01-31 21:14:31 +01:00
PCoder
681b1a1d93 Remove some more 2019-01-30 23:08:43 +01:00
PCoder
4c77678a36 Remove unnecessary brs from DE translation 2019-01-30 23:04:08 +01:00
PCoder
10137d8675 Fix button letter spacing style 2019-01-30 22:16:07 +01:00
PCoder
13a606aac0 Add translation for 'accept' and fix styles 2019-01-30 22:11:16 +01:00
PCoder
c1ecef9b76 GDPR: Add/update DE translations 2019-01-30 22:03:23 +01:00
PCoder
e2c8ab084f Change chief information officer name, email
Malcolm -> Sanghee
2019-01-30 22:02:12 +01:00
PCoder
2d4d174c24 Apply letter-spacing to gdpr text and translate 2019-01-30 22:01:18 +01:00
PCoder
16b5f1e5a4 Merge branch 'master' into 5151/gdpr_modal 2019-01-30 21:05:34 +01:00
PCoder
9a6351ddbe Update Changelog for 2.4.7 2019-01-30 20:49:31 +01:00
PCoder
3f15675977 Merge branch 'master' into aatish/dynamicweb-6213_alignment_fixes 2019-01-30 20:08:33 +01:00
ddb9c5d901 add equalizer for images on product plugin, allow animate option to be dynamically set 2018-12-09 21:21:41 +05:45
sanghee
df368c715f changed topnav font into 400 by default 2018-11-13 21:21:46 +01:00
PCoder
66d21e0e9d Add missing sites in DE translation 2018-10-25 23:52:30 +02:00
PCoder
6fb157b40d Fix errors in DE text 2018-10-25 23:45:23 +02:00
PCoder
7eb532a7df Add DE translations 2018-10-25 23:22:35 +02:00
PCoder
f6a7659756 Replace some special chars 2018-10-25 23:20:17 +02:00
PCoder
58fe28f334 Add privacy policy text EN 2018-10-25 23:11:09 +02:00
PCoder
61206d4998 Load i18n module 2018-10-25 23:10:35 +02:00
PCoder
1feacc1770 Merge branch 'master' into 5151/gdpr_modal 2018-10-25 22:05:24 +02:00
PCoder
06d849c5ce Merge branch 'master' into 5151/gdpr_modal 2018-08-24 11:10:59 +02:00
PCoder
e230f2ac8c Merge master into 5151/gdpr_modal 2018-08-22 23:25:11 +02:00
PCoder
33cf6cdd2b Create IS_TENANT_SITE context variable 2018-07-21 13:28:43 +02:00
PCoder
028a27c538 Reformat code 2018-07-21 13:28:04 +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
44fb184436 Add templates/gdpr to the template path 2018-07-21 10:49:58 +02:00
PCoder
831bf9a8be Add gdpr_banner.html template 2018-07-21 10:46:53 +02:00
168 changed files with 8560 additions and 1447 deletions

1
.dockerignore Normal file
View file

@ -0,0 +1 @@
.git

3
.gitignore vendored
View file

@ -10,7 +10,7 @@ __pycache__/
.ropeproject/
#django
local_settings.py
Pipfile
media/
!media/keep
/CACHE/
@ -43,3 +43,4 @@ secret-key
# to keep empty dirs
!.gitkeep
*.orig
.vscode/settings.json

202
Changelog
View file

@ -1,3 +1,205 @@
3.2: 2021-02-07
* 8816: Update order confirmation text to better prepared for payment dispute
* supportticket#22990: Fix: can't add a deleted card
3.1: 2021-01-11
* 8781: Fix error is setting a default card (MR!746)
3.0: 2021-01-07
* 8393: Implement SCA for stripe payments (MR!745)
* 8691: Implment check_vm_templates management command (MR!744)
2.14: 2020-12-07
* 8692: Create a script that fixes django db for the order after celery error (MR!743)
2.13: 2020-12-02
* 8654: Fix 500 error on invoices list for the user contact+devuanhosting.com@virus.media (MR!742)
* 8593: Escape user's ssh key in xml-rpc call to create VM (MR!741)
2.12.1: 2020-07-21
* 8307: Introduce "Exclude vat calculations" for Generic Products (MR!740)
* Change DE VAT rate to 16% from 19% (MR!739)
2.12: 2020-06-23
* 7894: Show one time payment invoices (MR!738)
2.11: 2020-06-11
* Bugfix: Correct the wrong constant name (caused payment to go thru and showing error and VMs not instantiated)
2.10.8: 2020-06-10
* #8102: Refactor MAX_TIME_TO_WAIT_FOR_VM_TERMINATE to increase time to poll whether VM has been terminated or not (MR!737)
2.10.7: 2020-05-25
* Bugfix: Handle VM templates deleted in OpenNebula but VM instances still existing (MR!736)
Notes for deployment:
When deploying define a UPDATED_TEMPLATES string represented dictionary value in .env
```
# Represents Template Ids that were
# deleted and the new template Id to look for the template
# definition
UPDATED_TEMPLATES="{1: 100}"
```
2.10.6: 2020-03-25
* Bugfix: Handle Nonetype for discount's name (MR!735)
2.10.5: 2020-03-17
* Introduce base price for VMs and let admins add stripe_coupon_id (MR!730)
Notes for deployment:
1. Add env variable `VM_BASE_PRICE`
2. Migrate datacenterlight app. This introduces the stripe_coupon_code field in the VMPricing.
3. Create a coupon in stripe with the desired value and note down the stripe's coupon id
4. Update the discount amount and set the corresponding coupon id in the admin
2.10.3b: 2020-03-05
* #7773: Use username for communicating with opennebula all the time
2.10.2b: 2020-02-25
* #7764: Fix uid represented as bytestring
* #7769: [hosting] ssh private key download feature does not work well on Firefox
2.10.1: 2020-02-02:
* Changes the pricing structure of generic products into the pre vat and with vat (like that for VM)
* Shows product name (if exists) in the invoices list if it belongs to a generic product
* Small bugfixes (right alignment of price in the invoice list, show prices with 2 decimal places etc)
2.10: 2020-02-01
* Feature: Introduce new design to show VAT exclusive/VAT inclusive pricing together
* Feature: Separate VAT and discount in Stripe
* Feature: Show Stripe invoices until we have a better way of showing them elegantly
* Bugfix: Fix bug where VAT is set to 0 because user set a valid VAT number before but later chose not to use any VAT number
2.9.5: 2020-01-20
* Feature: Show invoices directly from stripe (MR!727)
2.9.4: 2020-01-10
* Bugfix: Buying VPN generic item caused 500 error
2.9.3: 2020-01-05
* Feature: Add StripeTaxRate model to save tax rates created in Stripe
* Bugfix: Add vat rates for CY, IL and LI manually
2.9.2: 2020-01-02
* Bugfix: Improve admin email for terminate vm (include subscription details and subscription amount) (MR!726)
2.9.1: 2019-12-31
* Bugfix: Error handling tax_id updated webhook
2.9: 2019-12-31
* Feature: Enable saving user's VAT Number and validate it (MR!725)
Notes for deployment:
1. Migrate db for utils app
./manage.py migrate utils
2. Uninstall old version and install a more recent version of stripe
```
source venv/bin/activate
./manage.py shell
pip uninstall stripe
pip install stripe==2.41.0
```
3. Create tax id updated webhook
```
./manage.py webhook --create \
--webhook_endpoint https://datacenterlight.ch/en-us/webhooks/ \
--events_csv customer.tax_id.updated
```
4. From the secret obtained in 3, setup an environment variable
```
WEBHOOK_SECRET='whsec......'
```
5. Deploy
2.8.2: 2019-12-24
* Bugfix: [dcl calculator plugin] Set the POST action url explicitly
2.8.1: 2019-12-24
* [dcl cms navbar plugin]: Provide an option to show non transparent navar always
2.8: 2019-12-20
* ldap_migration: Migrate django users to Ldap
Notes for deployment:
```
1. Git Pull
2. Ensure the newly dependencies in requirements.txt are installed
3. Put new values in .env
4. Run migrations
5. Restart uwsgi
```
2.7.3: 2019-12-18
* Bugfix: Swiss VAT being wrongly added to non-EU customers
2.7.2: 2019-12-17
* Add vat rates for AD, TK and IS
* Improve billing address' string representation
Notes for deployment:
- Import the newly added vat rates into db
```
./manage.py import_vat_rates vat_rates.csv
```
2.7.1: 2019-12-14
* feature: Add management command to list active VM customers (MR!723)
2.7: 2019-12-9
* feature: EU VAT for new subscriptions (MR!721)
Notes for deployment:
- Add the following to .env file
- FIRST_VM_ID_AFTER_EU_VAT=<to VM_ID from which we begin EU VAT>
- PRE_EU_VAT_RATE=whatever the rate was before introduction of EU VAT (7.7 for example)
2.6.10: 2019-11-16
* translation: Add DE translations for features in 2.6.{8,9} by moep (MR!719)
2.6.9: 2019-11-15
* feature: Allow creating yearly subscriptions for Generic Products (MR!718)
Notes for deployment:
- do a db migrate for new column added to Generic Product model
./manage.py migrate hosting
2.6.8: 2019-11-15
* feature: [EU VAT] Add EU VAT feature for generic products (MR!717)
Notes for deployment:
- do a db migrate a to create VATRates table
./manage.py migrate hosting
- load vat_rates.csv
./manage.py import_vat_rates vat_rates.csv
2.6.7: 2019-11-04
* bugfix: [admin] Improve dumpuser: show proper dates + bugfix
* bugfix: [admin] Improve fetch_stripe_bills:
- fix wrong assigment of string to num_invoice_created
variable,
- return None (do not handle the case) if we don't have an
order
* bugfix: [admin] Improve deleteuser: do not delete order, bill and vm_detail
2.6.6: 2019-11-04
* feature: [admin] Add dumpuser management command that dumps a user's data in json (MR!716)
2.6.5: 2019-09-24
* #7169: [hosting] Fix server error while vm terminate takes longer than 30 seconds
* #7170: [hosting] Improve admin email body contents for hosting vm terminate error case
2.6.4: 2019-09-15
* #7147: [OpenBSD vm] Add an explanatory text for username puffy on OpenBSD (MR!714)
2.6.3: 2019-08-28
* #7032: [hosting] Bugfix: Reentering the same SSH key used before does allow user to proceed further; complains key exists (MR!712)
* #7070: [check_vm/api] Bugfix: Provide oneadmin credentials to check whether a user is the owner of a VM (MR!713)
2.6.2: 2019-08-22
* #7068: [django/node/rails] Remove public- prefix from OS template names (MR!711)
2.6.1: 2019-07-09
* #6941: [hosting dashboard] Show the card's expiry year & month too in the list of added cards (MR!710)
2.6: 2019-07-03
* #5509: Getting rid of our key by still supporting multiple user keys (MR!709)
2.5.11: 2019-06-11
* #6672: [api] Check VM belongs to user in the infrastructure directly (MR!707)
* #bugfix: DE translation fix "Learn mehr" -> "Lerne mehr" (MR!708)
2.5.10: 2019-05-16
* #6672: [api] REST endpoint for ungleich-cli to verify if a VM belongs to a user (MR!705)
* #6670: [hosting/save_ssh_key] Upgrade cdist version to 5.0.1 to manage keys on Alpine linux
2.5.9: 2019-05-09
* #6669: [hosting] Fix opennebula vm query takes long (MR!703)
* [hosting] Increase VMDetail model's configuration parameter length to 128 (MR!702)
2.5.8: 2019-05-06
* #6631: Add `deleteuser` management command (MR!701)
2.5.7: 2019-05-05
* #6657: [all] Remove dependency on code.jquery.com, maxcdn.bootstrapcdn.com and oss.maxcdn.com and add them locally (MR!700)
2.5.6: 2019-05-05
* [blog] Check if the blog page is IPv6.Blog and load header image accordingly
2.5.5: 2019-05-04
* [blog] Use modified djangocms_blog module to not show "Category - ... " (MR!699)
2.5.4: 2019-05-04
* #6124: [blog] Allow setting title, subtitle of the blog page by passing GET params (MR!698)
2.5.3: 2019-04-20
* #6561: [bills] Show mutiple line items in the invoice details (MR!697)
* #6561: [bills] Link line item to a Stripe Plan (MR!697)
2.5.2: 2019-04-20
* #6561: [bills] Fix fetch_stripe_bills to import bills containing multiple line items belonging to same subscription (MR!695)
2.5.1: 2019-04-17
* #6561: [hosting] Preparation for monthly invoices for customers (MR!689)
* [logging] Enhance logger, Include timestamp + module name in the logging messages (MR!693)
2.5: 2019-04-11
* #6589: [vm creation, listing] Fix obtaining ip address/template related info from oca api call (MR!690, MR!691 and MR!692)
[python-oca] VirtualMachinePool infoextended (https://github.com/ungleich/python-oca/pull/3)
2.4.10: 2019-02-14
* #6451: [dg, gdpr banner] Update phone number (MR!688 by pcoder)
2.4.9: 2019-02-01
* bugfix: Fix inconsistent styles in GDPR modal (MR!679 by pcoder)
2.4.8: 2019-01-31
* #5151: [all] Add GDPR banner (MR!678 by pcoder)
* #6059: [dcl] Change topnav font to 400 by default (MR! 680 by Sanghee)
2.4.7: 2019-01-30
* #6213: [cms] Make ungleich product items equal heights and add option to animate or not animate the contents (MR!682 by Aatish)
2.4.6: 2019-01-09
* #6261: Add ungleich black logo to blog template for mobile view (MR!685)
2.4.5: 2019-01-07

18
Dockerfile Normal file
View file

@ -0,0 +1,18 @@
FROM python:3.10.0-alpine3.15
WORKDIR /usr/src/app
RUN apk add --update --no-cache \
git \
build-base \
openldap-dev \
python3-dev \
libpq-dev \
&& rm -rf /var/cache/apk/*
# FIX https://github.com/python-ldap/python-ldap/issues/432
RUN echo 'INPUT ( libldap.so )' > /usr/lib/libldap_r.so
COPY requirements.txt ./
RUN pip install --no-cache-dir -r requirements.txt
COPY ./ .

View file

@ -10,13 +10,35 @@ Requirements
Install
=======
.. note::
lxml that is one of the dependency of dynamicweb couldn't
get build on Python 3.7 so, please use Python 3.5.
First install packages from requirements.archlinux.txt or
requirements.debian.txt based on your distribution.
The quick way:
``pip install -r requirements.txt``
Next find the dump.db file on stagging server. Path for the file is under the base application folder.
or you can create one for yourself by running the following commands on dynamicweb server
.. code:: sh
sudo su - postgres
pg_dump app > /tmp/postgres_db.bak
exit
cp /tmp/postgres_db.bak /root/postgres_db.bak
Now, you can download this using sftp.
Install the postgresql server and import the database::
``psql -d app < dump.db``
``psql -d app -U root < dump.db``
**No migration is needed after a clean install, and You are ready to start developing.**
@ -25,9 +47,9 @@ Development
Project is separated in master branch and development branch, and feature branches.
Master branch is currently used on `Digital Glarus <https://digitalglarus.ungleich.ch/en-us/digitalglarus/>`_ and `Ungleich blog <https://digitalglarus.ungleich.ch/en-us/blog/>`_.
If You are starting to create a new feature fork the github `repo <https://github.com/ungleich/dynamicweb>`_ and branch the development branch.
If You are starting to create a new feature fork the github `repo <https://github.com/ungleich/dynamicweb>`_ and branch the development branch.
After You have complited the task create a pull request and ask someone to review the code from other developers.
After You have completed the task, create a pull request and ask someone to review the code from other developers.
**Cheat sheet for branching and forking**:

View file

@ -14,6 +14,12 @@ help:
@echo ' make rsync_upload '
@echo ' make install_debian_packages '
buildimage:
docker build -t dynamicweb:$$(git describe) .
releaseimage: buildimage
./release.sh
collectstatic:
$(PY?) $(BASEDIR)/manage.py collectstatic

View file

@ -6,14 +6,6 @@
{% block content_blog %}
<section class="blog-list">
{% block blog_title %}
<header>
<h2>
{% if author %}{% trans "Articles by" %} {{ author.get_full_name }}
{% elif archive_date %}{% trans "Archive" %} &ndash; {% if month %}{{ archive_date|date:'F' }} {% endif %}{{ year }}
{% elif tagged_entries %}{% trans "Tag" %} &ndash; {{ tagged_entries|capfirst }}
{% elif category %}{% trans "Category" %} &ndash; {{ category }}{% endif %}
</h2>
</header>
{% endblock %}
{% for post in post_list %}
{% include "djangocms_blog/includes/blog_item.html" with post=post image="true" TRUNCWORDS_COUNT=TRUNCWORDS_COUNT %}

View file

@ -184,6 +184,11 @@ class DCLNavbarPluginModel(CMSPlugin):
default=True,
help_text='Uncheck this if you do not want to show login/dashboard.'
)
show_non_transparent_navbar_always = models.BooleanField(
default=False,
help_text='Check this if you want to show non transparent navbar only.'
'(Useful when we want to setup a simple page)'
)
def get_logo_dark(self):
# used only if atleast one logo exists

View file

@ -1,5 +1,6 @@
from cms.plugin_base import CMSPluginBase
from cms.plugin_pool import plugin_pool
from django.conf import settings
from .cms_models import (
DCLBannerItemPluginModel, DCLBannerListPluginModel, DCLContactPluginModel,
@ -100,6 +101,7 @@ class DCLCalculatorPlugin(CMSPluginBase):
vm_type=instance.vm_type
).order_by('name')
context['instance'] = instance
context['vm_base_price'] = settings.VM_BASE_PRICE
context['min_ram'] = 0.5 if instance.enable_512mb_ram else 1
return context

View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-09-26 20:44+0000\n"
"POT-Creation-Date: 2021-02-07 11:10+0000\n"
"PO-Revision-Date: 2018-03-30 23:22+0000\n"
"Last-Translator: b'Anonymous User <coder.purple+25@gmail.com>'\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -20,12 +20,28 @@ msgstr ""
"X-Translated-Using: django-rosetta 0.8.1\n"
msgid "CMS Favicon"
msgstr ""
msgstr "CMS Favicon"
#, python-format
msgid "Your New VM %(vm_name)s at Data Center Light"
msgstr "Deine neue VM %(vm_name)s bei Data Center Light"
msgid "Your VM is almost ready!"
msgstr "Deine VM ist fast fertig!"
msgid ""
"You need to specify your public SSH key to access your VM. You can either "
"add your existing key, or generate a new key pair by clicking the generate "
"button below. After choosing your public SSH key option youll be directed "
"to the order confirmation page."
msgstr ""
"Du musst deinen öffentlichen SSH-Schlüssel angeben, um auf deine VM "
"zugreifen zu können. Du kannst entweder deinen vorhandenen Schlüssel "
"hinzufügen oder ein neues Schlüsselpaar generieren, indem du auf die "
"Schaltfläche \"Generieren\" unten klickst. Nachdem du deine öffentliche SSH-"
"Schlüsseloption ausgewählt hast, wirst du zur Bestellbestätigungsseite "
"weitergeleitet. "
msgid "All Rights Reserved"
msgstr "Alle Rechte vorbehalten"
@ -36,7 +52,7 @@ msgid "Login"
msgstr "Anmelden"
msgid "Dashboard"
msgstr ""
msgstr "Dashboard"
msgid "Thank you for contacting us."
msgstr "Nachricht gesendet."
@ -48,7 +64,7 @@ msgid "Get in touch with us!"
msgstr "Sende uns eine Nachricht."
msgid "Name"
msgstr ""
msgstr "Name"
msgid "Please enter your name."
msgstr "Bitte gib Deinen Namen ein."
@ -92,7 +108,7 @@ msgid "Your account details are as follows"
msgstr "Deine Account Details sind unten aufgelistet"
msgid "Username"
msgstr "Username"
msgstr "Benutzername"
msgid "Your email address"
msgstr "Deine E-Mail-Adresse"
@ -128,14 +144,18 @@ msgid ""
"the heart of Switzerland."
msgstr "Bei uns findest Du die günstiges VMs aus der Schweiz."
msgid "Try now, order a VM. VM price starts from only 15CHF per month."
msgstr "Unser Angebot beginnt bei 15 CHF pro Monat. Probier's jetzt aus!"
msgid "Try now, order a VM. VM price starts from only 11.5 CHF per month."
msgstr "Unser Angebot beginnt bei 11.5 CHF pro Monat. Probier's jetzt aus!"
msgid "ORDER VM"
msgstr "VM BESTELLEN"
#, python-format
msgid "Please enter a value in range %(min_ram)s - 200."
msgstr "Bitte gib einen Wert von %(min_ram)s bis 200 ein."
msgid "VM hosting"
msgstr ""
msgstr "VM Hosting"
msgid "month"
msgstr "Monat"
@ -152,9 +172,6 @@ msgstr "Standort: Schweiz"
msgid "Please enter a value in range 1 - 48."
msgstr "Bitte gib einen Wert von 1 bis 48 ein."
msgid "Please enter a value in range 1 - 200."
msgstr "Bitte gib einen Wert von 1 bis 200 ein."
msgid "Please enter a value in range 10 - 2000."
msgstr "Bitte gib einen Wert von 10 bis 2000 ein."
@ -190,24 +207,24 @@ msgstr ""
msgid "Only wants you to pay for what you actually need."
msgstr ""
"Möchte, dass du nur bezahlst, was du auch wirklich brauchst: Wähle deine "
"Du möchtest nur das bezahlen, was du auch wirklich brauchst: Wähle deine "
"Ressourcen individuell aus!"
msgid ""
"Is creative, using a modern and alternative design for a data center in "
"order to make it more sustainable and affordable at the same time."
msgstr ""
"Ist kreativ, indem es sich ein modernes und alternatives Layout zu Nutze "
"macht um Nachhaltigkeit zu fördern und somit erschwingliche Preise bieten zu "
"können."
"Es ist kreativ, da es sich ein modernes und alternatives Layout zu "
"Nutzemacht um Nachhaltigkeit zu fördern und somit erschwingliche Preise "
"bieten zu können."
msgid ""
"Cuts down the costs for you by using FOSS (Free Open Source Software) "
"exclusively, wherefore we can save money from paying licenses."
msgstr ""
"Sorgt dafür, dass unnötige Kosten erspart werden, indem es ausschliesslich "
"mit FOSS (Free Open Source Software) arbeitet und wir daher auf "
"Lizenzgebühren verzichten können."
"Um unnötige Kosten zu sparen werden, wird ausschliesslich Software aufBasis "
"von FOSS (Free Open Source Software) eingesetzt und dadurch können auf "
"Lizenzgebühren verzichtet werden."
msgid "Scale out"
msgstr "Skalierung"
@ -294,7 +311,7 @@ msgid "Billing Address"
msgstr "Rechnungsadresse"
msgid "Make a payment"
msgstr ""
msgstr "Tätige eine Bezahlung"
msgid "Your Order"
msgstr "Deine Bestellung"
@ -358,6 +375,9 @@ msgstr "Letzten"
msgid "Type"
msgstr "Typ"
msgid "Expiry"
msgstr "Ablaufdatum"
msgid "SELECT"
msgstr "AUSWÄHLEN"
@ -386,6 +406,19 @@ msgstr "Datum"
msgid "Billed to"
msgstr "Rechnungsadresse"
msgid "VAT Number"
msgstr "MwSt-Nummer"
msgid "Your VAT number has been verified"
msgstr "Deine MwSt-Nummer wurde überprüft"
msgid ""
"Your VAT number is under validation. VAT will be adjusted, once the "
"validation is complete."
msgstr ""
"Deine MwSt-Nummer wird derzeit validiert. Die MwSt. wird angepasst, sobald "
"die Validierung abgeschlossen ist."
msgid "Payment method"
msgstr "Bezahlmethode"
@ -398,42 +431,63 @@ msgstr "Bestellungsübersicht"
msgid "Product"
msgstr "Produkt"
msgid "Amount"
msgstr ""
msgid "Description"
msgstr ""
msgstr "Beschreibung"
msgid "Recurring"
msgstr ""
msgstr "Wiederholend"
msgid "Subtotal"
msgstr "Zwischensumme"
msgid "Price Before VAT"
msgstr "Preis ohne MwSt."
msgid "VAT"
msgstr "Mehrwertsteuer"
msgid "Pre VAT"
msgstr "Exkl. MwSt."
msgid ""
"By clicking \"Place order\" this plan will charge your credit card account "
"with %(total_price)s CHF/month"
msgstr ""
"Wenn Du \"bestellen\" auswählst, wird Deine Kreditkarte mit "
"%(vm_total_price)s CHF pro Monat belastet"
msgid "VAT for"
msgstr "MwSt für"
msgid ""
"By clicking \"Place order\" this payment will charge your credit card "
"account with a one time amount of %(total_price)s CHF"
msgstr ""
"Wenn Du \"bestellen\" auswählst, wird Deine Kreditkarte mit "
"%(vm_total_price)s CHF pro Monat belastet"
msgid "Your Price in Total"
msgstr "Dein Gesamtpreis"
#, python-format
msgid ""
"By clicking \"Place order\" this plan will charge your credit card account "
"with %(vm_total_price)s CHF/month"
" By clicking \"Place order\" you agree to our <a href=\"https://"
"datacenterlight.ch/en-us/cms/terms-of-service/\">Terms of Service</a> and "
"this plan will charge your credit card account with %(total_price)s CHF/year"
msgstr ""
"Wenn Du \"bestellen\" auswählst, wird Deine Kreditkarte mit "
"%(vm_total_price)s CHF pro Monat belastet"
"Indem Du auf \"Bestellung aufgeben\" klickst, erklärst Du dich mit unseren <a href=\"https://"
"datacenterlight.ch/en-us/cms/terms-of-service/\">Nutzungsbedingungen</a> einverstanden und Dein Kreditkartenkonto wird mit %(total_price)s CHF/Jahr belastet."
#, python-format
msgid ""
"\n"
" By clicking \"Place order\" you agree to "
"our <a href=\"https://datacenterlight.ch/en-us/cms/terms-of-service/\">Terms "
"of Service</a> and this plan will charge your credit card account with "
"%(total_price)s CHF/month"
msgstr ""
"\n"
"Indem Du auf \"Bestellung aufgeben\" klickst, erklärst Du dich mit unseren <a href=\"https://"
"datacenterlight.ch/en-us/cms/terms-of-service/\">Nutzungsbedingungen</a> einverstanden und Dein Kreditkartenkonto wird mit %(total_price)s CHF/Monat belastet."
#, python-format
msgid ""
"By clicking \"Place order\" you agree to our <a href=\"https://"
"datacenterlight.ch/en-us/cms/terms-of-service/\">Terms of Service</a> and "
"this plan will charge your credit card account with %(total_price)s CHF"
msgstr ""
"Indem Du auf \"Bestellung aufgeben\" klickst, erklärst Du dich mit unseren <a href=\"https://"
"datacenterlight.ch/de/cms/terms-of-service/\">Nutzungsbedingungen</a> einverstanden und Dein Kreditkartenkonto wird mit %(total_price)s CHF belastet."
#, python-format
msgid ""
"By clicking \"Place order\" you agree to our <a href=\"https://"
"datacenterlight.ch/en-us/cms/terms-of-service/\">Terms of Service</a> and "
"this plan will charge your credit card account with %(vm_total_price)s CHF/"
"month"
msgstr ""
"Indem Du auf \"Bestellung aufgeben\" klickst, erklärst Du dich mit unseren <a href=\"https://"
"datacenterlight.ch/de/cms/terms-of-service/\">Nutzungsbedingungen</a> einverstanden und Dein Kreditkartenkonto wird mit %(vm_total_price)s CHF/Monat belastet"
msgid "Place order"
msgstr "Bestellen"
@ -445,10 +499,10 @@ msgid "Hold tight, we are processing your request"
msgstr "Bitte warten - wir verarbeiten Deine Anfrage gerade"
msgid "OK"
msgstr ""
msgstr "Ok"
msgid "Close"
msgstr ""
msgstr "Schliessen"
msgid "Some problem encountered. Please try again later."
msgstr "Ein Problem ist aufgetreten. Bitte versuche es später noch einmal."
@ -460,7 +514,7 @@ msgid "Tech Stack"
msgstr "Tech Stack"
msgid "We are seriously open source."
msgstr "Wir sind vollends opensource."
msgstr "Wir sind vollends Open Source."
msgid ""
" Our full software stack is open source We don't use anything that isn't "
@ -530,11 +584,17 @@ msgid "Starting from only 15CHF per month. Try now."
msgstr "Unser Angebot beginnt bei 15 CHF pro Monat. Probier's jetzt aus!"
msgid "Actions speak louder than words. Let's do it, try our VM now."
msgstr "Tagen sagen mehr als Worte Teste jetzt unsere VM!"
msgstr "Taten sagen mehr als Worte Teste jetzt unsere VM!"
msgid "See Invoice"
msgstr "Siehe Rechnung"
msgid "Invalid number of cores"
msgstr "Ungültige Anzahle CPU-Kerne"
msgid "Invalid calculator properties"
msgstr "Ungültige Berechnungseigenschaften"
msgid "Invalid RAM size"
msgstr "Ungültige RAM-Grösse"
@ -544,17 +604,24 @@ msgstr "Ungültige Speicher-Grösse"
#, python-brace-format
msgid "Incorrect pricing name. Please contact support{support_email}"
msgstr ""
#, python-brace-format
msgid "{user} does not have permission to access the card"
msgstr "{user} hat keine Erlaubnis auf diese Karte zuzugreifen"
msgid "An error occurred. Details: {}"
msgstr "Ein Fehler ist aufgetreten. Details: {}"
"Ungültige Preisbezeichnung. Bitte kontaktiere den Support{support_email}"
msgid "Confirm Order"
msgstr "Bestellung Bestätigen"
#, fuzzy
#| msgid "Thank you!"
msgid "Thank you !"
msgstr "Vielen Dank!"
msgid "Your product will be provisioned as soon as we receive the payment."
msgstr ""
#, python-brace-format
msgid "An error occurred while associating the card. Details: {details}"
msgstr ""
"Beim Verbinden der Karte ist ein Fehler aufgetreten. Details: {details}"
msgid "Error."
msgstr ""
@ -565,16 +632,30 @@ msgstr ""
"Es ist ein Fehler bei der Zahlung betreten. Du wirst nach dem Schliessen vom "
"Popup zur Bezahlseite weitergeleitet."
#, python-brace-format
msgid "An error occurred while associating the card. Details: {details}"
msgstr ""
"Beim Verbinden der Karte ist ein Fehler aufgetreten. Details: {details}"
msgid "Thank you for the order."
msgstr "Danke für Deine Bestellung."
msgid "Confirmation of your payment"
msgid ""
"Your product will be provisioned as soon as we receive a payment "
"confirmation from Stripe. We will send you a confirmation email. You can "
"always contact us at support@datacenterlight.ch"
msgstr ""
msgid ""
"Your VM will be up and running in a few moments. We will send you a "
"confirmation email as soon as it is ready."
msgstr ""
"Deine VM ist gleich bereit. Wir senden Dir eine Bestätigungsemail, sobald Du "
"auf sie zugreifen kannst."
msgid " This is a monthly recurring plan."
msgstr ""
msgstr "Dies ist ein monatlich wiederkehrender Plan."
msgid " This is an yearly recurring plan."
msgstr "Dies ist ein jährlich wiederkehrender Plan."
msgid "Confirmation of your payment"
msgstr "Bestätigung deiner Zahlung"
#, python-brace-format
msgid ""
@ -586,6 +667,14 @@ msgid ""
"Cheers,\n"
"Your Data Center Light team"
msgstr ""
"Hallo {name},\n"
"\n"
"vielen Dank für deine Bestellung!\n"
"Wir haben deine Bezahlung in Höhe von {amount:.2f} CHF erhalten. "
"{recurring}\n"
"\n"
"Grüsse\n"
"Dein Data Center Light Team"
msgid "Thank you for the payment."
msgstr "Danke für Deine Bestellung."
@ -594,16 +683,49 @@ msgid ""
"You will soon receive a confirmation email of the payment. You can always "
"contact us at info@ungleich.ch for any question that you may have."
msgstr ""
"Du wirst bald eine Bestätigungs-E-Mail über die Zahlung erhalten. Du kannst "
"jederzeit unter info@ungleich.ch kontaktieren."
msgid "Thank you for the order."
msgstr "Danke für Deine Bestellung."
#, python-format
#~ msgid ""
#~ "By clicking \"Place order\" this plan will charge your credit card "
#~ "account with %(total_price)s CHF/month"
#~ msgstr ""
#~ "Wenn Du \"bestellen\" auswählst, wird Deine Kreditkarte mit "
#~ "%(total_price)s CHF pro Monat belastet"
msgid ""
"Your VM will be up and running in a few moments. We will send you a "
"confirmation email as soon as it is ready."
msgstr ""
"Deine VM ist gleich bereit. Wir senden Dir eine Bestätigungsemail, sobald Du "
"auf sie zugreifen kannst."
#, fuzzy, python-format
#~| msgid ""
#~| "By clicking \"Place order\" this payment will charge your credit card "
#~| "account with a one time amount of %(total_price)s CHF"
#~ msgid ""
#~ "By clicking \"Place order\" this payment will charge your credit card "
#~ "account with a one time amount of %(total_price)s CHF"
#~ msgstr ""
#~ "Wenn Du \"bestellen\" auswählst, wird Deine Kreditkarte mit "
#~ "%(vm_total_price)s CHF pro Monat belastet"
#, python-brace-format
#~ msgid "{user} does not have permission to access the card"
#~ msgstr "{user} hat keine Erlaubnis auf diese Karte zuzugreifen"
#~ msgid "An error occurred. Details: {}"
#~ msgstr "Ein Fehler ist aufgetreten. Details: {}"
#~ msgid "Price"
#~ msgstr "Preise"
#~ msgid "Total Amount"
#~ msgstr "Gesamtsumme"
#~ msgid "Amount"
#~ msgstr "Betrag"
#~ msgid "Subtotal"
#~ msgstr "Zwischensumme"
#~ msgid "VAT"
#~ msgstr "Mehrwertsteuer"
#~ msgid ""
#~ "You are not making any payment yet. After submitting your card "
@ -613,12 +735,6 @@ msgstr ""
#~ "ausgelöst, nachdem Du die Bestellung auf der nächsten Seite bestätigt "
#~ "hast."
#~ msgid "Card Number"
#~ msgstr "Kreditkartennummer"
#~ msgid "Expiry Date"
#~ msgstr "Ablaufdatum"
#~ msgid ""
#~ "You are not making any payment yet. After placing your order, you will be "
#~ "taken to the Submit Payment Page."
@ -627,9 +743,6 @@ msgstr ""
#~ "ausgelöst, nachdem Du die Bestellung auf der nächsten Seite bestätigt "
#~ "hast."
#~ msgid "Pricing"
#~ msgstr "Preise"
#~ msgid "Order VM"
#~ msgstr "VM bestellen"
@ -673,9 +786,6 @@ msgstr ""
#~ "Wir werden dann sobald als möglich Ihren Beta-Zugang erstellen und Sie "
#~ "daraufhin kontaktieren.Bis dahin bitten wir Sie um etwas Geduld."
#~ msgid "Thank you!"
#~ msgstr "Vielen Dank!"
#~ msgid "Thank you for order! Our team will contact you via email"
#~ msgstr ""
#~ "Vielen Dank für die Bestellung. Unser Team setzt sich sobald wie möglich "

View file

@ -0,0 +1,41 @@
import logging
from django.core.management.base import BaseCommand
from hosting.models import (
HostingOrder, VMDetail
)
from membership.models import CustomUser
logger = logging.getLogger(__name__)
class Command(BaseCommand):
help = '''Dumps the email addresses of all customers who have a VM'''
def add_arguments(self, parser):
parser.add_argument('-a', '--all_registered', action='store_true',
help='All registered users')
def handle(self, *args, **options):
all_registered = options['all_registered']
all_customers_set = set()
if all_registered:
all_customers = CustomUser.objects.filter(
is_admin=False, validated=True
)
for customer in all_customers:
all_customers_set.add(customer.email)
else:
all_hosting_orders = HostingOrder.objects.filter()
running_vm_details = VMDetail.objects.filter(terminated_at=None)
running_vm_ids = [rvm.vm_id for rvm in running_vm_details]
for order in all_hosting_orders:
if order.vm_id in running_vm_ids:
all_customers_set.add(order.customer.user.email)
for cu in all_customers_set:
print(cu)
if all_registered:
print("All registered users = %s" % len(all_customers_set))
else:
print("Total active customers = %s" % len(all_customers_set))

View file

@ -0,0 +1,65 @@
from django.core.management.base import BaseCommand
from opennebula_api.models import OpenNebulaManager
from datacenterlight.models import VMTemplate
from membership.models import CustomUser
from django.conf import settings
from time import sleep
import datetime
import json
import logging
import os
logger = logging.getLogger(__name__)
class Command(BaseCommand):
help = '''Checks all VM templates to find if they can be instantiated'''
def add_arguments(self, parser):
parser.add_argument('user_email', type=str)
def handle(self, *args, **options):
result_dict = {}
user_email = options['user_email'] if 'user_email' in options else ""
if user_email:
cu = CustomUser.objects.get(email=user_email)
specs = {'cpu': 1, 'memory': 1, 'disk_size': 10}
manager = OpenNebulaManager(email=user_email, password=cu.password)
pub_keys = [settings.TEST_MANAGE_SSH_KEY_PUBKEY]
PROJECT_PATH = os.path.abspath(os.path.dirname(__name__))
if not os.path.exists("%s/outputs" % PROJECT_PATH):
os.mkdir("%s/outputs" % PROJECT_PATH)
for vm_template in VMTemplate.objects.all():
vm_name = 'test-%s' % vm_template.name
vm_id = manager.create_vm(
template_id=vm_template.opennebula_vm_template_id,
specs=specs,
ssh_key='\n'.join(pub_keys),
vm_name=vm_name
)
if vm_id and vm_id > 0:
result_dict[vm_name] = "%s OK, created VM %s" % (
'%s %s %s' % (vm_template.opennebula_vm_template_id,
vm_template.name, vm_template.vm_type),
vm_id
)
self.stdout.write(self.style.SUCCESS(result_dict[vm_name]))
manager.delete_vm(vm_id)
else:
result_dict[vm_name] = '''Error creating VM %s, template_id
%s %s''' % (vm_name,
vm_template.opennebula_vm_template_id,
vm_template.vm_type)
self.stdout.write(self.style.ERROR(result_dict[vm_name]))
sleep(1)
date_str = datetime.datetime.strftime(
datetime.datetime.now(), '%Y%m%d%H%M%S'
)
with open("%s/outputs/check_vm_templates_%s.txt" %
(PROJECT_PATH, date_str),
'w',
encoding='utf-8') as f:
f.write(json.dumps(result_dict))
self.stdout.write(self.style.SUCCESS("Done"))

View file

@ -0,0 +1,141 @@
import logging
import sys
import uuid
import oca
import stripe
from django.core.management.base import BaseCommand
from hosting.models import (
UserCardDetail, UserHostingKey
)
from membership.models import CustomUser, DeletedUser
from opennebula_api.models import OpenNebulaManager
logger = logging.getLogger(__name__)
def query_yes_no(question, default="yes"):
"""Ask a yes/no question via raw_input() and return their answer.
"question" is a string that is presented to the user.
"default" is the presumed answer if the user just hits <Enter>.
It must be "yes" (the default), "no" or None (meaning
an answer is required of the user).
The "answer" return value is True for "yes" or False for "no".
"""
valid = {"yes": True, "y": True, "ye": True,
"no": False, "n": False}
if default is None:
prompt = " [y/n] "
elif default == "yes":
prompt = " [Y/n] "
elif default == "no":
prompt = " [y/N] "
else:
raise ValueError("invalid default answer: '%s'" % default)
while True:
sys.stdout.write(question + prompt)
choice = input().lower()
if default is not None and choice == '':
return valid[default]
elif choice in valid:
return valid[choice]
else:
sys.stdout.write("Please respond with 'yes' or 'no' "
"(or 'y' or 'n').\n")
class Command(BaseCommand):
help = '''Deletes all resources of the user from the project'''
def add_arguments(self, parser):
parser.add_argument('customer_email', nargs='+', type=str)
def handle(self, *args, **options):
try:
for email in options['customer_email']:
r = query_yes_no("Are you sure you want to delete {} ?".format(
email, None
))
if r:
logger.debug("Deleting user {}".format(email))
# Get stripe customer instance and delete the customer
try:
cus_user = CustomUser.objects.get(email=email)
except CustomUser.DoesNotExist as dne:
logger.error("CustomUser with email {} does "
"not exist".format(email))
sys.exit(1)
stripe_customer = cus_user.stripecustomer
c = stripe.Customer.retrieve(
stripe_customer.stripe_id
)
cus_delete_obj = c.delete()
if cus_delete_obj.deleted:
logger.debug(
"StripeCustomer {} associated with {} deleted"
"".format(stripe_customer.stripe_id, email)
)
else:
logger.error("Error while deleting the StripeCustomer")
# delete UserCardDetail
ucds = UserCardDetail.objects.filter(
stripe_customer=stripe_customer
)
for ucd in ucds:
if ucd is not None:
logger.debug(
"User Card Detail {} associated with {} deleted"
"".format(ucd.id, email)
)
ucd.delete()
else:
logger.error(
"Error while deleting the User Card Detail")
# delete UserHostingKey
uhks = UserHostingKey.objects.filter(
user=cus_user
)
for uhk in uhks:
uhk.delete()
# delete stripe customer
stripe_customer.delete()
# add user to deleteduser
DeletedUser.objects.create(
email=cus_user.email, name=cus_user.name,
user_id = cus_user.id
)
# reset CustomUser
cus_user.email = str(uuid.uuid4())
cus_user.validated = 0
cus_user.save()
# remove user from OpenNebula
manager = OpenNebulaManager()
user_pool = manager._get_user_pool()
on_user = user_pool.get_by_name(email)
if on_user.id > 0:
logger.debug(
"Deleting user {} => ID={} from opennebula".format(
email, on_user.id)
)
manager.oneadmin_client.call(
oca.User.METHODS['delete'], on_user.id
)
else:
logger.error(
"User not found with email {}. "
"Not doing anything".format(email)
)
logger.debug("Deleted {} SUCCESSFULLY.".format(email))
except Exception as e:
print(" *** Error occurred. Details {}".format(str(e)))

View file

@ -0,0 +1,134 @@
import json
import logging
import sys
from django.core.management.base import BaseCommand
from membership.models import CustomUser
from hosting.models import (
HostingOrder, VMDetail, UserCardDetail, UserHostingKey
)
logger = logging.getLogger(__name__)
class Command(BaseCommand):
help = '''Dumps the data of a customer into a json file'''
def add_arguments(self, parser):
parser.add_argument('customer_email', nargs='+', type=str)
def handle(self, *args, **options):
try:
for email in options['customer_email']:
try:
cus_user = CustomUser.objects.get(email=email)
except CustomUser.DoesNotExist as dne:
logger.error("CustomUser with email {} does "
"not exist".format(email))
sys.exit(1)
hosting_orders = HostingOrder.objects.filter(
customer=cus_user.stripecustomer.id
)
vm_ids = []
orders_dict = {}
for order in hosting_orders:
order_dict = {}
vm_ids.append(order.vm_id)
order_dict["VM_ID"] = order.vm_id
order_dict["Order Nr."] = order.id
order_dict["Created On"] = str(order.created_at)
order_dict["Price"] = order.price
order_dict["Payment card details"] = {
"last4": order.last4,
"brand": order.cc_brand
}
if order.subscription_id is not None and order.stripe_charge_id is None:
order_dict["Order type"] = "Monthly susbcription"
else:
order_dict["Order type"] = "One time payment"
# billing address
if order.billing_address is not None:
order_dict["Billing Address"] = {
"Street": order.billing_address.street_address,
"City": order.billing_address.city,
"Country": order.billing_address.country,
"Postal code": order.billing_address.postal_code,
"Card holder name": order.billing_address.cardholder_name
}
else:
logger.error(
"did not find billing_address")
# Order Detail
if order.order_detail is not None:
order_dict["Specifications"] = {
"RAM": "{} GB".format(order.order_detail.memory),
"Cores": order.order_detail.cores,
"Disk space (SSD)": "{} GB".format(
order.order_detail.ssd_size)
}
else:
logger.error(
"Did not find order_detail. None")
vm_detail = VMDetail.objects.get(vm_id=order.vm_id)
if vm_detail is not None:
order_dict["VM Details"] = {
"VM_ID": order.vm_id,
"IPv4": vm_detail.ipv4,
"IPv6": vm_detail.ipv6,
"OS": vm_detail.configuration,
}
order_dict["Terminated on"] = str(vm_detail.terminated_at)
orders_dict[order.vm_id] = order_dict
# UserCardDetail
cards = {}
ucds = UserCardDetail.objects.filter(
stripe_customer=cus_user.stripecustomer
)
for ucd in ucds:
card = {}
if ucd is not None:
card["Last 4"] = ucd.last4
card["Brand"] = ucd.brand
card["Expiry month"] = ucd.exp_month
card["Expiry year"] = ucd.exp_year
card["Preferred"] = ucd.preferred
cards[ucd.id] = card
else:
logger.error(
"Error while deleting the User Card Detail")
# UserHostingKey
keys = {}
uhks = UserHostingKey.objects.filter(
user=cus_user
)
for uhk in uhks:
key = {
"Public key": uhk.public_key,
"Name": uhk.name,
"Created on": str(uhk.created_at)
}
if uhk.private_key:
key["Private key"] = uhk.private_key
keys[uhk.name] = key
output_dict = {
"User details": {
"Name": cus_user.name,
"Email": cus_user.email,
"Activated": "yes" if cus_user.validated == 1 else "no",
"Last login": str(cus_user.last_login)
},
"Orders": orders_dict,
"Payment cards": cards,
"SSH Keys": keys
}
print(json.dumps(output_dict, indent=4))
except Exception as e:
print(" *** Error occurred. Details {}".format(str(e)))

View file

@ -0,0 +1,76 @@
from django.core.management.base import BaseCommand
from datacenterlight.tasks import handle_metadata_and_emails
from opennebula_api.models import OpenNebulaManager
from membership.models import CustomUser
import logging
import json
logger = logging.getLogger(__name__)
class Command(BaseCommand):
help = '''Updates the DB after manual creation of VM'''
def add_arguments(self, parser):
parser.add_argument('vm_id', type=int)
parser.add_argument('order_id', type=int)
parser.add_argument('user', type=str)
parser.add_argument('specs', type=str)
parser.add_argument('template', type=str)
def handle(self, *args, **options):
vm_id = options['vm_id']
order_id = options['order_id']
user_str = options['user']
specs_str = options['specs']
template_str = options['template']
json_acceptable_string = user_str.replace("'", "\"")
user_dict = json.loads(json_acceptable_string)
json_acceptable_string = specs_str.replace("'", "\"")
specs = json.loads(json_acceptable_string)
json_acceptable_string = template_str.replace("'", "\"")
template = json.loads(json_acceptable_string)
if vm_id <= 0:
self.stdout.write(self.style.ERROR(
'vm_id can\'t be less than or 0. Given: %s' % vm_id))
return
if vm_id <= 0:
self.stdout.write(self.style.ERROR(
'order_id can\'t be less than or 0. Given: %s' % vm_id))
return
if specs_str is None or specs_str == "":
self.stdout.write(
self.style.ERROR('specs can\'t be empty or None'))
return
user = {
'name': user_dict['name'],
'email': user_dict['email'],
'username': user_dict['username'],
'pass': user_dict['pass'],
'request_scheme': user_dict['request_scheme'],
'request_host': user_dict['request_host'],
'language': user_dict['language'],
}
cu = CustomUser.objects.get(username=user.get('username'))
# Create OpenNebulaManager
self.stdout.write(
self.style.SUCCESS(
'Connecting using %s' % (cu.username)
)
)
manager = OpenNebulaManager(email=cu.username, password=cu.password)
handle_metadata_and_emails(order_id, vm_id, manager, user, specs,
template)
self.stdout.write(
self.style.SUCCESS(
'Done handling metadata and emails for %s %s %s' % (
order_id,
vm_id,
str(user)
)
)
)

View file

@ -0,0 +1,20 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.9.4 on 2019-04-20 09:52
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('datacenterlight', '0027_dclcalculatorpluginmodel_enable_512mb_ram'),
]
operations = [
migrations.AddField(
model_name='stripeplan',
name='stripe_plan_name',
field=models.CharField(default='', max_length=512, null=True),
),
]

View file

@ -0,0 +1,25 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.9.4 on 2019-04-20 10:22
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('datacenterlight', '0028_stripeplan_stripe_plan_name'),
]
operations = [
migrations.AddField(
model_name='stripeplan',
name='amount',
field=models.PositiveIntegerField(default=0),
),
migrations.AddField(
model_name='stripeplan',
name='interval',
field=models.CharField(default='', max_length=128, null=True),
),
]

View file

@ -0,0 +1,20 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.9.4 on 2019-12-24 03:34
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('datacenterlight', '0029_auto_20190420_1022'),
]
operations = [
migrations.AddField(
model_name='dclnavbarpluginmodel',
name='show_non_transparent_navbar_always',
field=models.BooleanField(default=False, help_text='Check this if you want to show non transparent navbar only.(Useful when we want to setup a simple page)'),
),
]

View file

@ -0,0 +1,20 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.9.4 on 2020-02-04 03:16
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('datacenterlight', '0030_dclnavbarpluginmodel_show_non_transparent_navbar_always'),
]
operations = [
migrations.AddField(
model_name='vmpricing',
name='stripe_coupon_id',
field=models.CharField(blank=True, max_length=255, null=True),
),
]

View file

@ -54,6 +54,7 @@ class VMPricing(models.Model):
discount_amount = models.DecimalField(
max_digits=6, decimal_places=2, default=0
)
stripe_coupon_id = models.CharField(max_length=255, null=True, blank=True)
def __str__(self):
display_str = self.name + ' => ' + ' - '.join([
@ -103,6 +104,9 @@ class StripePlan(models.Model):
A model to store Data Center Light's created Stripe plans
"""
stripe_plan_id = models.CharField(max_length=256, null=True)
stripe_plan_name = models.CharField(max_length=512, default="", null=True)
amount = models.PositiveIntegerField(default=0)
interval = models.CharField(max_length=128, default="", null=True)
@classmethod
def create(cls, stripe_plan_id):

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -0,0 +1,288 @@
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
<svg xmlns="http://www.w3.org/2000/svg">
<metadata></metadata>
<defs>
<font id="glyphicons_halflingsregular" horiz-adv-x="1200" >
<font-face units-per-em="1200" ascent="960" descent="-240" />
<missing-glyph horiz-adv-x="500" />
<glyph horiz-adv-x="0" />
<glyph horiz-adv-x="400" />
<glyph unicode=" " />
<glyph unicode="*" d="M600 1100q15 0 34 -1.5t30 -3.5l11 -1q10 -2 17.5 -10.5t7.5 -18.5v-224l158 158q7 7 18 8t19 -6l106 -106q7 -8 6 -19t-8 -18l-158 -158h224q10 0 18.5 -7.5t10.5 -17.5q6 -41 6 -75q0 -15 -1.5 -34t-3.5 -30l-1 -11q-2 -10 -10.5 -17.5t-18.5 -7.5h-224l158 -158 q7 -7 8 -18t-6 -19l-106 -106q-8 -7 -19 -6t-18 8l-158 158v-224q0 -10 -7.5 -18.5t-17.5 -10.5q-41 -6 -75 -6q-15 0 -34 1.5t-30 3.5l-11 1q-10 2 -17.5 10.5t-7.5 18.5v224l-158 -158q-7 -7 -18 -8t-19 6l-106 106q-7 8 -6 19t8 18l158 158h-224q-10 0 -18.5 7.5 t-10.5 17.5q-6 41 -6 75q0 15 1.5 34t3.5 30l1 11q2 10 10.5 17.5t18.5 7.5h224l-158 158q-7 7 -8 18t6 19l106 106q8 7 19 6t18 -8l158 -158v224q0 10 7.5 18.5t17.5 10.5q41 6 75 6z" />
<glyph unicode="+" d="M450 1100h200q21 0 35.5 -14.5t14.5 -35.5v-350h350q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-350v-350q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v350h-350q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5 h350v350q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="&#xa0;" />
<glyph unicode="&#xa5;" d="M825 1100h250q10 0 12.5 -5t-5.5 -13l-364 -364q-6 -6 -11 -18h268q10 0 13 -6t-3 -14l-120 -160q-6 -8 -18 -14t-22 -6h-125v-100h275q10 0 13 -6t-3 -14l-120 -160q-6 -8 -18 -14t-22 -6h-125v-174q0 -11 -7.5 -18.5t-18.5 -7.5h-148q-11 0 -18.5 7.5t-7.5 18.5v174 h-275q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h125v100h-275q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h118q-5 12 -11 18l-364 364q-8 8 -5.5 13t12.5 5h250q25 0 43 -18l164 -164q8 -8 18 -8t18 8l164 164q18 18 43 18z" />
<glyph unicode="&#x2000;" horiz-adv-x="650" />
<glyph unicode="&#x2001;" horiz-adv-x="1300" />
<glyph unicode="&#x2002;" horiz-adv-x="650" />
<glyph unicode="&#x2003;" horiz-adv-x="1300" />
<glyph unicode="&#x2004;" horiz-adv-x="433" />
<glyph unicode="&#x2005;" horiz-adv-x="325" />
<glyph unicode="&#x2006;" horiz-adv-x="216" />
<glyph unicode="&#x2007;" horiz-adv-x="216" />
<glyph unicode="&#x2008;" horiz-adv-x="162" />
<glyph unicode="&#x2009;" horiz-adv-x="260" />
<glyph unicode="&#x200a;" horiz-adv-x="72" />
<glyph unicode="&#x202f;" horiz-adv-x="260" />
<glyph unicode="&#x205f;" horiz-adv-x="325" />
<glyph unicode="&#x20ac;" d="M744 1198q242 0 354 -189q60 -104 66 -209h-181q0 45 -17.5 82.5t-43.5 61.5t-58 40.5t-60.5 24t-51.5 7.5q-19 0 -40.5 -5.5t-49.5 -20.5t-53 -38t-49 -62.5t-39 -89.5h379l-100 -100h-300q-6 -50 -6 -100h406l-100 -100h-300q9 -74 33 -132t52.5 -91t61.5 -54.5t59 -29 t47 -7.5q22 0 50.5 7.5t60.5 24.5t58 41t43.5 61t17.5 80h174q-30 -171 -128 -278q-107 -117 -274 -117q-206 0 -324 158q-36 48 -69 133t-45 204h-217l100 100h112q1 47 6 100h-218l100 100h134q20 87 51 153.5t62 103.5q117 141 297 141z" />
<glyph unicode="&#x20bd;" d="M428 1200h350q67 0 120 -13t86 -31t57 -49.5t35 -56.5t17 -64.5t6.5 -60.5t0.5 -57v-16.5v-16.5q0 -36 -0.5 -57t-6.5 -61t-17 -65t-35 -57t-57 -50.5t-86 -31.5t-120 -13h-178l-2 -100h288q10 0 13 -6t-3 -14l-120 -160q-6 -8 -18 -14t-22 -6h-138v-175q0 -11 -5.5 -18 t-15.5 -7h-149q-10 0 -17.5 7.5t-7.5 17.5v175h-267q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h117v100h-267q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h117v475q0 10 7.5 17.5t17.5 7.5zM600 1000v-300h203q64 0 86.5 33t22.5 119q0 84 -22.5 116t-86.5 32h-203z" />
<glyph unicode="&#x2212;" d="M250 700h800q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="&#x231b;" d="M1000 1200v-150q0 -21 -14.5 -35.5t-35.5 -14.5h-50v-100q0 -91 -49.5 -165.5t-130.5 -109.5q81 -35 130.5 -109.5t49.5 -165.5v-150h50q21 0 35.5 -14.5t14.5 -35.5v-150h-800v150q0 21 14.5 35.5t35.5 14.5h50v150q0 91 49.5 165.5t130.5 109.5q-81 35 -130.5 109.5 t-49.5 165.5v100h-50q-21 0 -35.5 14.5t-14.5 35.5v150h800zM400 1000v-100q0 -60 32.5 -109.5t87.5 -73.5q28 -12 44 -37t16 -55t-16 -55t-44 -37q-55 -24 -87.5 -73.5t-32.5 -109.5v-150h400v150q0 60 -32.5 109.5t-87.5 73.5q-28 12 -44 37t-16 55t16 55t44 37 q55 24 87.5 73.5t32.5 109.5v100h-400z" />
<glyph unicode="&#x25fc;" horiz-adv-x="500" d="M0 0z" />
<glyph unicode="&#x2601;" d="M503 1089q110 0 200.5 -59.5t134.5 -156.5q44 14 90 14q120 0 205 -86.5t85 -206.5q0 -121 -85 -207.5t-205 -86.5h-750q-79 0 -135.5 57t-56.5 137q0 69 42.5 122.5t108.5 67.5q-2 12 -2 37q0 153 108 260.5t260 107.5z" />
<glyph unicode="&#x26fa;" d="M774 1193.5q16 -9.5 20.5 -27t-5.5 -33.5l-136 -187l467 -746h30q20 0 35 -18.5t15 -39.5v-42h-1200v42q0 21 15 39.5t35 18.5h30l468 746l-135 183q-10 16 -5.5 34t20.5 28t34 5.5t28 -20.5l111 -148l112 150q9 16 27 20.5t34 -5zM600 200h377l-182 112l-195 534v-646z " />
<glyph unicode="&#x2709;" d="M25 1100h1150q10 0 12.5 -5t-5.5 -13l-564 -567q-8 -8 -18 -8t-18 8l-564 567q-8 8 -5.5 13t12.5 5zM18 882l264 -264q8 -8 8 -18t-8 -18l-264 -264q-8 -8 -13 -5.5t-5 12.5v550q0 10 5 12.5t13 -5.5zM918 618l264 264q8 8 13 5.5t5 -12.5v-550q0 -10 -5 -12.5t-13 5.5 l-264 264q-8 8 -8 18t8 18zM818 482l364 -364q8 -8 5.5 -13t-12.5 -5h-1150q-10 0 -12.5 5t5.5 13l364 364q8 8 18 8t18 -8l164 -164q8 -8 18 -8t18 8l164 164q8 8 18 8t18 -8z" />
<glyph unicode="&#x270f;" d="M1011 1210q19 0 33 -13l153 -153q13 -14 13 -33t-13 -33l-99 -92l-214 214l95 96q13 14 32 14zM1013 800l-615 -614l-214 214l614 614zM317 96l-333 -112l110 335z" />
<glyph unicode="&#xe001;" d="M700 650v-550h250q21 0 35.5 -14.5t14.5 -35.5v-50h-800v50q0 21 14.5 35.5t35.5 14.5h250v550l-500 550h1200z" />
<glyph unicode="&#xe002;" d="M368 1017l645 163q39 15 63 0t24 -49v-831q0 -55 -41.5 -95.5t-111.5 -63.5q-79 -25 -147 -4.5t-86 75t25.5 111.5t122.5 82q72 24 138 8v521l-600 -155v-606q0 -42 -44 -90t-109 -69q-79 -26 -147 -5.5t-86 75.5t25.5 111.5t122.5 82.5q72 24 138 7v639q0 38 14.5 59 t53.5 34z" />
<glyph unicode="&#xe003;" d="M500 1191q100 0 191 -39t156.5 -104.5t104.5 -156.5t39 -191l-1 -2l1 -5q0 -141 -78 -262l275 -274q23 -26 22.5 -44.5t-22.5 -42.5l-59 -58q-26 -20 -46.5 -20t-39.5 20l-275 274q-119 -77 -261 -77l-5 1l-2 -1q-100 0 -191 39t-156.5 104.5t-104.5 156.5t-39 191 t39 191t104.5 156.5t156.5 104.5t191 39zM500 1022q-88 0 -162 -43t-117 -117t-43 -162t43 -162t117 -117t162 -43t162 43t117 117t43 162t-43 162t-117 117t-162 43z" />
<glyph unicode="&#xe005;" d="M649 949q48 68 109.5 104t121.5 38.5t118.5 -20t102.5 -64t71 -100.5t27 -123q0 -57 -33.5 -117.5t-94 -124.5t-126.5 -127.5t-150 -152.5t-146 -174q-62 85 -145.5 174t-150 152.5t-126.5 127.5t-93.5 124.5t-33.5 117.5q0 64 28 123t73 100.5t104 64t119 20 t120.5 -38.5t104.5 -104z" />
<glyph unicode="&#xe006;" d="M407 800l131 353q7 19 17.5 19t17.5 -19l129 -353h421q21 0 24 -8.5t-14 -20.5l-342 -249l130 -401q7 -20 -0.5 -25.5t-24.5 6.5l-343 246l-342 -247q-17 -12 -24.5 -6.5t-0.5 25.5l130 400l-347 251q-17 12 -14 20.5t23 8.5h429z" />
<glyph unicode="&#xe007;" d="M407 800l131 353q7 19 17.5 19t17.5 -19l129 -353h421q21 0 24 -8.5t-14 -20.5l-342 -249l130 -401q7 -20 -0.5 -25.5t-24.5 6.5l-343 246l-342 -247q-17 -12 -24.5 -6.5t-0.5 25.5l130 400l-347 251q-17 12 -14 20.5t23 8.5h429zM477 700h-240l197 -142l-74 -226 l193 139l195 -140l-74 229l192 140h-234l-78 211z" />
<glyph unicode="&#xe008;" d="M600 1200q124 0 212 -88t88 -212v-250q0 -46 -31 -98t-69 -52v-75q0 -10 6 -21.5t15 -17.5l358 -230q9 -5 15 -16.5t6 -21.5v-93q0 -10 -7.5 -17.5t-17.5 -7.5h-1150q-10 0 -17.5 7.5t-7.5 17.5v93q0 10 6 21.5t15 16.5l358 230q9 6 15 17.5t6 21.5v75q-38 0 -69 52 t-31 98v250q0 124 88 212t212 88z" />
<glyph unicode="&#xe009;" d="M25 1100h1150q10 0 17.5 -7.5t7.5 -17.5v-1050q0 -10 -7.5 -17.5t-17.5 -7.5h-1150q-10 0 -17.5 7.5t-7.5 17.5v1050q0 10 7.5 17.5t17.5 7.5zM100 1000v-100h100v100h-100zM875 1000h-550q-10 0 -17.5 -7.5t-7.5 -17.5v-350q0 -10 7.5 -17.5t17.5 -7.5h550 q10 0 17.5 7.5t7.5 17.5v350q0 10 -7.5 17.5t-17.5 7.5zM1000 1000v-100h100v100h-100zM100 800v-100h100v100h-100zM1000 800v-100h100v100h-100zM100 600v-100h100v100h-100zM1000 600v-100h100v100h-100zM875 500h-550q-10 0 -17.5 -7.5t-7.5 -17.5v-350q0 -10 7.5 -17.5 t17.5 -7.5h550q10 0 17.5 7.5t7.5 17.5v350q0 10 -7.5 17.5t-17.5 7.5zM100 400v-100h100v100h-100zM1000 400v-100h100v100h-100zM100 200v-100h100v100h-100zM1000 200v-100h100v100h-100z" />
<glyph unicode="&#xe010;" d="M50 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM650 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400 q0 21 14.5 35.5t35.5 14.5zM50 500h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM650 500h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="&#xe011;" d="M50 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200 q0 21 14.5 35.5t35.5 14.5zM850 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM50 700h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200 q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 700h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM850 700h200q21 0 35.5 -14.5t14.5 -35.5v-200 q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM50 300h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 300h200 q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM850 300h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5 t35.5 14.5z" />
<glyph unicode="&#xe012;" d="M50 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 1100h700q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v200 q0 21 14.5 35.5t35.5 14.5zM50 700h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 700h700q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-700 q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM50 300h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 300h700q21 0 35.5 -14.5t14.5 -35.5v-200 q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="&#xe013;" d="M465 477l571 571q8 8 18 8t17 -8l177 -177q8 -7 8 -17t-8 -18l-783 -784q-7 -8 -17.5 -8t-17.5 8l-384 384q-8 8 -8 18t8 17l177 177q7 8 17 8t18 -8l171 -171q7 -7 18 -7t18 7z" />
<glyph unicode="&#xe014;" d="M904 1083l178 -179q8 -8 8 -18.5t-8 -17.5l-267 -268l267 -268q8 -7 8 -17.5t-8 -18.5l-178 -178q-8 -8 -18.5 -8t-17.5 8l-268 267l-268 -267q-7 -8 -17.5 -8t-18.5 8l-178 178q-8 8 -8 18.5t8 17.5l267 268l-267 268q-8 7 -8 17.5t8 18.5l178 178q8 8 18.5 8t17.5 -8 l268 -267l268 268q7 7 17.5 7t18.5 -7z" />
<glyph unicode="&#xe015;" d="M507 1177q98 0 187.5 -38.5t154.5 -103.5t103.5 -154.5t38.5 -187.5q0 -141 -78 -262l300 -299q8 -8 8 -18.5t-8 -18.5l-109 -108q-7 -8 -17.5 -8t-18.5 8l-300 299q-119 -77 -261 -77q-98 0 -188 38.5t-154.5 103t-103 154.5t-38.5 188t38.5 187.5t103 154.5 t154.5 103.5t188 38.5zM506.5 1023q-89.5 0 -165.5 -44t-120 -120.5t-44 -166t44 -165.5t120 -120t165.5 -44t166 44t120.5 120t44 165.5t-44 166t-120.5 120.5t-166 44zM425 900h150q10 0 17.5 -7.5t7.5 -17.5v-75h75q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5 t-17.5 -7.5h-75v-75q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v75h-75q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h75v75q0 10 7.5 17.5t17.5 7.5z" />
<glyph unicode="&#xe016;" d="M507 1177q98 0 187.5 -38.5t154.5 -103.5t103.5 -154.5t38.5 -187.5q0 -141 -78 -262l300 -299q8 -8 8 -18.5t-8 -18.5l-109 -108q-7 -8 -17.5 -8t-18.5 8l-300 299q-119 -77 -261 -77q-98 0 -188 38.5t-154.5 103t-103 154.5t-38.5 188t38.5 187.5t103 154.5 t154.5 103.5t188 38.5zM506.5 1023q-89.5 0 -165.5 -44t-120 -120.5t-44 -166t44 -165.5t120 -120t165.5 -44t166 44t120.5 120t44 165.5t-44 166t-120.5 120.5t-166 44zM325 800h350q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-350q-10 0 -17.5 7.5 t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5z" />
<glyph unicode="&#xe017;" d="M550 1200h100q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM800 975v166q167 -62 272 -209.5t105 -331.5q0 -117 -45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5 t-184.5 123t-123 184.5t-45.5 224q0 184 105 331.5t272 209.5v-166q-103 -55 -165 -155t-62 -220q0 -116 57 -214.5t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5q0 120 -62 220t-165 155z" />
<glyph unicode="&#xe018;" d="M1025 1200h150q10 0 17.5 -7.5t7.5 -17.5v-1150q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v1150q0 10 7.5 17.5t17.5 7.5zM725 800h150q10 0 17.5 -7.5t7.5 -17.5v-750q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v750 q0 10 7.5 17.5t17.5 7.5zM425 500h150q10 0 17.5 -7.5t7.5 -17.5v-450q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v450q0 10 7.5 17.5t17.5 7.5zM125 300h150q10 0 17.5 -7.5t7.5 -17.5v-250q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5 v250q0 10 7.5 17.5t17.5 7.5z" />
<glyph unicode="&#xe019;" d="M600 1174q33 0 74 -5l38 -152l5 -1q49 -14 94 -39l5 -2l134 80q61 -48 104 -105l-80 -134l3 -5q25 -44 39 -93l1 -6l152 -38q5 -43 5 -73q0 -34 -5 -74l-152 -38l-1 -6q-15 -49 -39 -93l-3 -5l80 -134q-48 -61 -104 -105l-134 81l-5 -3q-44 -25 -94 -39l-5 -2l-38 -151 q-43 -5 -74 -5q-33 0 -74 5l-38 151l-5 2q-49 14 -94 39l-5 3l-134 -81q-60 48 -104 105l80 134l-3 5q-25 45 -38 93l-2 6l-151 38q-6 42 -6 74q0 33 6 73l151 38l2 6q13 48 38 93l3 5l-80 134q47 61 105 105l133 -80l5 2q45 25 94 39l5 1l38 152q43 5 74 5zM600 815 q-89 0 -152 -63t-63 -151.5t63 -151.5t152 -63t152 63t63 151.5t-63 151.5t-152 63z" />
<glyph unicode="&#xe020;" d="M500 1300h300q41 0 70.5 -29.5t29.5 -70.5v-100h275q10 0 17.5 -7.5t7.5 -17.5v-75h-1100v75q0 10 7.5 17.5t17.5 7.5h275v100q0 41 29.5 70.5t70.5 29.5zM500 1200v-100h300v100h-300zM1100 900v-800q0 -41 -29.5 -70.5t-70.5 -29.5h-700q-41 0 -70.5 29.5t-29.5 70.5 v800h900zM300 800v-700h100v700h-100zM500 800v-700h100v700h-100zM700 800v-700h100v700h-100zM900 800v-700h100v700h-100z" />
<glyph unicode="&#xe021;" d="M18 618l620 608q8 7 18.5 7t17.5 -7l608 -608q8 -8 5.5 -13t-12.5 -5h-175v-575q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v375h-300v-375q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v575h-175q-10 0 -12.5 5t5.5 13z" />
<glyph unicode="&#xe022;" d="M600 1200v-400q0 -41 29.5 -70.5t70.5 -29.5h300v-650q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v1100q0 21 14.5 35.5t35.5 14.5h450zM1000 800h-250q-21 0 -35.5 14.5t-14.5 35.5v250z" />
<glyph unicode="&#xe023;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM525 900h50q10 0 17.5 -7.5t7.5 -17.5v-275h175q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5z" />
<glyph unicode="&#xe024;" d="M1300 0h-538l-41 400h-242l-41 -400h-538l431 1200h209l-21 -300h162l-20 300h208zM515 800l-27 -300h224l-27 300h-170z" />
<glyph unicode="&#xe025;" d="M550 1200h200q21 0 35.5 -14.5t14.5 -35.5v-450h191q20 0 25.5 -11.5t-7.5 -27.5l-327 -400q-13 -16 -32 -16t-32 16l-327 400q-13 16 -7.5 27.5t25.5 11.5h191v450q0 21 14.5 35.5t35.5 14.5zM1125 400h50q10 0 17.5 -7.5t7.5 -17.5v-350q0 -10 -7.5 -17.5t-17.5 -7.5 h-1050q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h50q10 0 17.5 -7.5t7.5 -17.5v-175h900v175q0 10 7.5 17.5t17.5 7.5z" />
<glyph unicode="&#xe026;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM525 900h150q10 0 17.5 -7.5t7.5 -17.5v-275h137q21 0 26 -11.5t-8 -27.5l-223 -275q-13 -16 -32 -16t-32 16l-223 275q-13 16 -8 27.5t26 11.5h137v275q0 10 7.5 17.5t17.5 7.5z " />
<glyph unicode="&#xe027;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM632 914l223 -275q13 -16 8 -27.5t-26 -11.5h-137v-275q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v275h-137q-21 0 -26 11.5t8 27.5l223 275q13 16 32 16 t32 -16z" />
<glyph unicode="&#xe028;" d="M225 1200h750q10 0 19.5 -7t12.5 -17l186 -652q7 -24 7 -49v-425q0 -12 -4 -27t-9 -17q-12 -6 -37 -6h-1100q-12 0 -27 4t-17 8q-6 13 -6 38l1 425q0 25 7 49l185 652q3 10 12.5 17t19.5 7zM878 1000h-556q-10 0 -19 -7t-11 -18l-87 -450q-2 -11 4 -18t16 -7h150 q10 0 19.5 -7t11.5 -17l38 -152q2 -10 11.5 -17t19.5 -7h250q10 0 19.5 7t11.5 17l38 152q2 10 11.5 17t19.5 7h150q10 0 16 7t4 18l-87 450q-2 11 -11 18t-19 7z" />
<glyph unicode="&#xe029;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM540 820l253 -190q17 -12 17 -30t-17 -30l-253 -190q-16 -12 -28 -6.5t-12 26.5v400q0 21 12 26.5t28 -6.5z" />
<glyph unicode="&#xe030;" d="M947 1060l135 135q7 7 12.5 5t5.5 -13v-362q0 -10 -7.5 -17.5t-17.5 -7.5h-362q-11 0 -13 5.5t5 12.5l133 133q-109 76 -238 76q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5h150q0 -117 -45.5 -224 t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5q192 0 347 -117z" />
<glyph unicode="&#xe031;" d="M947 1060l135 135q7 7 12.5 5t5.5 -13v-361q0 -11 -7.5 -18.5t-18.5 -7.5h-361q-11 0 -13 5.5t5 12.5l134 134q-110 75 -239 75q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5h-150q0 117 45.5 224t123 184.5t184.5 123t224 45.5q192 0 347 -117zM1027 600h150 q0 -117 -45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5q-192 0 -348 118l-134 -134q-7 -8 -12.5 -5.5t-5.5 12.5v360q0 11 7.5 18.5t18.5 7.5h360q10 0 12.5 -5.5t-5.5 -12.5l-133 -133q110 -76 240 -76q116 0 214.5 57t155.5 155.5t57 214.5z" />
<glyph unicode="&#xe032;" d="M125 1200h1050q10 0 17.5 -7.5t7.5 -17.5v-1150q0 -10 -7.5 -17.5t-17.5 -7.5h-1050q-10 0 -17.5 7.5t-7.5 17.5v1150q0 10 7.5 17.5t17.5 7.5zM1075 1000h-850q-10 0 -17.5 -7.5t-7.5 -17.5v-850q0 -10 7.5 -17.5t17.5 -7.5h850q10 0 17.5 7.5t7.5 17.5v850 q0 10 -7.5 17.5t-17.5 7.5zM325 900h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 900h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5zM325 700h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 700h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5zM325 500h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 500h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5zM325 300h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 300h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5z" />
<glyph unicode="&#xe033;" d="M900 800v200q0 83 -58.5 141.5t-141.5 58.5h-300q-82 0 -141 -59t-59 -141v-200h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-600q0 -41 29.5 -70.5t70.5 -29.5h900q41 0 70.5 29.5t29.5 70.5v600q0 41 -29.5 70.5t-70.5 29.5h-100zM400 800v150q0 21 15 35.5t35 14.5h200 q20 0 35 -14.5t15 -35.5v-150h-300z" />
<glyph unicode="&#xe034;" d="M125 1100h50q10 0 17.5 -7.5t7.5 -17.5v-1075h-100v1075q0 10 7.5 17.5t17.5 7.5zM1075 1052q4 0 9 -2q16 -6 16 -23v-421q0 -6 -3 -12q-33 -59 -66.5 -99t-65.5 -58t-56.5 -24.5t-52.5 -6.5q-26 0 -57.5 6.5t-52.5 13.5t-60 21q-41 15 -63 22.5t-57.5 15t-65.5 7.5 q-85 0 -160 -57q-7 -5 -15 -5q-6 0 -11 3q-14 7 -14 22v438q22 55 82 98.5t119 46.5q23 2 43 0.5t43 -7t32.5 -8.5t38 -13t32.5 -11q41 -14 63.5 -21t57 -14t63.5 -7q103 0 183 87q7 8 18 8z" />
<glyph unicode="&#xe035;" d="M600 1175q116 0 227 -49.5t192.5 -131t131 -192.5t49.5 -227v-300q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v300q0 127 -70.5 231.5t-184.5 161.5t-245 57t-245 -57t-184.5 -161.5t-70.5 -231.5v-300q0 -10 -7.5 -17.5t-17.5 -7.5h-50 q-10 0 -17.5 7.5t-7.5 17.5v300q0 116 49.5 227t131 192.5t192.5 131t227 49.5zM220 500h160q8 0 14 -6t6 -14v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14v460q0 8 6 14t14 6zM820 500h160q8 0 14 -6t6 -14v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14v460 q0 8 6 14t14 6z" />
<glyph unicode="&#xe036;" d="M321 814l258 172q9 6 15 2.5t6 -13.5v-750q0 -10 -6 -13.5t-15 2.5l-258 172q-21 14 -46 14h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h250q25 0 46 14zM900 668l120 120q7 7 17 7t17 -7l34 -34q7 -7 7 -17t-7 -17l-120 -120l120 -120q7 -7 7 -17 t-7 -17l-34 -34q-7 -7 -17 -7t-17 7l-120 119l-120 -119q-7 -7 -17 -7t-17 7l-34 34q-7 7 -7 17t7 17l119 120l-119 120q-7 7 -7 17t7 17l34 34q7 8 17 8t17 -8z" />
<glyph unicode="&#xe037;" d="M321 814l258 172q9 6 15 2.5t6 -13.5v-750q0 -10 -6 -13.5t-15 2.5l-258 172q-21 14 -46 14h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h250q25 0 46 14zM766 900h4q10 -1 16 -10q96 -129 96 -290q0 -154 -90 -281q-6 -9 -17 -10l-3 -1q-9 0 -16 6 l-29 23q-7 7 -8.5 16.5t4.5 17.5q72 103 72 229q0 132 -78 238q-6 8 -4.5 18t9.5 17l29 22q7 5 15 5z" />
<glyph unicode="&#xe038;" d="M967 1004h3q11 -1 17 -10q135 -179 135 -396q0 -105 -34 -206.5t-98 -185.5q-7 -9 -17 -10h-3q-9 0 -16 6l-42 34q-8 6 -9 16t5 18q111 150 111 328q0 90 -29.5 176t-84.5 157q-6 9 -5 19t10 16l42 33q7 5 15 5zM321 814l258 172q9 6 15 2.5t6 -13.5v-750q0 -10 -6 -13.5 t-15 2.5l-258 172q-21 14 -46 14h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h250q25 0 46 14zM766 900h4q10 -1 16 -10q96 -129 96 -290q0 -154 -90 -281q-6 -9 -17 -10l-3 -1q-9 0 -16 6l-29 23q-7 7 -8.5 16.5t4.5 17.5q72 103 72 229q0 132 -78 238 q-6 8 -4.5 18.5t9.5 16.5l29 22q7 5 15 5z" />
<glyph unicode="&#xe039;" d="M500 900h100v-100h-100v-100h-400v-100h-100v600h500v-300zM1200 700h-200v-100h200v-200h-300v300h-200v300h-100v200h600v-500zM100 1100v-300h300v300h-300zM800 1100v-300h300v300h-300zM300 900h-100v100h100v-100zM1000 900h-100v100h100v-100zM300 500h200v-500 h-500v500h200v100h100v-100zM800 300h200v-100h-100v-100h-200v100h-100v100h100v200h-200v100h300v-300zM100 400v-300h300v300h-300zM300 200h-100v100h100v-100zM1200 200h-100v100h100v-100zM700 0h-100v100h100v-100zM1200 0h-300v100h300v-100z" />
<glyph unicode="&#xe040;" d="M100 200h-100v1000h100v-1000zM300 200h-100v1000h100v-1000zM700 200h-200v1000h200v-1000zM900 200h-100v1000h100v-1000zM1200 200h-200v1000h200v-1000zM400 0h-300v100h300v-100zM600 0h-100v91h100v-91zM800 0h-100v91h100v-91zM1100 0h-200v91h200v-91z" />
<glyph unicode="&#xe041;" d="M500 1200l682 -682q8 -8 8 -18t-8 -18l-464 -464q-8 -8 -18 -8t-18 8l-682 682l1 475q0 10 7.5 17.5t17.5 7.5h474zM319.5 1024.5q-29.5 29.5 -71 29.5t-71 -29.5t-29.5 -71.5t29.5 -71.5t71 -29.5t71 29.5t29.5 71.5t-29.5 71.5z" />
<glyph unicode="&#xe042;" d="M500 1200l682 -682q8 -8 8 -18t-8 -18l-464 -464q-8 -8 -18 -8t-18 8l-682 682l1 475q0 10 7.5 17.5t17.5 7.5h474zM800 1200l682 -682q8 -8 8 -18t-8 -18l-464 -464q-8 -8 -18 -8t-18 8l-56 56l424 426l-700 700h150zM319.5 1024.5q-29.5 29.5 -71 29.5t-71 -29.5 t-29.5 -71.5t29.5 -71.5t71 -29.5t71 29.5t29.5 71.5t-29.5 71.5z" />
<glyph unicode="&#xe043;" d="M300 1200h825q75 0 75 -75v-900q0 -25 -18 -43l-64 -64q-8 -8 -13 -5.5t-5 12.5v950q0 10 -7.5 17.5t-17.5 7.5h-700q-25 0 -43 -18l-64 -64q-8 -8 -5.5 -13t12.5 -5h700q10 0 17.5 -7.5t7.5 -17.5v-950q0 -10 -7.5 -17.5t-17.5 -7.5h-850q-10 0 -17.5 7.5t-7.5 17.5v975 q0 25 18 43l139 139q18 18 43 18z" />
<glyph unicode="&#xe044;" d="M250 1200h800q21 0 35.5 -14.5t14.5 -35.5v-1150l-450 444l-450 -445v1151q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="&#xe045;" d="M822 1200h-444q-11 0 -19 -7.5t-9 -17.5l-78 -301q-7 -24 7 -45l57 -108q6 -9 17.5 -15t21.5 -6h450q10 0 21.5 6t17.5 15l62 108q14 21 7 45l-83 301q-1 10 -9 17.5t-19 7.5zM1175 800h-150q-10 0 -21 -6.5t-15 -15.5l-78 -156q-4 -9 -15 -15.5t-21 -6.5h-550 q-10 0 -21 6.5t-15 15.5l-78 156q-4 9 -15 15.5t-21 6.5h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-650q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h750q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5 t7.5 17.5v650q0 10 -7.5 17.5t-17.5 7.5zM850 200h-500q-10 0 -19.5 -7t-11.5 -17l-38 -152q-2 -10 3.5 -17t15.5 -7h600q10 0 15.5 7t3.5 17l-38 152q-2 10 -11.5 17t-19.5 7z" />
<glyph unicode="&#xe046;" d="M500 1100h200q56 0 102.5 -20.5t72.5 -50t44 -59t25 -50.5l6 -20h150q41 0 70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5v600q0 41 29.5 70.5t70.5 29.5h150q2 8 6.5 21.5t24 48t45 61t72 48t102.5 21.5zM900 800v-100 h100v100h-100zM600 730q-95 0 -162.5 -67.5t-67.5 -162.5t67.5 -162.5t162.5 -67.5t162.5 67.5t67.5 162.5t-67.5 162.5t-162.5 67.5zM600 603q43 0 73 -30t30 -73t-30 -73t-73 -30t-73 30t-30 73t30 73t73 30z" />
<glyph unicode="&#xe047;" d="M681 1199l385 -998q20 -50 60 -92q18 -19 36.5 -29.5t27.5 -11.5l10 -2v-66h-417v66q53 0 75 43.5t5 88.5l-82 222h-391q-58 -145 -92 -234q-11 -34 -6.5 -57t25.5 -37t46 -20t55 -6v-66h-365v66q56 24 84 52q12 12 25 30.5t20 31.5l7 13l399 1006h93zM416 521h340 l-162 457z" />
<glyph unicode="&#xe048;" d="M753 641q5 -1 14.5 -4.5t36 -15.5t50.5 -26.5t53.5 -40t50.5 -54.5t35.5 -70t14.5 -87q0 -67 -27.5 -125.5t-71.5 -97.5t-98.5 -66.5t-108.5 -40.5t-102 -13h-500v89q41 7 70.5 32.5t29.5 65.5v827q0 24 -0.5 34t-3.5 24t-8.5 19.5t-17 13.5t-28 12.5t-42.5 11.5v71 l471 -1q57 0 115.5 -20.5t108 -57t80.5 -94t31 -124.5q0 -51 -15.5 -96.5t-38 -74.5t-45 -50.5t-38.5 -30.5zM400 700h139q78 0 130.5 48.5t52.5 122.5q0 41 -8.5 70.5t-29.5 55.5t-62.5 39.5t-103.5 13.5h-118v-350zM400 200h216q80 0 121 50.5t41 130.5q0 90 -62.5 154.5 t-156.5 64.5h-159v-400z" />
<glyph unicode="&#xe049;" d="M877 1200l2 -57q-83 -19 -116 -45.5t-40 -66.5l-132 -839q-9 -49 13 -69t96 -26v-97h-500v97q186 16 200 98l173 832q3 17 3 30t-1.5 22.5t-9 17.5t-13.5 12.5t-21.5 10t-26 8.5t-33.5 10q-13 3 -19 5v57h425z" />
<glyph unicode="&#xe050;" d="M1300 900h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-200v-850q0 -22 25 -34.5t50 -13.5l25 -2v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v850h-200q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h1000v-300zM175 1000h-75v-800h75l-125 -167l-125 167h75v800h-75l125 167z" />
<glyph unicode="&#xe051;" d="M1100 900h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-200v-650q0 -22 25 -34.5t50 -13.5l25 -2v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v650h-200q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h1000v-300zM1167 50l-167 -125v75h-800v-75l-167 125l167 125v-75h800v75z" />
<glyph unicode="&#xe052;" d="M50 1100h600q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 800h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM50 500h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="&#xe053;" d="M250 1100h700q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 800h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM250 500h700q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="&#xe054;" d="M500 950v100q0 21 14.5 35.5t35.5 14.5h600q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5zM100 650v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000 q-21 0 -35.5 14.5t-14.5 35.5zM300 350v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5zM0 50v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100 q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5z" />
<glyph unicode="&#xe055;" d="M50 1100h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 800h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM50 500h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="&#xe056;" d="M50 1100h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 1100h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM50 800h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 800h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 500h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 500h800q21 0 35.5 -14.5t14.5 -35.5v-100 q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 200h800 q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="&#xe057;" d="M400 0h-100v1100h100v-1100zM550 1100h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM550 800h500q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-500 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM267 550l-167 -125v75h-200v100h200v75zM550 500h300q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM550 200h600 q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="&#xe058;" d="M50 1100h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM900 0h-100v1100h100v-1100zM50 800h500q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-500 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM1100 600h200v-100h-200v-75l-167 125l167 125v-75zM50 500h300q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h600 q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="&#xe059;" d="M75 1000h750q31 0 53 -22t22 -53v-650q0 -31 -22 -53t-53 -22h-750q-31 0 -53 22t-22 53v650q0 31 22 53t53 22zM1200 300l-300 300l300 300v-600z" />
<glyph unicode="&#xe060;" d="M44 1100h1112q18 0 31 -13t13 -31v-1012q0 -18 -13 -31t-31 -13h-1112q-18 0 -31 13t-13 31v1012q0 18 13 31t31 13zM100 1000v-737l247 182l298 -131l-74 156l293 318l236 -288v500h-1000zM342 884q56 0 95 -39t39 -94.5t-39 -95t-95 -39.5t-95 39.5t-39 95t39 94.5 t95 39z" />
<glyph unicode="&#xe062;" d="M648 1169q117 0 216 -60t156.5 -161t57.5 -218q0 -115 -70 -258q-69 -109 -158 -225.5t-143 -179.5l-54 -62q-9 8 -25.5 24.5t-63.5 67.5t-91 103t-98.5 128t-95.5 148q-60 132 -60 249q0 88 34 169.5t91.5 142t137 96.5t166.5 36zM652.5 974q-91.5 0 -156.5 -65 t-65 -157t65 -156.5t156.5 -64.5t156.5 64.5t65 156.5t-65 157t-156.5 65z" />
<glyph unicode="&#xe063;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 173v854q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57z" />
<glyph unicode="&#xe064;" d="M554 1295q21 -72 57.5 -143.5t76 -130t83 -118t82.5 -117t70 -116t49.5 -126t18.5 -136.5q0 -71 -25.5 -135t-68.5 -111t-99 -82t-118.5 -54t-125.5 -23q-84 5 -161.5 34t-139.5 78.5t-99 125t-37 164.5q0 69 18 136.5t49.5 126.5t69.5 116.5t81.5 117.5t83.5 119 t76.5 131t58.5 143zM344 710q-23 -33 -43.5 -70.5t-40.5 -102.5t-17 -123q1 -37 14.5 -69.5t30 -52t41 -37t38.5 -24.5t33 -15q21 -7 32 -1t13 22l6 34q2 10 -2.5 22t-13.5 19q-5 4 -14 12t-29.5 40.5t-32.5 73.5q-26 89 6 271q2 11 -6 11q-8 1 -15 -10z" />
<glyph unicode="&#xe065;" d="M1000 1013l108 115q2 1 5 2t13 2t20.5 -1t25 -9.5t28.5 -21.5q22 -22 27 -43t0 -32l-6 -10l-108 -115zM350 1100h400q50 0 105 -13l-187 -187h-368q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v182l200 200v-332 q0 -165 -93.5 -257.5t-256.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5zM1009 803l-362 -362l-161 -50l55 170l355 355z" />
<glyph unicode="&#xe066;" d="M350 1100h361q-164 -146 -216 -200h-195q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5l200 153v-103q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5z M824 1073l339 -301q8 -7 8 -17.5t-8 -17.5l-340 -306q-7 -6 -12.5 -4t-6.5 11v203q-26 1 -54.5 0t-78.5 -7.5t-92 -17.5t-86 -35t-70 -57q10 59 33 108t51.5 81.5t65 58.5t68.5 40.5t67 24.5t56 13.5t40 4.5v210q1 10 6.5 12.5t13.5 -4.5z" />
<glyph unicode="&#xe067;" d="M350 1100h350q60 0 127 -23l-178 -177h-349q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v69l200 200v-219q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5z M643 639l395 395q7 7 17.5 7t17.5 -7l101 -101q7 -7 7 -17.5t-7 -17.5l-531 -532q-7 -7 -17.5 -7t-17.5 7l-248 248q-7 7 -7 17.5t7 17.5l101 101q7 7 17.5 7t17.5 -7l111 -111q8 -7 18 -7t18 7z" />
<glyph unicode="&#xe068;" d="M318 918l264 264q8 8 18 8t18 -8l260 -264q7 -8 4.5 -13t-12.5 -5h-170v-200h200v173q0 10 5 12t13 -5l264 -260q8 -7 8 -17.5t-8 -17.5l-264 -265q-8 -7 -13 -5t-5 12v173h-200v-200h170q10 0 12.5 -5t-4.5 -13l-260 -264q-8 -8 -18 -8t-18 8l-264 264q-8 8 -5.5 13 t12.5 5h175v200h-200v-173q0 -10 -5 -12t-13 5l-264 265q-8 7 -8 17.5t8 17.5l264 260q8 7 13 5t5 -12v-173h200v200h-175q-10 0 -12.5 5t5.5 13z" />
<glyph unicode="&#xe069;" d="M250 1100h100q21 0 35.5 -14.5t14.5 -35.5v-438l464 453q15 14 25.5 10t10.5 -25v-1000q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v1000q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="&#xe070;" d="M50 1100h100q21 0 35.5 -14.5t14.5 -35.5v-438l464 453q15 14 25.5 10t10.5 -25v-438l464 453q15 14 25.5 10t10.5 -25v-1000q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5 t-14.5 35.5v1000q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="&#xe071;" d="M1200 1050v-1000q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -10.5 -25t-25.5 10l-492 480q-15 14 -15 35t15 35l492 480q15 14 25.5 10t10.5 -25v-438l464 453q15 14 25.5 10t10.5 -25z" />
<glyph unicode="&#xe072;" d="M243 1074l814 -498q18 -11 18 -26t-18 -26l-814 -498q-18 -11 -30.5 -4t-12.5 28v1000q0 21 12.5 28t30.5 -4z" />
<glyph unicode="&#xe073;" d="M250 1000h200q21 0 35.5 -14.5t14.5 -35.5v-800q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v800q0 21 14.5 35.5t35.5 14.5zM650 1000h200q21 0 35.5 -14.5t14.5 -35.5v-800q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v800 q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="&#xe074;" d="M1100 950v-800q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v800q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5z" />
<glyph unicode="&#xe075;" d="M500 612v438q0 21 10.5 25t25.5 -10l492 -480q15 -14 15 -35t-15 -35l-492 -480q-15 -14 -25.5 -10t-10.5 25v438l-464 -453q-15 -14 -25.5 -10t-10.5 25v1000q0 21 10.5 25t25.5 -10z" />
<glyph unicode="&#xe076;" d="M1048 1102l100 1q20 0 35 -14.5t15 -35.5l5 -1000q0 -21 -14.5 -35.5t-35.5 -14.5l-100 -1q-21 0 -35.5 14.5t-14.5 35.5l-2 437l-463 -454q-14 -15 -24.5 -10.5t-10.5 25.5l-2 437l-462 -455q-15 -14 -25.5 -9.5t-10.5 24.5l-5 1000q0 21 10.5 25.5t25.5 -10.5l466 -450 l-2 438q0 20 10.5 24.5t25.5 -9.5l466 -451l-2 438q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="&#xe077;" d="M850 1100h100q21 0 35.5 -14.5t14.5 -35.5v-1000q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v438l-464 -453q-15 -14 -25.5 -10t-10.5 25v1000q0 21 10.5 25t25.5 -10l464 -453v438q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="&#xe078;" d="M686 1081l501 -540q15 -15 10.5 -26t-26.5 -11h-1042q-22 0 -26.5 11t10.5 26l501 540q15 15 36 15t36 -15zM150 400h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="&#xe079;" d="M885 900l-352 -353l352 -353l-197 -198l-552 552l552 550z" />
<glyph unicode="&#xe080;" d="M1064 547l-551 -551l-198 198l353 353l-353 353l198 198z" />
<glyph unicode="&#xe081;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM650 900h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-150h-150 q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -21 14.5 -35.5t35.5 -14.5h150v-150q0 -21 14.5 -35.5t35.5 -14.5h100q21 0 35.5 14.5t14.5 35.5v150h150q21 0 35.5 14.5t14.5 35.5v100q0 21 -14.5 35.5t-35.5 14.5h-150v150q0 21 -14.5 35.5t-35.5 14.5z" />
<glyph unicode="&#xe082;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM850 700h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -21 14.5 -35.5 t35.5 -14.5h500q21 0 35.5 14.5t14.5 35.5v100q0 21 -14.5 35.5t-35.5 14.5z" />
<glyph unicode="&#xe083;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM741.5 913q-12.5 0 -21.5 -9l-120 -120l-120 120q-9 9 -21.5 9 t-21.5 -9l-141 -141q-9 -9 -9 -21.5t9 -21.5l120 -120l-120 -120q-9 -9 -9 -21.5t9 -21.5l141 -141q9 -9 21.5 -9t21.5 9l120 120l120 -120q9 -9 21.5 -9t21.5 9l141 141q9 9 9 21.5t-9 21.5l-120 120l120 120q9 9 9 21.5t-9 21.5l-141 141q-9 9 -21.5 9z" />
<glyph unicode="&#xe084;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM546 623l-84 85q-7 7 -17.5 7t-18.5 -7l-139 -139q-7 -8 -7 -18t7 -18 l242 -241q7 -8 17.5 -8t17.5 8l375 375q7 7 7 17.5t-7 18.5l-139 139q-7 7 -17.5 7t-17.5 -7z" />
<glyph unicode="&#xe085;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM588 941q-29 0 -59 -5.5t-63 -20.5t-58 -38.5t-41.5 -63t-16.5 -89.5 q0 -25 20 -25h131q30 -5 35 11q6 20 20.5 28t45.5 8q20 0 31.5 -10.5t11.5 -28.5q0 -23 -7 -34t-26 -18q-1 0 -13.5 -4t-19.5 -7.5t-20 -10.5t-22 -17t-18.5 -24t-15.5 -35t-8 -46q-1 -8 5.5 -16.5t20.5 -8.5h173q7 0 22 8t35 28t37.5 48t29.5 74t12 100q0 47 -17 83 t-42.5 57t-59.5 34.5t-64 18t-59 4.5zM675 400h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5z" />
<glyph unicode="&#xe086;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM675 1000h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5 t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5zM675 700h-250q-10 0 -17.5 -7.5t-7.5 -17.5v-50q0 -10 7.5 -17.5t17.5 -7.5h75v-200h-75q-10 0 -17.5 -7.5t-7.5 -17.5v-50q0 -10 7.5 -17.5t17.5 -7.5h350q10 0 17.5 7.5t7.5 17.5v50q0 10 -7.5 17.5 t-17.5 7.5h-75v275q0 10 -7.5 17.5t-17.5 7.5z" />
<glyph unicode="&#xe087;" d="M525 1200h150q10 0 17.5 -7.5t7.5 -17.5v-194q103 -27 178.5 -102.5t102.5 -178.5h194q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-194q-27 -103 -102.5 -178.5t-178.5 -102.5v-194q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v194 q-103 27 -178.5 102.5t-102.5 178.5h-194q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h194q27 103 102.5 178.5t178.5 102.5v194q0 10 7.5 17.5t17.5 7.5zM700 893v-168q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v168q-68 -23 -119 -74 t-74 -119h168q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-168q23 -68 74 -119t119 -74v168q0 10 7.5 17.5t17.5 7.5h150q10 0 17.5 -7.5t7.5 -17.5v-168q68 23 119 74t74 119h-168q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h168 q-23 68 -74 119t-119 74z" />
<glyph unicode="&#xe088;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM759 823l64 -64q7 -7 7 -17.5t-7 -17.5l-124 -124l124 -124q7 -7 7 -17.5t-7 -17.5l-64 -64q-7 -7 -17.5 -7t-17.5 7l-124 124l-124 -124q-7 -7 -17.5 -7t-17.5 7l-64 64 q-7 7 -7 17.5t7 17.5l124 124l-124 124q-7 7 -7 17.5t7 17.5l64 64q7 7 17.5 7t17.5 -7l124 -124l124 124q7 7 17.5 7t17.5 -7z" />
<glyph unicode="&#xe089;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM782 788l106 -106q7 -7 7 -17.5t-7 -17.5l-320 -321q-8 -7 -18 -7t-18 7l-202 203q-8 7 -8 17.5t8 17.5l106 106q7 8 17.5 8t17.5 -8l79 -79l197 197q7 7 17.5 7t17.5 -7z" />
<glyph unicode="&#xe090;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5q0 -120 65 -225 l587 587q-105 65 -225 65zM965 819l-584 -584q104 -62 219 -62q116 0 214.5 57t155.5 155.5t57 214.5q0 115 -62 219z" />
<glyph unicode="&#xe091;" d="M39 582l522 427q16 13 27.5 8t11.5 -26v-291h550q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-550v-291q0 -21 -11.5 -26t-27.5 8l-522 427q-16 13 -16 32t16 32z" />
<glyph unicode="&#xe092;" d="M639 1009l522 -427q16 -13 16 -32t-16 -32l-522 -427q-16 -13 -27.5 -8t-11.5 26v291h-550q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5h550v291q0 21 11.5 26t27.5 -8z" />
<glyph unicode="&#xe093;" d="M682 1161l427 -522q13 -16 8 -27.5t-26 -11.5h-291v-550q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v550h-291q-21 0 -26 11.5t8 27.5l427 522q13 16 32 16t32 -16z" />
<glyph unicode="&#xe094;" d="M550 1200h200q21 0 35.5 -14.5t14.5 -35.5v-550h291q21 0 26 -11.5t-8 -27.5l-427 -522q-13 -16 -32 -16t-32 16l-427 522q-13 16 -8 27.5t26 11.5h291v550q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="&#xe095;" d="M639 1109l522 -427q16 -13 16 -32t-16 -32l-522 -427q-16 -13 -27.5 -8t-11.5 26v291q-94 -2 -182 -20t-170.5 -52t-147 -92.5t-100.5 -135.5q5 105 27 193.5t67.5 167t113 135t167 91.5t225.5 42v262q0 21 11.5 26t27.5 -8z" />
<glyph unicode="&#xe096;" d="M850 1200h300q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -10.5 -25t-24.5 10l-94 94l-249 -249q-8 -7 -18 -7t-18 7l-106 106q-7 8 -7 18t7 18l249 249l-94 94q-14 14 -10 24.5t25 10.5zM350 0h-300q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 10.5 25t24.5 -10l94 -94l249 249 q8 7 18 7t18 -7l106 -106q7 -8 7 -18t-7 -18l-249 -249l94 -94q14 -14 10 -24.5t-25 -10.5z" />
<glyph unicode="&#xe097;" d="M1014 1120l106 -106q7 -8 7 -18t-7 -18l-249 -249l94 -94q14 -14 10 -24.5t-25 -10.5h-300q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 10.5 25t24.5 -10l94 -94l249 249q8 7 18 7t18 -7zM250 600h300q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -10.5 -25t-24.5 10l-94 94 l-249 -249q-8 -7 -18 -7t-18 7l-106 106q-7 8 -7 18t7 18l249 249l-94 94q-14 14 -10 24.5t25 10.5z" />
<glyph unicode="&#xe101;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM704 900h-208q-20 0 -32 -14.5t-8 -34.5l58 -302q4 -20 21.5 -34.5 t37.5 -14.5h54q20 0 37.5 14.5t21.5 34.5l58 302q4 20 -8 34.5t-32 14.5zM675 400h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5z" />
<glyph unicode="&#xe102;" d="M260 1200q9 0 19 -2t15 -4l5 -2q22 -10 44 -23l196 -118q21 -13 36 -24q29 -21 37 -12q11 13 49 35l196 118q22 13 45 23q17 7 38 7q23 0 47 -16.5t37 -33.5l13 -16q14 -21 18 -45l25 -123l8 -44q1 -9 8.5 -14.5t17.5 -5.5h61q10 0 17.5 -7.5t7.5 -17.5v-50 q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 -7.5t-7.5 -17.5v-175h-400v300h-200v-300h-400v175q0 10 -7.5 17.5t-17.5 7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5h61q11 0 18 3t7 8q0 4 9 52l25 128q5 25 19 45q2 3 5 7t13.5 15t21.5 19.5t26.5 15.5 t29.5 7zM915 1079l-166 -162q-7 -7 -5 -12t12 -5h219q10 0 15 7t2 17l-51 149q-3 10 -11 12t-15 -6zM463 917l-177 157q-8 7 -16 5t-11 -12l-51 -143q-3 -10 2 -17t15 -7h231q11 0 12.5 5t-5.5 12zM500 0h-375q-10 0 -17.5 7.5t-7.5 17.5v375h400v-400zM1100 400v-375 q0 -10 -7.5 -17.5t-17.5 -7.5h-375v400h400z" />
<glyph unicode="&#xe103;" d="M1165 1190q8 3 21 -6.5t13 -17.5q-2 -178 -24.5 -323.5t-55.5 -245.5t-87 -174.5t-102.5 -118.5t-118 -68.5t-118.5 -33t-120 -4.5t-105 9.5t-90 16.5q-61 12 -78 11q-4 1 -12.5 0t-34 -14.5t-52.5 -40.5l-153 -153q-26 -24 -37 -14.5t-11 43.5q0 64 42 102q8 8 50.5 45 t66.5 58q19 17 35 47t13 61q-9 55 -10 102.5t7 111t37 130t78 129.5q39 51 80 88t89.5 63.5t94.5 45t113.5 36t129 31t157.5 37t182 47.5zM1116 1098q-8 9 -22.5 -3t-45.5 -50q-38 -47 -119 -103.5t-142 -89.5l-62 -33q-56 -30 -102 -57t-104 -68t-102.5 -80.5t-85.5 -91 t-64 -104.5q-24 -56 -31 -86t2 -32t31.5 17.5t55.5 59.5q25 30 94 75.5t125.5 77.5t147.5 81q70 37 118.5 69t102 79.5t99 111t86.5 148.5q22 50 24 60t-6 19z" />
<glyph unicode="&#xe104;" d="M653 1231q-39 -67 -54.5 -131t-10.5 -114.5t24.5 -96.5t47.5 -80t63.5 -62.5t68.5 -46.5t65 -30q-4 7 -17.5 35t-18.5 39.5t-17 39.5t-17 43t-13 42t-9.5 44.5t-2 42t4 43t13.5 39t23 38.5q96 -42 165 -107.5t105 -138t52 -156t13 -159t-19 -149.5q-13 -55 -44 -106.5 t-68 -87t-78.5 -64.5t-72.5 -45t-53 -22q-72 -22 -127 -11q-31 6 -13 19q6 3 17 7q13 5 32.5 21t41 44t38.5 63.5t21.5 81.5t-6.5 94.5t-50 107t-104 115.5q10 -104 -0.5 -189t-37 -140.5t-65 -93t-84 -52t-93.5 -11t-95 24.5q-80 36 -131.5 114t-53.5 171q-2 23 0 49.5 t4.5 52.5t13.5 56t27.5 60t46 64.5t69.5 68.5q-8 -53 -5 -102.5t17.5 -90t34 -68.5t44.5 -39t49 -2q31 13 38.5 36t-4.5 55t-29 64.5t-36 75t-26 75.5q-15 85 2 161.5t53.5 128.5t85.5 92.5t93.5 61t81.5 25.5z" />
<glyph unicode="&#xe105;" d="M600 1094q82 0 160.5 -22.5t140 -59t116.5 -82.5t94.5 -95t68 -95t42.5 -82.5t14 -57.5t-14 -57.5t-43 -82.5t-68.5 -95t-94.5 -95t-116.5 -82.5t-140 -59t-159.5 -22.5t-159.5 22.5t-140 59t-116.5 82.5t-94.5 95t-68.5 95t-43 82.5t-14 57.5t14 57.5t42.5 82.5t68 95 t94.5 95t116.5 82.5t140 59t160.5 22.5zM888 829q-15 15 -18 12t5 -22q25 -57 25 -119q0 -124 -88 -212t-212 -88t-212 88t-88 212q0 59 23 114q8 19 4.5 22t-17.5 -12q-70 -69 -160 -184q-13 -16 -15 -40.5t9 -42.5q22 -36 47 -71t70 -82t92.5 -81t113 -58.5t133.5 -24.5 t133.5 24t113 58.5t92.5 81.5t70 81.5t47 70.5q11 18 9 42.5t-14 41.5q-90 117 -163 189zM448 727l-35 -36q-15 -15 -19.5 -38.5t4.5 -41.5q37 -68 93 -116q16 -13 38.5 -11t36.5 17l35 34q14 15 12.5 33.5t-16.5 33.5q-44 44 -89 117q-11 18 -28 20t-32 -12z" />
<glyph unicode="&#xe106;" d="M592 0h-148l31 120q-91 20 -175.5 68.5t-143.5 106.5t-103.5 119t-66.5 110t-22 76q0 21 14 57.5t42.5 82.5t68 95t94.5 95t116.5 82.5t140 59t160.5 22.5q61 0 126 -15l32 121h148zM944 770l47 181q108 -85 176.5 -192t68.5 -159q0 -26 -19.5 -71t-59.5 -102t-93 -112 t-129 -104.5t-158 -75.5l46 173q77 49 136 117t97 131q11 18 9 42.5t-14 41.5q-54 70 -107 130zM310 824q-70 -69 -160 -184q-13 -16 -15 -40.5t9 -42.5q18 -30 39 -60t57 -70.5t74 -73t90 -61t105 -41.5l41 154q-107 18 -178.5 101.5t-71.5 193.5q0 59 23 114q8 19 4.5 22 t-17.5 -12zM448 727l-35 -36q-15 -15 -19.5 -38.5t4.5 -41.5q37 -68 93 -116q16 -13 38.5 -11t36.5 17l12 11l22 86l-3 4q-44 44 -89 117q-11 18 -28 20t-32 -12z" />
<glyph unicode="&#xe107;" d="M-90 100l642 1066q20 31 48 28.5t48 -35.5l642 -1056q21 -32 7.5 -67.5t-50.5 -35.5h-1294q-37 0 -50.5 34t7.5 66zM155 200h345v75q0 10 7.5 17.5t17.5 7.5h150q10 0 17.5 -7.5t7.5 -17.5v-75h345l-445 723zM496 700h208q20 0 32 -14.5t8 -34.5l-58 -252 q-4 -20 -21.5 -34.5t-37.5 -14.5h-54q-20 0 -37.5 14.5t-21.5 34.5l-58 252q-4 20 8 34.5t32 14.5z" />
<glyph unicode="&#xe108;" d="M650 1200q62 0 106 -44t44 -106v-339l363 -325q15 -14 26 -38.5t11 -44.5v-41q0 -20 -12 -26.5t-29 5.5l-359 249v-263q100 -93 100 -113v-64q0 -21 -13 -29t-32 1l-205 128l-205 -128q-19 -9 -32 -1t-13 29v64q0 20 100 113v263l-359 -249q-17 -12 -29 -5.5t-12 26.5v41 q0 20 11 44.5t26 38.5l363 325v339q0 62 44 106t106 44z" />
<glyph unicode="&#xe109;" d="M850 1200h100q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-150h-1100v150q0 21 14.5 35.5t35.5 14.5h50v50q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-50h500v50q0 21 14.5 35.5t35.5 14.5zM1100 800v-750q0 -21 -14.5 -35.5 t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v750h1100zM100 600v-100h100v100h-100zM300 600v-100h100v100h-100zM500 600v-100h100v100h-100zM700 600v-100h100v100h-100zM900 600v-100h100v100h-100zM100 400v-100h100v100h-100zM300 400v-100h100v100h-100zM500 400 v-100h100v100h-100zM700 400v-100h100v100h-100zM900 400v-100h100v100h-100zM100 200v-100h100v100h-100zM300 200v-100h100v100h-100zM500 200v-100h100v100h-100zM700 200v-100h100v100h-100zM900 200v-100h100v100h-100z" />
<glyph unicode="&#xe110;" d="M1135 1165l249 -230q15 -14 15 -35t-15 -35l-249 -230q-14 -14 -24.5 -10t-10.5 25v150h-159l-600 -600h-291q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h209l600 600h241v150q0 21 10.5 25t24.5 -10zM522 819l-141 -141l-122 122h-209q-21 0 -35.5 14.5 t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h291zM1135 565l249 -230q15 -14 15 -35t-15 -35l-249 -230q-14 -14 -24.5 -10t-10.5 25v150h-241l-181 181l141 141l122 -122h159v150q0 21 10.5 25t24.5 -10z" />
<glyph unicode="&#xe111;" d="M100 1100h1000q41 0 70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-596l-304 -300v300h-100q-41 0 -70.5 29.5t-29.5 70.5v600q0 41 29.5 70.5t70.5 29.5z" />
<glyph unicode="&#xe112;" d="M150 1200h200q21 0 35.5 -14.5t14.5 -35.5v-250h-300v250q0 21 14.5 35.5t35.5 14.5zM850 1200h200q21 0 35.5 -14.5t14.5 -35.5v-250h-300v250q0 21 14.5 35.5t35.5 14.5zM1100 800v-300q0 -41 -3 -77.5t-15 -89.5t-32 -96t-58 -89t-89 -77t-129 -51t-174 -20t-174 20 t-129 51t-89 77t-58 89t-32 96t-15 89.5t-3 77.5v300h300v-250v-27v-42.5t1.5 -41t5 -38t10 -35t16.5 -30t25.5 -24.5t35 -19t46.5 -12t60 -4t60 4.5t46.5 12.5t35 19.5t25 25.5t17 30.5t10 35t5 38t2 40.5t-0.5 42v25v250h300z" />
<glyph unicode="&#xe113;" d="M1100 411l-198 -199l-353 353l-353 -353l-197 199l551 551z" />
<glyph unicode="&#xe114;" d="M1101 789l-550 -551l-551 551l198 199l353 -353l353 353z" />
<glyph unicode="&#xe115;" d="M404 1000h746q21 0 35.5 -14.5t14.5 -35.5v-551h150q21 0 25 -10.5t-10 -24.5l-230 -249q-14 -15 -35 -15t-35 15l-230 249q-14 14 -10 24.5t25 10.5h150v401h-381zM135 984l230 -249q14 -14 10 -24.5t-25 -10.5h-150v-400h385l215 -200h-750q-21 0 -35.5 14.5 t-14.5 35.5v550h-150q-21 0 -25 10.5t10 24.5l230 249q14 15 35 15t35 -15z" />
<glyph unicode="&#xe116;" d="M56 1200h94q17 0 31 -11t18 -27l38 -162h896q24 0 39 -18.5t10 -42.5l-100 -475q-5 -21 -27 -42.5t-55 -21.5h-633l48 -200h535q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-50q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v50h-300v-50 q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v50h-31q-18 0 -32.5 10t-20.5 19l-5 10l-201 961h-54q-20 0 -35 14.5t-15 35.5t15 35.5t35 14.5z" />
<glyph unicode="&#xe117;" d="M1200 1000v-100h-1200v100h200q0 41 29.5 70.5t70.5 29.5h300q41 0 70.5 -29.5t29.5 -70.5h500zM0 800h1200v-800h-1200v800z" />
<glyph unicode="&#xe118;" d="M200 800l-200 -400v600h200q0 41 29.5 70.5t70.5 29.5h300q42 0 71 -29.5t29 -70.5h500v-200h-1000zM1500 700l-300 -700h-1200l300 700h1200z" />
<glyph unicode="&#xe119;" d="M635 1184l230 -249q14 -14 10 -24.5t-25 -10.5h-150v-601h150q21 0 25 -10.5t-10 -24.5l-230 -249q-14 -15 -35 -15t-35 15l-230 249q-14 14 -10 24.5t25 10.5h150v601h-150q-21 0 -25 10.5t10 24.5l230 249q14 15 35 15t35 -15z" />
<glyph unicode="&#xe120;" d="M936 864l249 -229q14 -15 14 -35.5t-14 -35.5l-249 -229q-15 -15 -25.5 -10.5t-10.5 24.5v151h-600v-151q0 -20 -10.5 -24.5t-25.5 10.5l-249 229q-14 15 -14 35.5t14 35.5l249 229q15 15 25.5 10.5t10.5 -25.5v-149h600v149q0 21 10.5 25.5t25.5 -10.5z" />
<glyph unicode="&#xe121;" d="M1169 400l-172 732q-5 23 -23 45.5t-38 22.5h-672q-20 0 -38 -20t-23 -41l-172 -739h1138zM1100 300h-1000q-41 0 -70.5 -29.5t-29.5 -70.5v-100q0 -41 29.5 -70.5t70.5 -29.5h1000q41 0 70.5 29.5t29.5 70.5v100q0 41 -29.5 70.5t-70.5 29.5zM800 100v100h100v-100h-100 zM1000 100v100h100v-100h-100z" />
<glyph unicode="&#xe122;" d="M1150 1100q21 0 35.5 -14.5t14.5 -35.5v-850q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v850q0 21 14.5 35.5t35.5 14.5zM1000 200l-675 200h-38l47 -276q3 -16 -5.5 -20t-29.5 -4h-7h-84q-20 0 -34.5 14t-18.5 35q-55 337 -55 351v250v6q0 16 1 23.5t6.5 14 t17.5 6.5h200l675 250v-850zM0 750v-250q-4 0 -11 0.5t-24 6t-30 15t-24 30t-11 48.5v50q0 26 10.5 46t25 30t29 16t25.5 7z" />
<glyph unicode="&#xe123;" d="M553 1200h94q20 0 29 -10.5t3 -29.5l-18 -37q83 -19 144 -82.5t76 -140.5l63 -327l118 -173h17q19 0 33 -14.5t14 -35t-13 -40.5t-31 -27q-8 -4 -23 -9.5t-65 -19.5t-103 -25t-132.5 -20t-158.5 -9q-57 0 -115 5t-104 12t-88.5 15.5t-73.5 17.5t-54.5 16t-35.5 12l-11 4 q-18 8 -31 28t-13 40.5t14 35t33 14.5h17l118 173l63 327q15 77 76 140t144 83l-18 32q-6 19 3.5 32t28.5 13zM498 110q50 -6 102 -6q53 0 102 6q-12 -49 -39.5 -79.5t-62.5 -30.5t-63 30.5t-39 79.5z" />
<glyph unicode="&#xe124;" d="M800 946l224 78l-78 -224l234 -45l-180 -155l180 -155l-234 -45l78 -224l-224 78l-45 -234l-155 180l-155 -180l-45 234l-224 -78l78 224l-234 45l180 155l-180 155l234 45l-78 224l224 -78l45 234l155 -180l155 180z" />
<glyph unicode="&#xe125;" d="M650 1200h50q40 0 70 -40.5t30 -84.5v-150l-28 -125h328q40 0 70 -40.5t30 -84.5v-100q0 -45 -29 -74l-238 -344q-16 -24 -38 -40.5t-45 -16.5h-250q-7 0 -42 25t-66 50l-31 25h-61q-45 0 -72.5 18t-27.5 57v400q0 36 20 63l145 196l96 198q13 28 37.5 48t51.5 20z M650 1100l-100 -212l-150 -213v-375h100l136 -100h214l250 375v125h-450l50 225v175h-50zM50 800h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v500q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="&#xe126;" d="M600 1100h250q23 0 45 -16.5t38 -40.5l238 -344q29 -29 29 -74v-100q0 -44 -30 -84.5t-70 -40.5h-328q28 -118 28 -125v-150q0 -44 -30 -84.5t-70 -40.5h-50q-27 0 -51.5 20t-37.5 48l-96 198l-145 196q-20 27 -20 63v400q0 39 27.5 57t72.5 18h61q124 100 139 100z M50 1000h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v500q0 21 14.5 35.5t35.5 14.5zM636 1000l-136 -100h-100v-375l150 -213l100 -212h50v175l-50 225h450v125l-250 375h-214z" />
<glyph unicode="&#xe127;" d="M356 873l363 230q31 16 53 -6l110 -112q13 -13 13.5 -32t-11.5 -34l-84 -121h302q84 0 138 -38t54 -110t-55 -111t-139 -39h-106l-131 -339q-6 -21 -19.5 -41t-28.5 -20h-342q-7 0 -90 81t-83 94v525q0 17 14 35.5t28 28.5zM400 792v-503l100 -89h293l131 339 q6 21 19.5 41t28.5 20h203q21 0 30.5 25t0.5 50t-31 25h-456h-7h-6h-5.5t-6 0.5t-5 1.5t-5 2t-4 2.5t-4 4t-2.5 4.5q-12 25 5 47l146 183l-86 83zM50 800h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v500 q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="&#xe128;" d="M475 1103l366 -230q2 -1 6 -3.5t14 -10.5t18 -16.5t14.5 -20t6.5 -22.5v-525q0 -13 -86 -94t-93 -81h-342q-15 0 -28.5 20t-19.5 41l-131 339h-106q-85 0 -139.5 39t-54.5 111t54 110t138 38h302l-85 121q-11 15 -10.5 34t13.5 32l110 112q22 22 53 6zM370 945l146 -183 q17 -22 5 -47q-2 -2 -3.5 -4.5t-4 -4t-4 -2.5t-5 -2t-5 -1.5t-6 -0.5h-6h-6.5h-6h-475v-100h221q15 0 29 -20t20 -41l130 -339h294l106 89v503l-342 236zM1050 800h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5 v500q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="&#xe129;" d="M550 1294q72 0 111 -55t39 -139v-106l339 -131q21 -6 41 -19.5t20 -28.5v-342q0 -7 -81 -90t-94 -83h-525q-17 0 -35.5 14t-28.5 28l-9 14l-230 363q-16 31 6 53l112 110q13 13 32 13.5t34 -11.5l121 -84v302q0 84 38 138t110 54zM600 972v203q0 21 -25 30.5t-50 0.5 t-25 -31v-456v-7v-6v-5.5t-0.5 -6t-1.5 -5t-2 -5t-2.5 -4t-4 -4t-4.5 -2.5q-25 -12 -47 5l-183 146l-83 -86l236 -339h503l89 100v293l-339 131q-21 6 -41 19.5t-20 28.5zM450 200h500q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-500 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="&#xe130;" d="M350 1100h500q21 0 35.5 14.5t14.5 35.5v100q0 21 -14.5 35.5t-35.5 14.5h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -21 14.5 -35.5t35.5 -14.5zM600 306v-106q0 -84 -39 -139t-111 -55t-110 54t-38 138v302l-121 -84q-15 -12 -34 -11.5t-32 13.5l-112 110 q-22 22 -6 53l230 363q1 2 3.5 6t10.5 13.5t16.5 17t20 13.5t22.5 6h525q13 0 94 -83t81 -90v-342q0 -15 -20 -28.5t-41 -19.5zM308 900l-236 -339l83 -86l183 146q22 17 47 5q2 -1 4.5 -2.5t4 -4t2.5 -4t2 -5t1.5 -5t0.5 -6v-5.5v-6v-7v-456q0 -22 25 -31t50 0.5t25 30.5 v203q0 15 20 28.5t41 19.5l339 131v293l-89 100h-503z" />
<glyph unicode="&#xe131;" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM914 632l-275 223q-16 13 -27.5 8t-11.5 -26v-137h-275 q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h275v-137q0 -21 11.5 -26t27.5 8l275 223q16 13 16 32t-16 32z" />
<glyph unicode="&#xe132;" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM561 855l-275 -223q-16 -13 -16 -32t16 -32l275 -223q16 -13 27.5 -8 t11.5 26v137h275q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5h-275v137q0 21 -11.5 26t-27.5 -8z" />
<glyph unicode="&#xe133;" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM855 639l-223 275q-13 16 -32 16t-32 -16l-223 -275q-13 -16 -8 -27.5 t26 -11.5h137v-275q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v275h137q21 0 26 11.5t-8 27.5z" />
<glyph unicode="&#xe134;" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM675 900h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-275h-137q-21 0 -26 -11.5 t8 -27.5l223 -275q13 -16 32 -16t32 16l223 275q13 16 8 27.5t-26 11.5h-137v275q0 10 -7.5 17.5t-17.5 7.5z" />
<glyph unicode="&#xe135;" d="M600 1176q116 0 222.5 -46t184 -123.5t123.5 -184t46 -222.5t-46 -222.5t-123.5 -184t-184 -123.5t-222.5 -46t-222.5 46t-184 123.5t-123.5 184t-46 222.5t46 222.5t123.5 184t184 123.5t222.5 46zM627 1101q-15 -12 -36.5 -20.5t-35.5 -12t-43 -8t-39 -6.5 q-15 -3 -45.5 0t-45.5 -2q-20 -7 -51.5 -26.5t-34.5 -34.5q-3 -11 6.5 -22.5t8.5 -18.5q-3 -34 -27.5 -91t-29.5 -79q-9 -34 5 -93t8 -87q0 -9 17 -44.5t16 -59.5q12 0 23 -5t23.5 -15t19.5 -14q16 -8 33 -15t40.5 -15t34.5 -12q21 -9 52.5 -32t60 -38t57.5 -11 q7 -15 -3 -34t-22.5 -40t-9.5 -38q13 -21 23 -34.5t27.5 -27.5t36.5 -18q0 -7 -3.5 -16t-3.5 -14t5 -17q104 -2 221 112q30 29 46.5 47t34.5 49t21 63q-13 8 -37 8.5t-36 7.5q-15 7 -49.5 15t-51.5 19q-18 0 -41 -0.5t-43 -1.5t-42 -6.5t-38 -16.5q-51 -35 -66 -12 q-4 1 -3.5 25.5t0.5 25.5q-6 13 -26.5 17.5t-24.5 6.5q1 15 -0.5 30.5t-7 28t-18.5 11.5t-31 -21q-23 -25 -42 4q-19 28 -8 58q6 16 22 22q6 -1 26 -1.5t33.5 -4t19.5 -13.5q7 -12 18 -24t21.5 -20.5t20 -15t15.5 -10.5l5 -3q2 12 7.5 30.5t8 34.5t-0.5 32q-3 18 3.5 29 t18 22.5t15.5 24.5q6 14 10.5 35t8 31t15.5 22.5t34 22.5q-6 18 10 36q8 0 24 -1.5t24.5 -1.5t20 4.5t20.5 15.5q-10 23 -31 42.5t-37.5 29.5t-49 27t-43.5 23q0 1 2 8t3 11.5t1.5 10.5t-1 9.5t-4.5 4.5q31 -13 58.5 -14.5t38.5 2.5l12 5q5 28 -9.5 46t-36.5 24t-50 15 t-41 20q-18 -4 -37 0zM613 994q0 -17 8 -42t17 -45t9 -23q-8 1 -39.5 5.5t-52.5 10t-37 16.5q3 11 16 29.5t16 25.5q10 -10 19 -10t14 6t13.5 14.5t16.5 12.5z" />
<glyph unicode="&#xe136;" d="M756 1157q164 92 306 -9l-259 -138l145 -232l251 126q6 -89 -34 -156.5t-117 -110.5q-60 -34 -127 -39.5t-126 16.5l-596 -596q-15 -16 -36.5 -16t-36.5 16l-111 110q-15 15 -15 36.5t15 37.5l600 599q-34 101 5.5 201.5t135.5 154.5z" />
<glyph unicode="&#xe137;" horiz-adv-x="1220" d="M100 1196h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5v100q0 41 29.5 70.5t70.5 29.5zM1100 1096h-200v-100h200v100zM100 796h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000 q-41 0 -70.5 29.5t-29.5 70.5v100q0 41 29.5 70.5t70.5 29.5zM1100 696h-500v-100h500v100zM100 396h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5v100q0 41 29.5 70.5t70.5 29.5zM1100 296h-300v-100h300v100z " />
<glyph unicode="&#xe138;" d="M150 1200h900q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM700 500v-300l-200 -200v500l-350 500h900z" />
<glyph unicode="&#xe139;" d="M500 1200h200q41 0 70.5 -29.5t29.5 -70.5v-100h300q41 0 70.5 -29.5t29.5 -70.5v-400h-500v100h-200v-100h-500v400q0 41 29.5 70.5t70.5 29.5h300v100q0 41 29.5 70.5t70.5 29.5zM500 1100v-100h200v100h-200zM1200 400v-200q0 -41 -29.5 -70.5t-70.5 -29.5h-1000 q-41 0 -70.5 29.5t-29.5 70.5v200h1200z" />
<glyph unicode="&#xe140;" d="M50 1200h300q21 0 25 -10.5t-10 -24.5l-94 -94l199 -199q7 -8 7 -18t-7 -18l-106 -106q-8 -7 -18 -7t-18 7l-199 199l-94 -94q-14 -14 -24.5 -10t-10.5 25v300q0 21 14.5 35.5t35.5 14.5zM850 1200h300q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -10.5 -25t-24.5 10l-94 94 l-199 -199q-8 -7 -18 -7t-18 7l-106 106q-7 8 -7 18t7 18l199 199l-94 94q-14 14 -10 24.5t25 10.5zM364 470l106 -106q7 -8 7 -18t-7 -18l-199 -199l94 -94q14 -14 10 -24.5t-25 -10.5h-300q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 10.5 25t24.5 -10l94 -94l199 199 q8 7 18 7t18 -7zM1071 271l94 94q14 14 24.5 10t10.5 -25v-300q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -25 10.5t10 24.5l94 94l-199 199q-7 8 -7 18t7 18l106 106q8 7 18 7t18 -7z" />
<glyph unicode="&#xe141;" d="M596 1192q121 0 231.5 -47.5t190 -127t127 -190t47.5 -231.5t-47.5 -231.5t-127 -190.5t-190 -127t-231.5 -47t-231.5 47t-190.5 127t-127 190.5t-47 231.5t47 231.5t127 190t190.5 127t231.5 47.5zM596 1010q-112 0 -207.5 -55.5t-151 -151t-55.5 -207.5t55.5 -207.5 t151 -151t207.5 -55.5t207.5 55.5t151 151t55.5 207.5t-55.5 207.5t-151 151t-207.5 55.5zM454.5 905q22.5 0 38.5 -16t16 -38.5t-16 -39t-38.5 -16.5t-38.5 16.5t-16 39t16 38.5t38.5 16zM754.5 905q22.5 0 38.5 -16t16 -38.5t-16 -39t-38 -16.5q-14 0 -29 10l-55 -145 q17 -23 17 -51q0 -36 -25.5 -61.5t-61.5 -25.5t-61.5 25.5t-25.5 61.5q0 32 20.5 56.5t51.5 29.5l122 126l1 1q-9 14 -9 28q0 23 16 39t38.5 16zM345.5 709q22.5 0 38.5 -16t16 -38.5t-16 -38.5t-38.5 -16t-38.5 16t-16 38.5t16 38.5t38.5 16zM854.5 709q22.5 0 38.5 -16 t16 -38.5t-16 -38.5t-38.5 -16t-38.5 16t-16 38.5t16 38.5t38.5 16z" />
<glyph unicode="&#xe142;" d="M546 173l469 470q91 91 99 192q7 98 -52 175.5t-154 94.5q-22 4 -47 4q-34 0 -66.5 -10t-56.5 -23t-55.5 -38t-48 -41.5t-48.5 -47.5q-376 -375 -391 -390q-30 -27 -45 -41.5t-37.5 -41t-32 -46.5t-16 -47.5t-1.5 -56.5q9 -62 53.5 -95t99.5 -33q74 0 125 51l548 548 q36 36 20 75q-7 16 -21.5 26t-32.5 10q-26 0 -50 -23q-13 -12 -39 -38l-341 -338q-15 -15 -35.5 -15.5t-34.5 13.5t-14 34.5t14 34.5q327 333 361 367q35 35 67.5 51.5t78.5 16.5q14 0 29 -1q44 -8 74.5 -35.5t43.5 -68.5q14 -47 2 -96.5t-47 -84.5q-12 -11 -32 -32 t-79.5 -81t-114.5 -115t-124.5 -123.5t-123 -119.5t-96.5 -89t-57 -45q-56 -27 -120 -27q-70 0 -129 32t-93 89q-48 78 -35 173t81 163l511 511q71 72 111 96q91 55 198 55q80 0 152 -33q78 -36 129.5 -103t66.5 -154q17 -93 -11 -183.5t-94 -156.5l-482 -476 q-15 -15 -36 -16t-37 14t-17.5 34t14.5 35z" />
<glyph unicode="&#xe143;" d="M649 949q48 68 109.5 104t121.5 38.5t118.5 -20t102.5 -64t71 -100.5t27 -123q0 -57 -33.5 -117.5t-94 -124.5t-126.5 -127.5t-150 -152.5t-146 -174q-62 85 -145.5 174t-150 152.5t-126.5 127.5t-93.5 124.5t-33.5 117.5q0 64 28 123t73 100.5t104 64t119 20 t120.5 -38.5t104.5 -104zM896 972q-33 0 -64.5 -19t-56.5 -46t-47.5 -53.5t-43.5 -45.5t-37.5 -19t-36 19t-40 45.5t-43 53.5t-54 46t-65.5 19q-67 0 -122.5 -55.5t-55.5 -132.5q0 -23 13.5 -51t46 -65t57.5 -63t76 -75l22 -22q15 -14 44 -44t50.5 -51t46 -44t41 -35t23 -12 t23.5 12t42.5 36t46 44t52.5 52t44 43q4 4 12 13q43 41 63.5 62t52 55t46 55t26 46t11.5 44q0 79 -53 133.5t-120 54.5z" />
<glyph unicode="&#xe144;" d="M776.5 1214q93.5 0 159.5 -66l141 -141q66 -66 66 -160q0 -42 -28 -95.5t-62 -87.5l-29 -29q-31 53 -77 99l-18 18l95 95l-247 248l-389 -389l212 -212l-105 -106l-19 18l-141 141q-66 66 -66 159t66 159l283 283q65 66 158.5 66zM600 706l105 105q10 -8 19 -17l141 -141 q66 -66 66 -159t-66 -159l-283 -283q-66 -66 -159 -66t-159 66l-141 141q-66 66 -66 159.5t66 159.5l55 55q29 -55 75 -102l18 -17l-95 -95l247 -248l389 389z" />
<glyph unicode="&#xe145;" d="M603 1200q85 0 162 -15t127 -38t79 -48t29 -46v-953q0 -41 -29.5 -70.5t-70.5 -29.5h-600q-41 0 -70.5 29.5t-29.5 70.5v953q0 21 30 46.5t81 48t129 37.5t163 15zM300 1000v-700h600v700h-600zM600 254q-43 0 -73.5 -30.5t-30.5 -73.5t30.5 -73.5t73.5 -30.5t73.5 30.5 t30.5 73.5t-30.5 73.5t-73.5 30.5z" />
<glyph unicode="&#xe146;" d="M902 1185l283 -282q15 -15 15 -36t-14.5 -35.5t-35.5 -14.5t-35 15l-36 35l-279 -267v-300l-212 210l-308 -307l-280 -203l203 280l307 308l-210 212h300l267 279l-35 36q-15 14 -15 35t14.5 35.5t35.5 14.5t35 -15z" />
<glyph unicode="&#xe148;" d="M700 1248v-78q38 -5 72.5 -14.5t75.5 -31.5t71 -53.5t52 -84t24 -118.5h-159q-4 36 -10.5 59t-21 45t-40 35.5t-64.5 20.5v-307l64 -13q34 -7 64 -16.5t70 -32t67.5 -52.5t47.5 -80t20 -112q0 -139 -89 -224t-244 -97v-77h-100v79q-150 16 -237 103q-40 40 -52.5 93.5 t-15.5 139.5h139q5 -77 48.5 -126t117.5 -65v335l-27 8q-46 14 -79 26.5t-72 36t-63 52t-40 72.5t-16 98q0 70 25 126t67.5 92t94.5 57t110 27v77h100zM600 754v274q-29 -4 -50 -11t-42 -21.5t-31.5 -41.5t-10.5 -65q0 -29 7 -50.5t16.5 -34t28.5 -22.5t31.5 -14t37.5 -10 q9 -3 13 -4zM700 547v-310q22 2 42.5 6.5t45 15.5t41.5 27t29 42t12 59.5t-12.5 59.5t-38 44.5t-53 31t-66.5 24.5z" />
<glyph unicode="&#xe149;" d="M561 1197q84 0 160.5 -40t123.5 -109.5t47 -147.5h-153q0 40 -19.5 71.5t-49.5 48.5t-59.5 26t-55.5 9q-37 0 -79 -14.5t-62 -35.5q-41 -44 -41 -101q0 -26 13.5 -63t26.5 -61t37 -66q6 -9 9 -14h241v-100h-197q8 -50 -2.5 -115t-31.5 -95q-45 -62 -99 -112 q34 10 83 17.5t71 7.5q32 1 102 -16t104 -17q83 0 136 30l50 -147q-31 -19 -58 -30.5t-55 -15.5t-42 -4.5t-46 -0.5q-23 0 -76 17t-111 32.5t-96 11.5q-39 -3 -82 -16t-67 -25l-23 -11l-55 145q4 3 16 11t15.5 10.5t13 9t15.5 12t14.5 14t17.5 18.5q48 55 54 126.5 t-30 142.5h-221v100h166q-23 47 -44 104q-7 20 -12 41.5t-6 55.5t6 66.5t29.5 70.5t58.5 71q97 88 263 88z" />
<glyph unicode="&#xe150;" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM935 1184l230 -249q14 -14 10 -24.5t-25 -10.5h-150v-900h-200v900h-150q-21 0 -25 10.5t10 24.5l230 249q14 15 35 15t35 -15z" />
<glyph unicode="&#xe151;" d="M1000 700h-100v100h-100v-100h-100v500h300v-500zM400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM801 1100v-200h100v200h-100zM1000 350l-200 -250h200v-100h-300v150l200 250h-200v100h300v-150z " />
<glyph unicode="&#xe152;" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1000 1050l-200 -250h200v-100h-300v150l200 250h-200v100h300v-150zM1000 0h-100v100h-100v-100h-100v500h300v-500zM801 400v-200h100v200h-100z " />
<glyph unicode="&#xe153;" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1000 700h-100v400h-100v100h200v-500zM1100 0h-100v100h-200v400h300v-500zM901 400v-200h100v200h-100z" />
<glyph unicode="&#xe154;" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1100 700h-100v100h-200v400h300v-500zM901 1100v-200h100v200h-100zM1000 0h-100v400h-100v100h200v-500z" />
<glyph unicode="&#xe155;" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM900 1000h-200v200h200v-200zM1000 700h-300v200h300v-200zM1100 400h-400v200h400v-200zM1200 100h-500v200h500v-200z" />
<glyph unicode="&#xe156;" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1200 1000h-500v200h500v-200zM1100 700h-400v200h400v-200zM1000 400h-300v200h300v-200zM900 100h-200v200h200v-200z" />
<glyph unicode="&#xe157;" d="M350 1100h400q162 0 256 -93.5t94 -256.5v-400q0 -165 -93.5 -257.5t-256.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5z" />
<glyph unicode="&#xe158;" d="M350 1100h400q165 0 257.5 -92.5t92.5 -257.5v-400q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-163 0 -256.5 92.5t-93.5 257.5v400q0 163 94 256.5t256 93.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5zM440 770l253 -190q17 -12 17 -30t-17 -30l-253 -190q-16 -12 -28 -6.5t-12 26.5v400q0 21 12 26.5t28 -6.5z" />
<glyph unicode="&#xe159;" d="M350 1100h400q163 0 256.5 -94t93.5 -256v-400q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 163 92.5 256.5t257.5 93.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5zM350 700h400q21 0 26.5 -12t-6.5 -28l-190 -253q-12 -17 -30 -17t-30 17l-190 253q-12 16 -6.5 28t26.5 12z" />
<glyph unicode="&#xe160;" d="M350 1100h400q165 0 257.5 -92.5t92.5 -257.5v-400q0 -163 -92.5 -256.5t-257.5 -93.5h-400q-163 0 -256.5 94t-93.5 256v400q0 165 92.5 257.5t257.5 92.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5zM580 693l190 -253q12 -16 6.5 -28t-26.5 -12h-400q-21 0 -26.5 12t6.5 28l190 253q12 17 30 17t30 -17z" />
<glyph unicode="&#xe161;" d="M550 1100h400q165 0 257.5 -92.5t92.5 -257.5v-400q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h450q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5h-450q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM338 867l324 -284q16 -14 16 -33t-16 -33l-324 -284q-16 -14 -27 -9t-11 26v150h-250q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5h250v150q0 21 11 26t27 -9z" />
<glyph unicode="&#xe162;" d="M793 1182l9 -9q8 -10 5 -27q-3 -11 -79 -225.5t-78 -221.5l300 1q24 0 32.5 -17.5t-5.5 -35.5q-1 0 -133.5 -155t-267 -312.5t-138.5 -162.5q-12 -15 -26 -15h-9l-9 8q-9 11 -4 32q2 9 42 123.5t79 224.5l39 110h-302q-23 0 -31 19q-10 21 6 41q75 86 209.5 237.5 t228 257t98.5 111.5q9 16 25 16h9z" />
<glyph unicode="&#xe163;" d="M350 1100h400q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-450q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h450q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400 q0 165 92.5 257.5t257.5 92.5zM938 867l324 -284q16 -14 16 -33t-16 -33l-324 -284q-16 -14 -27 -9t-11 26v150h-250q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5h250v150q0 21 11 26t27 -9z" />
<glyph unicode="&#xe164;" d="M750 1200h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -10.5 -25t-24.5 10l-109 109l-312 -312q-15 -15 -35.5 -15t-35.5 15l-141 141q-15 15 -15 35.5t15 35.5l312 312l-109 109q-14 14 -10 24.5t25 10.5zM456 900h-156q-41 0 -70.5 -29.5t-29.5 -70.5v-500 q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v148l200 200v-298q0 -165 -93.5 -257.5t-256.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5h300z" />
<glyph unicode="&#xe165;" d="M600 1186q119 0 227.5 -46.5t187 -125t125 -187t46.5 -227.5t-46.5 -227.5t-125 -187t-187 -125t-227.5 -46.5t-227.5 46.5t-187 125t-125 187t-46.5 227.5t46.5 227.5t125 187t187 125t227.5 46.5zM600 1022q-115 0 -212 -56.5t-153.5 -153.5t-56.5 -212t56.5 -212 t153.5 -153.5t212 -56.5t212 56.5t153.5 153.5t56.5 212t-56.5 212t-153.5 153.5t-212 56.5zM600 794q80 0 137 -57t57 -137t-57 -137t-137 -57t-137 57t-57 137t57 137t137 57z" />
<glyph unicode="&#xe166;" d="M450 1200h200q21 0 35.5 -14.5t14.5 -35.5v-350h245q20 0 25 -11t-9 -26l-383 -426q-14 -15 -33.5 -15t-32.5 15l-379 426q-13 15 -8.5 26t25.5 11h250v350q0 21 14.5 35.5t35.5 14.5zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5z M900 200v-50h100v50h-100z" />
<glyph unicode="&#xe167;" d="M583 1182l378 -435q14 -15 9 -31t-26 -16h-244v-250q0 -20 -17 -35t-39 -15h-200q-20 0 -32 14.5t-12 35.5v250h-250q-20 0 -25.5 16.5t8.5 31.5l383 431q14 16 33.5 17t33.5 -14zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5z M900 200v-50h100v50h-100z" />
<glyph unicode="&#xe168;" d="M396 723l369 369q7 7 17.5 7t17.5 -7l139 -139q7 -8 7 -18.5t-7 -17.5l-525 -525q-7 -8 -17.5 -8t-17.5 8l-292 291q-7 8 -7 18t7 18l139 139q8 7 18.5 7t17.5 -7zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5zM900 200v-50h100v50 h-100z" />
<glyph unicode="&#xe169;" d="M135 1023l142 142q14 14 35 14t35 -14l77 -77l-212 -212l-77 76q-14 15 -14 36t14 35zM655 855l210 210q14 14 24.5 10t10.5 -25l-2 -599q-1 -20 -15.5 -35t-35.5 -15l-597 -1q-21 0 -25 10.5t10 24.5l208 208l-154 155l212 212zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5 v-250h-1100v250q0 21 14.5 35.5t35.5 14.5zM900 200v-50h100v50h-100z" />
<glyph unicode="&#xe170;" d="M350 1200l599 -2q20 -1 35 -15.5t15 -35.5l1 -597q0 -21 -10.5 -25t-24.5 10l-208 208l-155 -154l-212 212l155 154l-210 210q-14 14 -10 24.5t25 10.5zM524 512l-76 -77q-15 -14 -36 -14t-35 14l-142 142q-14 14 -14 35t14 35l77 77zM50 300h1000q21 0 35.5 -14.5 t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5zM900 200v-50h100v50h-100z" />
<glyph unicode="&#xe171;" d="M1200 103l-483 276l-314 -399v423h-399l1196 796v-1096zM483 424v-230l683 953z" />
<glyph unicode="&#xe172;" d="M1100 1000v-850q0 -21 -14.5 -35.5t-35.5 -14.5h-150v400h-700v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200z" />
<glyph unicode="&#xe173;" d="M1100 1000l-2 -149l-299 -299l-95 95q-9 9 -21.5 9t-21.5 -9l-149 -147h-312v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM1132 638l106 -106q7 -7 7 -17.5t-7 -17.5l-420 -421q-8 -7 -18 -7 t-18 7l-202 203q-8 7 -8 17.5t8 17.5l106 106q7 8 17.5 8t17.5 -8l79 -79l297 297q7 7 17.5 7t17.5 -7z" />
<glyph unicode="&#xe174;" d="M1100 1000v-269l-103 -103l-134 134q-15 15 -33.5 16.5t-34.5 -12.5l-266 -266h-329v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM1202 572l70 -70q15 -15 15 -35.5t-15 -35.5l-131 -131 l131 -131q15 -15 15 -35.5t-15 -35.5l-70 -70q-15 -15 -35.5 -15t-35.5 15l-131 131l-131 -131q-15 -15 -35.5 -15t-35.5 15l-70 70q-15 15 -15 35.5t15 35.5l131 131l-131 131q-15 15 -15 35.5t15 35.5l70 70q15 15 35.5 15t35.5 -15l131 -131l131 131q15 15 35.5 15 t35.5 -15z" />
<glyph unicode="&#xe175;" d="M1100 1000v-300h-350q-21 0 -35.5 -14.5t-14.5 -35.5v-150h-500v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM850 600h100q21 0 35.5 -14.5t14.5 -35.5v-250h150q21 0 25 -10.5t-10 -24.5 l-230 -230q-14 -14 -35 -14t-35 14l-230 230q-14 14 -10 24.5t25 10.5h150v250q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="&#xe176;" d="M1100 1000v-400l-165 165q-14 15 -35 15t-35 -15l-263 -265h-402v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM935 565l230 -229q14 -15 10 -25.5t-25 -10.5h-150v-250q0 -20 -14.5 -35 t-35.5 -15h-100q-21 0 -35.5 15t-14.5 35v250h-150q-21 0 -25 10.5t10 25.5l230 229q14 15 35 15t35 -15z" />
<glyph unicode="&#xe177;" d="M50 1100h1100q21 0 35.5 -14.5t14.5 -35.5v-150h-1200v150q0 21 14.5 35.5t35.5 14.5zM1200 800v-550q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v550h1200zM100 500v-200h400v200h-400z" />
<glyph unicode="&#xe178;" d="M935 1165l248 -230q14 -14 14 -35t-14 -35l-248 -230q-14 -14 -24.5 -10t-10.5 25v150h-400v200h400v150q0 21 10.5 25t24.5 -10zM200 800h-50q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h50v-200zM400 800h-100v200h100v-200zM18 435l247 230 q14 14 24.5 10t10.5 -25v-150h400v-200h-400v-150q0 -21 -10.5 -25t-24.5 10l-247 230q-15 14 -15 35t15 35zM900 300h-100v200h100v-200zM1000 500h51q20 0 34.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-34.5 -14.5h-51v200z" />
<glyph unicode="&#xe179;" d="M862 1073l276 116q25 18 43.5 8t18.5 -41v-1106q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v397q-4 1 -11 5t-24 17.5t-30 29t-24 42t-11 56.5v359q0 31 18.5 65t43.5 52zM550 1200q22 0 34.5 -12.5t14.5 -24.5l1 -13v-450q0 -28 -10.5 -59.5 t-25 -56t-29 -45t-25.5 -31.5l-10 -11v-447q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v447q-4 4 -11 11.5t-24 30.5t-30 46t-24 55t-11 60v450q0 2 0.5 5.5t4 12t8.5 15t14.5 12t22.5 5.5q20 0 32.5 -12.5t14.5 -24.5l3 -13v-350h100v350v5.5t2.5 12 t7 15t15 12t25.5 5.5q23 0 35.5 -12.5t13.5 -24.5l1 -13v-350h100v350q0 2 0.5 5.5t3 12t7 15t15 12t24.5 5.5z" />
<glyph unicode="&#xe180;" d="M1200 1100v-56q-4 0 -11 -0.5t-24 -3t-30 -7.5t-24 -15t-11 -24v-888q0 -22 25 -34.5t50 -13.5l25 -2v-56h-400v56q75 0 87.5 6.5t12.5 43.5v394h-500v-394q0 -37 12.5 -43.5t87.5 -6.5v-56h-400v56q4 0 11 0.5t24 3t30 7.5t24 15t11 24v888q0 22 -25 34.5t-50 13.5 l-25 2v56h400v-56q-75 0 -87.5 -6.5t-12.5 -43.5v-394h500v394q0 37 -12.5 43.5t-87.5 6.5v56h400z" />
<glyph unicode="&#xe181;" d="M675 1000h375q21 0 35.5 -14.5t14.5 -35.5v-150h-105l-295 -98v98l-200 200h-400l100 100h375zM100 900h300q41 0 70.5 -29.5t29.5 -70.5v-500q0 -41 -29.5 -70.5t-70.5 -29.5h-300q-41 0 -70.5 29.5t-29.5 70.5v500q0 41 29.5 70.5t70.5 29.5zM100 800v-200h300v200 h-300zM1100 535l-400 -133v163l400 133v-163zM100 500v-200h300v200h-300zM1100 398v-248q0 -21 -14.5 -35.5t-35.5 -14.5h-375l-100 -100h-375l-100 100h400l200 200h105z" />
<glyph unicode="&#xe182;" d="M17 1007l162 162q17 17 40 14t37 -22l139 -194q14 -20 11 -44.5t-20 -41.5l-119 -118q102 -142 228 -268t267 -227l119 118q17 17 42.5 19t44.5 -12l192 -136q19 -14 22.5 -37.5t-13.5 -40.5l-163 -162q-3 -1 -9.5 -1t-29.5 2t-47.5 6t-62.5 14.5t-77.5 26.5t-90 42.5 t-101.5 60t-111 83t-119 108.5q-74 74 -133.5 150.5t-94.5 138.5t-60 119.5t-34.5 100t-15 74.5t-4.5 48z" />
<glyph unicode="&#xe183;" d="M600 1100q92 0 175 -10.5t141.5 -27t108.5 -36.5t81.5 -40t53.5 -37t31 -27l9 -10v-200q0 -21 -14.5 -33t-34.5 -9l-202 34q-20 3 -34.5 20t-14.5 38v146q-141 24 -300 24t-300 -24v-146q0 -21 -14.5 -38t-34.5 -20l-202 -34q-20 -3 -34.5 9t-14.5 33v200q3 4 9.5 10.5 t31 26t54 37.5t80.5 39.5t109 37.5t141 26.5t175 10.5zM600 795q56 0 97 -9.5t60 -23.5t30 -28t12 -24l1 -10v-50l365 -303q14 -15 24.5 -40t10.5 -45v-212q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v212q0 20 10.5 45t24.5 40l365 303v50 q0 4 1 10.5t12 23t30 29t60 22.5t97 10z" />
<glyph unicode="&#xe184;" d="M1100 700l-200 -200h-600l-200 200v500h200v-200h200v200h200v-200h200v200h200v-500zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-12l137 -100h-950l137 100h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5 t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="&#xe185;" d="M700 1100h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-1000h300v1000q0 41 -29.5 70.5t-70.5 29.5zM1100 800h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-700h300v700q0 41 -29.5 70.5t-70.5 29.5zM400 0h-300v400q0 41 29.5 70.5t70.5 29.5h100q41 0 70.5 -29.5t29.5 -70.5v-400z " />
<glyph unicode="&#xe186;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 700h-200v-100h200v-300h-300v100h200v100h-200v300h300v-100zM900 700v-300l-100 -100h-200v500h200z M700 700v-300h100v300h-100z" />
<glyph unicode="&#xe187;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 300h-100v200h-100v-200h-100v500h100v-200h100v200h100v-500zM900 700v-300l-100 -100h-200v500h200z M700 700v-300h100v300h-100z" />
<glyph unicode="&#xe188;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 700h-200v-300h200v-100h-300v500h300v-100zM900 700h-200v-300h200v-100h-300v500h300v-100z" />
<glyph unicode="&#xe189;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 400l-300 150l300 150v-300zM900 550l-300 -150v300z" />
<glyph unicode="&#xe190;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM900 300h-700v500h700v-500zM800 700h-130q-38 0 -66.5 -43t-28.5 -108t27 -107t68 -42h130v300zM300 700v-300 h130q41 0 68 42t27 107t-28.5 108t-66.5 43h-130z" />
<glyph unicode="&#xe191;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 700h-200v-100h200v-300h-300v100h200v100h-200v300h300v-100zM900 300h-100v400h-100v100h200v-500z M700 300h-100v100h100v-100z" />
<glyph unicode="&#xe192;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM300 700h200v-400h-300v500h100v-100zM900 300h-100v400h-100v100h200v-500zM300 600v-200h100v200h-100z M700 300h-100v100h100v-100z" />
<glyph unicode="&#xe193;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 500l-199 -200h-100v50l199 200v150h-200v100h300v-300zM900 300h-100v400h-100v100h200v-500zM701 300h-100 v100h100v-100z" />
<glyph unicode="&#xe194;" d="M600 1191q120 0 229.5 -47t188.5 -126t126 -188.5t47 -229.5t-47 -229.5t-126 -188.5t-188.5 -126t-229.5 -47t-229.5 47t-188.5 126t-126 188.5t-47 229.5t47 229.5t126 188.5t188.5 126t229.5 47zM600 1021q-114 0 -211 -56.5t-153.5 -153.5t-56.5 -211t56.5 -211 t153.5 -153.5t211 -56.5t211 56.5t153.5 153.5t56.5 211t-56.5 211t-153.5 153.5t-211 56.5zM800 700h-300v-200h300v-100h-300l-100 100v200l100 100h300v-100z" />
<glyph unicode="&#xe195;" d="M600 1191q120 0 229.5 -47t188.5 -126t126 -188.5t47 -229.5t-47 -229.5t-126 -188.5t-188.5 -126t-229.5 -47t-229.5 47t-188.5 126t-126 188.5t-47 229.5t47 229.5t126 188.5t188.5 126t229.5 47zM600 1021q-114 0 -211 -56.5t-153.5 -153.5t-56.5 -211t56.5 -211 t153.5 -153.5t211 -56.5t211 56.5t153.5 153.5t56.5 211t-56.5 211t-153.5 153.5t-211 56.5zM800 700v-100l-50 -50l100 -100v-50h-100l-100 100h-150v-100h-100v400h300zM500 700v-100h200v100h-200z" />
<glyph unicode="&#xe197;" d="M503 1089q110 0 200.5 -59.5t134.5 -156.5q44 14 90 14q120 0 205 -86.5t85 -207t-85 -207t-205 -86.5h-128v250q0 21 -14.5 35.5t-35.5 14.5h-300q-21 0 -35.5 -14.5t-14.5 -35.5v-250h-222q-80 0 -136 57.5t-56 136.5q0 69 43 122.5t108 67.5q-2 19 -2 37q0 100 49 185 t134 134t185 49zM525 500h150q10 0 17.5 -7.5t7.5 -17.5v-275h137q21 0 26 -11.5t-8 -27.5l-223 -244q-13 -16 -32 -16t-32 16l-223 244q-13 16 -8 27.5t26 11.5h137v275q0 10 7.5 17.5t17.5 7.5z" />
<glyph unicode="&#xe198;" d="M502 1089q110 0 201 -59.5t135 -156.5q43 15 89 15q121 0 206 -86.5t86 -206.5q0 -99 -60 -181t-150 -110l-378 360q-13 16 -31.5 16t-31.5 -16l-381 -365h-9q-79 0 -135.5 57.5t-56.5 136.5q0 69 43 122.5t108 67.5q-2 19 -2 38q0 100 49 184.5t133.5 134t184.5 49.5z M632 467l223 -228q13 -16 8 -27.5t-26 -11.5h-137v-275q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v275h-137q-21 0 -26 11.5t8 27.5q199 204 223 228q19 19 31.5 19t32.5 -19z" />
<glyph unicode="&#xe199;" d="M700 100v100h400l-270 300h170l-270 300h170l-300 333l-300 -333h170l-270 -300h170l-270 -300h400v-100h-50q-21 0 -35.5 -14.5t-14.5 -35.5v-50h400v50q0 21 -14.5 35.5t-35.5 14.5h-50z" />
<glyph unicode="&#xe200;" d="M600 1179q94 0 167.5 -56.5t99.5 -145.5q89 -6 150.5 -71.5t61.5 -155.5q0 -61 -29.5 -112.5t-79.5 -82.5q9 -29 9 -55q0 -74 -52.5 -126.5t-126.5 -52.5q-55 0 -100 30v-251q21 0 35.5 -14.5t14.5 -35.5v-50h-300v50q0 21 14.5 35.5t35.5 14.5v251q-45 -30 -100 -30 q-74 0 -126.5 52.5t-52.5 126.5q0 18 4 38q-47 21 -75.5 65t-28.5 97q0 74 52.5 126.5t126.5 52.5q5 0 23 -2q0 2 -1 10t-1 13q0 116 81.5 197.5t197.5 81.5z" />
<glyph unicode="&#xe201;" d="M1010 1010q111 -111 150.5 -260.5t0 -299t-150.5 -260.5q-83 -83 -191.5 -126.5t-218.5 -43.5t-218.5 43.5t-191.5 126.5q-111 111 -150.5 260.5t0 299t150.5 260.5q83 83 191.5 126.5t218.5 43.5t218.5 -43.5t191.5 -126.5zM476 1065q-4 0 -8 -1q-121 -34 -209.5 -122.5 t-122.5 -209.5q-4 -12 2.5 -23t18.5 -14l36 -9q3 -1 7 -1q23 0 29 22q27 96 98 166q70 71 166 98q11 3 17.5 13.5t3.5 22.5l-9 35q-3 13 -14 19q-7 4 -15 4zM512 920q-4 0 -9 -2q-80 -24 -138.5 -82.5t-82.5 -138.5q-4 -13 2 -24t19 -14l34 -9q4 -1 8 -1q22 0 28 21 q18 58 58.5 98.5t97.5 58.5q12 3 18 13.5t3 21.5l-9 35q-3 12 -14 19q-7 4 -15 4zM719.5 719.5q-49.5 49.5 -119.5 49.5t-119.5 -49.5t-49.5 -119.5t49.5 -119.5t119.5 -49.5t119.5 49.5t49.5 119.5t-49.5 119.5zM855 551q-22 0 -28 -21q-18 -58 -58.5 -98.5t-98.5 -57.5 q-11 -4 -17 -14.5t-3 -21.5l9 -35q3 -12 14 -19q7 -4 15 -4q4 0 9 2q80 24 138.5 82.5t82.5 138.5q4 13 -2.5 24t-18.5 14l-34 9q-4 1 -8 1zM1000 515q-23 0 -29 -22q-27 -96 -98 -166q-70 -71 -166 -98q-11 -3 -17.5 -13.5t-3.5 -22.5l9 -35q3 -13 14 -19q7 -4 15 -4 q4 0 8 1q121 34 209.5 122.5t122.5 209.5q4 12 -2.5 23t-18.5 14l-36 9q-3 1 -7 1z" />
<glyph unicode="&#xe202;" d="M700 800h300v-380h-180v200h-340v-200h-380v755q0 10 7.5 17.5t17.5 7.5h575v-400zM1000 900h-200v200zM700 300h162l-212 -212l-212 212h162v200h100v-200zM520 0h-395q-10 0 -17.5 7.5t-7.5 17.5v395zM1000 220v-195q0 -10 -7.5 -17.5t-17.5 -7.5h-195z" />
<glyph unicode="&#xe203;" d="M700 800h300v-520l-350 350l-550 -550v1095q0 10 7.5 17.5t17.5 7.5h575v-400zM1000 900h-200v200zM862 200h-162v-200h-100v200h-162l212 212zM480 0h-355q-10 0 -17.5 7.5t-7.5 17.5v55h380v-80zM1000 80v-55q0 -10 -7.5 -17.5t-17.5 -7.5h-155v80h180z" />
<glyph unicode="&#xe204;" d="M1162 800h-162v-200h100l100 -100h-300v300h-162l212 212zM200 800h200q27 0 40 -2t29.5 -10.5t23.5 -30t7 -57.5h300v-100h-600l-200 -350v450h100q0 36 7 57.5t23.5 30t29.5 10.5t40 2zM800 400h240l-240 -400h-800l300 500h500v-100z" />
<glyph unicode="&#xe205;" d="M650 1100h100q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h50v50q0 21 14.5 35.5t35.5 14.5zM1000 850v150q41 0 70.5 -29.5t29.5 -70.5v-800 q0 -41 -29.5 -70.5t-70.5 -29.5h-600q-1 0 -20 4l246 246l-326 326v324q0 41 29.5 70.5t70.5 29.5v-150q0 -62 44 -106t106 -44h300q62 0 106 44t44 106zM412 250l-212 -212v162h-200v100h200v162z" />
<glyph unicode="&#xe206;" d="M450 1100h100q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h50v50q0 21 14.5 35.5t35.5 14.5zM800 850v150q41 0 70.5 -29.5t29.5 -70.5v-500 h-200v-300h200q0 -36 -7 -57.5t-23.5 -30t-29.5 -10.5t-40 -2h-600q-41 0 -70.5 29.5t-29.5 70.5v800q0 41 29.5 70.5t70.5 29.5v-150q0 -62 44 -106t106 -44h300q62 0 106 44t44 106zM1212 250l-212 -212v162h-200v100h200v162z" />
<glyph unicode="&#xe209;" d="M658 1197l637 -1104q23 -38 7 -65.5t-60 -27.5h-1276q-44 0 -60 27.5t7 65.5l637 1104q22 39 54 39t54 -39zM704 800h-208q-20 0 -32 -14.5t-8 -34.5l58 -302q4 -20 21.5 -34.5t37.5 -14.5h54q20 0 37.5 14.5t21.5 34.5l58 302q4 20 -8 34.5t-32 14.5zM500 300v-100h200 v100h-200z" />
<glyph unicode="&#xe210;" d="M425 1100h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM425 800h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5 t17.5 7.5zM825 800h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM25 500h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150 q0 10 7.5 17.5t17.5 7.5zM425 500h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM825 500h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5 v150q0 10 7.5 17.5t17.5 7.5zM25 200h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM425 200h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5 t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM825 200h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5z" />
<glyph unicode="&#xe211;" d="M700 1200h100v-200h-100v-100h350q62 0 86.5 -39.5t-3.5 -94.5l-66 -132q-41 -83 -81 -134h-772q-40 51 -81 134l-66 132q-28 55 -3.5 94.5t86.5 39.5h350v100h-100v200h100v100h200v-100zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-12l137 -100 h-950l138 100h-13q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="&#xe212;" d="M600 1300q40 0 68.5 -29.5t28.5 -70.5h-194q0 41 28.5 70.5t68.5 29.5zM443 1100h314q18 -37 18 -75q0 -8 -3 -25h328q41 0 44.5 -16.5t-30.5 -38.5l-175 -145h-678l-178 145q-34 22 -29 38.5t46 16.5h328q-3 17 -3 25q0 38 18 75zM250 700h700q21 0 35.5 -14.5 t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-150v-200l275 -200h-950l275 200v200h-150q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="&#xe213;" d="M600 1181q75 0 128 -53t53 -128t-53 -128t-128 -53t-128 53t-53 128t53 128t128 53zM602 798h46q34 0 55.5 -28.5t21.5 -86.5q0 -76 39 -183h-324q39 107 39 183q0 58 21.5 86.5t56.5 28.5h45zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-13 l138 -100h-950l137 100h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="&#xe214;" d="M600 1300q47 0 92.5 -53.5t71 -123t25.5 -123.5q0 -78 -55.5 -133.5t-133.5 -55.5t-133.5 55.5t-55.5 133.5q0 62 34 143l144 -143l111 111l-163 163q34 26 63 26zM602 798h46q34 0 55.5 -28.5t21.5 -86.5q0 -76 39 -183h-324q39 107 39 183q0 58 21.5 86.5t56.5 28.5h45 zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-13l138 -100h-950l137 100h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="&#xe215;" d="M600 1200l300 -161v-139h-300q0 -57 18.5 -108t50 -91.5t63 -72t70 -67.5t57.5 -61h-530q-60 83 -90.5 177.5t-30.5 178.5t33 164.5t87.5 139.5t126 96.5t145.5 41.5v-98zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-13l138 -100h-950l137 100 h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="&#xe216;" d="M600 1300q41 0 70.5 -29.5t29.5 -70.5v-78q46 -26 73 -72t27 -100v-50h-400v50q0 54 27 100t73 72v78q0 41 29.5 70.5t70.5 29.5zM400 800h400q54 0 100 -27t72 -73h-172v-100h200v-100h-200v-100h200v-100h-200v-100h200q0 -83 -58.5 -141.5t-141.5 -58.5h-400 q-83 0 -141.5 58.5t-58.5 141.5v400q0 83 58.5 141.5t141.5 58.5z" />
<glyph unicode="&#xe218;" d="M150 1100h900q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v500q0 21 14.5 35.5t35.5 14.5zM125 400h950q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-283l224 -224q13 -13 13 -31.5t-13 -32 t-31.5 -13.5t-31.5 13l-88 88h-524l-87 -88q-13 -13 -32 -13t-32 13.5t-13 32t13 31.5l224 224h-289q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM541 300l-100 -100h324l-100 100h-124z" />
<glyph unicode="&#xe219;" d="M200 1100h800q83 0 141.5 -58.5t58.5 -141.5v-200h-100q0 41 -29.5 70.5t-70.5 29.5h-250q-41 0 -70.5 -29.5t-29.5 -70.5h-100q0 41 -29.5 70.5t-70.5 29.5h-250q-41 0 -70.5 -29.5t-29.5 -70.5h-100v200q0 83 58.5 141.5t141.5 58.5zM100 600h1000q41 0 70.5 -29.5 t29.5 -70.5v-300h-1200v300q0 41 29.5 70.5t70.5 29.5zM300 100v-50q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v50h200zM1100 100v-50q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v50h200z" />
<glyph unicode="&#xe221;" d="M480 1165l682 -683q31 -31 31 -75.5t-31 -75.5l-131 -131h-481l-517 518q-32 31 -32 75.5t32 75.5l295 296q31 31 75.5 31t76.5 -31zM108 794l342 -342l303 304l-341 341zM250 100h800q21 0 35.5 -14.5t14.5 -35.5v-50h-900v50q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="&#xe223;" d="M1057 647l-189 506q-8 19 -27.5 33t-40.5 14h-400q-21 0 -40.5 -14t-27.5 -33l-189 -506q-8 -19 1.5 -33t30.5 -14h625v-150q0 -21 14.5 -35.5t35.5 -14.5t35.5 14.5t14.5 35.5v150h125q21 0 30.5 14t1.5 33zM897 0h-595v50q0 21 14.5 35.5t35.5 14.5h50v50 q0 21 14.5 35.5t35.5 14.5h48v300h200v-300h47q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-50z" />
<glyph unicode="&#xe224;" d="M900 800h300v-575q0 -10 -7.5 -17.5t-17.5 -7.5h-375v591l-300 300v84q0 10 7.5 17.5t17.5 7.5h375v-400zM1200 900h-200v200zM400 600h300v-575q0 -10 -7.5 -17.5t-17.5 -7.5h-650q-10 0 -17.5 7.5t-7.5 17.5v950q0 10 7.5 17.5t17.5 7.5h375v-400zM700 700h-200v200z " />
<glyph unicode="&#xe225;" d="M484 1095h195q75 0 146 -32.5t124 -86t89.5 -122.5t48.5 -142q18 -14 35 -20q31 -10 64.5 6.5t43.5 48.5q10 34 -15 71q-19 27 -9 43q5 8 12.5 11t19 -1t23.5 -16q41 -44 39 -105q-3 -63 -46 -106.5t-104 -43.5h-62q-7 -55 -35 -117t-56 -100l-39 -234q-3 -20 -20 -34.5 t-38 -14.5h-100q-21 0 -33 14.5t-9 34.5l12 70q-49 -14 -91 -14h-195q-24 0 -65 8l-11 -64q-3 -20 -20 -34.5t-38 -14.5h-100q-21 0 -33 14.5t-9 34.5l26 157q-84 74 -128 175l-159 53q-19 7 -33 26t-14 40v50q0 21 14.5 35.5t35.5 14.5h124q11 87 56 166l-111 95 q-16 14 -12.5 23.5t24.5 9.5h203q116 101 250 101zM675 1000h-250q-10 0 -17.5 -7.5t-7.5 -17.5v-50q0 -10 7.5 -17.5t17.5 -7.5h250q10 0 17.5 7.5t7.5 17.5v50q0 10 -7.5 17.5t-17.5 7.5z" />
<glyph unicode="&#xe226;" d="M641 900l423 247q19 8 42 2.5t37 -21.5l32 -38q14 -15 12.5 -36t-17.5 -34l-139 -120h-390zM50 1100h106q67 0 103 -17t66 -71l102 -212h823q21 0 35.5 -14.5t14.5 -35.5v-50q0 -21 -14 -40t-33 -26l-737 -132q-23 -4 -40 6t-26 25q-42 67 -100 67h-300q-62 0 -106 44 t-44 106v200q0 62 44 106t106 44zM173 928h-80q-19 0 -28 -14t-9 -35v-56q0 -51 42 -51h134q16 0 21.5 8t5.5 24q0 11 -16 45t-27 51q-18 28 -43 28zM550 727q-32 0 -54.5 -22.5t-22.5 -54.5t22.5 -54.5t54.5 -22.5t54.5 22.5t22.5 54.5t-22.5 54.5t-54.5 22.5zM130 389 l152 130q18 19 34 24t31 -3.5t24.5 -17.5t25.5 -28q28 -35 50.5 -51t48.5 -13l63 5l48 -179q13 -61 -3.5 -97.5t-67.5 -79.5l-80 -69q-47 -40 -109 -35.5t-103 51.5l-130 151q-40 47 -35.5 109.5t51.5 102.5zM380 377l-102 -88q-31 -27 2 -65l37 -43q13 -15 27.5 -19.5 t31.5 6.5l61 53q19 16 14 49q-2 20 -12 56t-17 45q-11 12 -19 14t-23 -8z" />
<glyph unicode="&#xe227;" d="M625 1200h150q10 0 17.5 -7.5t7.5 -17.5v-109q79 -33 131 -87.5t53 -128.5q1 -46 -15 -84.5t-39 -61t-46 -38t-39 -21.5l-17 -6q6 0 15 -1.5t35 -9t50 -17.5t53 -30t50 -45t35.5 -64t14.5 -84q0 -59 -11.5 -105.5t-28.5 -76.5t-44 -51t-49.5 -31.5t-54.5 -16t-49.5 -6.5 t-43.5 -1v-75q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v75h-100v-75q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v75h-175q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h75v600h-75q-10 0 -17.5 7.5t-7.5 17.5v150 q0 10 7.5 17.5t17.5 7.5h175v75q0 10 7.5 17.5t17.5 7.5h150q10 0 17.5 -7.5t7.5 -17.5v-75h100v75q0 10 7.5 17.5t17.5 7.5zM400 900v-200h263q28 0 48.5 10.5t30 25t15 29t5.5 25.5l1 10q0 4 -0.5 11t-6 24t-15 30t-30 24t-48.5 11h-263zM400 500v-200h363q28 0 48.5 10.5 t30 25t15 29t5.5 25.5l1 10q0 4 -0.5 11t-6 24t-15 30t-30 24t-48.5 11h-363z" />
<glyph unicode="&#xe230;" d="M212 1198h780q86 0 147 -61t61 -147v-416q0 -51 -18 -142.5t-36 -157.5l-18 -66q-29 -87 -93.5 -146.5t-146.5 -59.5h-572q-82 0 -147 59t-93 147q-8 28 -20 73t-32 143.5t-20 149.5v416q0 86 61 147t147 61zM600 1045q-70 0 -132.5 -11.5t-105.5 -30.5t-78.5 -41.5 t-57 -45t-36 -41t-20.5 -30.5l-6 -12l156 -243h560l156 243q-2 5 -6 12.5t-20 29.5t-36.5 42t-57 44.5t-79 42t-105 29.5t-132.5 12zM762 703h-157l195 261z" />
<glyph unicode="&#xe231;" d="M475 1300h150q103 0 189 -86t86 -189v-500q0 -41 -42 -83t-83 -42h-450q-41 0 -83 42t-42 83v500q0 103 86 189t189 86zM700 300v-225q0 -21 -27 -48t-48 -27h-150q-21 0 -48 27t-27 48v225h300z" />
<glyph unicode="&#xe232;" d="M475 1300h96q0 -150 89.5 -239.5t239.5 -89.5v-446q0 -41 -42 -83t-83 -42h-450q-41 0 -83 42t-42 83v500q0 103 86 189t189 86zM700 300v-225q0 -21 -27 -48t-48 -27h-150q-21 0 -48 27t-27 48v225h300z" />
<glyph unicode="&#xe233;" d="M1294 767l-638 -283l-378 170l-78 -60v-224l100 -150v-199l-150 148l-150 -149v200l100 150v250q0 4 -0.5 10.5t0 9.5t1 8t3 8t6.5 6l47 40l-147 65l642 283zM1000 380l-350 -166l-350 166v147l350 -165l350 165v-147z" />
<glyph unicode="&#xe234;" d="M250 800q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM650 800q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM1050 800q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44z" />
<glyph unicode="&#xe235;" d="M550 1100q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM550 700q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM550 300q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44z" />
<glyph unicode="&#xe236;" d="M125 1100h950q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-950q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM125 700h950q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-950q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5 t17.5 7.5zM125 300h950q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-950q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5z" />
<glyph unicode="&#xe237;" d="M350 1200h500q162 0 256 -93.5t94 -256.5v-500q0 -165 -93.5 -257.5t-256.5 -92.5h-500q-165 0 -257.5 92.5t-92.5 257.5v500q0 165 92.5 257.5t257.5 92.5zM900 1000h-600q-41 0 -70.5 -29.5t-29.5 -70.5v-600q0 -41 29.5 -70.5t70.5 -29.5h600q41 0 70.5 29.5 t29.5 70.5v600q0 41 -29.5 70.5t-70.5 29.5zM350 900h500q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -14.5 -35.5t-35.5 -14.5h-500q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 14.5 35.5t35.5 14.5zM400 800v-200h400v200h-400z" />
<glyph unicode="&#xe238;" d="M150 1100h1000q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-200h50q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-200h50q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-200h50q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5 t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5h50v200h-50q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5h50v200h-50q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5h50v200h-50q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5z" />
<glyph unicode="&#xe239;" d="M650 1187q87 -67 118.5 -156t0 -178t-118.5 -155q-87 66 -118.5 155t0 178t118.5 156zM300 800q124 0 212 -88t88 -212q-124 0 -212 88t-88 212zM1000 800q0 -124 -88 -212t-212 -88q0 124 88 212t212 88zM300 500q124 0 212 -88t88 -212q-124 0 -212 88t-88 212z M1000 500q0 -124 -88 -212t-212 -88q0 124 88 212t212 88zM700 199v-144q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v142q40 -4 43 -4q17 0 57 6z" />
<glyph unicode="&#xe240;" d="M745 878l69 19q25 6 45 -12l298 -295q11 -11 15 -26.5t-2 -30.5q-5 -14 -18 -23.5t-28 -9.5h-8q1 0 1 -13q0 -29 -2 -56t-8.5 -62t-20 -63t-33 -53t-51 -39t-72.5 -14h-146q-184 0 -184 288q0 24 10 47q-20 4 -62 4t-63 -4q11 -24 11 -47q0 -288 -184 -288h-142 q-48 0 -84.5 21t-56 51t-32 71.5t-16 75t-3.5 68.5q0 13 2 13h-7q-15 0 -27.5 9.5t-18.5 23.5q-6 15 -2 30.5t15 25.5l298 296q20 18 46 11l76 -19q20 -5 30.5 -22.5t5.5 -37.5t-22.5 -31t-37.5 -5l-51 12l-182 -193h891l-182 193l-44 -12q-20 -5 -37.5 6t-22.5 31t6 37.5 t31 22.5z" />
<glyph unicode="&#xe241;" d="M1200 900h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-200v-850q0 -22 25 -34.5t50 -13.5l25 -2v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v850h-200q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h1000v-300zM500 450h-25q0 15 -4 24.5t-9 14.5t-17 7.5t-20 3t-25 0.5h-100v-425q0 -11 12.5 -17.5t25.5 -7.5h12v-50h-200v50q50 0 50 25v425h-100q-17 0 -25 -0.5t-20 -3t-17 -7.5t-9 -14.5t-4 -24.5h-25v150h500v-150z" />
<glyph unicode="&#xe242;" d="M1000 300v50q-25 0 -55 32q-14 14 -25 31t-16 27l-4 11l-289 747h-69l-300 -754q-18 -35 -39 -56q-9 -9 -24.5 -18.5t-26.5 -14.5l-11 -5v-50h273v50q-49 0 -78.5 21.5t-11.5 67.5l69 176h293l61 -166q13 -34 -3.5 -66.5t-55.5 -32.5v-50h312zM412 691l134 342l121 -342 h-255zM1100 150v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5 -35.5z" />
<glyph unicode="&#xe243;" d="M50 1200h1100q21 0 35.5 -14.5t14.5 -35.5v-1100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v1100q0 21 14.5 35.5t35.5 14.5zM611 1118h-70q-13 0 -18 -12l-299 -753q-17 -32 -35 -51q-18 -18 -56 -34q-12 -5 -12 -18v-50q0 -8 5.5 -14t14.5 -6 h273q8 0 14 6t6 14v50q0 8 -6 14t-14 6q-55 0 -71 23q-10 14 0 39l63 163h266l57 -153q11 -31 -6 -55q-12 -17 -36 -17q-8 0 -14 -6t-6 -14v-50q0 -8 6 -14t14 -6h313q8 0 14 6t6 14v50q0 7 -5.5 13t-13.5 7q-17 0 -42 25q-25 27 -40 63h-1l-288 748q-5 12 -19 12zM639 611 h-197l103 264z" />
<glyph unicode="&#xe244;" d="M1200 1100h-1200v100h1200v-100zM50 1000h400q21 0 35.5 -14.5t14.5 -35.5v-900q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v900q0 21 14.5 35.5t35.5 14.5zM650 1000h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM700 900v-300h300v300h-300z" />
<glyph unicode="&#xe245;" d="M50 1200h400q21 0 35.5 -14.5t14.5 -35.5v-900q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v900q0 21 14.5 35.5t35.5 14.5zM650 700h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400 q0 21 14.5 35.5t35.5 14.5zM700 600v-300h300v300h-300zM1200 0h-1200v100h1200v-100z" />
<glyph unicode="&#xe246;" d="M50 1000h400q21 0 35.5 -14.5t14.5 -35.5v-350h100v150q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-150h100v-100h-100v-150q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v150h-100v-350q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5v800q0 21 14.5 35.5t35.5 14.5zM700 700v-300h300v300h-300z" />
<glyph unicode="&#xe247;" d="M100 0h-100v1200h100v-1200zM250 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM300 1000v-300h300v300h-300zM250 500h900q21 0 35.5 -14.5t14.5 -35.5v-400 q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="&#xe248;" d="M600 1100h150q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-150v-100h450q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5h350v100h-150q-21 0 -35.5 14.5 t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5h150v100h100v-100zM400 1000v-300h300v300h-300z" />
<glyph unicode="&#xe249;" d="M1200 0h-100v1200h100v-1200zM550 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM600 1000v-300h300v300h-300zM50 500h900q21 0 35.5 -14.5t14.5 -35.5v-400 q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="&#xe250;" d="M865 565l-494 -494q-23 -23 -41 -23q-14 0 -22 13.5t-8 38.5v1000q0 25 8 38.5t22 13.5q18 0 41 -23l494 -494q14 -14 14 -35t-14 -35z" />
<glyph unicode="&#xe251;" d="M335 635l494 494q29 29 50 20.5t21 -49.5v-1000q0 -41 -21 -49.5t-50 20.5l-494 494q-14 14 -14 35t14 35z" />
<glyph unicode="&#xe252;" d="M100 900h1000q41 0 49.5 -21t-20.5 -50l-494 -494q-14 -14 -35 -14t-35 14l-494 494q-29 29 -20.5 50t49.5 21z" />
<glyph unicode="&#xe253;" d="M635 865l494 -494q29 -29 20.5 -50t-49.5 -21h-1000q-41 0 -49.5 21t20.5 50l494 494q14 14 35 14t35 -14z" />
<glyph unicode="&#xe254;" d="M700 741v-182l-692 -323v221l413 193l-413 193v221zM1200 0h-800v200h800v-200z" />
<glyph unicode="&#xe255;" d="M1200 900h-200v-100h200v-100h-300v300h200v100h-200v100h300v-300zM0 700h50q0 21 4 37t9.5 26.5t18 17.5t22 11t28.5 5.5t31 2t37 0.5h100v-550q0 -22 -25 -34.5t-50 -13.5l-25 -2v-100h400v100q-4 0 -11 0.5t-24 3t-30 7t-24 15t-11 24.5v550h100q25 0 37 -0.5t31 -2 t28.5 -5.5t22 -11t18 -17.5t9.5 -26.5t4 -37h50v300h-800v-300z" />
<glyph unicode="&#xe256;" d="M800 700h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-100v-550q0 -22 25 -34.5t50 -14.5l25 -1v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v550h-100q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h800v-300zM1100 200h-200v-100h200v-100h-300v300h200v100h-200v100h300v-300z" />
<glyph unicode="&#xe257;" d="M701 1098h160q16 0 21 -11t-7 -23l-464 -464l464 -464q12 -12 7 -23t-21 -11h-160q-13 0 -23 9l-471 471q-7 8 -7 18t7 18l471 471q10 9 23 9z" />
<glyph unicode="&#xe258;" d="M339 1098h160q13 0 23 -9l471 -471q7 -8 7 -18t-7 -18l-471 -471q-10 -9 -23 -9h-160q-16 0 -21 11t7 23l464 464l-464 464q-12 12 -7 23t21 11z" />
<glyph unicode="&#xe259;" d="M1087 882q11 -5 11 -21v-160q0 -13 -9 -23l-471 -471q-8 -7 -18 -7t-18 7l-471 471q-9 10 -9 23v160q0 16 11 21t23 -7l464 -464l464 464q12 12 23 7z" />
<glyph unicode="&#xe260;" d="M618 993l471 -471q9 -10 9 -23v-160q0 -16 -11 -21t-23 7l-464 464l-464 -464q-12 -12 -23 -7t-11 21v160q0 13 9 23l471 471q8 7 18 7t18 -7z" />
<glyph unicode="&#xf8ff;" d="M1000 1200q0 -124 -88 -212t-212 -88q0 124 88 212t212 88zM450 1000h100q21 0 40 -14t26 -33l79 -194q5 1 16 3q34 6 54 9.5t60 7t65.5 1t61 -10t56.5 -23t42.5 -42t29 -64t5 -92t-19.5 -121.5q-1 -7 -3 -19.5t-11 -50t-20.5 -73t-32.5 -81.5t-46.5 -83t-64 -70 t-82.5 -50q-13 -5 -42 -5t-65.5 2.5t-47.5 2.5q-14 0 -49.5 -3.5t-63 -3.5t-43.5 7q-57 25 -104.5 78.5t-75 111.5t-46.5 112t-26 90l-7 35q-15 63 -18 115t4.5 88.5t26 64t39.5 43.5t52 25.5t58.5 13t62.5 2t59.5 -4.5t55.5 -8l-147 192q-12 18 -5.5 30t27.5 12z" />
<glyph unicode="&#x1f511;" d="M250 1200h600q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-150v-500l-255 -178q-19 -9 -32 -1t-13 29v650h-150q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM400 1100v-100h300v100h-300z" />
<glyph unicode="&#x1f6aa;" d="M250 1200h750q39 0 69.5 -40.5t30.5 -84.5v-933l-700 -117v950l600 125h-700v-1000h-100v1025q0 23 15.5 49t34.5 26zM500 525v-100l100 20v100z" />
</font>
</defs></svg>

After

Width:  |  Height:  |  Size: 106 KiB

File diff suppressed because one or more lines are too long

View file

@ -186,3 +186,14 @@ footer .dcl-link-separator::before {
background: transparent !important;
resize: none;
}
.existing-keys-title {
font-weight: bold;
font-size: 14px;
}
@media(max-width:767px) {
.vspace-top {
margin-top: 35px;
}
}

View file

@ -532,6 +532,7 @@
.order-detail-container .total-price {
font-size: 18px;
line-height: 20px;
}
@media (max-width: 767px) {

View file

@ -73,6 +73,7 @@ textarea {
.navbar {
transition: all .3s ease-in;
font-weight: 400;
}
.navbar-default .navbar-nav>.open>a,

View file

@ -0,0 +1,8 @@
/*
HTML5 Shiv v3.7.0 | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed
*/
(function(l,f){function m(){var a=e.elements;return"string"==typeof a?a.split(" "):a}function i(a){var b=n[a[o]];b||(b={},h++,a[o]=h,n[h]=b);return b}function p(a,b,c){b||(b=f);if(g)return b.createElement(a);c||(c=i(b));b=c.cache[a]?c.cache[a].cloneNode():r.test(a)?(c.cache[a]=c.createElem(a)).cloneNode():c.createElem(a);return b.canHaveChildren&&!s.test(a)?c.frag.appendChild(b):b}function t(a,b){if(!b.cache)b.cache={},b.createElem=a.createElement,b.createFrag=a.createDocumentFragment,b.frag=b.createFrag();
a.createElement=function(c){return!e.shivMethods?b.createElem(c):p(c,a,b)};a.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+m().join().replace(/[\w\-]+/g,function(a){b.createElem(a);b.frag.createElement(a);return'c("'+a+'")'})+");return n}")(e,b.frag)}function q(a){a||(a=f);var b=i(a);if(e.shivCSS&&!j&&!b.hasCSS){var c,d=a;c=d.createElement("p");d=d.getElementsByTagName("head")[0]||d.documentElement;c.innerHTML="x<style>article,aside,dialog,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}mark{background:#FF0;color:#000}template{display:none}</style>";
c=d.insertBefore(c.lastChild,d.firstChild);b.hasCSS=!!c}g||t(a,b);return a}var k=l.html5||{},s=/^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i,r=/^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i,j,o="_html5shiv",h=0,n={},g;(function(){try{var a=f.createElement("a");a.innerHTML="<xyz></xyz>";j="hidden"in a;var b;if(!(b=1==a.childNodes.length)){f.createElement("a");var c=f.createDocumentFragment();b="undefined"==typeof c.cloneNode||
"undefined"==typeof c.createDocumentFragment||"undefined"==typeof c.createElement}g=b}catch(d){g=j=!0}})();var e={elements:k.elements||"abbr article aside audio bdi canvas data datalist details dialog figcaption figure footer header hgroup main mark meter nav output progress section summary template time video",version:"3.7.0",shivCSS:!1!==k.shivCSS,supportsUnknownElements:g,shivMethods:!1!==k.shivMethods,type:"default",shivDocument:q,createElement:p,createDocumentFragment:function(a,b){a||(a=f);
if(g)return a.createDocumentFragment();for(var b=b||i(a),c=b.frag.cloneNode(),d=0,e=m(),h=e.length;d<h;d++)c.createElement(e[d]);return c}};l.html5=e;q(f)})(this,document);

File diff suppressed because one or more lines are too long

View file

@ -77,16 +77,18 @@
}
function _navScroll() {
if ($(window).scrollTop() > 10) {
$(".navbar").removeClass("navbar-transparent");
$(".navbar-default .btn-link").css("color", "#777");
$(".dropdown-menu").removeClass("navbar-transparent");
$(".dropdown-menu > li > a").css("color", "#777");
} else {
$(".navbar").addClass("navbar-transparent");
$(".navbar-default .btn-link").css("color", "#fff");
$(".dropdown-menu").addClass("navbar-transparent");
$(".dropdown-menu > li > a").css("color", "#fff");
if (!window.non_transparent_navbar_always) {
if ($(window).scrollTop() > 10) {
$(".navbar").removeClass("navbar-transparent");
$(".navbar-default .btn-link").css("color", "#777");
$(".dropdown-menu").removeClass("navbar-transparent");
$(".dropdown-menu > li > a").css("color", "#777");
} else {
$(".navbar").addClass("navbar-transparent");
$(".navbar-default .btn-link").css("color", "#fff");
$(".dropdown-menu").addClass("navbar-transparent");
$(".dropdown-menu > li > a").css("color", "#fff");
}
}
}
@ -223,8 +225,8 @@
}
var total = (cardPricing['cpu'].value * window.coresUnitPrice) +
(cardPricing['ram'].value * window.ramUnitPrice) +
(cardPricing['storage'].value * window.ssdUnitPrice) -
window.discountAmount;
(cardPricing['storage'].value * window.ssdUnitPrice) +
window.vmBasePrice - window.discountAmount;
total = parseFloat(total.toFixed(2));
$("#total").text(total);
}

View file

@ -0,0 +1,5 @@
/*! Respond.js v1.4.2: min/max-width media query polyfill * Copyright 2013 Scott Jehl
* Licensed under https://github.com/scottjehl/Respond/blob/master/LICENSE-MIT
* */
!function(a){"use strict";a.matchMedia=a.matchMedia||function(a){var b,c=a.documentElement,d=c.firstElementChild||c.firstChild,e=a.createElement("body"),f=a.createElement("div");return f.id="mq-test-1",f.style.cssText="position:absolute;top:-100em",e.style.background="none",e.appendChild(f),function(a){return f.innerHTML='&shy;<style media="'+a+'"> #mq-test-1 { width: 42px; }</style>',c.insertBefore(e,d),b=42===f.offsetWidth,c.removeChild(e),{matches:b,media:a}}}(a.document)}(this),function(a){"use strict";function b(){u(!0)}var c={};a.respond=c,c.update=function(){};var d=[],e=function(){var b=!1;try{b=new a.XMLHttpRequest}catch(c){b=new a.ActiveXObject("Microsoft.XMLHTTP")}return function(){return b}}(),f=function(a,b){var c=e();c&&(c.open("GET",a,!0),c.onreadystatechange=function(){4!==c.readyState||200!==c.status&&304!==c.status||b(c.responseText)},4!==c.readyState&&c.send(null))};if(c.ajax=f,c.queue=d,c.regex={media:/@media[^\{]+\{([^\{\}]*\{[^\}\{]*\})+/gi,keyframes:/@(?:\-(?:o|moz|webkit)\-)?keyframes[^\{]+\{(?:[^\{\}]*\{[^\}\{]*\})+[^\}]*\}/gi,urls:/(url\()['"]?([^\/\)'"][^:\)'"]+)['"]?(\))/g,findStyles:/@media *([^\{]+)\{([\S\s]+?)$/,only:/(only\s+)?([a-zA-Z]+)\s?/,minw:/\([\s]*min\-width\s*:[\s]*([\s]*[0-9\.]+)(px|em)[\s]*\)/,maxw:/\([\s]*max\-width\s*:[\s]*([\s]*[0-9\.]+)(px|em)[\s]*\)/},c.mediaQueriesSupported=a.matchMedia&&null!==a.matchMedia("only all")&&a.matchMedia("only all").matches,!c.mediaQueriesSupported){var g,h,i,j=a.document,k=j.documentElement,l=[],m=[],n=[],o={},p=30,q=j.getElementsByTagName("head")[0]||k,r=j.getElementsByTagName("base")[0],s=q.getElementsByTagName("link"),t=function(){var a,b=j.createElement("div"),c=j.body,d=k.style.fontSize,e=c&&c.style.fontSize,f=!1;return b.style.cssText="position:absolute;font-size:1em;width:1em",c||(c=f=j.createElement("body"),c.style.background="none"),k.style.fontSize="100%",c.style.fontSize="100%",c.appendChild(b),f&&k.insertBefore(c,k.firstChild),a=b.offsetWidth,f?k.removeChild(c):c.removeChild(b),k.style.fontSize=d,e&&(c.style.fontSize=e),a=i=parseFloat(a)},u=function(b){var c="clientWidth",d=k[c],e="CSS1Compat"===j.compatMode&&d||j.body[c]||d,f={},o=s[s.length-1],r=(new Date).getTime();if(b&&g&&p>r-g)return a.clearTimeout(h),h=a.setTimeout(u,p),void 0;g=r;for(var v in l)if(l.hasOwnProperty(v)){var w=l[v],x=w.minw,y=w.maxw,z=null===x,A=null===y,B="em";x&&(x=parseFloat(x)*(x.indexOf(B)>-1?i||t():1)),y&&(y=parseFloat(y)*(y.indexOf(B)>-1?i||t():1)),w.hasquery&&(z&&A||!(z||e>=x)||!(A||y>=e))||(f[w.media]||(f[w.media]=[]),f[w.media].push(m[w.rules]))}for(var C in n)n.hasOwnProperty(C)&&n[C]&&n[C].parentNode===q&&q.removeChild(n[C]);n.length=0;for(var D in f)if(f.hasOwnProperty(D)){var E=j.createElement("style"),F=f[D].join("\n");E.type="text/css",E.media=D,q.insertBefore(E,o.nextSibling),E.styleSheet?E.styleSheet.cssText=F:E.appendChild(j.createTextNode(F)),n.push(E)}},v=function(a,b,d){var e=a.replace(c.regex.keyframes,"").match(c.regex.media),f=e&&e.length||0;b=b.substring(0,b.lastIndexOf("/"));var g=function(a){return a.replace(c.regex.urls,"$1"+b+"$2$3")},h=!f&&d;b.length&&(b+="/"),h&&(f=1);for(var i=0;f>i;i++){var j,k,n,o;h?(j=d,m.push(g(a))):(j=e[i].match(c.regex.findStyles)&&RegExp.$1,m.push(RegExp.$2&&g(RegExp.$2))),n=j.split(","),o=n.length;for(var p=0;o>p;p++)k=n[p],l.push({media:k.split("(")[0].match(c.regex.only)&&RegExp.$2||"all",rules:m.length-1,hasquery:k.indexOf("(")>-1,minw:k.match(c.regex.minw)&&parseFloat(RegExp.$1)+(RegExp.$2||""),maxw:k.match(c.regex.maxw)&&parseFloat(RegExp.$1)+(RegExp.$2||"")})}u()},w=function(){if(d.length){var b=d.shift();f(b.href,function(c){v(c,b.href,b.media),o[b.href]=!0,a.setTimeout(function(){w()},0)})}},x=function(){for(var b=0;b<s.length;b++){var c=s[b],e=c.href,f=c.media,g=c.rel&&"stylesheet"===c.rel.toLowerCase();e&&g&&!o[e]&&(c.styleSheet&&c.styleSheet.rawCssText?(v(c.styleSheet.rawCssText,e,f),o[e]=!0):(!/^([a-zA-Z:]*\/\/)/.test(e)&&!r||e.replace(RegExp.$1,"").split("/")[0]===a.location.host)&&("//"===e.substring(0,2)&&(e=a.location.protocol+e),d.push({href:e,media:f})))}w()};x(),c.update=x,c.getEmValue=t,a.addEventListener?a.addEventListener("resize",b,!1):a.attachEvent&&a.attachEvent("onresize",b)}}(this);

View file

@ -8,7 +8,6 @@ from django.core.mail import EmailMessage
from django.core.urlresolvers import reverse
from django.utils import translation
from django.utils.translation import ugettext_lazy as _
from time import sleep
from dynamicweb.celery import app
from hosting.models import HostingOrder
@ -16,7 +15,7 @@ from membership.models import CustomUser
from opennebula_api.models import OpenNebulaManager
from opennebula_api.serializers import VirtualMachineSerializer
from utils.hosting_utils import (
get_all_public_keys, get_or_create_vm_detail, ping_ok
get_all_public_keys, get_or_create_vm_detail
)
from utils.mailer import BaseEmail
from utils.stripe_utils import StripeUtils
@ -57,13 +56,8 @@ def create_vm_task(self, vm_template_id, user, specs, template, order_id):
"Running create_vm_task on {}".format(current_task.request.hostname))
vm_id = None
try:
final_price = (
specs.get('total_price') if 'total_price' in specs
else specs.get('price')
)
if 'pass' in user:
on_user = user.get('email')
on_user = user.get('username')
on_pass = user.get('pass')
logger.debug("Using user {user} to create VM".format(user=on_user))
vm_name = None
@ -79,172 +73,22 @@ def create_vm_task(self, vm_template_id, user, specs, template, order_id):
# Create OpenNebulaManager
manager = OpenNebulaManager(email=on_user, password=on_pass)
custom_user = CustomUser.objects.get(email=user.get('email'))
pub_keys = get_all_public_keys(custom_user)
if manager.email != settings.OPENNEBULA_USERNAME:
manager.save_key_in_opennebula_user('\n'.join(pub_keys))
vm_id = manager.create_vm(
template_id=vm_template_id,
specs=specs,
ssh_key=settings.ONEADMIN_USER_SSH_PUBLIC_KEY,
ssh_key='\n'.join(pub_keys),
vm_name=vm_name
)
if vm_id is None:
raise Exception("Could not create VM")
# Update HostingOrder with the created vm_id
hosting_order = HostingOrder.objects.filter(id=order_id).first()
error_msg = None
try:
hosting_order.vm_id = vm_id
hosting_order.save()
logger.debug(
"Updated hosting_order {} with vm_id={}".format(
hosting_order.id, vm_id
)
)
except Exception as ex:
error_msg = (
"HostingOrder with id {order_id} not found. This means that "
"the hosting order was not created and/or it is/was not "
"associated with VM with id {vm_id}. Details {details}".format(
order_id=order_id, vm_id=vm_id, details=str(ex)
)
)
logger.error(error_msg)
stripe_utils = StripeUtils()
result = stripe_utils.set_subscription_metadata(
subscription_id=hosting_order.subscription_id,
metadata={"VM_ID": str(vm_id)}
)
if result.get('error') is not None:
emsg = "Could not update subscription metadata for {sub}".format(
sub=hosting_order.subscription_id
)
logger.error(emsg)
if error_msg:
error_msg += ". " + emsg
else:
error_msg = emsg
vm = VirtualMachineSerializer(manager.get_vm(vm_id)).data
context = {
'name': user.get('name'),
'email': user.get('email'),
'cores': specs.get('cpu'),
'memory': specs.get('memory'),
'storage': specs.get('disk_size'),
'price': final_price,
'template': template.get('name'),
'vm_name': vm.get('name'),
'vm_id': vm['vm_id'],
'order_id': order_id
}
if error_msg:
context['errors'] = error_msg
if 'pricing_name' in specs:
context['pricing'] = str(VMPricing.get_vm_pricing_by_name(
name=specs['pricing_name']
))
email_data = {
'subject': settings.DCL_TEXT + " Order from %s" % context['email'],
'from_email': settings.DCL_SUPPORT_FROM_ADDRESS,
'to': ['info@ungleich.ch'],
'body': "\n".join(
["%s=%s" % (k, v) for (k, v) in context.items()]),
'reply_to': [context['email']],
}
email = EmailMessage(**email_data)
email.send()
if 'pass' in user:
lang = 'en-us'
if user.get('language') is not None:
logger.debug(
"Language is set to {}".format(user.get('language')))
lang = user.get('language')
translation.activate(lang)
# Send notification to the user as soon as VM has been booked
context = {
'base_url': "{0}://{1}".format(user.get('request_scheme'),
user.get('request_host')),
'order_url': reverse('hosting:orders',
kwargs={'pk': order_id}),
'page_header': _(
'Your New VM %(vm_name)s at Data Center Light') % {
'vm_name': vm.get('name')},
'vm_name': vm.get('name')
}
email_data = {
'subject': context.get('page_header'),
'to': user.get('email'),
'context': context,
'template_name': 'new_booked_vm',
'template_path': 'hosting/emails/',
'from_address': settings.DCL_SUPPORT_FROM_ADDRESS,
}
email = BaseEmail(**email_data)
email.send()
# try to see if we have the IPv6 of the new vm and that if the ssh
# keys can be configured
vm_ipv6 = manager.get_ipv6(vm_id)
logger.debug("New VM ID is {vm_id}".format(vm_id=vm_id))
if vm_ipv6 is not None:
custom_user = CustomUser.objects.get(email=user.get('email'))
get_or_create_vm_detail(custom_user, manager, vm_id)
if custom_user is not None:
public_keys = get_all_public_keys(custom_user)
keys = [{'value': key, 'state': True} for key in
public_keys]
if len(keys) > 0:
logger.debug(
"Calling configure on {host} for "
"{num_keys} keys".format(
host=vm_ipv6, num_keys=len(keys)
)
)
# Let's wait until the IP responds to ping before we
# run the cdist configure on the host
did_manage_public_key = False
for i in range(0, 15):
if ping_ok(vm_ipv6):
logger.debug(
"{} is pingable. Doing a "
"manage_public_key".format(vm_ipv6)
)
sleep(10)
manager.manage_public_key(
keys, hosts=[vm_ipv6]
)
did_manage_public_key = True
break
else:
logger.debug(
"Can't ping {}. Wait 5 secs".format(
vm_ipv6
)
)
sleep(5)
if not did_manage_public_key:
emsg = ("Waited for over 75 seconds for {} to be "
"pingable. But the VM was not reachable. "
"So, gave up manage_public_key. Please do "
"this manually".format(vm_ipv6))
logger.error(emsg)
email_data = {
'subject': '{} CELERY TASK INCOMPLETE: {} not '
'pingable for 75 seconds'.format(
settings.DCL_TEXT, vm_ipv6
),
'from_email': current_task.request.hostname,
'to': settings.DCL_ERROR_EMAILS_TO_LIST,
'body': emsg
}
email = EmailMessage(**email_data)
email.send()
handle_metadata_and_emails(order_id, vm_id, manager, user, specs,
template)
except Exception as e:
logger.error(str(e))
try:
@ -266,3 +110,127 @@ def create_vm_task(self, vm_template_id, user, specs, template, order_id):
return
return vm_id
def handle_metadata_and_emails(order_id, vm_id, manager, user, specs,
template):
"""
Handle's setting up of the metadata in Stripe and database and sending of
emails to the user after VM creation
:param order_id: the hosting order id
:param vm_id: the id of the vm created
:param manager: the OpenNebula Manager instance
:param user: the user's dict passed to the celery task
:param specs: the specification's dict passed to the celery task
:param template: the template dict passed to the celery task
:return:
"""
custom_user = CustomUser.objects.get(email=user.get('email'))
final_price = (
specs.get('total_price') if 'total_price' in specs
else specs.get('price')
)
# Update HostingOrder with the created vm_id
hosting_order = HostingOrder.objects.filter(id=order_id).first()
error_msg = None
try:
hosting_order.vm_id = vm_id
hosting_order.save()
logger.debug(
"Updated hosting_order {} with vm_id={}".format(
hosting_order.id, vm_id
)
)
except Exception as ex:
error_msg = (
"HostingOrder with id {order_id} not found. This means that "
"the hosting order was not created and/or it is/was not "
"associated with VM with id {vm_id}. Details {details}".format(
order_id=order_id, vm_id=vm_id, details=str(ex)
)
)
logger.error(error_msg)
stripe_utils = StripeUtils()
result = stripe_utils.set_subscription_metadata(
subscription_id=hosting_order.subscription_id,
metadata={"VM_ID": str(vm_id)}
)
if result.get('error') is not None:
emsg = "Could not update subscription metadata for {sub}".format(
sub=hosting_order.subscription_id
)
logger.error(emsg)
if error_msg:
error_msg += ". " + emsg
else:
error_msg = emsg
vm = VirtualMachineSerializer(manager.get_vm(vm_id)).data
context = {
'name': user.get('name'),
'email': user.get('email'),
'cores': specs.get('cpu'),
'memory': specs.get('memory'),
'storage': specs.get('disk_size'),
'price': final_price,
'template': template.get('name'),
'vm_name': vm.get('name'),
'vm_id': vm['vm_id'],
'order_id': order_id
}
if error_msg:
context['errors'] = error_msg
if 'pricing_name' in specs:
context['pricing'] = str(VMPricing.get_vm_pricing_by_name(
name=specs['pricing_name']
))
email_data = {
'subject': settings.DCL_TEXT + " Order from %s" % context['email'],
'from_email': settings.DCL_SUPPORT_FROM_ADDRESS,
'to': ['dcl-orders@ungleich.ch'],
'body': "\n".join(
["%s=%s" % (k, v) for (k, v) in context.items()]),
'reply_to': [context['email']],
}
email = EmailMessage(**email_data)
email.send()
if 'pass' in user:
lang = 'en-us'
if user.get('language') is not None:
logger.debug(
"Language is set to {}".format(user.get('language')))
lang = user.get('language')
translation.activate(lang)
# Send notification to the user as soon as VM has been booked
context = {
'base_url': "{0}://{1}".format(user.get('request_scheme'),
user.get('request_host')),
'order_url': reverse('hosting:invoices'),
'page_header': _(
'Your New VM %(vm_name)s at Data Center Light') % {
'vm_name': vm.get('name')},
'vm_name': vm.get('name')
}
email_data = {
'subject': context.get('page_header'),
'to': user.get('email'),
'context': context,
'template_name': 'new_booked_vm',
'template_path': 'hosting/emails/',
'from_address': settings.DCL_SUPPORT_FROM_ADDRESS,
}
email = BaseEmail(**email_data)
email.send()
logger.debug("New VM ID is {vm_id}".format(vm_id=vm_id))
if vm_id > 0:
get_or_create_vm_detail(custom_user, manager, vm_id)

View file

@ -0,0 +1,10 @@
{% load staticfiles bootstrap3 i18n custom_tags humanize %}
{% block content %}
{% block userkey_form %}
{% with form_title=_("Your VM is almost ready!") form_sub_title=_("You need to specify your public SSH key to access your VM. You can either add your existing key, or generate a new key pair by clicking the generate button below. After choosing your public SSH key option youll be directed to the order confirmation page.") %}
{% include 'hosting/user_key.html' with title=form_title sub_title=form_sub_title %}
{% endwith %}
{% endblock userkey_form %}
{%endblock%}

View file

@ -43,7 +43,7 @@
</head>
<body>
{% include "gdpr_banner.html" %}
{% block navbar %}
{% include "datacenterlight/includes/_navbar.html" %}
{% endblock navbar %}

View file

@ -49,6 +49,7 @@
</head>
<body>
{% include "gdpr_banner.html" %}
{% cms_toolbar %}
{% render_placeholder cms_integration.navbar_placeholder %}

View file

@ -49,6 +49,7 @@
</head>
<body>
{% include "gdpr_banner.html" %}
{% cms_toolbar %}
{% placeholder 'datacenterlight_navbar' %}

View file

@ -1,5 +1,5 @@
<div class="price-calc-section">
<div class="card">
{% include "datacenterlight/includes/_calculator_form.html" with vm_pricing=instance.pricing %}
{% include "datacenterlight/includes/_calculator_form.html" with vm_pricing=instance.pricing vm_base_price=vm_base_price %}
</div>
</div>

View file

@ -1,7 +1,9 @@
{% load static i18n custom_tags cms_tags %}
{% get_current_language as LANGUAGE_CODE %}
<nav class="navbar navbar-default navbar-fixed-top topnav navbar-transparent">
{% if instance.show_non_transparent_navbar_always %}
<script>window.non_transparent_navbar_always=true;</script>
{% endif %}
<nav class="navbar navbar-default navbar-fixed-top topnav {% if instance.show_non_transparent_navbar_always != True %}navbar-transparent{% endif %}">
<!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#dcl-topnav">

View file

@ -28,7 +28,7 @@
{% blocktrans %}Thanks for joining us! We provide the most affordable virtual machines from the heart of Switzerland.{% endblocktrans %}
</p>
<p style="line-height: 1.75; font-family: Lato, Arial, sans-serif; font-weight: 300; margin: 0;">
{% blocktrans %}Try now, order a VM. VM price starts from only 15CHF per month.{% endblocktrans %}
{% blocktrans %}Try now, order a VM. VM price starts from only 11.5 CHF per month.{% endblocktrans %}
</p>
</td>
</tr>

View file

@ -3,7 +3,7 @@
{% trans "Welcome to Data Center Light!" %}
{% blocktrans %}Thanks for joining us! We provide the most affordable virtual machines from the heart of Switzerland.{% endblocktrans %}
{% blocktrans %}Try now, order a VM. VM price starts from only 15CHF per month.{% endblocktrans %}
{% blocktrans %}Try now, order a VM. VM price starts from only 11.5 CHF per month.{% endblocktrans %}
{{ base_url }}{% url 'hosting:create_virtual_machine' %}

View file

@ -9,12 +9,13 @@
window.ssdUnitPrice = {{vm_pricing.ssd_unit_price|default:0}};
window.hddUnitPrice = {{vm_pricing.hdd_unit_price|default:0}};
window.discountAmount = {{vm_pricing.discount_amount|default:0}};
window.vmBasePrice = {{vm_base_price|default:0}};
window.minRam = {{min_ram}};
window.minRamErr = '{% blocktrans with min_ram=min_ram %}Please enter a value in range {{min_ram}} - 200.{% endblocktrans %}';
</script>
{% endif %}
<form id="order_form" method="POST" action="{{calculator_form_url}}" data-toggle="validator" role="form">
<form id="order_form" method="POST" action="{% url 'datacenterlight:index' %}" data-toggle="validator" role="form">
{% csrf_token %}
<input type="hidden" name="pid" value="{{instance.id}}">
<div class="title">
@ -102,4 +103,4 @@
</div>
<input type="hidden" name="pricing_name" value="{% if vm_pricing.name %}{{vm_pricing.name}}{% else %}unknown{% endif%}"></input>
<input type="submit" class="btn btn-primary disabled" value="{% trans 'Continue' %}"></input>
</form>
</form>

View file

@ -1,7 +1,6 @@
{% load staticfiles i18n custom_tags %}
{% get_current_language as LANGUAGE_CODE %}
<nav class="navbar navbar-default navbar-fixed-top topnav navbar-transparent">
<nav class="navbar navbar-default navbar-fixed-top topnav {% if instance.show_non_transparent_navbar_always is False %}navbar-transparent{% endif %}">
<!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">

View file

@ -13,6 +13,15 @@
<!-- Credit card form -->
<div class="dcl-order-container">
<div class="payment-container">
<div id='payment_error'>
{% for message in messages %}
{% if 'vat_error' in message.tags %}
<ul class="list-unstyled">
<li><p class="card-warning-content card-warning-error">An error occurred while validating VAT number: {{ message|safe }}</p></li>
</ul>
{% endif %}
{% endfor %}
</div>
<div class="dcl-payment-grid">
<div class="dcl-payment-box">
<div class="dcl-payment-section">
@ -131,6 +140,7 @@
<h5 class="billing-head">{% trans "Credit Card" %}</h5>
<h5 class="membership-lead">{% trans "Last" %} 4: ***** {{card.last4}}</h5>
<h5 class="membership-lead">{% trans "Type" %}: {{card.brand}}</h5>
<h5 class="membership-lead">{% trans "Expiry" %}: {{card.exp_month}}/{{card.exp_year}}</h5>
</div>
<div class="col-xs-6 text-right align-bottom">
<a class="btn choice-btn choice-btn-faded" href="#" data-id_card="{{card.id}}">{% trans "SELECT" %}</a>

View file

@ -2,6 +2,14 @@
{% load staticfiles bootstrap3 i18n custom_tags humanize %}
{% block content %}
<script>
{% if payment_intent_secret %}
console.log("payment_intent_secret");
window.paymentIntentSecret = "{{payment_intent_secret}}";
{% else %}
console.log("No payment_intent_secret");
{% endif %}
</script>
<div id="order-detail{{order.pk}}" class="order-detail-container">
{% if messages %}
<div class="alert alert-warning">
@ -32,6 +40,16 @@
{{billing_address.cardholder_name}}<br>
{{billing_address.street_address}}, {{billing_address.postal_code}}<br>
{{billing_address.city}}, {{billing_address.country}}
{% if billing_address.vat_number %}
<br/>{% trans "VAT Number" %} {{billing_address.vat_number}}
{% if vm.vat_validation_status != "ch_vat" and vm.vat_validation_status != "not_needed" %}
{% if vm.vat_validation_status == "verified" %}
<span class="fa fa-fw fa-check-circle" aria-hidden="true" title='{% trans "Your VAT number has been verified" %}'></span>
{% else %}
<span class="fa fa-fw fa-info-circle" aria-hidden="true" title='{% trans "Your VAT number is under validation. VAT will be adjusted, once the validation is complete." %}'></span>
{% endif %}
{% endif %}
{% endif %}
{% endwith %}
</p>
</address>
@ -41,44 +59,128 @@
<h4>{% trans "Payment method" %}:</h4>
<p>
{{cc_brand|default:_('Credit Card')}} {% trans "ending in" %} ****{{cc_last4}}<br>
{% trans "Expiry" %} {{cc_exp_year}}/{{cc_exp_month}}<br/>
{{request.user.email}}
</p>
</div>
<hr>
<div>
<h4>{% trans "Order summary" %}</h4>
<style>
@media screen and (max-width:400px){
.header-no-left-padding {
padding-left: 0 !important;
}
}
@media screen and (max-width:767px){
.cmf-ord-heading {
font-size: 11px;
}
.order-detail-container .order-details {
font-size: 13px;
}
}
@media screen and (max-width:367px){
.cmf-ord-heading {
font-size: 11px;
}
.order-detail-container .order-details {
font-size: 12px;
}
}
</style>
{% if generic_payment_details %}
<div class="row">
<div class="col-sm-9">
<p>
<strong>{% trans "Product" %}:</strong>&nbsp;
{{ generic_payment_details.product_name }}
</p>
<div class="row">
<div class="col-sm-6">
<p>
<span>{% trans "Amount" %}: </span>
<strong class="pull-right">CHF {{generic_payment_details.amount|floatformat:2|intcomma}}</strong>
</p>
{% if generic_payment_details.description %}
<p>
<span>{% trans "Description" %}: </span>
<strong class="pull-right">{{generic_payment_details.description}}</strong>
</p>
{% endif %}
{% if generic_payment_details.recurring %}
<p>
<span>{% trans "Recurring" %}: </span>
<strong class="pull-right">Yes</strong>
</p>
{% endif %}
</div>
{% if generic_payment_details.description %}
<p>
<strong>{% trans "Description" %}: </strong>
<span class="pull-right">{{generic_payment_details.description}}</span>
</p>
{% endif %}
{% if generic_payment_details.recurring %}
<p>
<strong>{% trans "Recurring" %}: </strong>
<span class="pull-right">Yes</span>
</p>
{% endif %}
</div>
{% if generic_payment_details.exclude_vat_calculations %}
{% else %}
<div class="col-sm-12">
<hr class="thin-hr">
</div>
<div class="col-sm-9">
<p>
<strong class="text-uppercase">{% trans "Price Before VAT" %}</strong>
<strong class="pull-right">{{generic_payment_details.amount_before_vat|floatformat:2|intcomma}} CHF</strong>
</p>
</div>
<div class="col-sm-12">
<hr class="thin-hr">
</div>
<div class="col-sm-9">
<div class="row">
<div class="col-md-4 col-sm-4 col-xs-4">
<p><span></span></p>
</div>
<div class="col-md-3 col-sm-3 col-xs-4">
<p class="text-right"><strong class="cmf-ord-heading">{% trans "Pre VAT" %}</strong></p>
</div>
<div class="col-md-5 col-sm-5 col-xs-4 header-no-left-padding">
<p class="text-right"><strong class="cmf-ord-heading">{% trans "VAT for" %} {{generic_payment_details.vat_country}} ({{generic_payment_details.vat_rate}}%)</strong></p>
</div>
</div>
<div class="row">
<div class="col-md-4 col-sm-4 col-xs-4">
<p><span>Price</span></p>
</div>
<div class="col-md-3 col-sm-3 col-xs-4">
<p><span class="pull-right" >{{generic_payment_details.amount_before_vat|floatformat:2|intcomma}} CHF</span></p>
</div>
<div class="col-md-5 col-sm-5 col-xs-4">
<p><span class="pull-right">{{generic_payment_details.amount|floatformat:2|intcomma}} CHF</span></p>
</div>
</div>
</div>
<div class="col-sm-12">
<hr class="thin-hr">
</div>
<div class="col-sm-9">
<div class="row">
<div class="col-md-4 col-sm-4 col-xs-4">
<p><strong>Total</strong></p>
</div>
<div class="col-md-3 col-sm-3 col-xs-4">
<p><strong class="pull-right">{{generic_payment_details.amount_before_vat|floatformat:2|intcomma}} CHF</strong></p>
</div>
<div class="col-md-5 col-sm-5 col-xs-4">
<p><strong class="pull-right">{{generic_payment_details.amount|floatformat:2|intcomma}} CHF</strong></p>
</div>
</div>
</div>
{% endif %}
<div class="col-sm-12">
<hr class="thin-hr">
</div>
<div class="col-sm-9">
<strong class="text-uppercase align-center">{% trans "Your Price in Total" %}</strong>
<strong class="total-price pull-right">{{generic_payment_details.amount|floatformat:2|intcomma}} CHF</strong>
</div>
</div>
{% else %}
<p>
<strong>{% trans "Product" %}:</strong>&nbsp;
{{ request.session.template.name }}
</p>
<div class="row">
<div class="col-sm-6">
<div class="col-sm-9">
<p>
<span>{% trans "Cores" %}: </span>
<strong class="pull-right">{{vm.cpu|floatformat}}</strong>
@ -95,38 +197,75 @@
<div class="col-sm-12">
<hr class="thin-hr">
</div>
{% if vm.vat > 0 or vm.discount.amount > 0 %}
<div class="col-sm-6">
<div class="subtotal-price">
{% if vm.vat > 0 %}
<p>
<strong class="text-lg">{% trans "Subtotal" %} </strong>
<strong class="pull-right">{{vm.price|floatformat:2|intcomma}} CHF</strong>
</p>
<p>
<small>{% trans "VAT" %} ({{ vm.vat_percent|floatformat:2|intcomma }}%) </small>
<strong class="pull-right">{{vm.vat|floatformat:2|intcomma}} CHF</strong>
</p>
{% endif %}
{% if vm.discount.amount > 0 %}
<p class="text-primary">
{%trans "Discount" as discount_name %}
<strong>{{ vm.discount.name|default:discount_name }} </strong>
<strong class="pull-right">- {{ vm.discount.amount }} CHF</strong>
</p>
{% endif %}
</div>
</div>
<div class="col-sm-12">
<hr class="thin-hr">
</div>
{% endif %}
<div class="col-sm-6">
<p class="total-price">
<strong>{% trans "Total" %} </strong>
<strong class="pull-right">{{vm.total_price|floatformat:2|intcomma}} CHF</strong>
<div class="col-sm-9">
<p>
<strong class="text-uppercase">{% trans "Price Before VAT" %}</strong>
<strong class="pull-right">{{vm.price|floatformat:2|intcomma}} CHF</strong>
</p>
</div>
<div class="col-sm-12">
<hr class="thin-hr">
</div>
<div class="col-sm-9">
<div class="row">
<div class="col-md-4 col-sm-4 col-xs-4">
<p><span></span></p>
</div>
<div class="col-md-3 col-sm-3 col-xs-4">
<p class="text-right"><strong class="cmf-ord-heading">{% trans "Pre VAT" %}</strong></p>
</div>
<div class="col-md-5 col-sm-5 col-xs-4 header-no-left-padding">
<p class="text-right"><strong class="cmf-ord-heading">{% trans "VAT for" %} {{vm.vat_country}} ({{vm.vat_percent}}%)</strong></p>
</div>
</div>
<div class="row">
<div class="col-md-4 col-sm-4 col-xs-4">
<p><span>Price</span></p>
</div>
<div class="col-md-3 col-sm-3 col-xs-4">
<p><span class="pull-right" >{{vm.price|floatformat:2|intcomma}} CHF</span></p>
</div>
<div class="col-md-5 col-sm-5 col-xs-4">
<p><span class="pull-right">{{vm.price_with_vat|floatformat:2|intcomma}} CHF</span></p>
</div>
</div>
{% if vm.discount.amount > 0 %}
<div class="row">
<div class="col-md-4 col-sm-4 col-xs-4">
<p><span>{{vm.discount.name}}</span></p>
</div>
<div class="col-md-3 col-sm-3 col-xs-4">
<p><span class="pull-right">-{{vm.discount.amount|floatformat:2|intcomma}} CHF</span></p>
</div>
<div class="col-md-5 col-sm-5 col-xs-4">
<p><span class="pull-right">-{{vm.discount.amount_with_vat|floatformat:2|intcomma}} CHF</span></p>
</div>
</div>
{% endif %}
</div>
<div class="col-sm-12">
<hr class="thin-hr">
</div>
<div class="col-sm-9">
<div class="row">
<div class="col-md-4 col-sm-4 col-xs-4">
<p><strong>Total</strong></p>
</div>
<div class="col-md-3 col-sm-3 col-xs-4">
<p><strong class="pull-right">{{vm.price_after_discount|floatformat:2|intcomma}} CHF</strong></p>
</div>
<div class="col-md-5 col-sm-5 col-xs-4">
<p><strong class="pull-right">{{vm.price_after_discount_with_vat|floatformat:2|intcomma}} CHF</strong></p>
</div>
</div>
</div>
<div class="col-sm-12">
<hr class="thin-hr">
</div>
<div class="col-sm-9">
<strong class="text-uppercase align-center">{% trans "Your Price in Total" %}</strong>
<strong class="total-price pull-right">{{vm.total_price|floatformat:2|intcomma}} CHF</strong>
</div>
</div>
{% endif %}
</div>
@ -138,12 +277,17 @@
<div class="col-sm-8">
{% if generic_payment_details %}
{% if generic_payment_details.recurring %}
<div class="dcl-place-order-text">{% blocktrans with total_price=generic_payment_details.amount|floatformat:2|intcomma %}By clicking "Place order" this plan will charge your credit card account with {{total_price}} CHF/month{% endblocktrans %}.</div>
{% if generic_payment_details.recurring_interval == 'year' %}
<div class="dcl-place-order-text">{% blocktrans with total_price=generic_payment_details.amount|floatformat:2|intcomma %} By clicking "Place order" you agree to our <a href="https://datacenterlight.ch/en-us/cms/terms-of-service/">Terms of Service</a> and this plan will charge your credit card account with {{ total_price }} CHF/year{% endblocktrans %}.</div>
{% else %}
<div class="dcl-place-order-text">{% blocktrans with total_price=generic_payment_details.amount|floatformat:2|intcomma %}
By clicking "Place order" you agree to our <a href="https://datacenterlight.ch/en-us/cms/terms-of-service/">Terms of Service</a> and this plan will charge your credit card account with {{ total_price }} CHF/month{% endblocktrans %}.</div>
{% endif %}
{% else %}
<div class="dcl-place-order-text">{% blocktrans with total_price=generic_payment_details.amount|floatformat:2|intcomma %}By clicking "Place order" this payment will charge your credit card account with a one time amount of {{total_price}} CHF{% endblocktrans %}.</div>
<div class="dcl-place-order-text">{% blocktrans with total_price=generic_payment_details.amount|floatformat:2|intcomma %}By clicking "Place order" you agree to our <a href="https://datacenterlight.ch/en-us/cms/terms-of-service/">Terms of Service</a> and this plan will charge your credit card account with {{ total_price }} CHF{% endblocktrans %}.</div>
{% endif %}
{% else %}
<div class="dcl-place-order-text">{% blocktrans with vm_total_price=vm.total_price|floatformat:2|intcomma %}By clicking "Place order" this plan will charge your credit card account with {{vm_total_price}} CHF/month{% endblocktrans %}.</div>
<div class="dcl-place-order-text">{% blocktrans with vm_total_price=vm.total_price|floatformat:2|intcomma %}By clicking "Place order" you agree to our <a href="https://datacenterlight.ch/en-us/cms/terms-of-service/">Terms of Service</a> and this plan will charge your credit card account with {{ vm_total_price }} CHF/month{% endblocktrans %}.</div>
{% endif %}
</div>
<div class="col-sm-4 order-confirm-btn text-right">
@ -186,5 +330,14 @@
<script type="text/javascript">
{% trans "Some problem encountered. Please try again later." as err_msg %}
var create_vm_error_message = '{{err_msg|safe}}';
var pm_id = '{{id_payment_method}}';
var error_url = '{{ error_msg.redirect }}';
var error_msg = '{{ error_msg.msg_body }}';
var error_title = '{{ error_msg.msg_title }}';
var success_msg = '{{ success_msg.msg_body }}';
var success_title = '{{ success_msg.msg_title }}';
var success_url = '{{ success_msg.redirect }}';
window.stripeKey = "{{stripe_key}}";
window.isSubscription = ("{{is_subscription}}" === 'true');
</script>
{%endblock%}
{%endblock%}

View file

@ -1,6 +1,15 @@
import datetime
import logging
from django import template
from django.core.urlresolvers import resolve, reverse
from django.utils.translation import activate, get_language
from django.utils.safestring import mark_safe
from django.utils.translation import activate, get_language, ugettext_lazy as _
from hosting.models import GenericProduct, HostingOrder
from utils.hosting_utils import get_ip_addresses
logger = logging.getLogger(__name__)
register = template.Library()
@ -52,3 +61,116 @@ def escaped_line_break(value):
:return:
"""
return value.replace("\\n", "\n")
@register.filter('get_line_item_from_hosting_order_charge')
def get_line_item_from_hosting_order_charge(hosting_order_id):
"""
Returns ready-to-use "html" line item to be shown for a charge in the
invoice list page
:param hosting_order_id: the HostingOrder id
:return:
"""
try:
hosting_order = HostingOrder.objects.get(id = hosting_order_id)
if hosting_order.stripe_charge_id:
return mark_safe("""
<td class="xs-td-inline">{product_name}</td>
<td class="xs-td-inline">{created_at}</td>
<td class="xs-td-inline">{total}</td>
<td class="text-right last-td">
<a class="btn btn-order-detail" href="{receipt_url}" target="_blank">{see_invoice_text}</a>
</td>
""".format(
product_name=hosting_order.generic_product.product_name.capitalize(),
created_at=hosting_order.created_at.strftime('%Y-%m-%d'),
total='%.2f' % (hosting_order.price),
receipt_url=reverse('hosting:orders',
kwargs={'pk': hosting_order.id}),
see_invoice_text=_("See Invoice")
))
else:
return ""
except Exception as ex:
logger.error("Error %s" % str(ex))
return ""
@register.filter('get_line_item_from_stripe_invoice')
def get_line_item_from_stripe_invoice(invoice):
"""
Returns ready-to-use "html" line item to be shown for an invoice in the
invoice list page
:param invoice: the stripe Invoice object
:return:
"""
start_date = 0
end_date = 0
is_first = True
vm_id = -1
plan_name = ""
for line_data in invoice["lines"]["data"]:
if is_first:
plan_name = line_data.plan.name if line_data.plan is not None else ""
start_date = line_data.period.start
end_date = line_data.period.end
is_first = False
if hasattr(line_data.metadata, "VM_ID"):
vm_id = line_data.metadata.VM_ID
else:
if line_data.period.start < start_date:
start_date = line_data.period.start
if line_data.period.end > end_date:
end_date = line_data.period.end
if hasattr(line_data.metadata, "VM_ID"):
vm_id = line_data.metadata.VM_ID
try:
vm_id = int(vm_id)
except ValueError as ve:
print(str(ve))
if invoice["lines"]["data"]:
return mark_safe("""
<td class="xs-td-inline">{vm_id}</td>
<td class="xs-td-inline">{ip_addresses}</td>
<td class="xs-td-inline">{period}</td>
<td class="xs-td-inline text-right dcl-text-right-padding">{total}</td>
<td class="text-right last-td">
<a class="btn btn-order-detail" href="{stripe_invoice_url}" target="_blank">{see_invoice_text}</a>
</td>
""".format(
vm_id=vm_id if vm_id > 0 else "",
ip_addresses=mark_safe(get_ip_addresses(vm_id)) if vm_id > 0 else
mark_safe(get_product_name(plan_name)),
period=mark_safe("%s &mdash; %s" % (
datetime.datetime.fromtimestamp(start_date).strftime('%Y-%m-%d'),
datetime.datetime.fromtimestamp(end_date).strftime('%Y-%m-%d'))),
total='%.2f' % (invoice.total/100),
stripe_invoice_url=invoice.hosted_invoice_url,
see_invoice_text=_("See Invoice")
))
else:
return ""
def get_product_name(plan_name):
product_name = ""
if plan_name and plan_name.startswith("generic-"):
first_index_hyphen = plan_name.index("-") + 1
product_id = plan_name[first_index_hyphen:
(plan_name[first_index_hyphen:].index("-")) + first_index_hyphen]
try:
product = GenericProduct.objects.get(id=product_id)
product_name = product.product_name
except GenericProduct.DoesNotExist as dne:
logger.error("Generic product id=%s does not exist" % product_id)
product_name = plan_name
except GenericProduct.MultipleObjectsReturned as mor:
logger.error("Multiple products with id=%s exist" % product_id)
product_name = "Unknown"
else:
logger.debug("Product name for plan %s does not exist" % plan_name)
return product_name

View file

@ -1,12 +1,12 @@
from django.conf.urls import url
from django.views.generic import TemplateView, RedirectView
from utils.views import AskSSHKeyView
from .views import (
IndexView, PaymentOrderView, OrderConfirmationView,
WhyDataCenterLightView, ContactUsView
)
urlpatterns = [
url(r'^$', IndexView.as_view(), name='index'),
url(r'^t/$', IndexView.as_view(), name='index_t'),
@ -20,6 +20,8 @@ urlpatterns = [
url(r'^payment/?$', PaymentOrderView.as_view(), name='payment'),
url(r'^order-confirmation/?$', OrderConfirmationView.as_view(),
name='order_confirmation'),
url(r'^add-ssh-key/?$', AskSSHKeyView.as_view(),
name='add_ssh_key'),
url(r'^contact/?$', ContactUsView.as_view(), name='contact_us'),
url(r'glasfaser/?$',
TemplateView.as_view(template_name='ungleich_page/glasfaser.html'),

View file

@ -1,16 +1,28 @@
import datetime
import logging
import pyotp
import requests
import stripe
from django.conf import settings
from django.contrib.sites.models import Site
from datacenterlight.tasks import create_vm_task
from hosting.models import HostingOrder, HostingBill, OrderDetail
from membership.models import StripeCustomer
from utils.forms import UserBillingAddressForm
from utils.models import BillingAddress
from utils.models import BillingAddress, UserBillingAddress
from utils.stripe_utils import StripeUtils
from .cms_models import CMSIntegration
from .models import VMPricing, VMTemplate
logger = logging.getLogger(__name__)
eu_countries = ['at', 'be', 'bg', 'ch', 'cy', 'cz', 'hr', 'dk',
'ee', 'fi', 'fr', 'mc', 'de', 'gr', 'hu', 'ie', 'it',
'lv', 'lu', 'mt', 'nl', 'pl', 'pt', 'ro','sk', 'si', 'es',
'se', 'gb']
def get_cms_integration(name):
current_site = Site.objects.get_current()
@ -26,12 +38,14 @@ def get_cms_integration(name):
def create_vm(billing_address_data, stripe_customer_id, specs,
stripe_subscription_obj, card_details_dict, request,
vm_template_id, template, user):
logger.debug("In create_vm")
billing_address = BillingAddress(
cardholder_name=billing_address_data['cardholder_name'],
street_address=billing_address_data['street_address'],
city=billing_address_data['city'],
postal_code=billing_address_data['postal_code'],
country=billing_address_data['country']
country=billing_address_data['country'],
vat_number=billing_address_data['vat_number'],
)
billing_address.save()
customer = StripeCustomer.objects.filter(id=stripe_customer_id).first()
@ -89,14 +103,203 @@ def create_vm(billing_address_data, stripe_customer_id, specs,
create_vm_task.delay(vm_template_id, user, specs, template, order.id)
clear_all_session_vars(request)
def clear_all_session_vars(request):
if request.session is not None:
for session_var in ['specs', 'template', 'billing_address',
'billing_address_data', 'card_id',
'token', 'customer', 'generic_payment_type',
'generic_payment_details', 'product_id']:
'generic_payment_details', 'product_id',
'order_confirm_url', 'new_user_hosting_key_id',
'vat_validation_status', 'billing_address_id',
'id_payment_method']:
if session_var in request.session:
del request.session[session_var]
def check_otp(name, realm, token):
data = {
"auth_name": settings.AUTH_NAME,
"auth_token": pyotp.TOTP(settings.AUTH_SEED).now(),
"auth_realm": settings.AUTH_REALM,
"name": name,
"realm": realm,
"token": token
}
response = requests.post(
"https://{OTP_SERVER}{OTP_VERIFY_ENDPOINT}".format(
OTP_SERVER=settings.OTP_SERVER,
OTP_VERIFY_ENDPOINT=settings.OTP_VERIFY_ENDPOINT
),
data=data
)
return response.status_code
def validate_vat_number(stripe_customer_id, billing_address_id,
is_user_ba=False):
if is_user_ba:
try:
billing_address = UserBillingAddress.objects.get(
id=billing_address_id)
except UserBillingAddress.DoesNotExist as dne:
billing_address = None
logger.debug(
"UserBillingAddress does not exist for %s" % billing_address_id)
except UserBillingAddress.MultipleObjectsReturned as mor:
logger.debug(
"Multiple UserBillingAddress exist for %s" % billing_address_id)
billing_address = UserBillingAddress.objects.filter(
id=billing_address_id).order_by('-id').first()
else:
try:
billing_address = BillingAddress.objects.get(id=billing_address_id)
except BillingAddress.DoesNotExist as dne:
billing_address = None
logger.debug("BillingAddress does not exist for %s" % billing_address_id)
except BillingAddress.MultipleObjectsReturned as mor:
logger.debug("Multiple BillingAddress exist for %s" % billing_address_id)
billing_address = BillingAddress.objects.filter(id=billing_address_id).order_by('-id').first()
if billing_address is not None:
logger.debug("BillingAddress found: %s %s type=%s" % (
billing_address_id, str(billing_address), type(billing_address)))
if billing_address.country.lower().strip() not in eu_countries:
return {
"validated_on": "",
"status": "not_needed"
}
if billing_address.vat_number_validated_on:
logger.debug("billing_address verified on %s" %
billing_address.vat_number_validated_on)
return {
"validated_on": billing_address.vat_number_validated_on,
"status": "verified"
}
else:
logger.debug("billing_address not yet verified, "
"Checking if we already have a tax id")
if billing_address.stripe_tax_id:
logger.debug("We have a tax id %s" % billing_address.stripe_tax_id)
tax_id_obj = stripe.Customer.retrieve_tax_id(
stripe_customer_id,
billing_address.stripe_tax_id,
)
if tax_id_obj.verification.status == "verified":
logger.debug("Latest status on Stripe=%s. Updating" %
tax_id_obj.verification.status)
# update billing address
billing_address.vat_number_validated_on = datetime.datetime.now()
billing_address.vat_validation_status = tax_id_obj.verification.status
billing_address.save()
return {
"status": "verified",
"validated_on": billing_address.vat_number_validated_on
}
else:
billing_address.vat_validation_status = tax_id_obj.verification.status
billing_address.save()
logger.debug(
"Latest status on Stripe=%s" % str(tax_id_obj)
)
return {
"status": tax_id_obj.verification.status if tax_id_obj
else "unknown",
"validated_on": ""
}
else:
logger.debug("Creating a tax id")
logger.debug("Billing address = %s" % str(billing_address))
tax_id_obj = create_tax_id(
stripe_customer_id, billing_address_id,
"ch_vat" if billing_address.country.lower() == "ch" else "eu_vat",
is_user_ba=is_user_ba
)
logger.debug("tax_id_obj = %s" % str(tax_id_obj))
else:
logger.debug("invalid billing address")
return {
"status": "invalid billing address",
"validated_on": ""
}
if 'response_object' in tax_id_obj:
return tax_id_obj
return {
"status": tax_id_obj.verification.status,
"validated_on": datetime.datetime.now() if tax_id_obj.verification.status == "verified" else ""
}
def create_tax_id(stripe_customer_id, billing_address_id, type,
is_user_ba=False):
if is_user_ba:
try:
billing_address = UserBillingAddress.objects.get(
id=billing_address_id)
except UserBillingAddress.DoesNotExist as dne:
billing_address = None
logger.debug(
"UserBillingAddress does not exist for %s" % billing_address_id)
except UserBillingAddress.MultipleObjectsReturned as mor:
logger.debug(
"Multiple UserBillingAddress exist for %s" % billing_address_id)
billing_address = UserBillingAddress.objects.filter(
id=billing_address_id).order_by('-id').first()
else:
try:
billing_address = BillingAddress.objects.get(id=billing_address_id)
except BillingAddress.DoesNotExist as dne:
billing_address = None
logger.debug("BillingAddress does not exist for %s" % billing_address_id)
except BillingAddress.MultipleObjectsReturned as mor:
logger.debug("Multiple BillingAddress exist for %s" % billing_address_id)
billing_address = BillingAddress.objects.filter(billing_address_id).order_by('-id').first()
tax_id_obj = None
if billing_address:
stripe_utils = StripeUtils()
tax_id_response = stripe_utils.get_or_create_tax_id_for_user(
stripe_customer_id,
vat_number=billing_address.vat_number,
type=type,
country=billing_address.country
)
tax_id_obj = tax_id_response.get('response_object')
if not tax_id_obj:
logger.debug("Received none in tax_id_obj")
return {
'paid': False,
'response_object': None,
'error': "No such address found" if 'error' not in tax_id_response else
tax_id_response["error"]
}
try:
stripe_customer = StripeCustomer.objects.get(stripe_id=stripe_customer_id)
billing_address_set = set()
logger.debug("Updating billing address")
for ho in stripe_customer.hostingorder_set.all():
if ho.billing_address.vat_number == billing_address.vat_number:
billing_address_set.add(ho.billing_address)
for b_address in billing_address_set:
b_address.stripe_tax_id = tax_id_obj.id
b_address.vat_validation_status = tax_id_obj.verification.status
b_address.save()
logger.debug("Updated billing_address %s" % str(b_address))
ub_addresses = stripe_customer.user.billing_addresses.filter(
vat_number=billing_address.vat_number)
for ub_address in ub_addresses:
ub_address.stripe_tax_id = tax_id_obj.id
ub_address.vat_validation_status = tax_id_obj.verification.status
ub_address.save()
logger.debug("Updated user_billing_address %s" % str(ub_address))
except StripeCustomer.DoesNotExist as dne:
logger.debug("StripeCustomer %s does not exist" % stripe_customer_id)
billing_address.stripe_tax_id = tax_id_obj.id
billing_address.vat_validation_status = tax_id_obj.verification.status
billing_address.save()
return tax_id_obj

File diff suppressed because it is too large Load diff

View file

@ -35,6 +35,7 @@ class MembershipBillingForm(BillingAddressForm):
'city': _('City'),
'postal_code': _('Postal Code'),
'country': _('Country'),
'vat_number': _('VAT Number'),
}

View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-11-06 00:24+0530\n"
"POT-Creation-Date: 2019-01-31 23:53+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -51,62 +51,12 @@ msgstr "weiterlesen"
msgid "by"
msgstr "von"
msgid "US English"
msgid "Digital Glarus Gallery"
msgstr ""
msgid "German"
msgid "Digital Glarus Supporters"
msgstr ""
msgid "Content"
msgstr ""
msgid "default"
msgstr ""
msgid "2 Column"
msgstr ""
msgid "3 Column"
msgstr ""
msgid "DG.About"
msgstr ""
#, fuzzy
#| msgid "contact/?$"
msgid "DG.Contact"
msgstr "kontakt/?$"
msgid "DG.Home"
msgstr ""
msgid "DG.CoWork"
msgstr ""
msgid "DG.OneColumn"
msgstr ""
msgid "Blog"
msgstr ""
msgid "Page"
msgstr "Seite"
msgid "Data Center Light"
msgstr ""
msgid "Glasfaser"
msgstr ""
msgid "English"
msgstr ""
msgid "Deutsch"
msgstr ""
msgid "Amount"
msgstr "Betrag"
msgid "Street Address"
msgstr "Adresse"
@ -119,148 +69,33 @@ msgstr "Postleitzahl"
msgid "Country"
msgstr "Land"
msgid "My Donations"
msgstr ""
msgid "Logout"
msgstr ""
msgid "Set your new password"
msgstr ""
msgid "Reset"
msgstr ""
msgid "Already have an account ?"
msgstr ""
msgid "Log in"
msgstr ""
msgid "Invoice"
msgstr ""
msgid "Donation #"
msgstr ""
msgid "Billing Address:"
msgstr ""
msgid "Date:"
msgstr ""
msgid "Payment Method:"
msgstr ""
msgid "Donation summary"
msgstr ""
msgid "Donation"
msgstr ""
msgid "Total"
msgstr ""
msgid "Finish Configuration"
msgstr ""
msgid ""
"Thanks for you donation, you can cancel your monthly donation at any time "
"going to profile > subscription "
msgstr ""
msgid "View Donations"
msgstr ""
msgid "Cancel Donation"
msgstr ""
msgid "Donate"
msgstr ""
msgid "Donations Made"
msgstr ""
msgid "Date"
msgstr ""
msgid "View Detail"
msgstr ""
msgid "You haven been logged out"
msgstr "Sie wurden abgemeldet"
msgid "previous"
msgstr "vorherige"
msgid "next"
msgstr "nächste"
msgid "Reanude Donation"
msgstr ""
#, python-format
msgid ""
"You're receiving this email because you requested a password reset for your "
"user account at %(site_name)s."
msgstr ""
msgid "Please go to the following page and choose a new password:"
msgstr ""
msgid "Thanks for using our site!"
msgstr ""
#, python-format
msgid "The %(site_name)s team"
msgstr ""
msgid "You haven been logged out"
msgstr "Sie wurden abgemeldet"
msgid "Log in "
msgstr ""
msgid "Login"
msgstr ""
msgid "Don't have an account yet ? "
msgstr ""
msgid "Sign up"
msgstr ""
msgid "Forgot your password ? "
msgstr ""
msgid "Reset your password"
msgstr ""
msgid "DG.Detail"
msgstr ""
msgid "Page Header"
msgstr ""
msgid "Change to language:"
msgstr "Sprache wechseln zu: "
#, python-format
msgid "No %(verbose_name)s found matching the query"
msgstr ""
msgid "Digital Glarus Gallery"
msgstr ""
msgid "Digital Glarus Supporters"
msgstr ""
msgid "Page"
msgstr "Seite"
msgid "of"
msgstr "vom"
msgid "next"
msgstr "nächste"
msgid "Change to language:"
msgstr "Sprache wechseln zu: "
msgid "Bookings"
msgstr ""
msgid "Membership"
msgstr ""
msgid "Logout"
msgstr ""
msgid "booking/payment/edit/?$"
msgstr ""
@ -329,6 +164,642 @@ msgstr "befurworter/?$"
msgid "Message Successfully Sent"
msgstr ""
msgid "US English"
msgstr ""
msgid "German"
msgstr ""
msgid "Content"
msgstr ""
msgid "default"
msgstr ""
msgid "2 Column"
msgstr ""
msgid "3 Column"
msgstr ""
msgid "DG.About"
msgstr ""
#, fuzzy
#| msgid "contact/?$"
msgid "DG.Contact"
msgstr "kontakt/?$"
msgid "DG.Home"
msgstr ""
msgid "DG.CoWork"
msgstr ""
msgid "DG.OneColumn"
msgstr ""
msgid "Blog"
msgstr ""
msgid "Data Center Light"
msgstr ""
msgid "Glasfaser"
msgstr ""
msgid "ungleich"
msgstr ""
msgid "English"
msgstr ""
msgid "Deutsch"
msgstr ""
msgid "Datacenterlight Navbar"
msgstr ""
msgid "Datacenterlight Footer"
msgstr ""
msgid "Datacenterlight Calculator"
msgstr ""
msgid "Amount"
msgstr "Betrag"
msgid "My Donations"
msgstr ""
msgid "Set your new password"
msgstr ""
msgid "Reset"
msgstr ""
msgid "Already have an account ?"
msgstr ""
msgid "Log in"
msgstr ""
msgid "Invoice"
msgstr ""
msgid "Donation #"
msgstr ""
msgid "Billing Address:"
msgstr ""
msgid "Date:"
msgstr ""
msgid "Payment Method:"
msgstr ""
msgid "Donation summary"
msgstr ""
msgid "Donation"
msgstr ""
msgid "Total"
msgstr ""
msgid "Finish Configuration"
msgstr ""
msgid ""
"Thanks for you donation, you can cancel your monthly donation at any time "
"going to profile > subscription "
msgstr ""
msgid "View Donations"
msgstr ""
msgid "Cancel Donation"
msgstr ""
msgid "Donate"
msgstr ""
msgid "Donations Made"
msgstr ""
msgid "Date"
msgstr ""
msgid "View Detail"
msgstr ""
msgid "Reanude Donation"
msgstr ""
#, python-format
msgid ""
"You're receiving this email because you requested a password reset for your "
"user account at %(site_name)s."
msgstr ""
msgid "Please go to the following page and choose a new password:"
msgstr ""
msgid "Thanks for using our site!"
msgstr ""
#, python-format
msgid "The %(site_name)s team"
msgstr ""
msgid "Log in "
msgstr ""
msgid "Login"
msgstr ""
msgid "Don't have an account yet ? "
msgstr ""
msgid "Sign up"
msgstr ""
msgid "Forgot your password ? "
msgstr ""
msgid "Reset your password"
msgstr ""
msgid "DG.Detail"
msgstr ""
msgid ""
"This site uses cookies for analytics. By continuing to\n"
" browse this site, you agree to use this."
msgstr ""
"Diese Website verwendet Cookies für Analysezwecke. Mit dem weiterem Besuch "
"dieser Website erklärst Du Dich damit einverstanden, diese zu nutzen."
msgid "Learn more"
msgstr "Lerne mehr"
msgid "OK"
msgstr ""
msgid "Privacy policy"
msgstr "Datenschutz-Bestimmungen"
msgid ""
"\n"
" <strong>1. Responsibility and scope</strong><br/>\n"
" <br/>\n"
" Responsible in regards to EU General Data Protection\n"
" Regulation (\"GDPR\") and other applicable data "
"protection\n"
" laws:<br/>\n"
" <br/>\n"
" ungleich glarus ag<br/>\n"
" Bahnhofstrasse 1<br/>\n"
" 8783 Linthal (CH)<br/>\n"
" Tel.: +41 55 505 6266<br/>\n"
" E-Mail: info@ungleich.ch<br/>\n"
" <br/>\n"
" This privacy statement applies to the web content of\n"
" ungleich glarus ag, available at the<br/>\n"
" following domains:<br/>\n"
" <br/>\n"
" ungleich.ch<br/>\n"
" datacenterlight.ch<br/>\n"
" devuanhosting.com<br/>\n"
" devuanhosting.ch<br/>\n"
" digitalglarus.ch<br/>\n"
" hack4lgarus.ch<br/>\n"
" ipv6onlyhosting.com<br/>\n"
" django-hosting.ch<br/>\n"
" rails-hosting.ch<br/>\n"
" node-hosting.ch<br/>\n"
" blog.ungleich.ch<br/>\n"
" <br/>\n"
" The Data Privacy Officer:<br/>\n"
" <br/>\n"
" Sanghee Kim<br/>\n"
" ungleich glarus ag<br/>\n"
" Bahnhofstrasse 1<br/>\n"
" 8783 Linthal (CH)<br/>\n"
" E-Mail: <a href=\"mailto:sanghee.kim@ungleich.ch"
"\">sanghee.kim@ungleich.ch</a><br/>\n"
" <br/>\n"
" <br/>\n"
" <strong>2. General</strong><br/>\n"
" <br/>\n"
" User data is personal data which is necessary to "
"establish\n"
" or change the contractual relations\n"
" between ungleich glarus ag (\"us\") and you. This "
"includes\n"
" among other things for example the\n"
" name, the address, the date of birth, the e-mail address "
"or\n"
" the IP address. We save and use\n"
" your personal data only for the processing of your "
"orders\n"
" or for getting in contact with you.<br/>\n"
" <br/>\n"
" <br/>\n"
" <strong>3. Processing of personal data</strong><br/>\n"
" <br/>\n"
" When you call one of our websites we collect your IP\n"
" address. When you register an account with us your "
"contact\n"
" data will be stored. When you order products on our\n"
" platform we also collect among others your address and "
"your\n"
" payment details.<br/>\n"
" <br/>\n"
" <strong>I. Registration data</strong><br/>\n"
" <br/>\n"
" In the process of registration we need to collect some "
"of\n"
" your personal data. For example we collect your name, "
"your\n"
" address, your telephone number, your e-mail address and\n"
" your payment details to process orders. We do not "
"collect\n"
" your payment details such as credit card number, "
"expiration\n"
" date or the cvv code when you pay with credit card. You\n"
" expose those data directly to the respective payment\n"
" processor. Payments with credit card are processed by\n"
" Stripe Payments Europe Ltd. (\"Stripe\").<br/>\n"
" <br/>\n"
" <br/>\n"
" <strong>II. Server log files</strong><br/>\n"
" <br/>\n"
" When you call one of our websites we automatically save\n"
" traffic data. Normally the IP address, the type and "
"version\n"
" of your browser, the time and the website that lead to "
"our\n"
" website (\"Referer\") will be saved. Your IP address is\n"
" collected anonymously so that we cannot match it with "
"your\n"
" person. The collection of those data is necessary to\n"
" provide our websites and services, according to Art. 6 "
"par.\n"
" 1 lit. f GDPR.<br/>\n"
" <br/>\n"
" <br/>\n"
" <strong>4. Storage durations</strong><br/>\n"
" <br/>\n"
" Your data will be deleted immediately, as soon as it "
"isn't\n"
" relevant anymore for any contract between you and us. "
"In\n"
" some cases it could be necessary to store your data\n"
" further, to comply with our contractual or other legal\n"
" obligatons.<br/>\n"
" <br/>\n"
" <br/>\n"
" <strong>5. Disclosure of your personal data</strong><br/"
">\n"
" <br/>\n"
" We don't disclose your personal data to third parties,\n"
" except:<br/>\n"
" <br/>\n"
" a) You grant us your explicit permission according to "
"Art.\n"
" 6 par. 1 S. 1 lit. a GDPR.<br/>\n"
" <br/>\n"
" b) The disclosure of your data is legal and it is "
"necessary\n"
" to comply with our contractual or other legal "
"obligations,\n"
" according to Art. 6 par. 1 S. 1 lit b GDPR.<br/>\n"
" <br/>\n"
" c) There is a law or legal obligation to disclose your "
"data\n"
" or the disclosure is necessary for the performance of a\n"
" task carried out in the public interest or in the "
"exercise\n"
" of an official authority according to Art. 6 par. 1 S. "
"1\n"
" lit. c GDPR.<br/>\n"
" <br/>\n"
" d) The disclosure of your data is necessary for the\n"
" purposes of the legitimate interests pursued by us or by "
"a\n"
" third party, except where such interests are overridden "
"by\n"
" the interests or your fundamental right according to "
"Art.\n"
" 6. par. 1 S. 1 lit. f GDPR.<br/>\n"
" <br/>\n"
" <br/>\n"
" <strong>6. Cookies, Google Analytics, Twitter</"
"strong><br/>\n"
" <br/>\n"
" We use Cookies. When you visit one of our websites,\n"
" information is stored on your terminal device in the "
"form\n"
" of a \"cookie\". Cookies are small text files that are "
"stored\n"
" on your terminal device by your browser. You can opt-out "
"of\n"
" the storage of cookies in the settings of your\n"
" browser-software, but however, in this case you might "
"not\n"
" be able to fully use all functions and services on our\n"
" website.<br/>\n"
" <br/>\n"
" We use Google Analytics, a service provided by Google "
"Inc.,\n"
" 1600 Amphitheatre Parkway, Mountainview, CA 94043, USA\n"
" (\"Google\"). Google uses Cookies. Google will use "
"these\n"
" cookies on our behalf to analyse how you use our "
"websites\n"
" and to generate reports about the activities on our\n"
" websites. The information collected by those cookies "
"will\n"
" be transmitted to a Google server in the United States "
"of\n"
" America. We have Google's IP anonymization activated, "
"so\n"
" your IP address will be shortened before transmitting "
"to\n"
" Google. Only in exceptional cases the full IP address "
"will\n"
" be transmitted and then shortened afterwards. <br/>\n"
" <br/>\n"
" You may opt out from thecollection of these cookies by\n"
" downloading and installing a browser plugin available "
"at\n"
" the following link:<br/>\n"
" <br/>\n"
" <a href=\"http://tools.google.com/dlpage/gaoptout"
"\">http://tools.google.com/dlpage/gaoptout</a><br/>\n"
" <br/>\n"
" You may find further information about the processing "
"of\n"
" your personal data at the following links:<br/>\n"
" <br/>\n"
" <a href=\"https://policies.google.com/technologies/ads"
"\">https://policies.google.com/technologies/ads</a><br/>\n"
" <br/>\n"
" <a href=\"https://www.privacyshield.gov/participant?"
"id=a2zt000000001L5AAI&status=Active\">https://www.privacyshield.gov/"
"participant?id=a2zt000000001L5AAI&status=Active</a><br/>\n"
" <br/>\n"
" <a href=\"https://adssettings.google.com/authenticated"
"\">https://adssettings.google.com/authenticated</a><br/>\n"
" <br/>\n"
" The collected personal data will be deleted or "
"anonymized\n"
" after 14 months according to Art. 6 par. 1 lit. f\n"
" GDPR.<br/>\n"
" <br/>\n"
" Our websites use several functions from the social "
"network\n"
" Twitter, a service provided by Twitter Inc., 1355 "
"Market\n"
" Street, Suite 900, San Francisco, CA 94103, USA. We may\n"
" embed content of Twitter in our websites, such as "
"photos,\n"
" videos, texts or buttons. If you are registered with\n"
" Twitter, they may combine your use of these "
"functionalities\n"
" on our websites with your Twitter account. You may find\n"
" further information at https://twitter.com/de/privacy."
"<br/>\n"
" <br/>\n"
" <br/>\n"
" <strong>7. Your rights concerning your personal\n"
" data</strong><br/>\n"
" <br/>\n"
" Under applicable GDPR you may have the right to:<br/>\n"
" <br/>\n"
" a) Obtain confirmation as to whether or not personal "
"data\n"
" concerning you are being processed, and where that is "
"the\n"
" case, access to the personal data, according to Art. 15\n"
" GDPR.<br/>\n"
" <br/>\n"
" b) Obtain the rectification of false or inaccurate data\n"
" concerning you, according to Art. 15, Art. 16 GDPR.<br/"
">\n"
" <br/>\n"
" c) Obtain the deletion of your personal data, according "
"to\n"
" Art. 17 GDPR.<br/>\n"
" <br/>\n"
" d) Obtain the restriction of processing your personal "
"data,\n"
" according to Art. 18 GDPR.<br/>\n"
" <br/>\n"
" e) Obtain a digital copy of your personal data processed "
"by\n"
" us, according to Art. 20 GDPR.<br/>\n"
" <br/>\n"
" f) Revoke a granted permission regarding your personal "
"data\n"
" at any time, according to Art. 7 par. 3 GDPR.<br/>\n"
" <br/>\n"
" g) Complain at a data protection authority, according "
"to\n"
" Art. 77 GDPR.<br/>\n"
" <br/>\n"
" <br/>\n"
" <br/>\n"
" <strong>8. Hyperlinks / Disclaimer</strong><br/>\n"
" <br/>\n"
" This privacy policy applies only to our websites and not "
"to\n"
" other websites or applications operated by third "
"parties.\n"
" We may provide links to other websites but we are not\n"
" responsible for the privacy practices of such other\n"
" websites.<br/>\n"
" <br/>\n"
" <br/>\n"
" "
msgstr ""
"\n"
"<strong>1. Verantwortung und Geltungsbereich</strong><br/><br/"
">Verantwortlich im Sinne der EU-Datenschutzgrundverordnung („DSGVO“) und "
"sonstiger datenschutzrechtlicher Bestimmungen ist:<br/><br/>ungleich glarus "
"ag<br/>Bahnhofstrasse 1<br/>8783 Linthal (CH)<br/>Tel.: +41 55 505 6266<br/"
">E-Mail: info@ungleich.ch<br/><br/>Diese Datenschutzerklärung gilt für das "
"Internetangebot der ungleich glarus ag, welches unter den nachfolgenden "
"Domains erreichbar ist:<br/><br/>ungleich.ch<br/>datacenterlight.ch<br/"
">devuanhosting.com<br/>devuanhosting.ch<br/>digitalglarus.ch<br/>hack4lgarus."
"ch<br/>ipv6onlyhosting.com<br/>django-hosting.ch<br/>rails-hosting.ch"
"<br/>node-hosting.ch<br/>blog."
"ungleich.ch<br/><br/>Der Datenschutzbeauftragte des Verantwortlichen ist:<br/"
"><br/>Sanghee Kim<br/>ungleich glarus ag<br/>Bahnhofstrasse 1<br/>8783 "
"Linthal (CH)<br/>E-Mail: <a href=\"mailto:sanghee.kim@ungleich.ch\">sanghee."
"kim@ungleich.ch</a><br/><br/><br/><strong>2. Grundsätzliches</strong><br/"
"><br/>Bei personenbezogenen Daten handelt es sich um alle Informationen, die "
"sich auf eine identifizierte oder identifizierbare natürliche Person "
"beziehen. Hierzu gehört zum Beispiel dein Name, deine Anschrift, dein "
"Geburtsdatum, deine E-Mail-Adresse oder deine IP-Adresse. Wir speichern und "
"verwenden deine personenbezogenen Daten ausschließlich für die Bearbeitung "
"deiner Aufträge und für die Kontaktaufnahme mit dir.<br/><br/><br/"
"><strong>3. Verarbeitung deiner personenbezogenen Daten</strong><br/><br/"
">Bei jedem Aufruf einer unserer Internetseiten wird u. a. deine IP-Adresse "
"gespeichert. Wenn du dich bei uns registrierst, werden deine Kontaktdaten "
"gespeichert. Wenn du Aufträge an uns richtest oder Produkte bei uns "
"bestellst, werden darüber hinaus auch deine Anschrift und deine<br/"
">Zahlungsdaten gespeichert.<br/><br/><strong>I. Registrierungsdaten</"
"strong><br/><br/>Im Rahmen der Registrierung müssen wir einige "
"personenbezogene Daten von dir erheben und verarbeiten. Beispielsweise "
"benötigen wir deinen Namen, deine Anschrift, deine Telefonnummer, deine E-"
"Mail-Adresse und deine Zahlungsdaten um deine Aufträge zu verarbeiten. <br/"
">Bei der Zahlung mittels Kreditkarte erfassen und speichern wir keine "
"Zahlungsverkehrsinformationen wie Kreditkartennummern, das Ablaufdatum oder "
"die Prüfziffer. Diese gibst du ausschließlich direkt dem entsprechenden "
"Zahlungsdienstleister bekannt. Bei der Bezahlung mit Kreditkarte erfolgt die "
"Abwicklung der Bezahlung durch einen externen Dienstleister. <br/>Für die "
"Kreditkartenzahlung werden deine Angaben direkt vom Diensteanbieter Stripe "
"Payments Europe Ltd. („Stripe“) verarbeitet.<br/><br/><strong>II. "
"Serverlogdateien</strong><br/><br/>Bei jedem Aufruf einer unserer "
"Internetseiten speichern wir automatisch bestimmte Daten. Dazu gehören u. a. "
"deine IP-Adresse, Typ und Version des verwendeten Browsers, Uhrzeit, Datum "
"und die Webseite von der du auf unsere Seite gelangst (sog. „Referer“). "
"Deine IP-Adresse wird bei uns nur anonymisiert gespeichert, sodass ein "
"Personenbezug nicht mehr herstellbar ist. Die Erfassung der Daten zur "
"Bereitstellung unserer Internetseiten und die Speicherung der Daten in den "
"Server Logfiles ist für den Betrieb der Internetseite zwingend erforderlich "
"und dient damit der Wahrung eines berechtigten Interesses unseres "
"Unternehmens. Die Rechtsgrundlage für diese Verarbeitung ist Art. 6. Abs. 1 "
"lit. f DSGVO.<br/><br/><br/><strong>4. Speicherdauer</strong><br/><br/"
">Sofern die verarbeiteten personenbezogenen Daten für die Durchführung eines "
"ggf.<br/>geschlossenen Vertrages nicht mehr erforderlich sind, werden sie "
"umgehend gelöscht. Jedoch kann es auch nach Abschluss des Vertrags "
"erforderlich sein, personenbezogene Daten von dir zu speichern, um unseren "
"vertraglichen oder gesetzlichen Verpflichtungen nachzukommen.<br/><br/><br/"
"><strong>5. Weitergabe von personenbezogenen Daten</strong><br/><br/>Wir "
"geben deine personenbezogenen Daten grundsätzlich nicht an Dritte weiter, es "
"sei denn:<br/><br/>a) Du erteilst uns hierzu deine ausdrückliche "
"Einwilligung nach Art. 6 Abs. 1 S. 1 lit. a DSGVO.<br/><br/>b) Die "
"Weitergabe der Daten ist gesetzlich zulässig und nach Art. 6. Abs. 1 S. 1 "
"lit b DSGVO zur Erfüllung unserer vertraglichen Pflichten mit Ihnen "
"erforderlich.<br/><br/>c) Für die Weitergabe der Daten besteht nach Art. 6. "
"Abs. 1 S. 1 lit. c DSGVO eine gesetzliche Verpflichtung.<br/><br/>d) Die "
"Weitergabe der Daten ist nach Art. 6. Abs. 1 S. 1 lit. f DSGVO zur Wahrung "
"unserer berechtigten Interessen, sowie zur Geltendmachung, Ausübung oder "
"<Verteidigung von Rechtsansprüchen erforderlich und darüber hinaus kein "
"Grund zu der Annahme besteht, dass du ein überwiegendes schutzwürdiges "
"Interesse an der Nichtweitergabe deiner Daten hast.<br/><br/><br/><br/"
"><strong>6. Cookies, Google Analytics und Twitter</strong><br/><br/>Wir "
"setzen auf unseren Internetseiten sog. „Cookies“ ein. Cookies sind kleine "
"Textdateien, die im Rahmen deines Besuchs einer unserer Internetseiten von "
"uns an den Browser deines Endgeräts gesendet und dort gespeichert werden. "
"Einige Funktionen unseres Angebots können ohne den Einsatz bestimmter "
"Cookies grundsätzlich aus technischen Gründen nicht angeboten werden. Du "
"kannst deinen Browser allerdings so konfigurieren, dass er nur noch "
"bestimmte oder auch gar keine Cookies mehr akzeptiert. Es kann jedoch "
"passieren, dass du dadurch möglicherweise nicht mehr alle Funktionen unserer "
"Internetseiten nutzen kannst.<br/>Andere Cookies ermöglichen es uns hingegen "
"verschiedene Analysen deines Verhaltens oder etwa eine Verbindung zu deinen "
"sozialen Netzwerken aufzubauen. Mithilfe dieser Cookies können wir "
"beispielsweise unser Internetangebot für dich nutzerfreundlicher und "
"effektiver gestalten. Daraus folgt, dass wir auf Grundlage unserer "
"berechtigten Unternehmensinteressen (Optimierung und wirtschaftlicher "
"Betrieb unseres Internetangebots) den Werbeanalysedienst „Google Analytics“ "
"der Google Inc., 1600 Amphitheatre Parkway, Mountainview, CA 94043, "
"Vereinigte Staaten von Amerika („Google“) einsetzen. Google verwendet "
"Cookies. Die durch das Cookie erzeugten Informationen werden an einen Server "
"von Google in den Vereinigten Staaten von Amerika übertragen und dort "
"erhoben und gespeichert. Google nutzt dies Informationen in unserem Auftrag "
"dafür, die Nutzung unseres Internetangebots auszuwerten und Berichte über "
"die Aktivitäten auf unserem Onlineangebot uns gegenüber zu erbringen.<br/"
">Dabei werden aus den verarbeiteten Daten anonymisierte bzw. pseudonyme "
"Nutzungsprofile einiger Nutzer erstellt. Diese Nutzungsprofile sind nicht "
"auf eine IP-Adresse oder einen spezifischen Nutzer zurückzuführen. Darüber "
"hinaus setzen wir Google Analytics nur mit IP-Anonymisierung ein. Das heißt, "
"dass die IP-Adresse von Google gekürzt wird. Nur in wenigen Ausnahmefällen "
"wird die vollständige IP-Adresse an Google übertragen und dort gekürzt. Du "
"kannst der Verarbeitung von deinen erfassten Daten durch die Installation "
"dieses Browserplugins widersprechen: <a href=\"http://tools.google.com/"
"dlpage/gaoptout?hl=de\">http://tools.google.com/dlpage/gaoptout?hl=de</a><br/"
"><br/>Weitere Informationen zur Nutzung der Daten durch Google und "
"weiterführende Widerspruchsmöglichkeiten erhältst du in der "
"Datenschutzerklärung von Google:<br/><br/><a href=\"https://policies.google."
"com/technologies/ads\">https://policies.google.com/technologies/ads</a><br/"
"><br/>und auf den folgenden Webseiten:<br/><br/><a href=\"https://www."
"privacyshield.gov/participant?id=a2zt000000001L5AAI&status=Active\">https://"
"www.privacyshield.gov/participant?id=a2zt000000001L5AAI&status=Active</a><br/"
"><br/><a href=\"https://adssettings.google.com/authenticated\">https://"
"adssettings.google.com/authenticated</a><br/><br/>Die personenbezogenen "
"Daten werden nach 14 Monaten gelöscht oder anonymisiert.<br/>Rechtliche "
"Grundlage hierfür ist Art. 6 Abs. 1 lit. f DSGVO.<br/><br/>Innerhalb unseres "
"Onlineangebots können Funktionen und Inhalte des Dienstes Twitter "
"eingebunden werden. Twitter ist ein Dienst der Twitter Inc., 1355 Market "
"Street, Suite 900, San Francisco, CA 94103, Vereinigte Staaten von Amerika. "
"Hierzu können beispielsweise Inhalte wie Bilder, Videos oder Texte und "
"Schaltflächen gehören. Sofern du Mitglied der Plattform Twitter bist, kann "
"Twitter den Aufruf der Funktionalitäten deinem dortigen Profil zuordnen.<br/"
">Weitere Informationen zum Datenschutz bei Twitter, findest du in der "
"Datenschutzerklärung von<br/>Twitter unter <a href=\"https://twitter.com/de/"
"privacy\">https://twitter.com/de/privacy</a>.<br/><br/><br/><br/><strong>7. "
"Rechte des Betroffenen</strong><br/><br/>Aus der DSGVO ergeben sich für dich "
"als Betroffener die folgenden Rechte:<br/><br/>a) Du kannst gem. Art. 15 "
"DSGVO Auskunft über deine von uns verarbeiteten personenbezogenen Daten "
"verlangen. Du kannst insbesondere Auskunft über den Zweck der Verarbeitung, "
"die Kategorien der erhobenen personenbezogenen Daten, die Kategorien von "
"Dritten, gegenüber denen deine Daten offengelegt werden und die "
"voraussichtliche Speicherdauer verlangen.<br/><br/>b) Du hast gem. Art. 15 "
"u. Art. 16 DSGVO ein Recht auf Berichtigung, Vervollständigung, Löschung und "
"die Bestimmung von Einschränkungen hinsichtlich der Verarbeitung deiner "
"personenbezogenen Daten.<br/><br/>c) Gemäß Art. 17 DSGVO kannst du von uns "
"die Löschung deiner bei uns gespeicherten personenbezogenen Daten verlangen, "
"soweit die Verarbeitung nicht zur Erfüllung unserer rechtlichen "
"Verpflichtungen, aus Gründen des öffentlichen Interesses oder zur "
"Geltendmachung, Ausübung oder Verteidigung von Rechtsansprüchen erforderlich "
"ist.<br/><br/>d) Gemäß Art. 18 DSGVO kannst du von uns die Einschränkung der "
"Verarbeitung deiner personenbezogenen Daten verlangen, soweit die "
"Richtigkeit der Daten von dir bestritten wird, die Verarbeitung "
"grundsätzlich unrechtmäßig ist oder die Löschung deiner<br/"
">personenbezogenen Daten durch uns ablehnen, weil du diese zur "
"Geltendmachung, Ausübung oder Verteidigung von Rechtsansprüchen benötigst."
"<br/><br/>e) Gemäß Art. 20 DSGVO kannst du von uns verlangen, dass deine "
"personenbezogenen Daten, die du uns zur Verfügung gestellt hast, in einem "
"strukturierten, maschinenlesbaren und gängigen Format zu erhalten oder du "
"kannst die Übermittlung an eine andere Stelle verlangen.<br/><br/>f) Gemäß "
"Art. 7 Abs. 3 DSGVO kannst du deine erteilte Einwilligung gegenüber uns "
"jederzeit widerrufen. Dies hat zur Folge, dass wir die auf dieser "
"Einwilligung beruhende Datenverarbeitung für die Zukunft nicht mehr "
"fortführen dürfen.<br/><br/>g) Gemäß Art. 77 DSGVO steht dir das Recht zu, "
"dich bei einer Aufsichtsbehörde zu beschweren.<br/><br/><br/><strong>8. "
"Hyperlinks und Haftungsausschluss</strong><br/><br/>Auf unseren "
"Internetseiten befinden sich sog. „Hyperlinks“, also Verbindungen bzw.<br/"
">Weiterleitungen zu den Internetseiten Dritter. Bei Aktivierung dieser "
"Hyperlinks durch Anklicken, wirst du von unserer Internetseite direkt auf "
"die Internetseite eines Dritten weitergeleitet. Wir können keine "
"Verantwortung für den vertraulichen Umgang deiner Daten auf diesen Webseiten "
"Dritter übernehmen, da wir keinen Einfluss darauf haben, dass diese "
"Unternehmen die Datenschutzbestimmungen der DSGVO einhalten. Wir weisen dich "
"außerdem darauf hin, dass es aufgrund der Struktur des Internets möglich "
"ist, dass die Regelungen des Datenschutzes bzw. der DSGVO von anderen, "
"dritten Personen oder Institutionen die nicht innerhalb unseres "
"Verantwortungsbereichs liegen nicht beachtet werden, oder dass sich spontan, "
"kurzfristig schwerwiegende Sicherheitslücken in verbreiteten Standards und "
"technischen Protokollen auftun, die die Datenintegrität gefährden könnten."
"<br/> <br/>\n"
" "
msgid "Page Header"
msgstr ""
#, python-format
msgid "No %(verbose_name)s found matching the query"
msgstr ""
#~ msgid "Accept"
#~ msgstr "Annehmen"
#~ msgid "Enter your name or company name"
#~ msgstr "Geben Sie Ihren Namen oder der Ihrer Firma ein"
@ -365,3 +836,4 @@ msgstr ""
#~ msgid "index/?$"
#~ msgstr "index/?$"

Binary file not shown.

After

Width:  |  Height:  |  Size: 280 KiB

File diff suppressed because one or more lines are too long

View file

@ -53,7 +53,7 @@
<span class="map-caption">In der Au 7 Schwanden 8762 Switzerland
<br>info@digitalglarus.ch
<br>
(044) 534-66-22
+41 55 505 6266
<p>&nbsp;</p>
</span>
</div>

View file

@ -203,7 +203,7 @@
<span class="map-caption">In der Au 7 Schwanden 8762 Switzerland
<br>info@digitalglarus.ch
<br>
(044) 534-66-22
+41 55 505 6266
<p>&nbsp;</p>
</span>
</div>

View file

@ -214,7 +214,7 @@
<span class="map-caption">In der Au 7 Schwanden 8762 Switzerland
<br>info@digitalglarus.ch
<br>
(044) 534-66-22
+41 55 505 6266
<p>&nbsp;</p>
</span>
</div>

View file

@ -43,7 +43,7 @@
<span class="map-caption">In der Au 7 Schwanden 8762 Switzerland
<br>info@digitalglarus.ch
<br>
(044) 534-66-22
+41 55 505 6266
<p>&nbsp;</p>
</span>
</div>

View file

@ -101,7 +101,7 @@
<span class="map-caption">In der Au 7 Schwanden 8762 Switzerland
<br>info@digitalglarus.ch
<br>
(044) 534-66-22
+41 55 505 6266
<p>&nbsp;</p>
</span>
</div>

View file

@ -169,7 +169,7 @@
<span class="map-caption">In der Au 7 Schwanden 8762 Switzerland
<br>info@digitalglarus.ch
<br>
(044) 534-66-22
+41 55 505 6266
<p>&nbsp;</p>
</span>
</div>

View file

@ -139,7 +139,7 @@
In der Au 7 Schwanden 8762 Switzerland
<br>info@digitalglarus.ch
<br>
(044) 534-66-22
+41 55 505 6266
<br>
</span>
<p>&nbsp;</p>

View file

@ -453,7 +453,7 @@
<span class="map-caption">In der Au 7 Schwanden 8762 Switzerland
<br>info@digitalglarus.ch
<br>
(044) 534-66-22
+41 55 505 6266
<p>&nbsp;</p>
</span>
</div>

View file

@ -130,7 +130,7 @@
<span class="map-caption">In der Au 7 Schwanden 8762 Switzerland
<br>info@digitalglarus.ch
<br>
(044) 534-66-22
+41 55 505 6266
<p>&nbsp;</p>
</span>
</div>

View file

@ -68,7 +68,7 @@
<span class="map-caption">In der Au 7 Schwanden 8762 Switzerland
<br>info@digitalglarus.ch
<br>
(044) 534-66-22
+41 55 505 6266
<p>&nbsp;</p>
</span>
</div>

View file

@ -45,7 +45,7 @@
<span class="map-caption">In der Au 7 Schwanden 8762 Switzerland
<br>info@digitalglarus.ch
<br>
(044) 534-66-22
+41 55 505 6266
<p>&nbsp;</p>
</span>
</div>

View file

@ -101,7 +101,7 @@
<span class="map-caption">In der Au 7 Schwanden 8762 Switzerland
<br>info@digitalglarus.ch
<br>
(044) 534-66-22
+41 55 505 6266
<p>&nbsp;</p>
</span>
</div>

View file

@ -42,7 +42,7 @@
<span class="map-caption">In der Au 7 Schwanden 8762 Switzerland
<br>info@digitalglarus.ch
<br>
(044) 534-66-22
+41 55 505 6266
<p>&nbsp;</p>
</span>
</div>

View file

@ -238,7 +238,7 @@
<span class="map-caption">In der Au 7 Schwanden 8762 Switzerland
<br>info@digitalglarus.ch
<br>
(044) 534-66-22
+41 55 505 6266
<p>&nbsp;</p>
</span>
</div>

View file

@ -123,7 +123,7 @@
<span class="map-caption">In der Au 7 Schwanden 8762 Switzerland
<br>info@digitalglarus.ch
<br>
(044) 534-66-22
+41 55 505 6266
<p>&nbsp;</p>
</span>
</div>

View file

@ -46,7 +46,7 @@
<span class="map-caption">In der Au 7 Schwanden 8762 Switzerland
<br>info@digitalglarus.ch
<br>
(044) 534-66-22
+41 55 505 6266
<p>&nbsp;</p>
</span>
</div>

View file

@ -50,7 +50,7 @@
<span class="map-caption">In der Au 7 Schwanden 8762 Switzerland
<br>info@digitalglarus.ch
<br>
(044) 534-66-22
+41 55 505 6266
<p>&nbsp;</p>
</span>
</div>

View file

@ -78,7 +78,7 @@
<span class="map-caption">In der Au 7 Schwanden 8762 Switzerland
<br>info@digitalglarus.ch
<br>
(044) 534-66-22
+41 55 505 6266
<p>&nbsp;</p>
</span>
</div>

View file

@ -112,7 +112,7 @@
<body id="page-top" class="index">
{% include "gdpr_banner.html" %}
<!-- Navigation -->
<nav class="navbar navbar-default navbar-fixed-top">
<div style="margin-left: 0px; margin-right: 0px;">

View file

@ -52,7 +52,7 @@ PROJECT_DIR = os.path.abspath(
)
# load .env file
dotenv.read_dotenv("{0}/.env".format(PROJECT_DIR))
dotenv.load_dotenv("{0}/.env".format(PROJECT_DIR))
from multisite import SiteID
@ -153,6 +153,7 @@ INSTALLED_APPS = (
'rest_framework',
'opennebula_api',
'django_celery_results',
'webhook',
)
MIDDLEWARE_CLASSES = (
@ -194,6 +195,7 @@ TEMPLATES = [
os.path.join(PROJECT_DIR, 'templates/analytics'),
os.path.join(PROJECT_DIR, 'cms_templates/'),
os.path.join(PROJECT_DIR, 'cms_templates/djangocms_blog/'),
os.path.join(PROJECT_DIR, 'templates/gdpr'),
],
'APP_DIRS': True,
'OPTIONS': {
@ -243,8 +245,9 @@ DATABASES = {
}
AUTHENTICATION_BACKENDS = (
'utils.backend.MyLDAPBackend',
'guardian.backends.ObjectPermissionBackend',
'django.contrib.auth.backends.ModelBackend',
)
# Internationalization
@ -450,10 +453,10 @@ USE_X_FORWARDED_HOST = True
BOOTSTRAP3 = {
# The URL to the jQuery JavaScript file
'jquery_url': '//code.jquery.com/jquery.min.js',
'jquery_url': '%sdatacenterlight/js/jquery-1.11.1.min.js' % STATIC_URL,
# The Bootstrap base URL
'base_url': '//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/',
'base_url': '%sdatacenterlight/bootstrap-3.3.4/' % STATIC_URL,
# The complete URL to the Bootstrap CSS file
# (None means derive it from base_url)
@ -628,8 +631,6 @@ GOOGLE_ANALYTICS_PROPERTY_IDS = {
'datacenterlight.ch': 'UA-62285904-8',
'devuanhosting.ch': 'UA-62285904-9',
'devuanhosting.com': 'UA-62285904-9',
'ipv6onlyhosting.ch': 'UA-62285904-10',
'ipv6onlyhosting.net': 'UA-62285904-10',
'ipv6onlyhosting.com': 'UA-62285904-10',
'comic.ungleich.ch': 'UA-62285904-13',
'127.0.0.1:8000': 'localhost',
@ -647,6 +648,7 @@ CELERY_RESULT_SERIALIZER = 'json'
CELERY_MAX_RETRIES = int_env('CELERY_MAX_RETRIES', 5)
DCL_ERROR_EMAILS_TO = env('DCL_ERROR_EMAILS_TO')
ADMIN_EMAIL = env('ADMIN_EMAIL')
DCL_ERROR_EMAILS_TO_LIST = []
if DCL_ERROR_EMAILS_TO is not None:
@ -684,18 +686,26 @@ if ENABLE_LOGGING:
custom_handler_item = {
'custom_file': {
'level': LOG_LEVEL,
'class': 'logging.FileHandler',
'class': 'logging.handlers.RotatingFileHandler',
'filename':
"{PROJECT_DIR}/{LEVEL}.log".format(
"{PROJECT_DIR}/logs/{LEVEL}.log".format(
LEVEL=LOG_LEVEL.lower(),
PROJECT_DIR=PROJECT_DIR
)
),
'maxBytes': 1024 * 1024 * 5,
'backupCount': 10,
'formatter': 'standard',
}
}
handlers_dict.update(custom_handler_item)
LOGGING = {
'version': 1,
'disable_existing_loggers': False,
'formatters': {
'standard': {
'format': '%(asctime)s,%(msecs)d %(levelname)-8s [%(filename)s:%(lineno)d] %(message)s',
}
},
'handlers': handlers_dict,
'loggers': loggers_dict
}
@ -709,7 +719,55 @@ X_FRAME_OPTIONS = ('SAMEORIGIN' if X_FRAME_OPTIONS_ALLOW_FROM_URI is None else
X_FRAME_OPTIONS_ALLOW_FROM_URI.strip()
))
WEBHOOK_SECRET = env('WEBHOOK_SECRET')
DEBUG = bool_env('DEBUG')
ADD_TRIAL_PERIOD_TO_SUBSCRIPTION = bool_env('ADD_TRIAL_PERIOD_TO_SUBSCRIPTION')
# LDAP setup
LDAP_ADMIN_DN = env('LDAP_ADMIN_DN')
LDAP_ADMIN_PASSWORD = env('LDAP_ADMIN_PASSWORD')
AUTH_LDAP_SERVER = env('LDAPSERVER')
LDAP_CUSTOMER_DN = env('LDAP_CUSTOMER_DN')
LDAP_CUSTOMER_GROUP_ID = int(env('LDAP_CUSTOMER_GROUP_ID'))
LDAP_MAX_UID_FILE_PATH = os.environ.get('LDAP_MAX_UID_FILE_PATH',
os.path.join(os.path.abspath(os.path.dirname(__file__)), 'ldap_max_uid_file')
)
LDAP_DEFAULT_START_UID = int(env('LDAP_DEFAULT_START_UID'))
# Search union over OUs
AUTH_LDAP_START_TLS = bool(os.environ.get('LDAP_USE_TLS', False))
ENTIRE_SEARCH_BASE = env("ENTIRE_SEARCH_BASE")
AUTH_LDAP_USER_ATTR_MAP = {
"first_name": "givenName",
"last_name": "sn",
"email": "mail"
}
READ_VM_REALM = env('READ_VM_REALM')
AUTH_NAME = env('AUTH_NAME')
AUTH_SEED = env('AUTH_SEED')
AUTH_REALM = env('AUTH_REALM')
OTP_SERVER = env('OTP_SERVER')
OTP_VERIFY_ENDPOINT = env('OTP_VERIFY_ENDPOINT')
FIRST_VM_ID_AFTER_EU_VAT = int_env('FIRST_VM_ID_AFTER_EU_VAT')
PRE_EU_VAT_RATE = float(env('PRE_EU_VAT_RATE'))
VM_BASE_PRICE = float(env('VM_BASE_PRICE'))
UPDATED_TEMPLATES_STR = env('UPDATED_TEMPLATES')
UPDATED_TEMPLATES_DICT = {}
if UPDATED_TEMPLATES_STR:
UPDATED_TEMPLATES_DICT = eval(UPDATED_TEMPLATES_STR)
MAX_TIME_TO_WAIT_FOR_VM_TERMINATE = int_env(
'MAX_TIME_TO_WAIT_FOR_VM_TERMINATE', 15)
if DEBUG:
from .local import * # flake8: noqa

View file

@ -28,9 +28,7 @@ ALLOWED_HOSTS = [
".devuanhosting.ch",
".devuanhosting.com",
".digitalezukunft.ch",
".ipv6onlyhosting.ch",
".ipv6onlyhosting.com",
".ipv6onlyhosting.net",
".digitalglarus.ch",
".hack4glarus.ch",
".xn--nglarus-n2a.ch"

View file

@ -11,6 +11,7 @@ from hosting.views import (
RailsHostingView, DjangoHostingView, NodeJSHostingView
)
from datacenterlight.views import PaymentOrderView
from webhook import views as webhook_views
from membership import urls as membership_urls
from ungleich_page.views import LandingView
from django.views.generic import RedirectView
@ -62,6 +63,7 @@ urlpatterns += i18n_patterns(
name='blog_list_view'),
url(r'^cms/', include('cms.urls')),
url(r'^blog/', include('djangocms_blog.urls', namespace='djangocms_blog')),
url(r'^webhooks/', webhook_views.handle_webhook),
url(r'^$', RedirectView.as_view(url='/cms') if REDIRECT_TO_CMS
else LandingView.as_view()),
url(r'^', include('ungleich_page.urls', namespace='ungleich_page')),

View file

@ -1,15 +1,15 @@
import datetime
import logging
import subprocess
import tempfile
import xml
from django import forms
from django.conf import settings
from django.contrib.auth import authenticate
from django.utils.translation import ugettext_lazy as _
from membership.models import CustomUser
from utils.hosting_utils import get_all_public_keys
from .models import UserHostingKey, GenericProduct
logger = logging.getLogger(__name__)
@ -110,9 +110,14 @@ class ProductPaymentForm(GenericPaymentForm):
)
)
if self.product.product_is_subscription:
payment_type = "month"
if self.product.product_subscription_interval == "month":
payment_type = _('Monthly subscription')
elif self.product.product_subscription_interval == "year":
payment_type = _('Yearly subscription')
self.fields['amount'].label = "{amt} ({payment_type})".format(
amt=_('Amount in CHF'),
payment_type=_('Monthly subscription')
payment_type=payment_type
)
else:
self.fields['amount'].label = "{amt} ({payment_type})".format(
@ -187,20 +192,12 @@ class UserHostingKeyForm(forms.ModelForm):
alerts the user of it.
:return:
"""
if 'generate' in self.request.POST:
if ('generate' in self.request.POST
or not self.fields['public_key'].required):
return self.data.get('public_key')
KEY_ERROR_MESSAGE = _("Please input a proper SSH key")
openssh_pubkey_str = self.data.get('public_key').strip()
if openssh_pubkey_str in get_all_public_keys(self.request.user):
key_name = UserHostingKey.objects.filter(
user_id=self.request.user.id,
public_key=openssh_pubkey_str).first().name
KEY_EXISTS_MESSAGE = _(
"This key exists already with the name \"%(name)s\"") % {
'name': key_name}
raise forms.ValidationError(KEY_EXISTS_MESSAGE)
with tempfile.NamedTemporaryFile(delete=True) as tmp_public_key_file:
tmp_public_key_file.write(openssh_pubkey_str.encode('utf-8'))
tmp_public_key_file.flush()
@ -211,13 +208,17 @@ class UserHostingKeyForm(forms.ModelForm):
logger.debug(
"Not a correct ssh format {error}".format(error=str(cpe)))
raise forms.ValidationError(KEY_ERROR_MESSAGE)
return openssh_pubkey_str
return xml.sax.saxutils.escape(openssh_pubkey_str)
def clean_name(self):
INVALID_NAME_MESSAGE = _("Comma not accepted in the name of the key")
if "," in self.data.get('name'):
logger.debug(INVALID_NAME_MESSAGE)
raise forms.ValidationError(INVALID_NAME_MESSAGE)
return self.data.get('name')
def clean_user(self):
return self.request.user
return self.request.user if self.request.user.is_authenticated() else None
def clean(self):
cleaned_data = self.cleaned_data

View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-09-08 08:45+0000\n"
"POT-Creation-Date: 2021-02-07 10:19+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -27,6 +27,33 @@ msgstr "Dein Account wurde noch nicht aktiviert."
msgid "User does not exist"
msgstr "Der Benutzer existiert nicht"
msgid "Choose a product"
msgstr "Wähle ein Produkt"
msgid "Amount in CHF"
msgstr "Betrag"
msgid "Recurring monthly"
msgstr "monatlich wiederkehrend"
msgid "Amount field does not match"
msgstr "Betragsfeld stimmt nicht überein"
msgid "Recurring field does not match"
msgstr "Betragsfeld stimmt nicht überein"
msgid "Product name"
msgstr "Produkt"
msgid "Monthly subscription"
msgstr "Monatliches Abonnement"
msgid "Yearly subscription"
msgstr "Jährliches Abonnement"
msgid "One time payment"
msgstr "Einmalzahlung"
msgid "Confirm Password"
msgstr "Passwort Bestätigung"
@ -48,9 +75,8 @@ msgstr "Key-Name"
msgid "Please input a proper SSH key"
msgstr "Bitte verwende einen gültigen SSH-Key"
#, python-format
msgid "This key exists already with the name \"%(name)s\""
msgstr "Der SSH-Key mit dem Name \"%(name)s\" existiert bereits"
msgid "Comma not accepted in the name of the key"
msgstr "Komma im Namen des Keys wird nicht akzeptiert"
msgid "All Rights Reserved"
msgstr "Alle Rechte vorbehalten"
@ -185,6 +211,9 @@ msgstr "Bezahlbares VM Hosting in der Schweiz"
msgid "My Dashboard"
msgstr "Mein Dashboard"
msgid "Welcome"
msgstr ""
msgid "My VMs"
msgstr "Meine VMs"
@ -209,11 +238,16 @@ msgstr "Du hast eine neue virtuelle Maschine bestellt!"
#, python-format
msgid "Your order of <strong>%(vm_name)s</strong> has been charged."
msgstr "Deine Bestellung von <strong>%(vm_name)s</strong> wurde entgegengenommen."
msgstr ""
"Deine Bestellung von <strong>%(vm_name)s</strong> wurde entgegengenommen."
msgid "You can view your VM detail by clicking the button below."
msgstr "Um die Rechnung zu sehen, klicke auf den Button unten."
msgid "You can log in to your VM by the username <strong>puffy</strong>."
msgstr ""
"Du kannst Dich auf Deiner VM mit dem user <strong>puffy</strong> einloggen."
msgid "View Detail"
msgstr "Details anzeigen"
@ -227,6 +261,9 @@ msgstr "Deine Bestellung von %(vm_name)s wurde entgegengenommen."
msgid "You can view your VM detail by following the link below."
msgstr "Um die Rechnung zu sehen, klicke auf den Link unten."
msgid "You can log in to your VM by the username puffy."
msgstr "Du kannst Dich auf Deiner VM mit dem user puffy einloggen."
msgid "Password Reset"
msgstr "Passwort zurücksetzen"
@ -305,6 +342,115 @@ msgstr "Dashboard"
msgid "Logout"
msgstr "Abmelden"
#, python-format
msgid "%(page_header_text)s"
msgstr ""
msgid "Invoice #"
msgstr "Rechnung"
msgid "Date"
msgstr "Datum"
msgid "Status"
msgstr ""
msgid "Terminated"
msgstr "Beendet"
msgid "Approved"
msgstr "Akzeptiert"
msgid "Declined"
msgstr "Abgelehnt"
msgid "Billed to"
msgstr "Rechnungsadresse"
#, fuzzy
#| msgid "Card Number"
msgid "VAT Number"
msgstr "Kreditkartennummer"
msgid "Payment method"
msgstr "Bezahlmethode"
msgid "ending in"
msgstr "endend in"
msgid "Invoice summary"
msgstr ""
msgid "Product"
msgstr "Produkt"
msgid "Period"
msgstr "Periode"
msgid "Cores"
msgstr "Prozessorkerne"
msgid "Memory"
msgstr "Arbeitsspeicher"
msgid "Disk space"
msgstr "Festplattenkapazität"
msgid "Subtotal"
msgstr "Zwischensumme"
msgid "VAT for"
msgstr ""
msgid "VAT"
msgstr "Mehrwertsteuer"
msgid "Discount"
msgstr "Rabatt"
msgid "Total"
msgstr "Gesamt"
msgid "Amount"
msgstr "Betrag"
msgid "Description"
msgstr "Beschreibung"
msgid "Recurring"
msgstr "wiederkehrend"
msgid "of"
msgstr "von"
msgid "each year"
msgstr "jedes Jahr"
msgid "of every month"
msgstr "jeden Monat"
msgid "BACK TO LIST"
msgstr "ZURÜCK ZUR LISTE"
msgid "Some problem encountered. Please try again later."
msgstr "Ein Problem ist aufgetreten. Bitte versuche es später noch einmal."
#, fuzzy
#| msgid "Description"
msgid "Subscriptions"
msgstr "Beschreibung"
#, fuzzy
#| msgid "One time payment"
msgid "One-time payments"
msgstr "Einmalzahlung"
msgid "VM ID"
msgstr ""
msgid "IP Address"
msgstr "IP-Adresse"
msgid "Log in"
msgstr "Anmelden"
@ -338,81 +484,28 @@ msgstr "Als gelesen markieren"
msgid "All notifications"
msgstr "Alle Benachrichtigungen"
#, python-format
msgid "%(page_header_text)s"
msgstr ""
msgid "Date"
msgstr "Datum"
msgid "Status"
msgstr ""
msgid "Terminated"
msgstr "Beendet"
msgid "Approved"
msgstr "Akzeptiert"
msgid "Declined"
msgstr "Abgelehnt"
msgid "Billed to"
msgstr "Rechnungsadresse"
msgid "Payment method"
msgstr "Bezahlmethode"
msgid "ending in"
msgstr "endend in"
msgid "Credit Card"
msgstr "Kreditkarte"
msgid "Expiry"
msgstr "Gültig bis"
msgid "Order summary"
msgstr "Bestellungsübersicht"
msgid "Product"
msgstr "Produkt"
msgid "Period"
msgstr "Periode"
msgid "Cores"
msgstr "Prozessorkerne"
msgid "Memory"
msgstr "Arbeitsspeicher"
msgid "Disk space"
msgstr "Festplattenkapazität"
msgid "Subtotal"
msgstr "Zwischensumme"
msgid "VAT"
msgstr "Mehrwertsteuer"
msgid "Discount"
msgstr "Rabatt"
msgid "Total"
msgstr "Gesamt"
#, python-format
msgid ""
"By clicking \"Place order\" this plan will charge your credit card account "
"with %(vm_price)s CHF/month"
"By clicking \"Place order\" you agree to our <a href=\"https://"
"datacenterlight.ch/en-us/cms/terms-of-service/\">Terms of Service</a> and "
"this plan will charge your credit card account with %(vm_price)s CHF/month."
msgstr ""
"Wenn Du \"bestellen\" auswählst, wird Deine Kreditkarte mit %(vm_price)s CHF "
"pro Monat belastet"
"Indem Du auf \"Bestellung aufgeben\" klickst, erklärst Du dich mit unseren"
" <a href=\"https://"
"datacenterlight.ch/de/cms/terms-of-service/\">Nutzungsbedingungen</a> einverstanden und Dein Kreditkartenkonto wird mit %(vm_price)s CHF/Monat belastet."
msgid "Place order"
msgstr "Bestellen"
msgid "BACK TO LIST"
msgstr "ZURÜCK ZUR LISTE"
msgid "Processing..."
msgstr "Abarbeitung..."
@ -420,28 +513,19 @@ msgid "Hold tight, we are processing your request"
msgstr "Bitte warten - wir bearbeiten Deine Anfrage gerade"
msgid "OK"
msgstr ""
msgstr "Ok"
msgid "Close"
msgstr "Schliessen"
msgid "Some problem encountered. Please try again later."
msgstr "Ein Problem ist aufgetreten. Bitte versuche es später noch einmal."
msgid "Order Nr."
msgstr "Bestellung Nr."
msgid "Amount"
msgstr "Betrag"
msgid "See Invoice"
msgstr "Siehe Rechnung"
msgid "Page"
msgstr ""
msgid "of"
msgstr ""
msgstr "Seite"
msgid "Your Order"
msgstr "Deine Bestellung"
@ -511,6 +595,19 @@ msgstr "Absenden"
msgid "Password reset"
msgstr "Passwort zurücksetzen"
#, fuzzy
#| msgid "Key name"
msgid "My Username"
msgstr "Key-Name"
msgid "Your VAT number has been verified"
msgstr ""
msgid ""
"Your VAT number is under validation. VAT will be adjusted, once the "
"validation is complete."
msgstr ""
msgid "UPDATE"
msgstr "AKTUALISIEREN"
@ -539,9 +636,6 @@ msgstr ""
"Wir nutzen <a href=\"https://stripe.com\" target=\"_blank\">Stripe</a> für "
"die Bezahlung und speichern keine Informationen in unserer Datenbank."
msgid "Add your public SSH key"
msgstr "Füge deinen öffentlichen SSH-Key hinzu"
msgid "Use your created key to access to the VM"
msgstr "Benutze deinen erstellten SSH-Key um auf deine VM zugreifen zu können"
@ -715,21 +809,15 @@ msgstr "Dein Passwort konnte nicht zurückgesetzt werden."
msgid "The reset password link is no longer valid."
msgstr "Der Link zum Zurücksetzen Deines Passwortes ist nicht mehr gültig."
msgid "Could not set a default card."
msgstr ""
msgid "Card deassociation successful"
msgstr "Die Verbindung mit der Karte wurde erfolgreich aufgehoben"
msgid "You are not permitted to do this operation"
msgstr "Du hast keine Erlaubnis um diese Operation durchzuführen"
msgid "The selected card does not exist"
msgstr "Die ausgewählte Karte existiert nicht"
msgid "Billing address updated successfully"
msgstr "Die Rechnungsadresse wurde erfolgreich aktualisiert"
msgid "You seem to have already added this card"
msgstr "Es scheint, als hättest du diese Karte bereits hinzugefügt"
#, python-brace-format
msgid "An error occurred while associating the card. Details: {details}"
msgstr ""
@ -783,6 +871,9 @@ msgstr ""
msgid "Invalid number of cores"
msgstr "Ungültige Anzahle CPU-Kerne"
msgid "Invalid calculator properties"
msgstr ""
msgid "Invalid RAM size"
msgstr "Ungültige RAM-Grösse"
@ -792,6 +883,7 @@ msgstr "Ungültige Speicher-Grösse"
#, python-brace-format
msgid "Incorrect pricing name. Please contact support{support_email}"
msgstr ""
"Ungültige Preisbezeichnung. Bitte kontaktiere den Support{support_email}"
msgid ""
"We could not find the requested VM. Please "
@ -811,6 +903,8 @@ msgid ""
"VM terminate action timed out. Please contact support@datacenterlight.ch for "
"further information."
msgstr ""
"VM beendet wegen Zeitüberschreitung. Bitte kontaktiere "
"support@datacenterlight.ch für weitere Informationen."
#, python-format
msgid "Virtual Machine %(vm_name)s Cancelled"
@ -821,6 +915,22 @@ msgstr ""
"Es gab einen Fehler bei der Bearbeitung Deine Anfrage. Bitte versuche es "
"noch einmal."
#~ msgid "You are not permitted to do this operation"
#~ msgstr "Du hast keine Erlaubnis um diese Operation durchzuführen"
#~ msgid "The selected card does not exist"
#~ msgstr "Die ausgewählte Karte existiert nicht"
#~ msgid "You seem to have already added this card"
#~ msgstr "Es scheint, als hättest du diese Karte bereits hinzugefügt"
#, python-format
#~ msgid "This key exists already with the name \"%(name)s\""
#~ msgstr "Der SSH-Key mit dem Name \"%(name)s\" existiert bereits"
#~ msgid "Add your public SSH key"
#~ msgstr "Füge deinen öffentlichen SSH-Key hinzu"
#~ msgid "Do you want to cancel your Virtual Machine"
#~ msgstr "Bist Du sicher, dass Du Deine virtuelle Maschine beenden willst"
@ -830,9 +940,6 @@ msgstr ""
#~ msgid "My VM page"
#~ msgstr "Meine VM page"
#~ msgid "Invoice Date"
#~ msgstr "Rechnung Datum"
#~ msgid "VM %(VM_ID)s terminated successfully"
#~ msgstr "VM %(VM_ID)s erfolgreich beendet"

View file

@ -0,0 +1,81 @@
import datetime
import logging
from django.core.management.base import BaseCommand
from hosting.models import MonthlyHostingBill
from membership.models import CustomUser
from utils.stripe_utils import StripeUtils
logger = logging.getLogger(__name__)
class Command(BaseCommand):
help = '''Fetches invoices from Stripe and creates bills for a given
customer in the MonthlyHostingBill model'''
def add_arguments(self, parser):
parser.add_argument('customer_email', nargs='+', type=str)
def handle(self, *args, **options):
try:
for email in options['customer_email']:
self.stdout.write(
self.style.SUCCESS(
"---------------------------------------------")
)
stripe_utils = StripeUtils()
user = CustomUser.objects.get(email=email)
if hasattr(user, 'stripecustomer'):
self.stdout.write(self.style.SUCCESS(
'Found %s. Fetching bills for him.' % email))
mhb = MonthlyHostingBill.objects.filter(
customer=user.stripecustomer).last()
created_gt = {}
if mhb is not None:
# fetch only invoices which is created after
# mhb.created, because we already have invoices till
# this date
created_gt = int(mhb.created.timestamp())
all_invoices_response = stripe_utils.get_all_invoices(
user.stripecustomer.stripe_id,
created_gt=created_gt
)
if all_invoices_response['error'] is not None:
self.stdout.write(self.style.ERROR(all_invoices_response['error']))
user.import_stripe_bill_remark += "{}: {},".format(datetime.datetime.now(), all_invoices_response['error'])
user.save()
continue
all_invoices = all_invoices_response['response_object']
self.stdout.write(self.style.SUCCESS("Obtained {} invoices".format(len(all_invoices) if all_invoices is not None else 0)))
num_invoice_created = 0
for invoice in all_invoices:
invoice['customer'] = user.stripecustomer
try:
existing_mhb = MonthlyHostingBill.objects.get(invoice_id=invoice['invoice_id'])
logger.debug("Invoice %s exists already. Not importing." % invoice['invoice_id'])
except MonthlyHostingBill.DoesNotExist as dne:
logger.debug("Invoice id %s does not exist" % invoice['invoice_id'])
if MonthlyHostingBill.create(invoice) is not None:
num_invoice_created += 1
else:
user.import_stripe_bill_remark += "{}: Import failed - {},".format(
datetime.datetime.now(),
invoice['invoice_id'])
user.save()
logger.error("Did not import invoice for %s"
"" % str(invoice))
self.stdout.write(
self.style.SUCCESS("Number of invoices imported = %s" % num_invoice_created)
)
else:
self.stdout.write(self.style.SUCCESS(
'Customer email %s does not have a stripe customer.' % email))
user.import_stripe_bill_remark += "{}: No stripecustomer,".format(
datetime.datetime.now()
)
user.save()
except Exception as e:
print(" *** Error occurred. Details {}".format(str(e)))

View file

@ -0,0 +1,44 @@
from django.core.management.base import BaseCommand
import csv
from hosting.models import VATRates
class Command(BaseCommand):
help = '''Imports VAT Rates. Assume vat rates of format https://github.com/kdeldycke/vat-rates/blob/master/vat_rates.csv'''
def add_arguments(self, parser):
parser.add_argument('csv_file', nargs='+', type=str)
def handle(self, *args, **options):
try:
for c_file in options['csv_file']:
print("c_file = %s" % c_file)
with open(c_file, mode='r') as csv_file:
csv_reader = csv.DictReader(csv_file)
line_count = 0
for row in csv_reader:
if line_count == 0:
line_count += 1
obj, created = VATRates.objects.get_or_create(
start_date=row["start_date"],
stop_date=row["stop_date"] if row["stop_date"] is not "" else None,
territory_codes=row["territory_codes"],
currency_code=row["currency_code"],
rate=row["rate"],
rate_type=row["rate_type"],
description=row["description"]
)
if created:
self.stdout.write(self.style.SUCCESS(
'%s. %s - %s - %s - %s' % (
line_count,
obj.start_date,
obj.stop_date,
obj.territory_codes,
obj.rate
)
))
line_count+=1
except Exception as e:
print(" *** Error occurred. Details {}".format(str(e)))

View file

@ -0,0 +1,42 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.9.4 on 2019-04-03 03:47
from __future__ import unicode_literals
from django.db import migrations, models
import django.db.models.deletion
import utils.mixins
class Migration(migrations.Migration):
dependencies = [
('membership', '0007_auto_20180213_0128'),
('hosting', '0049_auto_20181005_0736'),
]
operations = [
migrations.CreateModel(
name='MonthlyHostingBill',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('created', models.DateTimeField(help_text='When the invoice was created')),
('receipt_number', models.CharField(help_text='The receipt number that is generated on Stripe', max_length=100)),
('invoice_number', models.CharField(help_text='The invoice number that is generated on Stripe', max_length=100)),
('paid_at', models.DateTimeField(help_text='Date on which the bill was paid')),
('period_start', models.DateTimeField()),
('period_end', models.DateTimeField()),
('billing_reason', models.CharField(max_length=25)),
('discount', models.PositiveIntegerField()),
('total', models.IntegerField()),
('lines_data_count', models.IntegerField()),
('invoice_id', models.CharField(max_length=100, unique=True)),
('lines_meta_data_csv', models.TextField()),
('customer', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='membership.StripeCustomer')),
('order', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='hosting.HostingOrder')),
],
options={
'permissions': (('view_monthlyhostingbill', 'View Monthly Hosting'),),
},
bases=(utils.mixins.AssignPermissionsMixin, models.Model),
),
]

View file

@ -0,0 +1,25 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.9.4 on 2019-04-03 07:03
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('hosting', '0050_monthlyhostingbill'),
]
operations = [
migrations.AddField(
model_name='monthlyhostingbill',
name='subscription_ids_csv',
field=models.TextField(default=''),
),
migrations.AlterField(
model_name='monthlyhostingbill',
name='lines_meta_data_csv',
field=models.TextField(default=''),
),
]

View file

@ -0,0 +1,37 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.9.4 on 2019-04-13 11:38
from __future__ import unicode_literals
from django.db import migrations, models
import django.db.models.deletion
import utils.mixins
class Migration(migrations.Migration):
dependencies = [
('hosting', '0051_auto_20190403_0703'),
]
operations = [
migrations.CreateModel(
name='HostingBillLineItem',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('amount', models.PositiveSmallIntegerField()),
('description', models.CharField(max_length=255)),
('discountable', models.BooleanField()),
('metadata', models.CharField(max_length=128)),
('period_start', models.DateTimeField()),
('period_end', models.DateTimeField()),
('proration', models.BooleanField()),
('quantity', models.PositiveIntegerField()),
('unit_amount', models.PositiveIntegerField()),
('monthly_hosting_bill', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='hosting.MonthlyHostingBill')),
],
options={
'permissions': (('view_hostingbilllineitem', 'View Monthly Hosting Bill Line Item'),),
},
bases=(utils.mixins.AssignPermissionsMixin, models.Model),
),
]

View file

@ -0,0 +1,22 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.9.4 on 2019-04-20 10:10
from __future__ import unicode_literals
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('datacenterlight', '0028_stripeplan_stripe_plan_name'),
('hosting', '0052_hostingbilllineitem'),
]
operations = [
migrations.AddField(
model_name='hostingbilllineitem',
name='stripe_plan',
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='datacenterlight.StripePlan'),
),
]

View file

@ -0,0 +1,20 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.9.4 on 2019-05-08 21:41
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('hosting', '0053_hostingbilllineitem_stripe_plan'),
]
operations = [
migrations.AlterField(
model_name='vmdetail',
name='configuration',
field=models.CharField(default='', max_length=128),
),
]

View file

@ -0,0 +1,22 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.9.4 on 2019-07-01 16:14
from __future__ import unicode_literals
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('hosting', '0054_auto_20190508_2141'),
]
operations = [
migrations.AlterField(
model_name='userhostingkey',
name='user',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
),
]

View file

@ -0,0 +1,20 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.9.4 on 2019-10-26 04:54
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('hosting', '0055_auto_20190701_1614'),
]
operations = [
migrations.AlterField(
model_name='hostingbilllineitem',
name='amount',
field=models.IntegerField(),
),
]

View file

@ -0,0 +1,30 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.9.4 on 2019-11-15 05:16
from __future__ import unicode_literals
from django.db import migrations, models
import utils.mixins
class Migration(migrations.Migration):
dependencies = [
('hosting', '0056_auto_20191026_0454'),
]
operations = [
migrations.CreateModel(
name='VATRates',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('start_date', models.DateField(blank=True, null=True)),
('stop_date', models.DateField(blank=True, null=True)),
('territory_codes', models.TextField(blank=True, default='')),
('currency_code', models.CharField(max_length=10)),
('rate', models.FloatField()),
('rate_type', models.TextField(blank=True, default='')),
('description', models.TextField(blank=True, default='')),
],
bases=(utils.mixins.AssignPermissionsMixin, models.Model),
),
]

View file

@ -0,0 +1,20 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.9.4 on 2019-11-15 14:57
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('hosting', '0057_vatrates'),
]
operations = [
migrations.AddField(
model_name='genericproduct',
name='product_subscription_interval',
field=models.CharField(default='month', help_text='Choose between `year` and `month`', max_length=10),
),
]

View file

@ -0,0 +1,29 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.9.4 on 2020-01-05 04:29
from __future__ import unicode_literals
from django.db import migrations, models
import utils.mixins
class Migration(migrations.Migration):
dependencies = [
('hosting', '0058_genericproduct_product_subscription_interval'),
]
operations = [
migrations.CreateModel(
name='StripeTaxRate',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('tax_rate_id', models.CharField(max_length=100, unique=True)),
('jurisdiction', models.CharField(max_length=10)),
('inclusive', models.BooleanField(default=False)),
('display_name', models.CharField(max_length=100)),
('percentage', models.FloatField(default=0)),
('description', models.CharField(max_length=100)),
],
bases=(utils.mixins.AssignPermissionsMixin, models.Model),
),
]

View file

@ -0,0 +1,33 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.9.4 on 2020-06-30 19:12
from __future__ import unicode_literals
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('hosting', '0059_stripetaxrate'),
]
operations = [
migrations.RunSQL(
sql=["update hosting_vatrates set stop_date = '2020-06-30' where territory_codes = 'DE' and rate = '0.19'"],
reverse_sql=[
"update hosting_vatrates set stop_date = null where stop_date = '2020-06-30' and territory_codes = 'DE' and rate = '0.19'"],
),
migrations.RunSQL(
sql=[
"insert into hosting_vatrates (start_date, stop_date, territory_codes, currency_code, rate, rate_type, description) values ('2020-07-01',null,'DE', 'EUR', '0.16', 'standard', 'Germany (member state) standard VAT rate - COVID 19 reduced rate')"],
reverse_sql=[
"delete from hosting_vatrates where description = 'Germany (member state) standard VAT rate - COVID 19 reduced rate' and start_date = '2020-07-01' and territory_codes = 'DE'" ],
),
migrations.RunSQL(
sql=[
"update hosting_stripetaxrate set description = 'VAT for DE pre-COVID-19' where description = 'VAT for DE'"],
reverse_sql=[
"update hosting_stripetaxrate set description = 'VAT for DE' where description = 'VAT for DE pre-COVID-19'"],
),
]

View file

@ -0,0 +1,20 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.9.4 on 2020-07-21 16:32
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('hosting', '0060_update_DE_vat_covid-19'),
]
operations = [
migrations.AddField(
model_name='genericproduct',
name='exclude_vat_calculations',
field=models.BooleanField(default=False, help_text='When checked VAT calculations are excluded for this product'),
),
]

View file

@ -0,0 +1,39 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.9.4 on 2020-12-23 05:36
from __future__ import unicode_literals
from django.db import migrations, models
import utils.mixins
class Migration(migrations.Migration):
dependencies = [
('hosting', '0061_genericproduct_exclude_vat_calculations'),
]
operations = [
migrations.CreateModel(
name='IncompleteSubscriptions',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('created_at', models.DateTimeField(auto_now_add=True)),
('completed_at', models.DateTimeField()),
('subscription_id', models.CharField(max_length=100)),
('subscription_status', models.CharField(max_length=30)),
('name', models.CharField(max_length=50)),
('email', models.EmailField(max_length=254)),
('request', models.TextField()),
('stripe_api_cus_id', models.CharField(max_length=30)),
('card_details_response', models.TextField()),
('stripe_subscription_obj', models.TextField()),
('stripe_onetime_charge', models.TextField()),
('gp_details', models.TextField()),
('specs', models.TextField()),
('vm_template_id', models.PositiveIntegerField(default=0)),
('template', models.TextField()),
('billing_address_data', models.TextField()),
],
bases=(utils.mixins.AssignPermissionsMixin, models.Model),
),
]

View file

@ -0,0 +1,20 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.9.4 on 2020-12-23 06:12
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('hosting', '0062_incompletesubscriptions'),
]
operations = [
migrations.AlterField(
model_name='incompletesubscriptions',
name='completed_at',
field=models.DateTimeField(null=True),
),
]

View file

@ -0,0 +1,33 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.9.4 on 2020-12-31 10:13
from __future__ import unicode_literals
from django.db import migrations, models
import utils.mixins
class Migration(migrations.Migration):
dependencies = [
('hosting', '0063_auto_20201223_0612'),
]
operations = [
migrations.CreateModel(
name='IncompletePaymentIntents',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('completed_at', models.DateTimeField(null=True)),
('created_at', models.DateTimeField(auto_now_add=True)),
('payment_intent_id', models.CharField(max_length=100)),
('request', models.TextField()),
('stripe_api_cus_id', models.CharField(max_length=30)),
('card_details_response', models.TextField()),
('stripe_subscription_id', models.TextField()),
('stripe_charge_id', models.TextField()),
('gp_details', models.TextField()),
('billing_address_data', models.TextField()),
],
bases=(utils.mixins.AssignPermissionsMixin, models.Model),
),
]

View file

@ -0,0 +1,25 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.9.4 on 2020-12-31 10:41
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('hosting', '0064_incompletepaymentintents'),
]
operations = [
migrations.AlterField(
model_name='incompletepaymentintents',
name='stripe_charge_id',
field=models.CharField(max_length=100, null=True),
),
migrations.AlterField(
model_name='incompletepaymentintents',
name='stripe_subscription_id',
field=models.CharField(max_length=100, null=True),
),
]

View file

@ -1,13 +1,16 @@
import json
import logging
import os
from datetime import datetime
import pytz
from Crypto.PublicKey import RSA
from dateutil.relativedelta import relativedelta
from django.db import models
from django.utils import timezone
from django.utils.functional import cached_property
from datacenterlight.models import VMPricing, VMTemplate
from datacenterlight.models import VMPricing, VMTemplate, StripePlan
from membership.models import StripeCustomer, CustomUser
from utils.mixins import AssignPermissionsMixin
from utils.models import BillingAddress
@ -75,14 +78,25 @@ class GenericProduct(AssignPermissionsMixin, models.Model):
product_price = models.DecimalField(max_digits=6, decimal_places=2)
product_vat = models.DecimalField(max_digits=6, decimal_places=4, default=0)
product_is_subscription = models.BooleanField(default=True)
product_subscription_interval = models.CharField(
max_length=10, default="month",
help_text="Choose between `year` and `month`")
exclude_vat_calculations = models.BooleanField(
default=False,
help_text="When checked VAT calculations are excluded for this product"
)
def __str__(self):
return self.product_name
def get_actual_price(self):
return round(
self.product_price + (self.product_price * self.product_vat), 2
)
def get_actual_price(self, vat_rate=None):
if self.exclude_vat_calculations:
return round(float(self.product_price), 2)
else:
VAT = vat_rate if vat_rate is not None else self.product_vat
return round(
float(self.product_price) + float(self.product_price) * float(VAT), 2
)
class HostingOrder(AssignPermissionsMixin, models.Model):
@ -155,8 +169,12 @@ class HostingOrder(AssignPermissionsMixin, models.Model):
def set_stripe_charge(self, stripe_charge):
self.stripe_charge_id = stripe_charge.id
self.last4 = stripe_charge.source.last4
self.cc_brand = stripe_charge.source.brand
if stripe_charge.source is None:
self.last4 = stripe_charge.payment_method_details.card.last4
self.cc_brand = stripe_charge.payment_method_details.card.brand
else:
self.last4 = stripe_charge.source.last4
self.cc_brand = stripe_charge.source.brand
self.save()
def set_subscription_id(self, subscription_id, cc_details):
@ -184,7 +202,7 @@ class HostingOrder(AssignPermissionsMixin, models.Model):
class UserHostingKey(models.Model):
user = models.ForeignKey(CustomUser)
user = models.ForeignKey(CustomUser, blank=True, null=True)
public_key = models.TextField()
private_key = models.FileField(upload_to='private_keys', blank=True)
created_at = models.DateTimeField(auto_now_add=True)
@ -209,6 +227,15 @@ class UserHostingKey(models.Model):
# self.save(update_fields=['public_key'])
return private_key, public_key
def delete(self,*args,**kwargs):
if bool(self.private_key) and os.path.isfile(self.private_key.path):
logger.debug("Removing private key {}".format(self.private_key.path))
os.remove(self.private_key.path)
else:
logger.debug("No private_key to remove")
super(UserHostingKey, self).delete(*args,**kwargs)
class HostingBill(AssignPermissionsMixin, models.Model):
customer = models.ForeignKey(StripeCustomer)
@ -232,13 +259,307 @@ class HostingBill(AssignPermissionsMixin, models.Model):
return instance
class MonthlyHostingBill(AssignPermissionsMixin, models.Model):
"""
Corresponds to Invoice object of Stripe
"""
customer = models.ForeignKey(StripeCustomer)
order = models.ForeignKey(HostingOrder)
created = models.DateTimeField(help_text="When the invoice was created")
receipt_number = models.CharField(
help_text="The receipt number that is generated on Stripe",
max_length=100
)
invoice_number = models.CharField(
help_text="The invoice number that is generated on Stripe",
max_length=100
)
paid_at = models.DateTimeField(help_text="Date on which the bill was paid")
period_start = models.DateTimeField()
period_end = models.DateTimeField()
billing_reason = models.CharField(max_length=25)
discount = models.PositiveIntegerField()
total = models.IntegerField()
lines_data_count = models.IntegerField()
invoice_id = models.CharField(unique=True, max_length=100)
lines_meta_data_csv = models.TextField(default="")
subscription_ids_csv = models.TextField(default="")
permissions = ('view_monthlyhostingbill',)
class Meta:
permissions = (
('view_monthlyhostingbill', 'View Monthly Hosting'),
)
@classmethod
def create(cls, args):
# Try to infer the HostingOrder from subscription id or VM_ID
if len(args['subscription_ids_csv']) > 0:
sub_ids = [sub_id.strip() for sub_id in args['subscription_ids_csv'].split(",")]
set_sub_ids = set(sub_ids)
if len(set_sub_ids) == 1:
# the multiple line items belong to the same subscription
sub_id = set_sub_ids.pop()
try:
args['order'] = HostingOrder.objects.get(
subscription_id=sub_id
)
except HostingOrder.DoesNotExist as dne:
logger.error("Hosting order for {} doesn't exist".format(
sub_id
))
args['order'] = None
else:
logger.debug(
"More than one subscriptions"
"for MonthlyHostingBill {}".format(args['invoice_id'])
)
logger.debug("SUB_IDS={}".format(','.join(sub_ids)))
logger.debug("Not importing invoices")
return None
elif len(args['lines_meta_data_csv']) > 0:
vm_ids = [vm_id.strip() for vm_id in args['lines_meta_data_csv'].split(",")]
if len(vm_ids) == 1:
args['order'] = HostingOrder.objects.get(vm_id=vm_ids[0])
else:
logger.debug(
"More than one VM_ID"
"for MonthlyHostingBill {}".format(args['invoice_id'])
)
logger.debug("VM_IDS={}".format(','.join(vm_ids)))
logger.debug("Not importing invoices")
return None
else:
logger.debug("Neither subscription id nor vm_id available")
logger.debug("Can't import invoice")
return None
if args['order'] is None:
logger.error(
"Order is None for {}".format(args['invoice_id']))
return None
instance = cls.objects.create(
created=datetime.utcfromtimestamp(
args['created']).replace(tzinfo=pytz.utc),
receipt_number=(
args['receipt_number']
if args['receipt_number'] is not None else ''
),
invoice_number=(
args['invoice_number']
if args['invoice_number'] is not None else ''
),
paid_at=datetime.utcfromtimestamp(
args['paid_at']).replace(tzinfo=pytz.utc),
period_start=datetime.utcfromtimestamp(
args['period_start']).replace(tzinfo=pytz.utc),
period_end=datetime.utcfromtimestamp(
args['period_end']).replace(tzinfo=pytz.utc),
billing_reason=(
args['billing_reason']
if args['billing_reason'] is not None else ''
),
discount=args['discount'],
total=args['total'],
lines_data_count=args['lines_data_count'],
invoice_id=args['invoice_id'],
lines_meta_data_csv=args['lines_meta_data_csv'],
customer=args['customer'],
order=args['order'],
subscription_ids_csv=args['subscription_ids_csv'],
)
if 'line_items' in args:
line_items = args['line_items']
for item in line_items:
stripe_plan = None
if item.type == "subscription" or item.type == "invoiceitem":
# Check stripe plan and prepare it for linking to bill item
stripe_plan_id = item.plan.id
try:
stripe_plan = StripePlan.objects.get(
stripe_plan_id=stripe_plan_id
)
except StripePlan.DoesNotExist as dne:
logger.error(
"StripePlan %s doesn't exist" % stripe_plan_id
)
if stripe_plan_id is not None:
# Create Stripe Plan because we don't have it
stripe_plan = StripePlan.objects.create(
stripe_plan_id=stripe_plan_id,
stripe_plan_name=item.plan.name,
amount=item.plan.amount,
interval=item.plan.interval
)
logger.debug("Creatd StripePlan " + stripe_plan_id)
line_item_instance = HostingBillLineItem.objects.create(
monthly_hosting_bill=instance,
amount=item.amount,
# description seems to be set to null in the Stripe
# response for an invoice
description="" if item.description is None else item.description,
discountable=item.discountable,
metadata=json.dumps(item.metadata),
period_start=datetime.utcfromtimestamp(item.period.start).replace(tzinfo=pytz.utc), period_end=datetime.utcfromtimestamp(item.period.end).replace(tzinfo=pytz.utc),
proration=item.proration,
quantity=item.quantity,
# Strange that line item does not have unit_amount but api
# states that it is present
# https://stripe.com/docs/api/invoiceitems/object#invoiceitem_object-unit_amount
# So, for the time being I set the unit_amount to 0 if not
# found in the line item
unit_amount=item.unit_amount if hasattr(item, "unit_amount") else 0,
stripe_plan=stripe_plan
)
line_item_instance.assign_permissions(instance.customer.user)
instance.assign_permissions(instance.customer.user)
return instance
def total_in_chf(self):
"""
Returns amount in chf. The total amount in this model is in cents.
Hence we multiply it by 0.01 to obtain the result
:return:
"""
return self.total * 0.01
def discount_in_chf(self):
"""
Returns discount in chf.
:return:
"""
return self.discount * 0.01
def get_vm_id(self):
"""
Returns the VM_ID metadata if set in this MHB else returns None
:return:
"""
return_value = None
if len(self.lines_meta_data_csv) > 0:
vm_ids = [vm_id.strip() for vm_id in
self.lines_meta_data_csv.split(",")]
unique_vm_ids=set(vm_ids)
unique_vm_ids.discard("")
if len(unique_vm_ids) == 1:
vm_id = unique_vm_ids.pop()
logger.debug("Getting invoice for {}".format(vm_id))
return vm_id
else:
logger.debug(
"More than one VM_ID"
"for MonthlyHostingBill {}".format(self.invoice_id)
)
logger.debug("VM_IDS={}".format(unique_vm_ids))
return return_value
def get_period_start(self):
"""
Return the period start of the invoice for the line items
:return:
"""
items = HostingBillLineItem.objects.filter(monthly_hosting_bill=self)
if len(items) > 0:
return items[0].period_start
else:
return self.period_start
def get_period_end(self):
"""
Return the period end of the invoice for the line items
:return:
"""
items = HostingBillLineItem.objects.filter(monthly_hosting_bill=self)
if len(items) > 0:
return items[0].period_end
else:
return self.period_end
class HostingBillLineItem(AssignPermissionsMixin, models.Model):
"""
Corresponds to InvoiceItem object of Stripe
"""
monthly_hosting_bill = models.ForeignKey(MonthlyHostingBill,
on_delete=models.CASCADE)
stripe_plan = models.ForeignKey(StripePlan, null=True,
on_delete=models.CASCADE)
amount = models.IntegerField()
description = models.CharField(max_length=255)
discountable = models.BooleanField()
metadata = models.CharField(max_length=128)
period_start = models.DateTimeField()
period_end = models.DateTimeField()
proration = models.BooleanField()
quantity = models.PositiveIntegerField()
unit_amount = models.PositiveIntegerField()
permissions = ('view_hostingbilllineitem',)
class Meta:
permissions = (
('view_hostingbilllineitem', 'View Monthly Hosting Bill Line Item'),
)
def amount_in_chf(self):
"""
Returns amount in chf. The amount in this model is in cents (as in
Stripe). Hence we multiply it by 0.01 to obtain the result
:return:
"""
return self.amount * 0.01
def unit_amount_in_chf(self):
"""
Returns unit amount in chf. If its 0, we obtain it from amount and
quantity.
:return:
"""
if self.unit_amount == 0:
return round((self.amount / self.quantity) * 0.01, 2)
else:
return self.unit_amount * 0.01
def get_item_detail_str(self):
"""
Returns line item html string representation
:return:
"""
item_detail = ""
# metadata is a dict; a dict with nothing has two chars at least {}
if self.metadata is not None and len(self.metadata) > 2:
try:
vm_dict = json.loads(self.metadata)
item_detail = "VM ID: {}<br/>".format(vm_dict["VM_ID"])
except ValueError as ve:
logger.error(
"Could not parse VM in metadata {}. Detail {}".format(
self.metadata, str(ve)
)
)
vm_conf = StripeUtils.get_vm_config_from_stripe_id(
self.stripe_plan.stripe_plan_id
)
if vm_conf is not None:
item_detail += ("<b>Cores</b>: {}<br/><b>RAM</b>: {} GB<br/>"
"<b>SSD</b>: {} GB<br/>").format(
vm_conf['cores'], int(float(vm_conf['ram'])),
vm_conf['ssd']
)
return item_detail
class VMDetail(models.Model):
user = models.ForeignKey(CustomUser)
vm_id = models.IntegerField(default=0)
disk_size = models.FloatField(default=0.0)
cores = models.FloatField(default=0.0)
memory = models.FloatField(default=0.0)
configuration = models.CharField(default='', max_length=25)
configuration = models.CharField(default='', max_length=128)
ipv4 = models.TextField(default='')
ipv6 = models.TextField(default='')
created_at = models.DateTimeField(auto_now_add=True)
@ -297,6 +618,8 @@ class UserCardDetail(AssignPermissionsMixin, models.Model):
for card in user_card_details:
cards_list.append({
'last4': card.last4, 'brand': card.brand, 'id': card.id,
'exp_year': card.exp_year,
'exp_month': '{:02d}'.format(card.exp_month),
'preferred': card.preferred
})
return cards_list
@ -353,7 +676,11 @@ class UserCardDetail(AssignPermissionsMixin, models.Model):
stripe_utils = StripeUtils()
cus_response = stripe_utils.get_customer(stripe_api_cus_id)
cu = cus_response['response_object']
cu.default_source = stripe_source_id
if stripe_source_id.startswith("pm"):
# card is a payment method
cu.invoice_settings.default_payment_method = stripe_source_id
else:
cu.default_source = stripe_source_id
cu.save()
UserCardDetail.save_default_card_local(
stripe_api_cus_id, stripe_source_id
@ -402,3 +729,54 @@ class UserCardDetail(AssignPermissionsMixin, models.Model):
return ucd
except UserCardDetail.DoesNotExist:
return None
class VATRates(AssignPermissionsMixin, models.Model):
start_date = models.DateField(blank=True, null=True)
stop_date = models.DateField(blank=True, null=True)
territory_codes = models.TextField(blank=True, default='')
currency_code = models.CharField(max_length=10)
rate = models.FloatField()
rate_type = models.TextField(blank=True, default='')
description = models.TextField(blank=True, default='')
class StripeTaxRate(AssignPermissionsMixin, models.Model):
tax_rate_id = models.CharField(max_length=100, unique=True)
jurisdiction = models.CharField(max_length=10)
inclusive = models.BooleanField(default=False)
display_name = models.CharField(max_length=100)
percentage = models.FloatField(default=0)
description = models.CharField(max_length=100)
class IncompletePaymentIntents(AssignPermissionsMixin, models.Model):
completed_at = models.DateTimeField(null=True)
created_at = models.DateTimeField(auto_now_add=True)
payment_intent_id = models.CharField(max_length=100)
request = models.TextField()
stripe_api_cus_id = models.CharField(max_length=30)
card_details_response = models.TextField()
stripe_subscription_id = models.CharField(max_length=100, null=True)
stripe_charge_id = models.CharField(max_length=100, null=True)
gp_details = models.TextField()
billing_address_data = models.TextField()
class IncompleteSubscriptions(AssignPermissionsMixin, models.Model):
created_at = models.DateTimeField(auto_now_add=True)
completed_at = models.DateTimeField(null=True)
subscription_id = models.CharField(max_length=100)
subscription_status = models.CharField(max_length=30)
name = models.CharField(max_length=50)
email = models.EmailField()
request = models.TextField()
stripe_api_cus_id = models.CharField(max_length=30)
card_details_response = models.TextField()
stripe_subscription_obj = models.TextField()
stripe_onetime_charge = models.TextField()
gp_details = models.TextField()
specs = models.TextField()
vm_template_id = models.PositiveIntegerField(default=0)
template = models.TextField()
billing_address_data = models.TextField()

View file

@ -23,7 +23,6 @@
.hosting-dashboard .dashboard-container-head {
color: #fff;
margin-bottom: 60px;
}
.hosting-dashboard-item {

Some files were not shown because too many files have changed in this diff Show more