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

1276 commits

Author SHA1 Message Date
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