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

1550 commits

Author SHA1 Message Date
PCoder 27a92780a6 Add amount label + Reset textarea height 2018-10-03 08:38:20 +02:00
PCoder 97693f0bb3 Format code 2018-10-03 08:27:22 +02:00
PCoder 530bbcd5f6 Create ProductPaymentForm from GenericPaymentForm 2018-10-03 08:18:45 +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 dd9e7dde35 Merge branch 'master' into task/5690/generic-payment-page 2018-10-02 09:01:46 +02:00
PCoder fcc113e9d9 Add locale_date class to date fields so that we can localize 2018-09-26 22:06:14 +02:00
PCoder 1041284866 Refactor moment.js locale date code to virutal_machine_detail.js 2018-09-26 21:52:12 +02:00
PCoder 4feeec23d4 Correct spelling: virutal -> virtual 2018-09-26 20:50:19 +02:00
PCoder ca578ecf56 Merge branch 'master' of https://github.com/MalcolmA/dynamicweb into MalcolmA-master 2018-09-26 20:46:54 +02:00
PCoder b021a8ed6e Remove filer dependency in migration 2018-09-26 09:29:10 +02:00
PCoder 99b11f013f Remove old migration 2018-09-26 09:25:03 +02:00
PCoder 1f990b1ab7 Update migration 2018-09-26 09:24:47 +02:00
PCoder 508360472a Add amount/recurring form fields validation 2018-09-26 09:14:11 +02:00
PCoder 48ba6a6166 Remove disabled on amount/recurring fields 2018-09-26 09:13:45 +02:00
PCoder 10e8f0a820 Show product name in hosting order detail 2018-09-26 09:10:15 +02:00
PCoder 5df2080f92 Reset amount and recurring fields on error 2018-09-26 09:09:12 +02:00
PCoder d54bf84b1e Format code 2018-09-25 02:20:57 +02:00
PCoder 50e5fea339 Add GenericProduct model and associate it to HostingOrder 2018-09-25 02:20:31 +02:00
PCoder 67231275c7 Modify migration 2018-09-25 02:19:28 +02:00
PCoder 1228d3dbc6 Add product_name to GenericPaymentForm 2018-09-25 02:18:31 +02:00
PCoder 69a1d2df71 Add ajax call to fetch price/recurring 
Based on selected production
 2018-09-25 02:16:44 +02:00
PCoder b63a572231 Register GenericProduct to adminsite 2018-09-25 02:14:37 +02:00
PCoder 114dbd8242 Make recurring monthly and amount in chf explicit 2018-09-24 08:32:33 +02:00
PCoder a90bec98ec Make invoice for generic payment showable 2018-09-24 08:22:46 +02:00
PCoder 2a694295ad Refactor payment.js 2018-09-23 17:00:48 +02:00
PCoder fcfc56e132 Move csrf_token out of the form loop 2018-09-23 16:15:48 +02:00
PCoder d6e4a86724 Append One time charge/Recurring only for generic payments 2018-09-23 13:34:26 +02:00
PCoder 9ec05e7df4 Merge billing and generic-payment forms and post values as get 
parameters
 2018-09-23 13:13:32 +02:00
PCoder e94ecfe52c Change recurring and description to non-required fields + Change 
amount to Floatfield
 2018-09-23 12:49:57 +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 c7edcdc8b1 Change description to CharField and set its height 2018-09-22 23:51:39 +02:00
PCoder a7fa52490c Create GenericPaymentForm 2018-09-22 08:16:26 +02:00
PCoder d7be223fcb Change margin bottom for vm terminate error 2018-09-08 12:39:12 +02:00
PCoder 304feb4f7b Update text 2018-09-08 10:46:07 +02:00
PCoder e376f38baa Correct text 2018-09-08 10:33:00 +02:00
PCoder 84dae63968 Fix: ugettext_lazy doesn't like string format 2018-09-08 10:29:47 +02:00
PCoder 4914280868 Set text for vm terminate timeout 2018-09-08 10:14:57 +02:00
PCoder a7afbec5b4 Fix flake8 error 2018-09-07 23:14:57 +02:00
PCoder ff6df8cd58 Simplify logic 2018-09-07 23:11:46 +02:00
PCoder 8e7789462e Merge branch 'master' into bugfix/log_vm_terminate_errors 2018-09-07 22:43:29 +02:00
PCoder 8a30100488 Use price in stripe plan name too 2018-09-05 23:26:51 +02:00
Malcolm Anyakee c891694dc0 Update Bugfix 
Fixed bugs and fixed typo
 2018-08-25 23:13:16 +02:00
