ungleich-public
/
dynamicweb
6
0
Fork 0
Code Issues 1 Pull Requests 2 Projects Releases Wiki Activity
4,773 Commits 13 Branches 148 Tags 315 MiB
Commit Graph

276 Commits

Author SHA1 Message Date
PCoder b03cb073c2 Replace @ with a comma 2018-09-06 00:44:47 +02:00
PCoder fdffe2389b Round price 2018-09-06 00:31:17 +02:00
PCoder d8a532e7b0 Round discount to 2 decimal points also 2018-09-06 00:26:08 +02:00
PCoder 642153345c Round price, vat and discount to 2 decimal places 2018-09-06 00:18:04 +02:00
PCoder 8a30100488 Use price in stripe plan name too 2018-09-05 23:26:51 +02:00
PCoder e230f2ac8c Merge master into 5151/gdpr_modal 2018-08-22 23:25:11 +02:00
PCoder 432b54a86d Remove timeout parameter in ping6 request 2018-08-22 20:27:19 +02:00
PCoder e66e8202db Remove unused variable 2018-08-22 19:56:56 +02:00
PCoder 3b07687d3e Refactor ping_ok from datacenterlight.utils to utils.hosting_utils 2018-08-22 00:12:14 +02:00
PCoder 33cf6cdd2b Create IS_TENANT_SITE context variable 2018-07-21 13:28:43 +02:00
PCoder b580ac24f6 Change string formatting 2018-07-07 21:30:40 +02:00
PCoder 3ccefbdb74 Reorganize imports 2018-07-07 21:29:44 +02:00
PCoder d9bcdf22b7 Add missing param in DE translation 2018-07-07 03:01:37 +02:00
PCoder 8d42ca3200 Remove token parameter from stripe_utils.get_card_details 
and add additional paramters to uniquely identify a card
 2018-07-07 01:08:49 +02:00
