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

167 commits

Author SHA1 Message Date
Arvind Tiwari
de1895d2a0 billing address form fixed 2017-09-08 23:46:29 +05:30
PCoder
dc6fa5428e Corrected filtering public ssh keys condition 2017-09-05 03:29:12 +05:30
PCoder
f84b95e385 Added some translations 2017-09-04 22:27:59 +05:30
M.Ravi
52edb5466d Added some translations in utils django.po 2017-09-03 17:22:16 +02:00
PCoder
3a739f1cde Added utils django.po 2017-09-02 17:23:10 +05:30
PCoder
7d12eff9be Added translations and reformatted code 2017-09-02 16:50:09 +05:30
PCoder
2276533185 Reformatted utils/views.py and added a condition to DCL_TEXT in passoword reset email 2017-09-02 16:36:27 +05:30
PCoder
1c42623964 Fixed some password reset email translation issues 2017-09-02 16:24:25 +05:30
PCoder
7c70ee637a Updated password reset template 2017-09-02 15:56:17 +05:30
PCoder
1bc78ceb5d Added save_ssh_key_error_handler 2017-09-01 02:33:31 +05:30
M.Ravi
ab31ad37d3 Not passing index to cdist configure 2017-08-31 18:57:05 +02:00
M.Ravi
75a778e65f Added hosting_utils.py 2017-08-31 18:35:19 +02:00
M.Ravi
89ba4b6d04 Added CdistUtils class to manage indices 2017-08-31 15:05:45 +02:00
PCoder
b35e74e355 Updated cdist integration code with index parameter 2017-08-31 12:55:19 +05:30
Arvind Tiwari
5105b4583e Merge remote-tracking branch 'ungleich/master' into task/3704/my_settings 2017-08-30 16:25:24 +05:30
M.Ravi
adb75b488c Merged dynamicwebs master into task/3731/cdist_ssh_key_handler 2017-08-30 12:10:44 +02:00
M.Ravi
a4a2b2a803 Refactored and commented utils/tasks 2017-08-30 09:44:33 +02:00
M.Ravi
96be1245dc utils/tasks: Refactored code 2017-08-29 18:15:23 +02:00
Arvind Tiwari
58e7a2aca7 saving cardholder name 2017-08-29 17:48:41 +05:30
Arvind Tiwari
32ba9c5ff7 Merge branch 'master' into task/3704/my_settings 2017-08-29 17:42:40 +05:30
Arvind Tiwari
ce1d346bc1 billing form in settings page 2017-08-29 17:42:35 +05:30
M.Ravi
21f51692c4 Improved save_ssh_key celery task 2017-08-28 11:40:59 +02:00
M.Ravi
2b541da94b Added SaveSSHKeyTestCase 2017-08-28 11:39:46 +02:00
PCoder
568f38dd67 Added utils/tasks.py 2017-08-28 12:25:39 +05:30
PCoder
1da04a05d1 Created send_plain_email_task celery task and calling it on contact send 2017-08-27 16:42:14 +05:30
M.Ravi
bf304f9493 Fixed obtaining ga code from dict 2017-08-24 16:10:53 +02:00
M.Ravi
01b64fec88 Attempt to fix no ga code in www. sites 2017-08-24 16:04:37 +02:00
M.Ravi
c9357058f7 Added STRIPE_API_PRIVATE_KEY_TEST to the test case 2017-08-24 13:38:10 +02:00
PCoder
b5e488e326 Formatted utils/stripe_utils.py 2017-08-24 10:31:57 +05:30
PCoder
9eecfbda64 Added hdd parameter as an optional parameter to the subscription plan id 2017-08-22 02:13:12 +05:30
PCoder
35736ae593 Refactored some code 2017-08-18 01:49:27 +05:30
PCoder
7e1bfc9fab Removed a print 2017-08-18 00:47:34 +05:30
PCoder
fc70c30f21 Merged master into task/3701/enable_monthly_payments 2017-08-18 00:40:57 +05:30
Pcoder
a80b0668a2 Merge pull request #432 from siarheipuhach/feature/task3637 
task/3637/Added stripe failed payment error handler
 2017-08-17 20:50:18 +02:00