PCoder 144a780105 Change text: 'Terminated VM can not ...' -> 'Terminated VMs can not ...' 2018-08-24 11:58:01 +02:00
PCoder 06d849c5ce Merge branch 'master' into 5151/gdpr_modal 2018-08-24 11:10:59 +02:00
PCoder d7f171d710 Change DE translation (beenden instead of terminieren) 2018-08-24 11:07:50 +02:00
PCoder 4f745b607d Merge branch 'master' into task/5487/warn_users_before_terminating_vm 2018-08-24 10:58:24 +02:00
PCoder e1263ce9b3 Add DE translation fo #5487 2018-08-23 19:40:16 +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 e230f2ac8c Merge master into 5151/gdpr_modal 2018-08-22 23:25:11 +02:00
PCoder 78e44332b5 Remove an unnecessary question mark 2018-08-22 23:16:26 +02:00
PCoder af78631ec8 Update hosting's django.po 2018-08-22 23:13:49 +02:00
PCoder 29172a9df7 Use a separate class for warning block 2018-08-22 23:06:20 +02:00
PCoder 4425aa7c88 Change modal text 2018-08-22 22:57:32 +02:00
PCoder b7ff519624 Reduce bottom padding further by 2px 2018-08-22 22:54:49 +02:00
PCoder 07837c8752 Reduce bottom padding 2018-08-22 22:51:22 +02:00
PCoder 1e5cf08273 Move the warning to the bottom 2018-08-22 22:47:49 +02:00
PCoder 7e790e7027 Add warning div 2018-08-22 22:36:29 +02:00
PCoder 929e7ead1c Add vm-terminate-warning style 2018-08-22 22:36:17 +02:00
PCoder 9c5363ef55 Merge branch 'master' into bugfix/show_meta_description_in_cms_page 2018-08-22 21:42:37 +02:00
PCoder b69abf3edd Make CC brand 128 characters long 2018-08-21 14:42:01 +02:00
PCoder 8bf6440110 Delete old migrations 2018-08-21 14:41:16 +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
M.Ravi 9381327a12 Change author of various cms pages to ungleich glarus ag 
(Being consistent)
 2018-08-20 11:52:27 +02:00
PCoder df10e84418 Add owner's email to the subject 2018-07-25 22:04:44 +02:00
PCoder a5cdfab306 Send an email to admin if the VM is still there after 30 seconds 
of the VM terminate calll
 2018-07-25 21:54:15 +02:00
PCoder 59b020c0d4 Replace all occurrences of logger.info with logger.error 2018-07-25 21:41:05 +02:00
PCoder 069cd18268 Add gdpr banner to all base templates 2018-07-21 13:27:15 +02:00
PCoder 33bd2e1760 Improve import_usercarddetails management command 2018-07-07 02:15:38 +02:00
PCoder 34ed51a643 Don't dissociate card if transaction fails 2018-07-07 02:03:42 +02:00
PCoder 0f26917f35 Fix PEP8 warning 2018-07-07 01:54:45 +02:00
PCoder 678167978c Add check to forbid user from deleting the last card 2018-07-07 01:50:46 +02:00
PCoder ebcbb26276 Add another DE translation - UPDATE 2018-07-07 01:38:03 +02:00
PCoder e18b8a527a Add missing DE translation 2018-07-07 01:35:52 +02:00
PCoder e60b93d126 Add management command import_usercarddetails 2018-07-07 01:28:25 +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 0db4a113e6 Add some styles and do not let user remove card if he has only one 2018-07-05 23:06:47 +02:00
PCoder 9035f98060 Update UserCardDetail get method 2018-07-05 09:58:57 +02:00
PCoder 8e742852a5 Show all cards in landing and hosting payment page 2018-07-04 02:03:08 +02:00
PCoder c118e86230 Remove unused context parameters -- introduced during merge 2018-07-03 23:56:42 +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 9904a71d38 Rename usercarddetail migration 2018-07-03 22:34:59 +02:00
PCoder c9d01ba95f Fix some errors 2018-07-03 21:52:44 +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
M.Ravi 5eff54cffe Fix a bug -- json not imported; use JsonResponse instead of 
HttpResponse
 2018-06-27 12:34:57 +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 fae9fce5c6 Remove unnecessary code 2018-06-12 11:15:17 +02:00
