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

1188 Commits

Author SHA1 Message Date
PCoder d933f71fe9 Merge branch 'master' into task/3452/back_button_mgmt 2018-03-03 11:37:41 +01:00
Arvind Tiwari 819848c90c why dcl plugin and id for each section 2018-03-02 02:05:42 +05:30
Arvind Tiwari 80ed92eece merged master 2018-02-23 18:14:31 +05:30
PCoder 8aeefd7144 Remove datacenterlight/img/beta-img.png and hosting/image/Beta.png 
and corresponding references in the code
 2018-02-20 19:56:22 +01:00
PCoder a5ad1a9edf Remove unused beta access templates and js 2018-02-20 19:48:52 +01:00
Arvind Tiwari 909067e11f removed vendor files from hosting and using the ones from dataccenterlight 2018-02-09 06:50:17 +05:30
Arvind Tiwari b9c53717e3 Merge branch 'master' into task/3713/clean_up_css 2018-02-08 17:11:41 +05:30
Arvind Tiwari b0548b6bb4
Update order_detail.html 2018-02-07 19:30:53 +05:30
Arvind Tiwari 22121fa7bc use the minified js 2018-02-07 19:14:03 +05:30
Arvind Tiwari e93eda8845 update html2canvas to fix bugs 2018-02-07 02:23:23 +05:30
Arvind Tiwari d73b0e2fde scale increased to 2 2018-02-05 03:17:33 +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 fb6ddd3512 moved styles to common.css, removed more unused styles 2018-01-17 16:31:46 +05:30
Arvind Tiwari 4fd761c396 removed unused classes from datacenterlight css files 2018-01-10 02:47:25 +05:30
PCoder dd9b0d8fd9 Refactor dcl's ssh key name prefix to DCL_SSH_KEY_NAME_PREFIX 2018-01-08 19:50:42 +01:00
PCoder 0706ac5909 Shorten generated ssh key and add seconds to the name 2018-01-08 19:35:39 +01:00
PCoder 3d1738871b Replace all ungleich.com with ungleich.ch 2018-01-03 08:54:19 +01:00
PCoder b0993d8728 Fix address: Bahnhotstrasse to Bahnhofstrasse 2017-12-27 23:44:27 +01:00
PCoder 1395c04a00 Add cache_control to CreateVirtualMachinesView and VirtualMachineView 2017-12-27 09:10:41 +01:00
PCoder 639e4cf414 Add get method and cache_control to OrdersHostingListView 2017-12-27 09:09:54 +01:00
PCoder 14ff876fbf Add cache_control to PaymentVMView and OrdersHostingDetailView 2017-12-27 09:06:46 +01:00
PCoder ab06eeff67 Add cache_control to SSHKEyCreateView and SettingsView post methods 2017-12-27 09:04:58 +01:00
PCoder 98e06686f9 Add get method and cache_control to SignupValidatedView 2017-12-27 09:03:17 +01:00
PCoder bec541c06a Add get method to hosting.SignupView and cache_control 2017-12-27 08:33:53 +01:00
PCoder 87cdb08f3c Change success_url in hosting.SignupView from ssh_keys to dashboard 2017-12-27 08:32:55 +01:00
PCoder d796272c10 Add cache_control headers to get and post methods 2017-12-25 15:54:23 +01:00
PCoder f357c83fc4 Remove cache_control headers from Classes 2017-12-25 15:53:24 +01:00
PCoder b4f03b9553 Add cache_control decorator to all hosting views 2017-12-25 15:10:34 +01:00
PCoder dd54b3052e Reorganize imports 2017-12-25 15:07:12 +01:00
PCoder 6c017d1581 Remove commented translation 2017-12-22 23:59:51 +01:00
PCoder 57c5255708 Update translation in DE : 200 to 2000 2017-12-22 23:37:49 +01:00
PCoder 3a558c86a6 Merge branch 'master' into task/3601/reduce_min_ram_to_1G 2017-12-22 23:27:32 +01:00
PCoder 3852ce04de Set default RAM value to 2G in landing and hosting VM calculators 2017-12-21 08:41:29 +01:00
PCoder 979a62f120 Merge branch 'master' into task/3774/update_stripe_subscription_on_vm_delete 2017-12-21 02:04:17 +01:00
PCoder 4dff4e07cb Change minimum required RAM from 2GB to 1GB 2017-12-21 01:25:52 +01:00
PCoder 4ee2ab8c45 Merge branch 'master' into task/3974/improve_invoice_number 2017-12-20 22:52:51 +01:00
PCoder 2628312bb9 Fix a bug and update delete vm email subject 2017-12-20 22:26:36 +01:00
PCoder 0634a1a41f Merge branch 'master' into task/3774/update_stripe_subscription_on_vm_delete 2017-12-20 21:28:55 +01:00
PCoder f61abf44c8 Remove unused import 2017-12-20 21:28:07 +01:00
PCoder 96de92d312 Reorganize code 2017-12-20 20:59:46 +01:00
PCoder 7d683e1257 Move Stripe subscription cancelation before deleting vm 2017-12-17 20:20:42 +01:00
PCoder a04aa8542d Add some logger debug messages 2017-12-12 22:55:30 +01:00
PCoder 1306dbe46a Merge branch 'master' into task/3774/update_stripe_subscription_on_vm_delete 2017-12-12 20:23:25 +01:00
M.Ravi 88afdc1dd1 Removed unwanted logger debug msg 2017-12-12 16:49:50 +01:00
M.Ravi 24d85d5086 Check has_perm only for invoices 2017-12-12 15:43:25 +01:00
M.Ravi 091b277f7d Correct call to has_perm 2017-12-12 12:42:40 +01:00
M.Ravi 57311eda73 Improve debug logs 2017-12-12 12:14:39 +01:00
PCoder 79b4b449d1 Add some logger messages 2017-12-12 09:53:19 +01:00
PCoder beefeb62cb Raise 404 for HostingOrder not belonging to user 2017-12-12 09:38:08 +01:00
Arvind Tiwari 8d64915d71 invoice footer added 2017-12-11 00:47:55 +05:30
PCoder 272e14f712 Update hosting django.po 2017-11-27 08:43:34 +01:00
PCoder 4a30438704 Update datacenterlight django.po 2017-11-27 08:38:10 +01:00
PCoder 5e2c40f1a5 Fix flake8 warnings 2017-11-27 08:03:59 +01:00
PCoder 2102a89cdc Test if PEP8 warnings can be detected in travis build 2017-11-27 07:56:28 +01:00
PCoder 94f0921168 Fix flake8 warning 2017-11-26 01:51:03 +01:00
PCoder d466c56a17 Correct skipIf conditions 2017-11-26 01:49:54 +01:00
PCoder 273fa75d55 Fix PEP8 warnings 2017-11-26 01:12:16 +01:00
PCoder 2bc4db1cab Add skipif to tests that require connecting to OpenNebula 2017-11-26 00:55:14 +01:00
PCoder a3525c1d18 SignupViewTest.test_anonymous_user_can_signup: Commented out user comparison in context 2017-11-25 21:22:59 +01:00
PCoder 3715b969b6 Comment out PaymentVMViewTest.test_post 2017-11-25 21:17:27 +01:00
PCoder 57170b55be Update site_name used in PasswordResetViewMixin 2017-11-25 20:02:41 +01:00
PCoder ddf69accdf Set validated=1 for user created in hosting.test_views.LoginViewTest 2017-11-25 19:44:19 +01:00
PCoder baf00b1a8b Remove context assertion in HostingPricingViewTest 2017-11-25 19:34:31 +01:00
PCoder 4c63a7d138 Remove assert comparison of contexts for the time-being 2017-11-25 19:28:58 +01:00
PCoder ff43e748af Set validated=1 when creating user in test 2017-11-25 19:23:18 +01:00
PCoder 3b6f047693 Comment out erroneous test code 2017-11-25 12:26:12 +01:00
PCoder 4a27890db5 Comment out test_anonymous_post 2017-11-24 22:43:39 +01:00
PCoder 6eec131218 Merge branch 'master' into task/3672/cleaning_existing_tests 2017-11-24 21:37:19 +01:00
Arvind Tiwari 372f015760 translation fix 2017-10-31 20:50:35 +05:30
PCoder c438c0d8cb Add some de translations 2017-10-31 09:38:36 +01:00
PCoder f9bd849333 Remove redundant "previous" text 2017-10-31 09:05:49 +01:00
PCoder d8ce0f95c5 Change letter-spacing to 2px for btn-vm-contact 2017-10-31 09:02:07 +01:00
PCoder 3e08760e04 Change letter-spacing to 2px for settings-container buttons 2017-10-31 08:58:43 +01:00
PCoder a2a35a9475 Fix error accessing stripecustomer for user when it doesn't exist 2017-10-30 08:26:35 +01:00
PCoder 16b6ecb38c Clear session variables on payment error 2017-10-29 23:48:33 +01:00
PCoder 62f30bf03c Remove some commented and unnecessary code 2017-10-29 22:03:19 +01:00
PCoder 63eb7fc0e2 Rename contains to get_user_card_details 2017-10-29 21:31:11 +01:00
PCoder bea3477d84 Handle errors related to payment by redirecting to payment page 2017-10-29 14:45:14 +01:00
PCoder bafb4e7b68 Remove hasCreditcard js code - not used anymore 2017-10-28 23:42:30 +02:00
PCoder db8dd9af54 Hosting payment: select card text update 2017-10-28 23:18:10 +02:00
PCoder 2a8f02a197 Order by preferred and id fields for cards in settings page 2017-10-28 22:32:35 +02:00
PCoder cac00d4b9e Implement select default card functionality 2017-10-28 22:19:53 +02:00
PCoder dc8ea8d253 Make save_default_card method static 2017-10-28 22:18:54 +02:00
PCoder c47b5cdc72 Add form to send selected card in settings page 2017-10-28 22:17:46 +02:00
PCoder 175180e193 Show DEFAULT text against the default card in the settings page 2017-10-28 20:45:00 +02:00
PCoder d2ae94327a Associate card only if it has not already been done 2017-10-28 18:29:19 +02:00
PCoder 06a5cba50e Add contains utility method 2017-10-28 18:28:14 +02:00
PCoder 4be105a0a9 Set default card for newly added card in hosting flow 2017-10-28 16:48:03 +02:00
PCoder a17a5f66bc Set preferred = False for cards that are not preferred 2017-10-28 16:47:10 +02:00
PCoder b6d1e8df6b Set preferred for the card that's used for a subscription 2017-10-28 15:45:05 +02:00
PCoder 6212c9df50 Manage token and card_id properly in hosting flow 2017-10-28 15:30:42 +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 38168e8f8f Allow use of previous cards in hosting flow 2017-10-27 00:45:26 +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 4dd407da67 Use card_id as session variable instead of token and customer 2017-10-26 17:57:11 +02:00
M.Ravi 780fa6cb60 Add get_or_create_user_card_detail method 2017-10-26 17:56:12 +02:00
M.Ravi 692f82cba4 Code rearrange 2017-10-26 15:15:27 +02:00
M.Ravi ef9dc446db Use hasattr to check if a user already has a stripecustomer object 2017-10-26 15:00:54 +02:00
M.Ravi 8d2c120b43 Associate newly added card with customer from hosting 2017-10-26 12:29:16 +02:00
Arvind Tiwari 64ffca6ded signup form placeholder translation 2017-10-26 03:24:29 +05:30
PCoder de5035d12e Add id_card input element 2017-10-22 00:21:08 +02:00
PCoder 21bb336166 Add js code to submit id_card 2017-10-22 00:20:40 +02:00
PCoder 8351b1bf8b Use refactored get_all_cards_list function 2017-10-21 23:14:55 +02:00
PCoder bf91bf3822 Change text: delete card to remove card 2017-10-21 23:14:05 +02:00
PCoder 7f4993c3f0 Update hosting payment template to use added cards 2017-10-21 23:12:53 +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 8df72620d6 Add 'billing address updated' message in that case 2017-10-21 20:58:54 +02:00
PCoder 75e90dbacd Refactor and add messages 2017-10-21 20:37:50 +02:00
PCoder be8181ec42 Add _messages template to hosting/settings.html 2017-10-21 17:02:24 +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 c664b44f2c Add functionality to delete user card 2017-10-21 00:02:35 +02:00
PCoder 255c8a1d80 Add UserCardDetail create method that assigns appropriate object permission 2017-10-21 00:00:21 +02:00
M.Ravi 60cfc24319 Merge branch task/3766/credit_card_options from tiwariav into task/3747/multiple_cards_support 2017-10-19 20:24:28 +02:00
M.Ravi 68a34762b9 Merge branch 'master' into task/3747/multiple_cards_support 2017-10-19 20:17:39 +02:00
Arvind Tiwari 1839a1c27c translation re compilation 2017-10-17 00:35:51 +05:30
Arvind Tiwari 2a71be354b conflicts resolved 2017-10-17 00:27:50 +05:30
M.Ravi c939106a35 Prepare to handle delete card 2017-10-16 16:29:09 +02:00
M.Ravi bff37d6246 Add card id param to card details 2017-10-16 16:20:03 +02:00
M.Ravi 3d50868c6a Add url for card delete 2017-10-16 16:18:39 +02:00
M.Ravi de275c23ac Add modal for card delete 2017-10-16 16:18:17 +02:00
M.Ravi 619f37829e Now showing cards from UserCardDetails 2017-10-15 23:57:15 +02:00
M.Ravi 52791f5e48 Refactor cc_brand to brand 2017-10-15 23:56:38 +02:00
M.Ravi 3f9c1a68d1 Remove unused code 2017-10-15 23:38:18 +02:00
M.Ravi 74a1f82c30 Refactor handling post for settings card input form 2017-10-15 23:37:01 +02:00
Arvind Tiwari 88be7be180 translation fix 2017-10-16 01:07:54 +05:30
Arvind Tiwari 9bc86255c4 user account details added and translation fix 2017-10-16 01:04:49 +05:30
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 f3ca9110e1 Add UserCardDetail migration 2017-10-15 19:56:40 +02:00
M.Ravi 6420a9869b Add functionality to save UserCardDetail 2017-10-15 19:55:37 +02:00
M.Ravi f71c8e553d Add name to user details form button name 2017-10-15 19:54:01 +02:00
M.Ravi 1a25bbf11e Add name to card form button name 2017-10-15 19:51:58 +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
M.Ravi e6f92d9ae4 Manual merge 2017-10-15 16:14:33 +02:00
Arvind Tiwari 3370f06bff msg fix 2017-10-15 02:30:42 +05:30
Arvind Tiwari c60d45c292 merge master 2017-10-15 01:52:29 +05:30
Arvind Tiwari 1c50eb45e9 Merge pull request #509 from tiwariav/task/3828/invoice_period 
task/3828 invoice period
 2017-10-15 01:27:02 +05:30
Arvind Tiwari ed1f1451ce [] removed around the vm name 2017-10-15 00:41:31 +05:30
Arvind Tiwari 2cd1850f02 password reset email fix 2017-10-15 00:30:52 +05:30
Arvind Tiwari 7b71ba1749 merged master 2017-10-15 00:10:02 +05:30
M.Ravi ed05411dac Return if the form already contains error 2017-10-14 12:52:18 +02:00
Arvind Tiwari 606a687bc7 conflicts resolved 2017-10-13 02:08:28 +05:30
M.Ravi 764a51c0e7 Merge branch 'master' into task/3774/update_stripe_subscription_on_vm_delete 2017-10-12 19:32:00 +02:00
M.Ravi 859ccd54a6 Remove some more commented code and console logs 2017-10-12 19:06:26 +02:00
M.Ravi 1b14598cc9 Create Stripe elements only stripe key is defined 2017-10-12 00:43:55 +02:00
M.Ravi a03040b449 Merge branch 'master' into task/3774/update_stripe_subscription_on_vm_delete 2017-10-11 21:25:52 +02:00