ungleich-public/dynamicweb
6
0
Fork 0
Code Issues 1 Pull requests 2 Projects Releases Wiki Activity
5132 commits 13 branches 148 tags 315 MiB
Commit graph

165 commits

Author SHA1 Message Date
PCoder 74ec39498e Update GenericProduct 
Remove url field
Make slug mandatory
 2018-10-03 09:58:49 +02:00
PCoder 3bad37c605 Make GenericProduct slug unique 2018-10-02 10:00:59 +02:00
PCoder 930333357e GenericProduct: Remove image field and add slug field 2018-10-02 09:27:38 +02:00
PCoder 50e5fea339 Add GenericProduct model and associate it to HostingOrder 2018-09-25 02:20:31 +02:00
PCoder d6e4a86724 Append One time charge/Recurring only for generic payments 2018-09-23 13:34:26 +02:00
PCoder 332e7d6624 Add generic_payment_id field to HostingOrder migration and 
reflect generic payments in adminsite
 2018-09-23 12:39:06 +02:00
PCoder 4baa3a7095 Improve HostingOrder str representation 2018-08-23 09:18:55 +02:00
PCoder 4a1434c514 Make string representation of HostingOrder more readable 2018-08-23 09:07:12 +02:00
PCoder f9584b4c82 Fix a bug when vm_template is None 2018-08-23 09:06:31 +02:00
PCoder b69abf3edd Make CC brand 128 characters long 2018-08-21 14:42:01 +02:00
PCoder 768b8ca820 Change HostingOrder cc_brand field size to 35 chars 2018-08-21 14:06:58 +02:00
PCoder 770b5e080b Make UserCardDetail brand field 35 chars long 2018-08-21 13:24:54 +02:00
PCoder 9035f98060 Update UserCardDetail get method 2018-07-05 09:58:57 +02:00
PCoder d98a683b2a Do a get on UserCardDetail only when fingerprint, exp_month and exp_year are known 2018-07-03 23:23:02 +02:00
PCoder 6d2b011925 Merge master into task/3747/multiple_cards_support 2018-07-03 21:29:04 +02:00
PCoder 44900f6a48 Rename OrderSpecifications to OrderDetail 2018-07-01 22:30:23 +02:00
PCoder 00cb1de75d Add type to OrderSpecification string 2018-07-01 19:46:21 +02:00
PCoder 7f57ace92d Set default and on_delete attributes 2018-07-01 19:23:05 +02:00
PCoder 900f014d92 Save order specifications in HostingOrder also 2018-07-01 18:33:10 +02:00
PCoder cf00ff6bd8 Attempt to merge master into task/3747/multiple_cards_support 2018-06-12 08:16:11 +02:00
Arvind Tiwari 3b6c2b9d4e fix vm_id default 2018-04-21 22:27:43 +05:30
PCoder 25c0694b6c Use vm_pricing for creating HostingOrder 2018-04-16 03:36:56 +02:00
PCoder c92bf30514 Associate HostingOrder and VMPricing 2018-04-16 03:23:09 +02:00
PCoder 63eb7fc0e2 Rename contains to get_user_card_details 2017-10-29 21:31:11 +01:00
PCoder 2a8f02a197 Order by preferred and id fields for cards in settings page 2017-10-28 22:32:35 +02:00
PCoder dc8ea8d253 Make save_default_card method static 2017-10-28 22:18:54 +02:00
PCoder 175180e193 Show DEFAULT text against the default card in the settings page 2017-10-28 20:45:00 +02:00
PCoder 06a5cba50e Add contains utility method 2017-10-28 18:28:14 +02:00
PCoder a17a5f66bc Set preferred = False for cards that are not preferred 2017-10-28 16:47:10 +02:00
PCoder d14a643171 Set preferred field as in card_details 2017-10-28 15:26:15 +02:00
PCoder 8759e2a4b5 Save default card only if Stripe's default_source is not None 2017-10-28 15:14:42 +02:00
PCoder a6d28bff86 Add set_default_card and set_default_card_from_stripe methods 2017-10-27 00:40:38 +02:00
M.Ravi 780fa6cb60 Add get_or_create_user_card_detail method 2017-10-26 17:56:12 +02:00
PCoder 303eb4112d Add doc. and return empty list for get_all_cards_list function 2017-10-21 21:34:54 +02:00
PCoder 14c7d6ac0e Refactor getting all cards to UserCardDetail.get_all_cards_list() 2017-10-21 21:27:21 +02:00
PCoder 70b6bbdf2f Save card id as a parameter and use it to delete a source 2017-10-21 13:27:35 +02:00
PCoder 255c8a1d80 Add UserCardDetail create method that assigns appropriate object permission 2017-10-21 00:00:21 +02:00
M.Ravi 167e3589d4 Rename user to stripe_customer 2017-10-15 21:21:36 +02:00
M.Ravi a1d7b07e0c Relate UserCardDetail with StripeCustomer and add more fields to uniquely identify if a user already has a card 2017-10-15 21:19:13 +02:00
M.Ravi 9a9a764023 Add preferred card field to UserCardDetail 2017-10-15 20:06:56 +02:00
M.Ravi a4b63e220a Relate UserCardDetail to CustomUser and rename some fields 2017-10-15 19:49:44 +02:00
M.Ravi 707f1a8768 Add UserCardDetail model + Reorganize imports 2017-10-15 18:00:43 +02:00
Arvind Tiwari 734a41a371 merged master 2017-10-03 18:42:00 +05:30
Arvind Tiwari df93dfe047 day set to one before 2017-09-30 18:10:34 +05:30
Arvind Tiwari 1f09bab3e4 minimum month diff set to 1 2017-09-30 18:08:02 +05:30
Arvind Tiwari 3701899304 timezone aware 2017-09-30 18:06:50 +05:30
Arvind Tiwari f1790445cd timezone aware 2017-09-30 18:05:02 +05:30
Arvind Tiwari bd91883369 end_date added 2017-09-30 17:55:49 +05:30
M.Ravi 313ba9d502 Refactor set_subscription_id - use stripe subscription id instead of obj 2017-09-29 08:42:17 +02:00
PCoder a45679d89a Added VMDetail model 2017-09-25 00:00:45 +05:30
PCoder 75da4a7711 hosting/models.py: Fixed bug extracting cc info from dict 2017-08-24 12:51:55 +05:30
PCoder 7c3a0b86d8 HostingOrder: Updated set_subscription_id to include cc details as parameter 2017-08-24 11:59:38 +05:30
PCoder 29d36faef0 Refactored some code 2017-08-21 00:41:46 +05:30
PCoder 35736ae593 Refactored some code 2017-08-18 01:49:27 +05:30
M.Ravi ecbbe1eb6d Added subscription_id field and reformatted the code 2017-08-17 18:16:36 +02:00
Siarhei Puhach d2d96e9951 Added private_key field to UserHostingkey model, some html updates 2017-07-06 14:18:22 +03:00
Siarhei Puhach edcfd3e9f4 Added Flake8 lib and fixed PEP8 violations 2017-06-29 17:34:40 +03:00
Modulos 46b918d175 Fix price calculation 2017-05-14 02:18:10 +02:00
Modulos 752e11bcea Readded hostingplans 2017-05-13 13:47:53 +02:00
Modulos 75d93b2aad Add images as configuration 2017-05-13 06:59:57 +02:00
Levi 8980f6b2fc merged opnnebula api changes 2017-05-12 12:13:18 -05:00
Modulos 130c00c8ee API Integration 
Please review carefully.
 2017-05-12 12:07:05 +02:00
