73b590f480
Set EU VAT context for invoice_detail
2019-12-09 14:42:12 +05:30
d864f82e0f
Make invoice EU VAT compatible
2019-12-09 12:30:49 +05:30
b759471274
Add /year text for yearly products
2019-12-04 01:17:46 +05:30
cc5d82ccac
Allow None value for billing_reason
2019-11-28 13:59:03 +05:30
b683a5ac44
Save import remark
2019-11-28 13:38:45 +05:30
987efe8f99
Move separator within loop
2019-11-28 12:35:32 +05:30
9a84fc899e
Add a line separator when fetching more than 1 stripe bill
2019-11-28 12:10:50 +05:30
49ef761b2e
translate it, too
2019-11-16 08:45:47 +01:00
aec2002a9f
Update django.po
2019-11-15 22:11:15 +05:30
7dd57fb116
Fix old order detail page
2019-11-15 22:04:37 +05:30
530e47586e
Fix month name
2019-11-15 21:23:04 +05:30
e726f953a4
Improve yearly recurring date text
2019-11-15 21:13:08 +05:30
5697e313df
Improve yearly recurring date text
2019-11-15 21:11:26 +05:30
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
a423dd9f49
Correct invoice for yearly subscription
2019-11-15 20:43:58 +05:30
6eef592cd8
Add migration file
2019-11-15 20:28:00 +05:30
3bf2654b50
Update ProductPaymentForm for yearly subscription
2019-11-15 19:45:35 +05:30
f0b604c6dc
Update Generic product model to include product_subscription_interval
2019-11-15 19:40:53 +05:30
efe411933f
Missing float conversions
2019-11-15 12:41:27 +05:30
940eaf3a07
Process prices as floats
2019-11-15 12:39:03 +05:30
582e952187
Convert VAT rate to decimal to be consistent
2019-11-15 12:24:24 +05:30
44a20a5029
Apply country specific VAT rates for Generic Products
2019-11-15 11:58:15 +05:30
7040d908dd
Add import_vat_rates management command
2019-11-15 11:03:09 +05:30
b3dd57f189
Add vatrates migration
2019-11-15 11:02:45 +05:30
c56d6bd627
Add VATRates model
2019-11-15 11:01:49 +05:30
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
6638d376b8
Make HostingBillLineAmount accept negative values
2019-10-26 10:32:49 +05:30
6d8782415f
Fix number formatting for price in invoice details
2019-10-08 06:33:52 +05:30
cc03c11c4a
Improve admin email logging
2019-09-24 10:34:04 +05:30
8cd7a69162
Convert lazy loaded string to str
2019-09-24 09:44:45 +05:30
e4e074ea8d
Add explanatory text indicating puffy username on OpenBSD VMs
2019-09-15 09:12:36 +05:30
pcoder116
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
b2d597232c
Use opennebula user credentials to find if vm belongs to user
2019-08-27 11:13:38 +05:30
7684687dbc
Remove commented code
2019-08-26 16:13:31 +05:30
97d83abffe
Comment out code that denied adding the same key
2019-08-26 16:01:34 +05:30
b50a543148
Remove public- prefix shown in django/node/rails hosting pages
2019-08-22 08:38:19 +05:30
728fd5850b
Update hosting django.po -- add "Expiry" -> Gültig bis
2019-07-09 21:21:22 +05:30
b6ec2ac95b
Add missing cc expiry year month in payment page
2019-07-09 19:08:19 +05:30
903ef48c75
Format cc month to 2 decimal places
2019-07-09 19:03:09 +05:30
fe44908868
Add expiry year and month to get_all_cards_list
2019-07-09 18:47:54 +05:30
59c45492a9
Add expiry year and month in the settings and order payment pages
2019-07-09 18:40:41 +05:30
921d832f9e
Make user in UserHostingKey model nullable
2019-07-03 06:44:31 +05:30
ddaa320628
Set user foreign key to be blank allowing null values
2019-07-01 23:11:49 +05:30
32de20aaba
Set unon authenticated user to NONE
2019-07-01 23:11:14 +05:30
c8c5bb763a
Remove Add SSH key form in "Order Confirm" page related code
...
(not needed)
2019-07-01 20:36:13 +05:30
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
5fcd0d6b18
Remove add SSH key form in the order confirmation
2019-07-01 08:18:10 +05:30
47fd9a8f28
Adjust urls in datacenterlight/hosting apps urls/views after refactor
2019-07-01 08:09:37 +05:30
f502e53845
Add basic implementation of AskSSHKeyView
2019-07-01 06:45:48 +05:30
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
34c917acc2
Add SSH form to hosting VM buy flow also
2019-06-25 03:10:50 +02:00
85f7d73442
Code cleanup: Remove ssh_key_added_to_vm email templates
2019-06-25 02:32:19 +02:00
6d3b5f40c0
Merge remote-tracking branch 'mainRepo/master' into task/5509/add-keys-to-opennebula-user
2019-06-25 02:29:15 +02:00
0cf5e541cc
Code cleanup: remove VM poweroff/resume methods + styles + html code
2019-06-25 02:24:14 +02:00
08608c726f
Code cleanup: remove updating ssh keys on live VMs
2019-06-25 02:11:57 +02:00
1e68ecb047
Confirm order button close: Redirect only to url specified
2019-06-24 04:31:29 +02:00
1ebfc8b2dc
Don't use VirtualMachineSerializer for obtaining users_vms
2019-06-10 14:51:40 +02:00
496178f44c
Check if VM belongs to user against opennebula backend
2019-06-08 04:40:16 +02:00
wcolmenares
5ad871f124
updated for read vm realm
2019-05-16 16:35:44 -04:00
pcoder116
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
wcolmenares
a82ecbe4d5
fix typho in check_vm
2019-05-16 13:34:13 -04:00
wcolmenares
ce630573e0
Remove print statement & correct code return
2019-05-16 13:33:31 -04:00
94d5c34152
[hosting/bill] Skip creating MHB for invoices that have been imported already
2019-05-13 21:15:38 +02:00
wcolmenares
69ec7d2b46
reuse of the env variable in the base settings
2019-05-13 03:44:09 -04:00
72ea362d01
Remove duplicated blocktrans in txt email template
2019-05-13 08:01:11 +02:00
9fd396363f
Center the add ssh key nicely
2019-05-13 07:13:49 +02:00
wcolmenares
1faf46cc1b
added validation to heck if the user is the one allowed to access
2019-05-12 21:34:10 -04:00
641c556bb6
Simplify code
2019-05-12 21:16:46 +02:00
f2af1f8708
Rename button id
2019-05-12 21:15:48 +02:00
bbe0017fa0
Add missing return statements for error
2019-05-12 21:15:15 +02:00
a44d50dd69
Fix wrong comparing of public_key object with a string value
2019-05-12 19:56:14 +02:00
d38edb0dfa
Add url for AddSshKeyToVMView
2019-05-12 19:22:10 +02:00
09ab9a714d
Add AddSshKeyToVMView
2019-05-12 19:21:19 +02:00
0104a804c2
Do not allow comma in SSH key name
2019-05-12 19:20:35 +02:00
c9c91b1ecb
JS code to handle the add ssh key functionality
2019-05-12 19:19:40 +02:00
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
7e538bf37b
Add ssh_key_added_to_vm.{html,txt} email templates
2019-05-12 19:12:34 +02:00
3133bde0e9
Don't set the key in the live template
2019-05-11 09:15:08 +02:00
b189371a7b
Call get_all_active_vmids to get the active vmids
2019-05-11 02:38:16 +02:00
7f6d4c1c53
Refactor get_all_vmids -> get_all_active_vmids
...
We now get this info from opennebula
2019-05-11 02:23:51 +02:00
65c9ccb671
Use save_key_in_opennebula_user and save_key_in_vm_template
2019-05-11 01:54:35 +02:00
1d70563ea2
Save user's key in opennebula
2019-05-10 09:19:42 +02:00
wcolmenares
b8ca7286f2
Add view to check if the vm belongs to a user
2019-05-09 01:34:18 -04:00
f0dfcccd96
Increase configuration length in VMDetail to 128 chars
2019-05-08 23:42:03 +02:00
d8b95abb39
Check private key is true
2019-05-06 08:48:26 +02:00
71d1e6e3c9
Add delete method for UserHostingKey
2019-04-28 23:13:54 +02:00
1ccb4e9790
Correct the way we get periods for invoices list
2019-04-22 11:40:00 +02:00
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
3a7c209b80
Fallback to Stripe plan name for product description if its set
2019-04-20 19:54:46 +02:00
dad4f42dc3
Do not add vm_conf to details if it is None
2019-04-20 19:13:34 +02:00
0b99a0cbec
Fix getting users email and password from the request object
2019-04-20 18:52:34 +02:00
a1a85e6c18
Style the invoice detail page for multiline items
2019-04-20 18:52:01 +02:00
2ae0c8629b
Add CSS styles for multi line invoice table
2019-04-20 18:51:23 +02:00
a811e9f83d
Add helper methods in HostingBillLineItem
2019-04-20 18:50:46 +02:00
e782d27739
Attempt to show relevant lines when we have more than 1 line item
2019-04-20 15:20:55 +02:00
aff197c1b5
Fix getting StripePlan by plan_id and not name
2019-04-20 14:12:45 +02:00
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
38d074811a
Link HostingBillLineItem to StripePlan
2019-04-20 12:41:30 +02:00
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
9f13253475
Add missing braces
2019-04-20 09:49:26 +02:00
2be59cb0c8
Add missing return value
2019-04-20 07:41:07 +02:00
86d70a7f0b
Count and log the number of invoices actually imported
2019-04-20 07:31:32 +02:00
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
0969c97eca
Add missing string to debug code
2019-04-18 08:13:56 +02:00
c3842a5ed5
Get periods from line items in invoice detail also
2019-04-13 15:43:27 +02:00
c5f72792d2
Show period of the first line item as the period of the invoice
2019-04-13 15:35:36 +02:00
a3a2016cb4
Attempt period from line_items
2019-04-13 15:24:37 +02:00
77669c962c
Fix passing correct created value
2019-04-13 15:00:19 +02:00
869f74e4e6
Fix typo
2019-04-13 14:43:39 +02:00
a4427dd3af
Set empty string for description if not available
2019-04-13 14:40:20 +02:00
ed6059feaa
Set unit amount to 0 if not available in Stripe response
2019-04-13 14:34:42 +02:00
4a01036ab5
Attempt correction to gt dict to be passed for created greater than
2019-04-13 14:34:17 +02:00
94c7873397
Fix getting line_items
2019-04-13 13:50:09 +02:00
8816793803
Add Line item
2019-04-13 13:42:04 +02:00
061ef7d036
Fetch invoices whose date is greater than given date only
2019-04-13 12:54:57 +02:00
9ee21b9bc3
Allow admin to see invoices
2019-04-13 12:37:37 +02:00
fefcdb5647
Pass correct key email
2019-04-12 09:10:19 +02:00
c232f4c1da
Fix error in obtaining customuser for mab
2019-04-12 08:41:05 +02:00
6a7b5459ce
Allow admin to list invoices
2019-04-12 08:14:52 +02:00
8c04acaff8
Check if user has stripecustomer attr
2019-04-06 14:07:26 +02:00
92b2504f1e
Paginate invoice list view by 10 items on each page
2019-04-05 00:09:52 +02:00
5987962414
Add VM ID to invoices list
2019-04-04 23:50:49 +02:00
3f3f47888d
Fix missing codes
2019-04-04 23:20:11 +02:00
73f7831744
Attempt to show IP address instead of invoice number
2019-04-04 23:14:24 +02:00
6d4af0c193
Fix getting number of mabs of a user
2019-04-04 08:10:16 +02:00
a59cd86fee
Fix error: get mab using customer and not email
2019-04-04 07:59:38 +02:00
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
316646465d
Use invoice's username and email
2019-04-04 07:46:28 +02:00
bb7107fe80
Remove erroneous space before filter param
2019-04-04 07:28:50 +02:00
0c4e0f1070
Show period in invoices page
2019-04-04 07:14:12 +02:00
8b6619f788
Invoice pdf generation: use invoice number and not id
2019-04-04 06:52:34 +02:00
d4d31dced9
Attempt invoice pdf with invoice_id instead of pk
2019-04-04 06:50:13 +02:00
f907837f04
dashboard: Link 'My bills' to invoices
2019-04-04 06:43:47 +02:00
e58dcbb44c
hosting urls: Change invoices/<pk>/ to invoice/<pk>
2019-04-04 06:41:23 +02:00
8f4a02738f
Revert back to old price values
2019-04-04 00:15:04 +02:00
ef1bdee9a7
Remove more autoformatting
2019-04-04 00:05:45 +02:00
13f84a8580
Add missing endif
2019-04-04 00:05:20 +02:00
baf62f1924
Simplify showing total price
2019-04-03 23:54:52 +02:00
f1a7958f03
Use correct class
2019-04-03 23:34:26 +02:00
903fee4db1
Fix more autoformatting issues
2019-04-03 23:31:52 +02:00
d00e84a4b6
Fix bug related to proper alignment
2019-04-03 23:24:56 +02:00
47422a99af
Fix more autoformatting related errors
2019-04-03 23:11:59 +02:00
ddd3cebc39
Fix blocktrans reformatted mistakenly
2019-04-03 23:09:57 +02:00
ef09ae4dab
Obtaing pricing from order
2019-04-03 23:07:37 +02:00
3ed5823c93
Add missing self.object initializer
2019-04-03 23:04:35 +02:00
76e3d95135
Use invoice_number of invoice pk
2019-04-03 22:59:39 +02:00
d07f3d7eba
Add missing object param
2019-04-03 22:59:01 +02:00
7de2129a00
Implement get invoice
2019-04-03 22:49:45 +02:00
ba6fa531db
Correct the name of the layout
2019-04-03 22:49:25 +02:00
d37a2de6eb
Add utility functions
2019-04-03 22:48:56 +02:00
94586c854a
Add invoice detail
2019-04-03 22:48:23 +02:00
ba9e554881
Implement get_object for invoice detail + url fix
2019-04-03 21:52:07 +02:00
247bbe622f
Add missing invoice_number argument to MHB create
2019-04-03 21:29:49 +02:00
e843a6f857
Make invoicelistview not inherit OrderHostingListView
2019-04-03 21:16:19 +02:00
def5a3a011
Add invoice urls
2019-04-03 20:34:04 +02:00
dbe3b2558c
Create an InvoiceListView
2019-04-03 20:31:54 +02:00
71832f8afc
invoices.html: Replace all order instances by invoice
2019-04-03 20:31:24 +02:00
de3734bf20
Add total_in_chf utility method
2019-04-03 20:29:33 +02:00
147fd0fe5e
Add invoices.html
2019-04-03 20:29:06 +02:00
5c31417a37
Convert timestamp to int
2019-04-03 19:34:57 +02:00
cc6afa8d2a
Fix datetime issue: pass unix timestamp instead of datetime
2019-04-03 19:22:27 +02:00
a690ef421f
Fix variable name
2019-04-03 09:24:25 +02:00
8e1e3e4157
Correct variable names
2019-04-03 09:12:14 +02:00
12b8a77862
Fix issues and also include subscription_id
2019-04-03 09:03:58 +02:00
444f79eab7
Remove unwanted logger code
2019-04-03 07:35:43 +02:00
dbf3b92c06
Add logging and verbosity
2019-04-03 07:08:39 +02:00
c85a4f3796
Catch error from stripe call
2019-04-03 06:59:05 +02:00
3eaa53ca78
Use stdout instead of logger
2019-04-03 06:36:28 +02:00
b1566c4c61
Get the last monthly hosting bill
2019-04-03 06:22:49 +02:00
0bc8c35031
Add migration
2019-04-03 06:13:12 +02:00
6d42f88be1
Complete implementation of fetch_stripe_bills
2019-04-03 06:12:48 +02:00
8dc00c9dd9
Add management command
2019-04-02 09:18:46 +02:00
0e84081880
Add monthlyhostingbill model + code
2019-04-02 09:18:15 +02:00
1feacc1770
Merge branch 'master' into 5151/gdpr_modal
2018-10-25 22:05:24 +02:00
c36554b4d1
Round total_price also to 2 decimal places
2018-10-18 06:58:18 +02:00
3ebf932422
Adjust hosting calculator form validation
...
For 512 MB RAM offer
2018-10-17 09:29:08 +02:00
814163e58e
Add minRAM js code for hosting also
2018-10-17 09:11:37 +02:00
2fbee916cc
Correct help text for product slug field
2018-10-05 09:37:57 +02:00
e3ec67d32c
ProductPaymentForm: Set input fields input-no-border style
2018-10-05 08:58:10 +02:00
1100d61b5d
Fix flake8 warnings
2018-10-03 23:17:25 +02:00
b3e3af1c1a
Make ProductPaymentForm's recurring field hidden
2018-10-03 22:54:45 +02:00
74ec39498e
Update GenericProduct
...
Remove url field
Make slug mandatory
2018-10-03 09:58:49 +02:00
e4bfdec0b6
Update ProductPaymentForm's validation
2018-10-03 09:38:49 +02:00
27a92780a6
Add amount label + Reset textarea height
2018-10-03 08:38:20 +02:00
97693f0bb3
Format code
2018-10-03 08:27:22 +02:00
530bbcd5f6
Create ProductPaymentForm from GenericPaymentForm
2018-10-03 08:18:45 +02:00
3bad37c605
Make GenericProduct slug unique
2018-10-02 10:00:59 +02:00
930333357e
GenericProduct: Remove image field and add slug field
2018-10-02 09:27:38 +02:00
dd9e7dde35
Merge branch 'master' into task/5690/generic-payment-page
2018-10-02 09:01:46 +02:00
fcc113e9d9
Add locale_date class to date fields so that we can localize
2018-09-26 22:06:14 +02:00
1041284866
Refactor moment.js locale date code to virutal_machine_detail.js
2018-09-26 21:52:12 +02:00
4feeec23d4
Correct spelling: virutal -> virtual
2018-09-26 20:50:19 +02:00
ca578ecf56
Merge branch 'master' of https://github.com/MalcolmA/dynamicweb into MalcolmA-master
2018-09-26 20:46:54 +02:00
b021a8ed6e
Remove filer dependency in migration
2018-09-26 09:29:10 +02:00
99b11f013f
Remove old migration
2018-09-26 09:25:03 +02:00
1f990b1ab7
Update migration
2018-09-26 09:24:47 +02:00
508360472a
Add amount/recurring form fields validation
2018-09-26 09:14:11 +02:00
48ba6a6166
Remove disabled on amount/recurring fields
2018-09-26 09:13:45 +02:00
10e8f0a820
Show product name in hosting order detail
2018-09-26 09:10:15 +02:00
5df2080f92
Reset amount and recurring fields on error
2018-09-26 09:09:12 +02:00
PCoder
_moep_
pcoder116
wcolmenares