amal/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
4951 commits 8 branches 146 tags 314 MiB
Commit graph

487 commits

Author SHA1 Message Date
PCoder
59c45492a9 Add expiry year and month in the settings and order payment pages 2019-07-09 18:40:41 +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
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
47fd9a8f28 Adjust urls in datacenterlight/hosting apps urls/views after refactor 2019-07-01 08:09:37 +05:30
PCoder
feeb102f92 Do SSH key validation only if the user doesn't have an existing key and 
the user has input some value in the add ssh key field
 2019-06-25 03:48:29 +02:00
PCoder
34c917acc2 Add SSH form to hosting VM buy flow also 2019-06-25 03:10:50 +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
08608c726f Code cleanup: remove updating ssh keys on live VMs 2019-06-25 02:11:57 +02:00
PCoder
1ebfc8b2dc Don't use VirtualMachineSerializer for obtaining users_vms 2019-06-10 14:51:40 +02:00
PCoder
496178f44c Check if VM belongs to user against opennebula backend 2019-06-08 04:40:16 +02:00
William Colmenares
5ad871f124 updated for read vm realm 2019-05-16 16:35:44 -04:00
William Colmenares
ce630573e0 Remove print statement & correct code return 2019-05-16 13:33:31 -04:00
William Colmenares
69ec7d2b46 reuse of the env variable in the base settings 2019-05-13 03:44:09 -04: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
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
09ab9a714d Add AddSshKeyToVMView 2019-05-12 19:21:19 +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
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
0b99a0cbec Fix getting users email and password from the request object 2019-04-20 18:52:34 +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
c3842a5ed5 Get periods from line items in invoice detail also 2019-04-13 15:43:27 +02:00
PCoder
a3a2016cb4 Attempt period from line_items 2019-04-13 15:24:37 +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
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
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
d00e84a4b6 Fix bug related to proper alignment 2019-04-03 23:24:56 +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
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
ba9e554881 Implement get_object for invoice detail + url fix 2019-04-03 21:52:07 +02:00
PCoder
e843a6f857 Make invoicelistview not inherit OrderHostingListView 2019-04-03 21:16:19 +02:00
PCoder
dbe3b2558c Create an InvoiceListView 2019-04-03 20:31:54 +02:00
PCoder
c36554b4d1 Round total_price also to 2 decimal places 2018-10-18 06:58:18 +02:00
PCoder
3ebf932422 Adjust hosting calculator form validation 
For 512 MB RAM offer
 2018-10-17 09:29:08 +02:00
PCoder
10e8f0a820 Show product name in hosting order detail 2018-09-26 09:10:15 +02:00
PCoder
d54bf84b1e Format code 2018-09-25 02:20:57 +02:00
PCoder
a90bec98ec Make invoice for generic payment showable 2018-09-24 08:22:46 +02:00
PCoder
304feb4f7b Update text 2018-09-08 10:46:07 +02:00
PCoder
e376f38baa Correct text 2018-09-08 10:33:00 +02:00
PCoder
84dae63968 Fix: ugettext_lazy doesn't like string format 2018-09-08 10:29:47 +02:00
PCoder
4914280868 Set text for vm terminate timeout 2018-09-08 10:14:57 +02:00
PCoder
a7afbec5b4 Fix flake8 error 2018-09-07 23:14:57 +02:00
PCoder
ff6df8cd58 Simplify logic 2018-09-07 23:11:46 +02:00
PCoder
8e7789462e Merge branch 'master' into bugfix/log_vm_terminate_errors 2018-09-07 22:43:29 +02:00
PCoder
8a30100488 Use price in stripe plan name too 2018-09-05 23:26:51 +02:00
PCoder
df10e84418 Add owner's email to the subject 2018-07-25 22:04:44 +02:00
PCoder
a5cdfab306 Send an email to admin if the VM is still there after 30 seconds 
of the VM terminate calll
 2018-07-25 21:54:15 +02:00