PCoder 6db38d7e29 Check card_id also for order confirmation 2018-06-12 11:14:36 +02:00
PCoder 86f0526773 Reformat code 2018-06-12 11:13:10 +02:00
PCoder 23630d4473 Move csrf_token call outside the for loop 2018-06-12 11:11:37 +02:00
PCoder 7494116468 Add missing import 2018-06-12 09:36:00 +02:00
PCoder 57eda62586 Update UserCardDetail migration 2018-06-12 08:28:46 +02:00
PCoder cf00ff6bd8 Attempt to merge master into task/3747/multiple_cards_support 2018-06-12 08:16:11 +02:00
Arvind Tiwari 8fb0d9a48a order detail divider lines full width 2018-05-12 21:59:06 +05:30
Arvind Tiwari b09604d30f add space befor CHF 2018-05-12 03:56:04 +05:30
Arvind Tiwari f39f95e1f7 remove template filter from translation 2018-05-12 03:47:54 +05:30
Arvind Tiwari 20f1df8a70 blocktrans variable fix 2018-05-12 03:39:38 +05:30
Arvind Tiwari 39f7898259 edit order detail footer text 2018-05-12 03:15:07 +05:30
Arvind Tiwari 55889499df order detail style fix 2018-05-12 02:47:27 +05:30
Arvind Tiwari 8044e0c2a0 calculator discount text modified 2018-05-11 17:47:27 +05:30
Arvind Tiwari 30deae5a20 strong color fix 2018-05-11 17:25:44 +05:30
Arvind Tiwari a14407182f font weight for discount name 2018-05-11 17:21:02 +05:30
Arvind Tiwari 73e3dce8d4 order detail page font format 2018-05-11 17:18:19 +05:30
Arvind Tiwari f3ffbd96e5 translation fix 2018-05-10 21:26:47 +05:30
Arvind Tiwari b351cb9aa0 translation fix 2018-05-10 21:25:38 +05:30
Arvind Tiwari 55cbe3244a fix testing error 2018-05-07 09:14:31 +05:30
Arvind Tiwari 0fdb88b8aa invoice discount amount fix 2018-05-07 07:50:32 +05:30
Arvind Tiwari 3d2ce27954 fix discount amount 2018-05-07 06:29:53 +05:30
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 7a72cc02ab translations 2018-05-07 05:22:05 +05:30
Arvind Tiwari f8dc2c6bbe discount option added to calculator 2018-05-07 05:07:58 +05:30
Arvind Tiwari 89ed869780 hosting calculator styles 2018-04-25 23:31:27 +05:30
Arvind Tiwari 0c4c945ec3 flake8 fix 2018-04-25 17:51:36 +05:30
Arvind Tiwari 91a65e88ec hosting vm payment price fix 2018-04-25 16:08:05 +05:30
Arvind Tiwari f66d768ecb hosting payment page 2018-04-25 15:55:58 +05:30
Arvind Tiwari 3bf064a017 add calculator placeholder to cms_integration 2018-04-25 14:52:25 +05:30
Arvind Tiwari 3b6c2b9d4e fix vm_id default 2018-04-21 22:27:43 +05:30
Arvind Tiwari a5bd8347e8 merged master 2018-04-21 21:01:42 +05:30
Arvind Tiwari 3debf34118 remove vm creation to util function 2018-04-20 20:25:24 +05:30
PCoder bd875ffe7d Create hostingorder outside celery task 2018-04-18 23:50:52 +02:00
PCoder 4e3211b62f Make total and subtotal texts bold 2018-04-18 21:37:12 +02:00
PCoder 36c0b9a0a6 Differentiate price and total_price in hosting order_detail 2018-04-17 22:23:46 +02:00
PCoder 2ac1ac7d97 Add subtotal and VAT to hosting order detail too 2018-04-17 22:20:36 +02:00
PCoder c2513dc7c3 Show vat_percent and subtotal for vat exclusive case 2018-04-17 21:38:28 +02:00
PCoder 1e76864821 Get vm price and vat and pass it to context 2018-04-16 04:46:43 +02:00
PCoder 731fef8ad9 Show VAT details in hosting/order_details if it is set 2018-04-16 04:39:21 +02:00
PCoder 6cc40cb67f virtual machine detail: show price upto 2 decimal places 2018-04-16 04:34:40 +02:00
PCoder 602ad1b2c0 Reformat code 2018-04-16 04:32:27 +02:00
PCoder 5738dc8e1b Virtual machine detail: use hostingorder for obtaining the price, 
rather than the serializer
 2018-04-16 04:32:08 +02:00