M.Ravi
5fe6007ad2 Refactored code and added app as a parameter in get_stripe_plan_id 2017-08-17 18:21:53 +02:00
M.Ravi
b0b1b6091a Refactored code and added app as a parameter in get_stripe_plan_id 2017-08-17 18:17:52 +02:00
M.Ravi
5c92e47ffe Added card that fails and a new test case to test failed payment 2017-08-17 16:42:32 +02:00
M.Ravi
0bc1766e4a Refactored tests and added test_subscribe_customer_to_plan 2017-08-17 15:32:13 +02:00
M.Ravi
ffd0d24f1a Refactored code 2017-08-17 13:23:49 +02:00
M.Ravi
3ef34d84a8 Added some comments and improved the test code 2017-08-17 13:02:39 +02:00
M.Ravi
1073b25a94 Refactored and added test_delete_unexisting_plan_should_fail 2017-08-17 12:43:42 +02:00
M.Ravi
2a348c40d1 Refactored code and added delete_stripe_plan method 2017-08-17 12:42:34 +02:00
M.Ravi
bba82e95d1 Cleaned up some unused code 2017-08-17 11:04:22 +02:00
PCoder
08c5485352 Added test_create_duplicate_plans_error_handling 2017-08-17 13:01:48 +05:30
PCoder
783ab5714c Improved get_or_create_plan and subscribe_customer_to_plan 2017-08-17 13:01:05 +05:30
PCoder
9d4085138a Added StripePlanTestCase 2017-08-17 04:25:07 +05:30
PCoder
974617badb Added get_or_create_plan and subscribe_customer_to_plan and get_stripe_plan_id_string functions to StripeUtils class 2017-08-17 04:23:38 +05:30
PCoder
999f5d8e2d Cleaned up a comment 2017-08-15 18:48:29 +05:30
PCoder
492f7553d8 Added test TestStripeCustomerDescription 2017-08-15 16:12:08 +05:30
PCoder
3be7fbe2ee Added name parameter for creating StripeCustomer and set description to this 2017-08-15 16:05:52 +05:30
PCoder
debfafaf26 Added migration file for missing card holder's name in utils_billing_address 2017-08-10 23:14:51 +05:30
Siarhei Puhach
4de04b2663 Changed visa card error placement 2017-08-07 09:56:57 +03:00
PCoder
e33df8f1e9 Added card holders name in UserBillingAddress to_dict function 2017-07-16 22:34:49 +05:30
PCoder
ed52e396d9 Formatted utils/models.py 2017-07-16 16:36:38 +05:30
PCoder
083b870b33 Formatted utils/forms.py 2017-07-16 16:35:55 +05:30
PCoder
a37464f8b3 Removed some unreachable code from utils/forms.py 2017-07-16 16:35:02 +05:30
PCoder
ba72527f2f Added validations for credit card inputs. Made credit card holder's name default value empty in the model. 2017-07-16 15:23:18 +05:30
PCoder
9d4cbb2be5 Introduced credit card holder's name in BaseBillingAddress model 2017-07-16 03:40:30 +05:30
PCoder
30058efa41 Inroduced credit card holder's name in Billing Address 2017-07-16 03:39:42 +05:30
M.Ravi
f419ce784f Fixed some flake8 warnings 2017-07-03 23:53:37 +02:00
M.Ravi
f9c3c80864 Merged the latest master into siarheipuhach-feature/flake8 2017-07-03 23:47:56 +02:00
Andrii Marynets
303d99d70d Merge branch 'master' into feature/add_google_analytics 
# Conflicts:
#	datacenterlight/templates/datacenterlight/order_detail.html
 2017-07-02 17:56:07 +03:00