PCoder 4c06a9e730 Add de translations by MalcolmA 2018-07-06 19:33:26 +02:00
PCoder 1f2743a65d Makemessages for datacenterlight, hosting and utils 2018-07-06 01:19:44 +02:00
PCoder baa2817f57 Update BillingAddressFormSignup: add email validation 2018-07-05 10:00:12 +02:00
PCoder 6d2b011925 Merge master into task/3747/multiple_cards_support 2018-07-03 21:29:04 +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 cf00ff6bd8 Attempt to merge master into task/3747/multiple_cards_support 2018-06-12 08:16:11 +02:00
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 a5bd8347e8 merged master 2018-04-21 21:01:42 +05:30
PCoder 1a7412f8ff stripe_utils: Add set_subscription_metadata method 2018-04-19 00:51:55 +02:00
PCoder a50fa77c8a Update get_vm_price_with_vat: Return vat_percentage also 2018-04-17 21:36:08 +02:00
PCoder e4e7d93275 Fix flake8 errors 2018-04-17 20:50:41 +02:00
PCoder 85b8c50ef1 Use proper decimal arithmetic to compute price and vat 2018-04-16 03:25:36 +02:00
PCoder 957cec00a0 Add get_vm_price_with_vat method 2018-04-15 20:59:31 +02:00
PCoder e9a883bf2e Fix a bug: use ssd_unit_price instead of sdd_unit_price 2018-04-15 20:57:10 +02:00
PCoder 283a0d25d1 Update get_vm_price method to use pricing defined in VMPricing 2018-04-15 13:31:55 +02:00
PCoder d933f71fe9 Merge branch 'master' into task/3452/back_button_mgmt 2018-03-03 11:37:41 +01:00
Arvind Tiwari 0879a3e324 fix flake8 issues 2018-02-22 14:18:55 +05:30
Arvind Tiwari 7692997c82 minor improvements 2018-02-13 19:03:15 +05:30
Arvind Tiwari 909067e11f removed vendor files from hosting and using the ones from dataccenterlight 2018-02-09 06:50:17 +05:30
Arvind Tiwari 10c6fd5696 add optimize folder 2018-02-08 19:43:13 +05:30
Arvind Tiwari 4145129974 remove whitespace from output 2018-02-08 19:10:37 +05:30
Arvind Tiwari b9c53717e3 Merge branch 'master' into task/3713/clean_up_css 2018-02-08 17:11:41 +05:30
Arvind Tiwari ff2761912e minor fix 2018-02-05 02:57:46 +05:30
Arvind Tiwari a43428539f optimize script documentation and report output 2018-02-05 02:47:18 +05:30
Arvind Tiwari 4ebd52cd69 fix user keys layout, adjust @media breakpoints to bs4, fix more unused css, optimize script 2018-02-04 03:20:27 +05:30
Arvind Tiwari 6bb7f2f187 create vm error fix, more css optimizations 2018-01-31 04:22:34 +05:30
Arvind Tiwari 9d196416e2 optimize script 2018-01-30 19:09:55 +05:30
PCoder 3d1738871b Replace all ungleich.com with ungleich.ch 2018-01-03 08:54:19 +01:00
PCoder 72baa3635b Add cache_control decorator to LoginViewMixin 2017-12-27 08:31:19 +01:00
PCoder 6fa8dbb5cb Add trial_end parameter to subscribe_customer_to_plan 2017-12-24 12:32:08 +01:00
PCoder 1306dbe46a Merge branch 'master' into task/3774/update_stripe_subscription_on_vm_delete 2017-12-12 20:23:25 +01:00
PCoder 4a30438704 Update datacenterlight django.po 2017-11-27 08:38:10 +01:00
PCoder 273fa75d55 Fix PEP8 warnings 2017-11-26 01:12:16 +01:00
PCoder 07ffbcda97 Add skipIf condition for utils.tests.TestStripeCustomerDescription 2017-11-25 23:57:58 +01:00
PCoder 8c5848c1aa Update skipif condition 2017-11-25 23:14:40 +01:00
PCoder 3284adaf7a Add cardholder_name to data in BillingAddressFormTest 2017-11-25 22:37:00 +01:00
PCoder 89ac6250f1 Add validated=1 to users created in utils.tests 2017-11-25 20:19:22 +01:00
PCoder 6eec131218 Merge branch 'master' into task/3672/cleaning_existing_tests 2017-11-24 21:37:19 +01:00
Arvind Tiwari b8d0ca17d7 translation fix in utils.forms 2017-10-31 21:01:54 +05:30
PCoder 23e7edf7c2 Return True if associate_customer_card runs ok 2017-10-29 14:40:15 +01:00
PCoder 2ffaee2d5b Add clear_items_from_list utility function 2017-10-29 13:14:29 +01:00
PCoder 7e5cab2cc4 Fix PEP8 warnings 2017-10-28 22:44:58 +02:00
PCoder 2a59a3336b Add metadata (vm_id) to Stripe subscription 2017-10-28 20:25:18 +02:00
PCoder 73169e825d Add set_as_default parameter for associate_customer_card method 2017-10-28 15:13:38 +02:00
PCoder bd7db30633 Add card hidden field to BillingAddressForm 2017-10-27 00:43:07 +02:00
PCoder 1374eaf1a2 Rename id to stripe_api_cus_id 2017-10-27 00:41:49 +02:00
M.Ravi 85d19c004b Remove redundant code in check_customer 2017-10-26 15:21:29 +02:00
PCoder 1e08ae5426 Stripe API: Use list() instead of all() as the former is deprecated 2017-10-21 20:46:29 +02:00
PCoder fb2056bf95 Update stripe_id for a missing case 2017-10-21 20:45:00 +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
M.Ravi a3ce43fd53 Add add_card_to_stripe_customer function 2017-10-15 23:32:16 +02:00
M.Ravi 83363f4701 Remove some lines 2017-10-15 21:46:26 +02:00
M.Ravi 7d69d8d5d4 Add get_cards_details_from_token function 2017-10-15 21:45:17 +02:00
Arvind Tiwari 3370f06bff msg fix 2017-10-15 02:30:42 +05:30
M.Ravi a03040b449 Merge branch 'master' into task/3774/update_stripe_subscription_on_vm_delete 2017-10-11 21:25:52 +02:00
Arvind Tiwari 452089e103 translation fix 2017-10-10 21:38:49 +05:30
M.Ravi f044b83b8f Add Stripe unsubscribe_customer method 2017-10-03 13:06:37 +02:00
M.Ravi e2188cc166 Added some skipIf conditions 2017-10-02 17:19:51 +02:00
M.Ravi b848841337 Add logger error messages for Stripe errors 2017-10-02 01:35:28 +02:00
M.Ravi 4334dfaa44 Update utils django.po 2017-09-29 22:36:38 +02:00
M.Ravi e6869612d8 Update resend activation link email text 2017-09-29 21:45:30 +02:00
M.Ravi 0202d5ba93 Add initial values for dcl billing form 2017-09-28 22:56:33 +02:00
PCoder fcda0b5637 DCL payment page: Get form data from session on error 2017-09-29 01:25:22 +05:30
PCoder 06ef940b01 Merge upstream 2017-09-28 03:33:43 +05:30
PCoder 5a2a134070 Merge upstream master 2017-09-28 01:35:09 +05:30
PCoder e33e9cd1ae Merge branch 'master' into tiwariav-task/3756/landing_billing_page 2017-09-26 12:20:56 +05:30
PCoder c17604e5c1 Merge master into task/3730/refactor_price_parameter 2017-09-26 12:16:50 +05:30
PCoder a9e8d8bb34 Merge branch 'master' into task/3764/show_cancelled_vms_my_orders 2017-09-26 12:09:09 +05:30
PCoder 6bf89669ef some more de translations 2017-09-26 02:07:28 +05:30
PCoder 3b55e331ed Merge branch 'master' into task/3764/show_cancelled_vms_my_orders 2017-09-26 01:58:42 +05:30
PCoder 75ff7e4ea8 Added some translations 2017-09-26 01:53:19 +05:30
PCoder 81bc5d5555 Merge branch 'master' into task/3781/resend_activation_mail 2017-09-26 01:18:02 +05:30
PCoder c2844d25ed Corrected a de spelling 2017-09-26 00:06:17 +05:30
verysanghee 04c29d0622 Update django.po 2017-09-25 20:17:12 +02:00
PCoder 114511e924 Fixed some flake8 warnings 2017-09-25 00:34:18 +05:30
PCoder 7278a20135 Added get_or_create_vm_detail function 2017-09-25 00:02:36 +05:30
PCoder 3e32e5127b Added ResendActivationLinkViewMixin 2017-09-24 15:55:52 +05:30
PCoder af426c5b7a Added ResendActivationEmailForm and translation function to untranslated texts 2017-09-24 15:54:45 +05:30
PCoder 9ab7622a9c Reformatted stripe_utils.py 2017-09-23 03:25:48 +05:30
PCoder 285d664660 Refactored obtaining stripe plan name to utils.stripe_utils.get_stripe_plan_name 2017-09-23 03:17:21 +05:30
PCoder 3bb7f09d41 Refactored obtaining vm price to utils.hosting_utils.get_vm_price 2017-09-23 03:16:18 +05:30
Arvind Tiwari fc03df4652 merged master 2017-09-20 23:21:24 +05:30
M.Ravi a06753ca4b Use hostname and send celery errors to DCL_ERROR_EMAILS_TO 2017-09-15 13:09:46 +02:00
M.Ravi 5c3cf7682f Fixed some flake8 warnings 2017-09-14 15:27:25 +02:00