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

1422 commits

Author SHA1 Message Date
William Colmenares
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
William Colmenares
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
9fd396363f Center the add ssh key nicely 2019-05-13 07:13:49 +02:00
William Colmenares
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
a44d50dd69 Fix wrong comparing of public_key object with a string value 2019-05-12 19:56:14 +02:00
PCoder
d38edb0dfa Add url for AddSshKeyToVMView 2019-05-12 19:22:10 +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
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
65c9ccb671 Use save_key_in_opennebula_user and save_key_in_vm_template 2019-05-11 01:54:35 +02:00
PCoder
1d70563ea2 Save user's key in opennebula 2019-05-10 09:19:42 +02:00
William Colmenares
b8ca7286f2 Add view to check if the vm belongs to a user 2019-05-09 01:34:18 -04:00
PCoder
f0dfcccd96 Increase configuration length in VMDetail to 128 chars 2019-05-08 23:42:03 +02:00
PCoder
d8b95abb39 Check private key is true 2019-05-06 08:48:26 +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
3a7c209b80 Fallback to Stripe plan name for product description if its set 2019-04-20 19:54:46 +02:00
PCoder
dad4f42dc3 Do not add vm_conf to details if it is None 2019-04-20 19:13:34 +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
aff197c1b5 Fix getting StripePlan by plan_id and not name 2019-04-20 14:12:45 +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
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
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
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
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
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
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