PCoder adbb8a269e Hostingorders: limit amount to 2 decimal places 2018-04-16 04:16:57 +02:00
PCoder b71fec7e61 Fix a bug: use vm_pricing instead of pricing 2018-04-16 04:00:48 +02:00
PCoder 25c0694b6c Use vm_pricing for creating HostingOrder 2018-04-16 03:36:56 +02:00
PCoder a8339a23a9 Use get_vm_price_with_vat in hosting invoice 2018-04-16 03:27:54 +02:00
PCoder c92bf30514 Associate HostingOrder and VMPricing 2018-04-16 03:23:09 +02:00
Arvind Tiwari 403f9b5a08 change logo in hosting emails 2018-04-13 17:55:08 +05:30
Arvind Tiwari a306f59327
Update mixins.py 2018-04-09 03:12:41 +05:30
Arvind Tiwari 5dd29bb09e
Update mixins.py 2018-04-09 03:02:50 +05:30
PCoder 698cf7f1ee Fix link in signup message 2018-04-07 13:16:36 +02:00
PCoder 7b1cb975df Fix Method Resolution Order 2018-04-07 13:15:44 +02:00
PCoder f911d6b403 Add HostingContextMixin to various hosting views 2018-04-07 12:53:53 +02:00
PCoder 399c91d636 Add HostingContextMixin that sets the REDIRECT_TO_CMS and 
MULTISITE_CMS_FALLBACK urls
 2018-04-07 12:51:49 +02:00
Arvind Tiwari 368fe0d08f merge master 2018-03-29 01:04:26 +05:30
Arvind Tiwari d52c061709 use humanize to add comma to numbers 2018-03-27 19:38:09 +05:30
Arvind Tiwari 52dafc99d3 ungleich gmbh -> ungleich glarus ag, settings page fix 2018-03-27 00:54:44 +05:30
Arvind Tiwari 849cdec0e2 unlocalize vm id 2018-03-21 01:29:28 +05:30
Arvind Tiwari c9ee9f6ec3 merge master 2018-03-21 01:09:47 +05:30
PCoder f10191cf89 Merge branch 'master' into task/3452/back_button_mgmt 2018-03-09 19:51:00 +01:00
PCoder a7a0ec8864 Add no_cache decorators instead of cache_control 2018-03-09 19:49:40 +01:00
Arvind Tiwari b6888106e5
Merge pull request #579 from tiwariav/task/4119/dcl_cms_plugins 
task/4119/dcl_cms_plugins
 2018-03-10 00:07:05 +05:30