Levi 3873540849 Force user to generate ssh key in order to create a VM #3147. As user I want to terminate a VM using web interface #3148. Change password in opennebula when user change his password on hosting app #3149 2017-05-12 00:56:35 -05:00
Levi 1f10f04a9d Fixed ssh key error, Now an existing user is not ask for his credit card again 2017-05-11 00:11:33 -05:00
Modulos 63052df6c9 Change to new OpenNebula functions 2017-05-09 05:05:58 +02:00
Modulos d0fc0144e5 Merge branch 'opennebula-integration' into vm_bill 2017-05-09 04:56:03 +02:00
Levi 9a34518457 attached opennebula vm id to virtualmachine plan 2017-05-08 21:54:12 -05:00
Levi abf6dbddce added create vm feature from a normal user in opennebula 2017-05-08 21:49:40 -05:00
Modulos 6dedf3693e Change to use OpenNebulaManager 2017-05-09 04:41:45 +02:00
Modulos 3ee075fad9 Merge branch 'opennebula-integration' into vm_bill 2017-05-09 04:04:53 +02:00
Levi bd83545653 Merge branch 'opennebula-integration' of github.com:ungleich/dynamicweb into opennebula-integration 2017-05-08 19:06:12 -05:00
Levi 7ae49d00dd added opennebula manager claass 2017-05-08 19:02:29 -05:00
Modulos 3078536bd7 Merge branch 'opennebula-integration' into vm_bill 2017-05-08 15:46:53 +02:00
M.Ravi 621376c5b4 Added functionality to create opennebula user if it does not exist 2017-05-08 16:23:03 +05:30
Modulos ae69a56ab2 Add error handling 2017-05-08 02:47:38 +02:00
Levi d72c1c810d added get vms 2017-05-07 18:57:44 -05:00
Modulos c2a76e6c39 Merge migrations and fix spacing 2017-05-07 16:09:41 +02:00
Modulos 4ab8963149 Follow fat models small views 
Based on the recommondation in 'Two scoops of Django' I moved the code
for accessing the customers vm from the view to the model.
 2017-05-07 16:07:38 +02:00