PCoder
59b020c0d4 Replace all occurrences of logger.info with logger.error 2018-07-25 21:41:05 +02:00
PCoder
34ed51a643 Don't dissociate card if transaction fails 2018-07-07 02:03:42 +02:00
PCoder
0f26917f35 Fix PEP8 warning 2018-07-07 01:54:45 +02:00
PCoder
678167978c Add check to forbid user from deleting the last card 2018-07-07 01:50:46 +02:00
PCoder
c118e86230 Remove unused context parameters -- introduced during merge 2018-07-03 23:56:42 +02:00
PCoder
c9d01ba95f Fix some errors 2018-07-03 21:52:44 +02:00
PCoder
6d2b011925 Merge master into task/3747/multiple_cards_support 2018-07-03 21:29:04 +02:00
M.Ravi
5eff54cffe Fix a bug -- json not imported; use JsonResponse instead of 
HttpResponse
 2018-06-27 12:34:57 +02:00
M.Ravi
2cd73b313a Merge master into task/3934/move_hosting_order_out_of_celery_task 
and resolve some conflicts
 2018-06-27 12:09:05 +02:00
PCoder
fae9fce5c6 Remove unnecessary code 2018-06-12 11:15:17 +02:00
PCoder
6db38d7e29 Check card_id also for order confirmation 2018-06-12 11:14:36 +02:00
PCoder
86f0526773 Reformat code 2018-06-12 11:13:10 +02:00
PCoder
7494116468 Add missing import 2018-06-12 09:36:00 +02:00
PCoder
cf00ff6bd8 Attempt to merge master into task/3747/multiple_cards_support 2018-06-12 08:16:11 +02:00
Arvind Tiwari
8044e0c2a0 calculator discount text modified 2018-05-11 17:47:27 +05:30
Arvind Tiwari
55cbe3244a fix testing error 2018-05-07 09:14:31 +05:30
Arvind Tiwari
3d2ce27954 fix discount amount 2018-05-07 06:29:53 +05:30
Arvind Tiwari
eeed9b2e72 discount name in templates 2018-05-07 06:25:50 +05:30
Arvind Tiwari
2ff8c25034 exclude discount from total price 2018-05-07 06:11:44 +05:30
Arvind Tiwari
f8dc2c6bbe discount option added to calculator 2018-05-07 05:07:58 +05:30
Arvind Tiwari
0c4c945ec3 flake8 fix 2018-04-25 17:51:36 +05:30
Arvind Tiwari
91a65e88ec hosting vm payment price fix 2018-04-25 16:08:05 +05:30
Arvind Tiwari
f66d768ecb hosting payment page 2018-04-25 15:55:58 +05:30
Arvind Tiwari
3bf064a017 add calculator placeholder to cms_integration 2018-04-25 14:52:25 +05:30
Arvind Tiwari
a5bd8347e8 merged master 2018-04-21 21:01:42 +05:30
Arvind Tiwari
3debf34118 remove vm creation to util function 2018-04-20 20:25:24 +05:30
PCoder
bd875ffe7d Create hostingorder outside celery task 2018-04-18 23:50:52 +02:00
PCoder
36c0b9a0a6 Differentiate price and total_price in hosting order_detail 2018-04-17 22:23:46 +02:00
PCoder
c2513dc7c3 Show vat_percent and subtotal for vat exclusive case 2018-04-17 21:38:28 +02:00
PCoder
1e76864821 Get vm price and vat and pass it to context 2018-04-16 04:46:43 +02:00
PCoder
731fef8ad9 Show VAT details in hosting/order_details if it is set 2018-04-16 04:39:21 +02:00
PCoder
602ad1b2c0 Reformat code 2018-04-16 04:32:27 +02:00
PCoder
b71fec7e61 Fix a bug: use vm_pricing instead of pricing 2018-04-16 04:00:48 +02:00
PCoder
a8339a23a9 Use get_vm_price_with_vat in hosting invoice 2018-04-16 03:27:54 +02:00