Commit Graph

53 Commits

Author SHA1 Message Date
Modulos d146c25899 Merge branch 'opennebula-integration' into vm_bill 2017-05-07 06:29:29 +02:00
Levi e67148ff59 fixing vm list 2017-05-06 18:39:19 -05:00
Levi e99be51de1 adding list vm 2017-05-06 18:19:28 -05:00
Levi c9c7023c73 fixed create vm method 2017-05-06 18:04:45 -05:00
Levi 97fecf88db fixed typo 2017-05-06 17:42:14 -05:00
Levi ac9ba1480b fixed payment issues 2017-05-06 17:36:02 -05:00
Modulos bd362cb619 Change to user_email add TODOs 2017-05-06 15:28:18 +02:00
Modulos 6f252def5d Return error if HostingBill object does not exist 2017-05-06 15:16:10 +02: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 2658205008 showing VMS 2017-04-29 12:54:14 -05:00
Levi 4ec830550c showing VMS 2017-04-29 12:51:30 -05:00
Levi 3e755b3b68 added vm_template parameter to djangohosting view 2017-04-29 12:46:56 -05:00
Levi 085133fb53 integrating hosting app with opennebula integration 2017-04-29 12:39:55 -05:00
Levi f56f294205 Fixed blling form goes out of background image, Fixed billing address page "amount" field seems broken, Changed authentication page fonts
Added new DG login.html, Fixed DG login contact footer, Added new DG login form, Added  DG login, Added DG signup, Added DG reset password, Added DG confirm reset password, Added DG membership payment view
 Please enter the commit message for your changes. Lines starting
2016-08-20 00:57:46 -05:00
Levi 4e07385949 Added command make_donations_charges in order to create stripe current monthly donations from all donators. Now the user can logout using navbar. Added restriction to user in order to make a donation when he has an active monthly donation . Added donations view where the user can view their recents donations. Now users receive an email after making his first donation. 2016-07-29 00:17:34 -05:00
Levi cb520f6b58 Created signup view. Added login after signup.Added signup url to nosystem app urls.py. Added logout view, Added logout button on nabber, Added password reset form, Added password view , Added password reset html, Added password reset email for nosystemd app. Added confirm_reset_password.html, Added confirm_ reset password view, Added confirm reset password form, Fixed reset password token generation, Started donation view, Added donation view, Added donation.html, Added donation form, Adding donation.js lib in order to capture stripe payments for nosystem app. 2016-07-22 01:24:32 -05:00
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 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 e90c5fece0 Created generic view for vm pricing widget, Added VM configuration info on VM detail view, Fixed template bugs. Fixed Blog urls bugs 2016-06-30 01:23:14 -05:00
Levi d8150b6593 Created reset password email, Added forgot password view, Added forgot password form, Added set new password form, Added set new password view, fixed signup response issue, fixed main menu ungleich button redirect to django-hosting 2016-06-21 00:10:38 -05:00
Levi 6d029fdeb5 Added cron to send email and fixing settings error 2016-06-16 01:04: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 a6eba4f536 #hotfix email after book vm 2016-06-05 15:49:51 -05:00
Levi cca3a23263 Fixed login/signup page background.Fixed payment input fields.Added login button on hosting page. Fixed hosting tests. Redirect to notifications page if an logged user try to login again. 2016-06-04 02:59:37 -05:00
Levi a846f42bf6 Added mark a notification as read feature, Fixed some errors 2016-05-29 13:37:43 -05:00
Levi b443d4d21e Created BaseEmail class , Now we are sending email to info@ungleich.com after an user book a VM, Fixed pricing issue, Now Admin can changed data about a booked VM 2016-05-25 01:23:32 -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
tmslav 3beb220f90 Merge pull request #77 from tmslav/develop
https://redmine.ungleich.ch/issues/2290
2016-05-21 00:04:41 +02:00
Tomislav R f6fbf13023 https://redmine.ungleich.ch/issues/2290 2016-05-21 00:03:17 +02:00
Levi 88ee543083 Merge branch 'develop' of github.com:ungleich/dynamicweb into develop 2016-05-20 16:43:17 -04:30
Levi 5bdcc5d2b2 Fixed Login Error Style , Started view to generating SSH key for a VM 2016-05-20 16:41:42 -04:30
Tom 418c257978 delete orders 2016-05-20 15:00:06 +00:00
Tomislav R 2a7603778a resolve conflicts 2016-05-20 14:22:51 +02:00
Levi e26eecf2eb Changed offers in VM pricing, Fixed pricing error changing disk size, VM footer dead links, Added logged out message 2016-05-19 01:47:16 -04:30
Tomislav R 04d8c263bf add delete hosting order 2016-05-19 00:58:28 +02:00
Levi 994b489c63 Added test to order detail view, Added test to customer orders view, Added test to virtual machine detail view, Added test to customer booked virtual machines view 2016-05-14 02:12:42 -04:30
Levi bf17e80df4 Added based view test, Added billing address form test, payment view test , Added test for hetzner pricing calculation, Added test for bern pricing calculation, Fixed script to load initial pricing data 2016-05-12 01:57:34 -05:00
Levi a99ea335c8 Added VM detail page, Added VM setting page, Added VM pricing page,Added VM orders page, Added VM status page 2016-05-04 00:16:41 -05:00
Levi 539117741e Changed redirect url after login 2016-05-03 01:06:43 -05:00
Levi 906df2a111 Added pagination to orders view, Created, Virtual machines booked page ,Changed logged user nabber , Added pagination to virtual machines view , Started Virtual machine detail page 2016-05-03 00:59:40 -05:00
Levi 1c5fc6a437 Added redirect urls after signup/login 2016-04-30 13:55:55 -05:00
Levi de48f1ce69 Fixes digitalglarus urls, Added translated text to ungleich landing page, Create user’s order template, Created view to list all user’s orders, Adding some style to pricing template 2016-04-29 01:53:24 -05:00
Levi 46ab364184 Handled stripe payment errors , Added invoice template, Added view to handle invoice data 2016-04-27 01:54:15 -05:00
Levi bf334a38d4 Added Hosting Order model, Created Billing Address Model , Method to create a customer using Stripe API , Created Customer Stripe profile to store for further charges , Method in order to charge an amount to a customer 2016-04-26 01:16:03 -05:00
Levi 5456c4c341 Created a base template for login / signup, Fixed some html design issues on login / signup pages, Added Billing Address Form to payment page, Handle Billing Address Form validation, Created VirtualMachinePlan model in order to store user purchased VM, Create method in order to create a stripe plan , Investigated about stripe payment workflows 2016-04-23 02:22:44 -05:00
Levi 38801abed7 Added View to render payment page, Added Payment and summary forms, Added Payment.js library to request stripe token , Added jQuery validator for handling payment form errors 2016-04-22 08:36:38 -05:00
Levi 4e23adcea6 Separated base hosting page into html sections, Added pricing selector to Django Page, Added pricing selector to Rails Page, Added pricing selector to NodeJS Page, Implemented hosting signup , Implemented hosting login, Created forms to handle login/signup errors 2016-04-20 01:03:32 -05:00