M.Ravi
c8cf166571 Merged code from siarheipuhach/dynamicweb 2017-07-01 15:18:44 +02:00
Andrii Marynets
9431e9846c Add middleware for fix "get_host() method fails when the host is behind multiple proxies" 2017-06-30 08:44:39 +03:00
PCoder
d161a285b8 Added get_card_details function to stripe_utils 2017-06-30 11:08:00 +05:30
Andrii Marynets
ebf8b0646d Fix not add analytics if DEBUG=True 2017-06-30 01:33:12 +03:00
Andrii Marynets
2ad984504c Add GOOGLE_ANALYTICS_PROPERTY_IDS for dynamic set ID 2017-06-30 01:23:35 +03:00
Siarhei Puhach
edcfd3e9f4 Added Flake8 lib and fixed PEP8 violations 2017-06-29 17:34:40 +03:00
Pcoder
d4876cdecb Fixed the username for the from_email address 2017-06-16 00:09:11 +05:30
Levi Velázquez
657e93862d Merge branch 'master' into bug/3313/pwd_reset_email_from_dcl_support 2017-06-15 01:17:14 -05:00
Levi
c7d29be24c Merge branch 'master' into develop 2017-06-12 23:51:03 -05:00
M.Ravi
d84496b0de Added 'site' parameter to PasswordResetViewMixin so that we can differentiate from which site we have requested a password reset. 2017-06-12 20:42:17 +05:30
Levi
d43855adda fixed #3350, #3328, #3316, #3339 2017-06-09 15:36:14 -05:00
M.Ravi
a60ef7cf7a Changed BaseEmail to accept from_address to modify the from header accordingly 2017-06-07 11:35:16 +05:30
Levi
8adcb75b8c Merge branch 'develop' of github.com:ungleich/dynamicweb into develop 2017-06-04 17:08:09 -05:00
Levi
8598c540b9 removed pdb 2017-06-04 17:05:48 -05:00
Levi
ab4d1cf9c9 Changes stripe v2 to stripe v3 and added localization support 2017-06-04 17:04:38 -05:00
modulos
37a9629408 Add more translations 2017-05-30 15:57:36 +02:00
Levi
47be413298 fixed redirect link 2017-05-28 15:01:18 -05:00
Levi
9a93a3e315 fixed vm pricing error 2017-05-25 13:04:29 -05:00
modulos
15259e59f2 Add support for sign up redirection 2017-05-23 19:18:51 +02: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
M.Ravi
d537fcb118 Manual merge of ungleich/master into opennebula-integration 2017-04-24 03:01:05 +05:30
Levi
3da05e8025 Finished responsive issues 2016-12-19 09:33:15 -05:00
Levi
a84a88479f Fixed #2789 #2788 #2790 #2812 #2811 2016-12-13 10:54:05 -05:00
Levi
ba2e231078 As an user I want to receive an email after finishing a booking process. Change Ungleich logo in email to DG logo. Error in membership booking email order dates. Fixed #2670 Design order email when a booking is free.Fixed template issues. Helping natacha to fix bug deploying project. Fixing copies.Fixed #2682. Fixed #2685 fixing copies . Helping natacha fixing bugs. Fixed #2677 Address line change. Started reactivate membership feature 2016-10-28 11:25:09 -05:00
Levi
05a165095d Fixed redirect signup error. Fixed login next url error 2016-10-14 00:11:05 -05:00
Levi
082f39e9dc Added url in booking&price menu bar button. Fixed bug when user booked for 1 days and two free days were being given. Created UserBillingAddress. Created UserBillingAddress Form.Created UserBillingAddress after first user payment. Added Previous Billing data to booking payment view if there is one. Moved booking button. Fixed error on free days in booking invoice. Added modal to cancel subscription page. Now a member can booking without entering his billing address or credit card info. Fixed error on free days.Current user billing address is showed on billing and booking order details. Edit billing address form added.Added user_billing_address.html. Added user billing address get views. Filled user billing address view with current user billing address.Now an user can edit his billing address. Added is_free flag in Select Booking Dates in order to now if a booking is free. Changed Booking Order Model in order to allow free payments. Added free payment template. Added free payment into Booking Payment View. Fixed issue #2586: new digitalglarus navbar font change.Fixed issue #2608 : style fix new DG.Fixed #2617: fix input fields and btn responsiveness on DG payment page. Fixed #2620: responsive issue in DG order summary.Fixed #2623: Order history style fix for deativate button and message below.Fixed #2625: DG membership activation page fix. Fixed #2616: fix navbar responsivness for new DG. Fixed #2619: credit card input field responsiveness fix 2016-10-13 23:33:48 -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
4580a75f89 Added DonatorStatus model in order to know if an donator has canceled or not his monthly donation, Now we create a DonatorStatus for the user after receiving his first donation. Added DonatorStatus view. Added donator_status.html in order to allow an user view his donation status , Added action to allow user to cancel his monthly donations. Now the user can logout using navbar. added Donation model to admin.Added command make_donations_charges in order to create stripe current monthly donations from all donators 2016-07-27 00:08:45 -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
da9169c4ce Added login.html, Added login view , Added login form,Created Donation Django Model 2016-07-19 01:07:49 -05:00
Levi
7cd5244fdc Added PostListViewUngleichTest, Added PostDetailViewUngleich, Converted detail ungleich post view into Class Based Django view, Added translations to ungleich landing page 2016-07-15 00:14:51 -05:00
Levi
3e6502133e Merge branch 'develop' into feature/hosting_permission 2016-07-09 17:43:28 -05:00
Levi
b34d84657e Added HostingUserLoginForm test, Added HostingUserSignupForm test, Added PasswordResetRequestForm Test, Added SetPasswordForm test, Created custom 404 page 2016-07-07 23:35:50 -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
c70c98ecc5 changing defualt 'from email' to no-reply@ungleich.ch 2016-06-24 00:53:26 -05:00
Levi
2ad5118688 changing defualt 'from email' to no-reply@ungleich.ch 2016-06-24 00:49:46 -05:00
Levi
3526ddd9af changing defualt 'from email' to no-reply@ungleich.ch 2016-06-24 00:45:21 -05:00