Modulos d146c25899 Merge branch 'opennebula-integration' into vm_bill 2017-05-07 06:29:29 +02:00
Levi 90307724c8 added null true to opennebula id atribute 2017-05-06 18:09:01 -05:00
Levi c9c7023c73 fixed create vm method 2017-05-06 18:04:45 -05:00
Modulos 673e8a0c79 Add total_price to HostingBill model 2017-05-06 14:44:08 +02:00
Modulos 2ff8b9e4a5 Add hosting bill view, model and urls 2017-05-05 14:59:11 +02:00
Levi ed806910e6 adding integration opennebula-hosting app 2017-05-03 23:19:32 -05:00
Levi 085133fb53 integrating hosting app with opennebula integration 2017-04-29 12:39:55 -05:00
M.Ravi cb4d96604c Manual merge of develop into opennebula-integration 2017-04-26 10:40:52 +05:30
M.Ravi 43350869e0 Reverted some files back to as they were in master. They had been reorganized. 2017-04-25 03:55:05 +05:30
M.Ravi 1e61ec965d Some more fixes for the issues of the review of rscnt. 2017-04-25 03:37:50 +05:30
M.Ravi a427fa8579 Renamed 'manage vmss' model names so that we have a nice name 2017-04-23 22:24:41 +05:30
M.Ravi b363bf5f6a First working version of opennebula-integration. 2017-03-15 17:32:55 +05:30
Levi 4352094680 Added ‘view virtual machine plan ’ permission, Added ‘delete virtual machine plan’ permission , Added ‘view hosting order’ permission 2016-07-10 22:08:51 -05:00
Levi 3e6502133e Merge branch 'develop' into feature/hosting_permission 2016-07-09 17:43:28 -05:00
Levi 0dc81fff3d Fixed duplicated post bug , Added reset password view test, Added confirm reset password view test 2016-07-04 23:44:15 -05:00
Levi a8b9e02ea5 started hosting permissions 2016-06-26 14:50:48 -05:00
Levi 288be32c5f As an user I want to be able to cancel my VM Plan subscription. As an user I want to be able to receive an email each time that my VM status changes. 2016-06-09 23:50:49 -05:00
Levi 82ca7da20a As an admin I can change the VM ip using admin panel ,Fixed notification view count label, Fixed hosting company name on payment view, Added configuration in VM hosting page, Admin can changes the VM configuration using admin panel 2016-06-07 00:29:22 -05:00
Levi d472d37fab Created custom “add order view” to admin panel, Added vm name and user email to orders list admin view , Started function to charge an user for his VM subscription from the admin panel, Created template for email after charge an user for his virtual machine plan, Handle errors creating an order in the admin panel, Now an email is sent to the user after charge him for his virtual machine plan 2016-06-03 00:07:47 -05:00
Levi a846f42bf6 Added mark a notification as read feature, Fixed some errors 2016-05-29 13:37:43 -05:00
Levi c33c4f4148 Added status field to a booked VM. Added the capability to change a booked VM status from the admin panel. Send email to user after his VM is approved 2016-05-27 00:51:10 -05:00
Levi 8376d0106c Added next button in order detail view after the user make a payment, Avoid to regenerate SSH Key if the user refresh the page, Now the key is served to download from javascript , Added public_key attribute to VirtualVMPlan in order to store keys created by the user, Now private key has PEM format and public has OpenSSH 2016-05-24 01:19:49 -05:00