Arvind Tiwari eefe9ba940 company fiscal number added to hosting invoice footer 2018-03-09 03:47:18 +05:30
Arvind Tiwari 82b8952595 removed unused tags from templated 2018-03-09 03:35:50 +05:30
Arvind Tiwari fc659cab9f number localization format for de set same as en 2018-03-07 19:22:13 +05:30
Arvind Tiwari 77843dd2cb header font-weight fix, unused code removed 2018-03-06 03:23:14 +05:30
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
Arvind Tiwari 3e6084a1b1 translation fix 2017-10-11 00:30:32 +05:30
Arvind Tiwari 452089e103 translation fix 2017-10-10 21:38:49 +05:30
Arvind Tiwari 6cdca621b2 original pattern.jpg added 2017-10-07 23:35:13 +05:30
Arvind Tiwari 25e3980b20 pattern.jpg compressed 2017-10-07 23:33:08 +05:30
Arvind Tiwari c400fdb02e width adjusted 2017-10-07 23:17:57 +05:30
Arvind Tiwari 2dd2945ee9 wider auth box 2017-10-07 17:51:18 +05:30
Arvind Tiwari d0003ce9f3 style fixes 2017-10-07 17:35:10 +05:30
Arvind Tiwari f3832c1db9 content-dashboard removed for unregistered pages 2017-10-07 17:06:55 +05:30
Arvind Tiwari 1dc374e09d footer links color changed 2017-10-07 16:23:04 +05:30
Arvind Tiwari 7d7b8661ea translations 2017-10-07 16:19:53 +05:30
Arvind Tiwari 769396d95e login pages restyled and footer included 2017-10-07 14:38:48 +05:30
Arvind Tiwari 88781e992c 24 hr fix 2017-10-06 04:20:38 +05:30
Arvind Tiwari d3d57ade37 formats fixed 2017-10-06 04:16:58 +05:30
Arvind Tiwari 8e5654bdb5 date time converted to locale 2017-10-06 04:11:40 +05:30
Arvind Tiwari 4dbf08f995 Merge branch 'master' into task/3828/invoice_period 2017-10-06 02:39:07 +05:30
Arvind Tiwari cc2e08aff5 translations 2017-10-06 02:02:22 +05:30
Arvind Tiwari ba8eaa2937 new card details option added 2017-10-06 01:59:18 +05:30
Arvind Tiwari bd3c59eb3e card_input template 2017-10-06 01:17:50 +05:30
Arvind Tiwari 6536991209 list all cards, card_input template 2017-10-06 01:17:35 +05:30
Arvind Tiwari 5e8b34d39c Update hosting favicon to dcl favicon 2017-10-06 01:02:14 +05:30
M.Ravi f0be6d6d7f Merge remote-tracking branch 'mainRepo/master' into task/3774/update_stripe_subscription_on_vm_delete 2017-10-04 19:32:02 +02:00
Arvind Tiwari fc68715bcb Merge pull request #507 from tiwariav/task/3811/create_vm_page_text 
task/3811 create vm page lead text added
 2017-10-04 01:00:03 +05:30
Arvind Tiwari 242f4edf8c Merge pull request #513 from tiwariav/bugfix/stripe_customer_id 
bugfix/stripe_customer_id
 2017-10-04 00:05:27 +05:30
Arvind Tiwari 1990c4758e merged master 2017-10-03 23:49:26 +05:30
Arvind Tiwari e7545247c9 Merge remote-tracking branch 'ungleich/master' 2017-10-03 23:46:43 +05:30
Arvind Tiwari 0ba6bca06b Merge pull request #508 from tiwariav/task/3823/hosting_favicon 
task/3823 hosting favicon link fixed
 2017-10-03 23:42:57 +05:30
Arvind Tiwari 618a82fc66 Merge remote-tracking branch 'ungleich/master' 2017-10-03 21:51:28 +05:30
Arvind Tiwari 7e380267b7 Update payment.css 2017-10-03 21:49:51 +05:30
Arvind Tiwari eb7b1a4ea0 Merge remote-tracking branch 'ungleich/master' 2017-10-03 21:46:23 +05:30
Arvind Tiwari 96d8f8358f Merge pull request #512 from tiwariav/bugfix/card_input 
Bugfix/hosting_card_input
 2017-10-03 21:39:44 +05:30
Arvind Tiwari c410e2cbc5 stripe_customer_id retrieved from request.user relation 2017-10-03 21:35:08 +05:30
Arvind Tiwari bfbf4d87cc Merge pull request #503 from tiwariav/task/3785/my_bills_page 
Task/3785 update my bills page
 2017-10-03 21:31:27 +05:30
Arvind Tiwari 315ce92a78 post request attributes changed 2017-10-03 21:24:35 +05:30
Arvind Tiwari 0263964705 stripe_id used instead of id 2017-10-03 21:04:25 +05:30
Arvind Tiwari 6802e2fdbc merged master 2017-10-03 18:54:47 +05:30
Arvind Tiwari 734a41a371 merged master 2017-10-03 18:42:00 +05:30
Arvind Tiwari 2e34d404ea translation 2017-10-03 18:25:32 +05:30
Arvind Tiwari e4837b063c alignment fix 2017-10-03 18:18:18 +05:30