PCoder
c285e1d9eb
Set respective order_confirm_url for landing vs hosting flows
...
For hosting flow also take the user to add_ssh_key after payment
2019-07-01 20:30:06 +05:30
PCoder
207c3a6c6c
Skip SSH key page for generic products page
2019-07-01 08:57:39 +05:30
PCoder
79eba3b70c
Remove add SSH key form in order confirmation related code
2019-07-01 08:28:28 +05:30
PCoder
5fcd0d6b18
Remove add SSH key form in the order confirmation
2019-07-01 08:18:10 +05:30
PCoder
9b73fa71dc
Add datacenterlight add_ssh_key.html template file
2019-07-01 08:10:37 +05:30
PCoder
47fd9a8f28
Adjust urls in datacenterlight/hosting apps urls/views after refactor
2019-07-01 08:09:37 +05:30
PCoder
f502e53845
Add basic implementation of AskSSHKeyView
2019-07-01 06:45:48 +05:30
PCoder
d5d90e0790
Add datacenterlight url: /add-ssh-key
2019-07-01 06:43:49 +05:30
PCoder
feeb102f92
Do SSH key validation only if the user doesn't have an existing key and
...
the user has input some value in the add ssh key field
2019-06-25 03:48:29 +02:00
PCoder
6d3b5f40c0
Merge remote-tracking branch 'mainRepo/master' into task/5509/add-keys-to-opennebula-user
2019-06-25 02:29:15 +02:00
PCoder
9ee1b7c124
Make public_key form params mandatory only if existing keys do not exist
2019-06-25 02:25:17 +02:00
PCoder
08608c726f
Code cleanup: remove updating ssh keys on live VMs
2019-06-25 02:11:57 +02:00
PCoder
39549d5e36
Close div
2019-06-24 19:07:11 +02:00
PCoder
a330dee9a1
Modify style
2019-06-24 18:58:44 +02:00
PCoder
ba7ff9e409
Adjust textarea styles
2019-06-24 18:39:25 +02:00
PCoder
04f1112b09
Add key in the text area
2019-06-24 18:26:45 +02:00
PCoder
ecc26d14e5
Show previous keys if exist in order confirmation
2019-06-24 17:24:35 +02:00
PCoder
110f29171d
Update user ssh key in opennebula
2019-06-24 04:33:48 +02:00
PCoder
87f5bf3dcc
Pass UserHostingKeyForm to the context of OrderConfirmationView
2019-06-24 04:32:27 +02:00
PCoder
108fbb09b0
Add ssh key form to order_detail page
...
To ask for the SSH key at the time of confirming and placing the order.
The order does not proceed until the user provides a valid ssh key.
2019-06-24 04:29:34 +02:00
69ec7d2b46
reuse of the env variable in the base settings
2019-05-13 03:44:09 -04:00
fda5118c39
Added otp verification
2019-05-12 21:34:54 -04:00
PCoder
219bfbda12
Use the correct email template
...
For notifying the user about ssh key was successfully added
2019-05-12 20:13:54 +02:00
PCoder
67d789ebdb
Implement save_ssh_key_in_vm_template_task
...
A celery task which first sends a power off signal to the VM with the
given ID and polls until it is powered off. Then, it updates the VM
template with the given ssh keys of the user and resumes it.
User is notified once the VM template has been updated.
2019-05-12 19:13:22 +02:00
PCoder
0b85784fd3
No need to manage ssh keys after VM is created
...
The ssh keys are added at the time the VM is created or later
2019-05-11 01:56:00 +02:00
PCoder
6a1faa52e4
Set user's own ssh keys when creating VM
2019-05-11 00:25:49 +02:00
PCoder
1d70563ea2
Save user's key in opennebula
2019-05-10 09:19:42 +02:00
PCoder
729a813804
Flip the order of logging
2019-05-06 08:47:59 +02:00
PCoder
3f01145cd1
Add additional None checks
2019-05-06 08:30:50 +02:00
PCoder
0f777e66d8
Add entry to DeletedUser + fix code to delete user from opennebula
2019-05-06 08:08:51 +02:00
PCoder
5d3f769750
Merge remote-tracking branch 'mainRepo/master' into feature/delete-user
2019-05-06 07:08:10 +02:00
PCoder
d91a403680
Add bootstrap-3.3.4 local resources
2019-05-05 20:24:47 +02:00
PCoder
2b99ac1670
Add html5shiv-3.7.0.js, jquery-1.11.1.min.js, respond-1.4.2.min.js
2019-05-05 20:21:19 +02:00
PCoder
2b118ff540
Correct spelling
2019-05-05 16:56:56 +02:00
PCoder
51100fd627
Add missing code
2019-04-29 00:53:06 +02:00
PCoder
0352096fa7
Call delete on Customer object
2019-04-29 00:17:59 +02:00
PCoder
a67284a89d
Rename management command deteteuser -> deleteuser
2019-04-29 00:02:45 +02:00
PCoder
591614ade5
Remove user from opennebula also
2019-04-28 23:57:39 +02:00
PCoder
c8bd3f97c6
Add deleteuser management command
2019-04-28 23:14:14 +02:00
PCoder
c8e35e63f0
Update datacenterlight StripePlan further
...
- Add field amount to stripeplan
- Add field interval to stripeplan
2019-04-20 12:22:51 +02:00
PCoder
4be098d07a
Add stripe_plan_name field to datacenterlight's StripePlan model
2019-04-20 11:55:47 +02:00
PCoder
5f8cc2199b
Change vm_pool infoextended to retrieve VMs in any state except DONE
2019-04-11 01:39:06 +02:00
PCoder
842766d0e2
Merge branch 'sanghee/dynamicweb-task/6059'
2019-01-31 21:21:49 +01:00
PCoder
16b5f1e5a4
Merge branch 'master' into 5151/gdpr_modal
2019-01-30 21:05:34 +01:00
sanghee
df368c715f
changed topnav font into 400 by default
2018-11-13 21:21:46 +01:00
1bfb710ee6
Change datacenterlight.ch message form to send email to support@ungleich.ch
2018-11-11 17:01:19 +01:00
PCoder
1feacc1770
Merge branch 'master' into 5151/gdpr_modal
2018-10-25 22:05:24 +02:00
PCoder
c36554b4d1
Round total_price also to 2 decimal places
2018-10-18 06:58:18 +02:00
PCoder
270c610111
Correct the min value of RAM
...
Based on what is set by the admin in the backend
2018-10-17 09:56:42 +02:00
PCoder
0e9f8ce906
Cleanup unnecessary code
2018-10-16 09:01:00 +02:00
PCoder
b7cc7b08ce
Update calculator min RAM input js validation
2018-10-16 08:58:12 +02:00
PCoder
26970ece92
Set default RAM step to 1
...
We later change this according to minRam set in the backend
2018-10-16 08:55:08 +02:00
PCoder
42d6f38f0c
Merge branch 'master' into task/5681/offer-512mb-ram
2018-10-08 07:56:57 +02:00
PCoder
5770c231ee
Fix flake8 warnings
2018-10-06 07:47:40 +02:00
PCoder
5985ded36f
Obtain product_slug from session
...
Obtaining slug from kwargs won't work in OrderConfirmation page
because we do not set the kwargs for that page. To resolve this,
I add the product_slug to the generic_payment_details dict in the
session
2018-10-06 07:31:41 +02:00
PCoder
2b7d4bbef5
Redirect to product page on error
2018-10-05 11:10:10 +02:00
PCoder
10dab1350a
Use refactored method clear_all_session_vars
2018-10-05 11:01:49 +02:00
PCoder
806726614e
Clear all session variables before loading DCLCalculatorPlugin
2018-10-05 10:37:23 +02:00
PCoder
5d9b2ee41a
Refactor clearing all session variables
2018-10-05 10:36:20 +02:00
PCoder
f4579595c3
Add newline character to end of file
2018-10-05 09:05:47 +02:00
PCoder
12eabc5f6c
Redirect user to product page on login
...
For the case when user is on product page and tries logging in
2018-10-05 08:58:57 +02:00
PCoder
8758cd1cd8
Add style input-no-border
2018-10-05 08:57:20 +02:00
PCoder
ec70cd1c83
Pass product_id to ProductPaymentForm
2018-10-03 22:53:24 +02:00
PCoder
193b87bbb5
Use proper payment form
2018-10-03 09:36:43 +02:00
PCoder
ca18004819
Remove stale reference to product_id
2018-10-03 09:36:00 +02:00
PCoder
e1c91d886b
Use explicit index in plan name formatting
2018-10-03 09:35:20 +02:00
PCoder
8a2734fa0e
Show GenericPaymentForm labels
2018-10-03 08:36:21 +02:00
PCoder
495ac0c6d6
Use ProductPaymentForm instead of GenericPaymentForm
...
Only if product_id is in the session, which identifies that we are
coming here via product_slug
2018-10-03 08:19:33 +02:00
PCoder
1cdc9ea657
Clear product_id from session
2018-10-03 08:18:19 +02:00
PCoder
a4065c7e24
Handle product_slug
2018-10-03 07:55:56 +02:00
PCoder
e47f4f05b4
Handler if product_slug is given (wip)
2018-10-02 10:02:02 +02:00
PCoder
dd9e7dde35
Merge branch 'master' into task/5690/generic-payment-page
2018-10-02 09:01:46 +02:00
PCoder
f2f95c8559
Update min attribute according to minimum ram in the plugin
2018-10-01 08:56:45 +02:00
PCoder
c2dbbf0424
Update views.py to include 512mb ram case
...
RAM server side validation is as follows:
- pid is a mandatory parameter for a valid RAM, otherwise a
validation error is raised
- check if enable_512mb_ram is enabled. In this case, validate
if the input ram is either a whole number or 0.5 and in the range
0.5 <= value <= 200
- otherwise check ram is a whole number in the range
1 <= value <= 200
2018-10-01 07:52:28 +02:00
PCoder
f85ef714ab
Pass instance context
...
Also POST plugin_id as a form parameter to check enable_512mb_ram
case
2018-10-01 07:50:18 +02:00
PCoder
24d719e4f1
Update migration
2018-09-29 07:37:23 +02:00
PCoder
5452c1c478
Merge master into task/5681/offer-512mb-ram
2018-09-28 08:36:35 +02:00
PCoder
db20e3cbe7
Add plus minus ram handler for 512MB option
2018-09-28 08:07:12 +02:00
PCoder
e1ce017ec8
Add migration
2018-09-27 22:48:23 +02:00
PCoder
b047ccdef1
Fix flake8 error
2018-09-27 22:33:24 +02:00
PCoder
56460ac8f0
Update migration
2018-09-27 22:16:05 +02:00
PCoder
d93861ca32
Set Devuan Ascii as default template
2018-09-27 22:14:42 +02:00
PCoder
a02c3c6973
Sort templates alphabetically
...
And also select the chosen template as the default one
2018-09-27 22:12:13 +02:00
PCoder
768f3532f7
Add default_selected_template field to DCLCalculatorPluginModel
2018-09-27 22:09:11 +02:00
PCoder
21084cdc9f
Initialize minRam js variable from what is passed from backend
2018-09-27 09:07:28 +02:00
PCoder
12f139976d
Simplify logic to set min_ram in the calculator form
2018-09-27 09:06:39 +02:00
PCoder
da21699212
Merge branch 'master' into task/5681/offer-512mb-ram
2018-09-26 23:10:17 +02:00
PCoder
3075cffd77
Include product_id in generic payment Stripe plan name
2018-09-26 23:01:04 +02:00
PCoder
232022aaaf
Fix flake8 errors
2018-09-26 22:51:34 +02:00
PCoder
b7929a16e2
Update datacenterlight django.po
2018-09-26 22:45:09 +02:00
PCoder
6c03e3f712
Change generic payment subject and correct misplaced comma
...
Data Center LightConfirmation of your payment ->
Confirmation of your payment
2018-09-26 22:42:33 +02:00
PCoder
72c16713a7
Update .po of datacenterlight
2018-09-26 22:37:32 +02:00
PCoder
52d048a555
Add missing Cheers string in email
2018-09-26 22:35:11 +02:00
PCoder
3148dbccf8
Translate text + reformat
2018-09-26 22:31:06 +02:00
PCoder
84056a5b36
Correct generic payment email as per Sanghee's corrections
2018-09-26 22:21:59 +02:00
PCoder
1041284866
Refactor moment.js locale date code to virutal_machine_detail.js
2018-09-26 21:52:12 +02:00
PCoder
737681136f
Correct flake8 error
2018-09-26 21:23:46 +02:00
PCoder
41cba9daa3
Show product name in dcl order detail template
2018-09-26 09:15:49 +02:00
PCoder
4575ff60ec
Refactor validation code + Add product_id to context
2018-09-26 09:15:24 +02:00
PCoder
9ff20491bd
Merge branch 'master' into task/5690/generic-payment-page
2018-09-25 23:25:22 +02:00
PCoder
c9ac959ff6
Change DCLNavbarPlugin to show login option only if set
2018-09-25 22:29:58 +02:00
PCoder
51c5fa98dd
Save description and product_id
2018-09-25 02:14:11 +02:00
PCoder
ed7ffb355f
Server side validation of the POSTed product
2018-09-25 02:13:39 +02:00
PCoder
1988020006
Handle generic-payment-form POST
...
To return pricing based on user's selected product
2018-09-25 02:12:42 +02:00
PCoder
b348c93fee
Add product hidden input type
...
To distinguish generic-payment-form submit
2018-09-25 01:56:10 +02:00
PCoder
481f13d20c
Check key existence
2018-09-24 22:27:25 +02:00
PCoder
d99271f71d
Redirect users to orders after generic payment is successful
2018-09-23 17:19:24 +02:00
PCoder
ff993e32db
Revert back to POST parameters for billing-form method
2018-09-23 17:01:29 +02:00
PCoder
dd82bdc9da
Fix a flake8 error
2018-09-23 13:27:33 +02:00
PCoder
7f3b916c58
Reformat code
2018-09-23 13:26:48 +02:00
PCoder
d23624c525
Modify datacenterlight/views.py to includes various cases of generic payment
2018-09-23 13:15:26 +02:00
PCoder
bc3eaaa7eb
Move csrf_token out of form loop
2018-09-23 13:10:26 +02:00
PCoder
bce47032ab
Handle generic payment separately in order_detail.html
2018-09-23 13:03:47 +02:00
PCoder
730492089b
Modify PaymentOrderView to accomodate the new generic payment case (WIP)
2018-09-22 08:20:49 +02:00
PCoder
429dd10b75
Modify dcl landing_payment.html to accomodate the new generic
...
payment form
2018-09-22 08:17:46 +02:00
PCoder
76efc35324
Add enable_512mb_ram option in model/plugin
2018-09-22 06:44:37 +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
9c5363ef55
Merge branch 'master' into bugfix/show_meta_description_in_cms_page
2018-08-22 21:42:37 +02:00
PCoder
13876c24c1
Update doc
2018-08-22 00:42:50 +02:00
PCoder
f56933021f
Also send an email if manage_ssh_key does not complete in time
2018-08-22 00:37:40 +02:00
PCoder
2ff7eaea65
Sleep additional 10 seconds before running manage_public_key
2018-08-22 00:25:59 +02:00
PCoder
893c8ed08b
Fix imports
2018-08-22 00:14:17 +02:00
PCoder
3b07687d3e
Refactor ping_ok from datacenterlight.utils to utils.hosting_utils
2018-08-22 00:12:14 +02:00
PCoder
a55587dbf3
Wait for VM to be pingable before doing a manage_public_key
2018-08-21 23:49:47 +02:00
PCoder
91021d7612
Add ping_ok utility method
2018-08-21 23:24:40 +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
069cd18268
Add gdpr banner to all base templates
2018-07-21 13:27:15 +02:00
PCoder
4dce0ee5bd
Add gdpr banner to dcl template
2018-07-21 10:51:11 +02:00
PCoder
34ed51a643
Don't dissociate card if transaction fails
2018-07-07 02:03:42 +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
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
5cd62abc70
Refactor code
2018-07-05 20:36:43 +02:00
PCoder
1e214f7b21
Improve comment
2018-07-05 20:35:34 +02:00
PCoder
6b663d82a1
Remove unused variable
2018-07-05 20:35:00 +02:00
PCoder
faa0604fae
Remove redundant code
2018-07-05 09:58:07 +02:00
PCoder
8d7b01d7e2
Disable dissociating card on subscription failure
2018-07-05 09:57:47 +02:00
PCoder
e9ac699be8
Add card detail creation code in various landing cases
2018-07-05 09:57:18 +02:00
PCoder
ec0216790f
Remove redundant code
2018-07-05 09:55:45 +02:00
PCoder
9bf8992ff4
Landing flow: set/get token/card_id
2018-07-04 02:53:43 +02:00
PCoder
dc28186fe9
Add styles for landing payment choices
2018-07-04 02:03:50 +02:00
PCoder
8e742852a5
Show all cards in landing and hosting payment page
2018-07-04 02:03:08 +02:00
PCoder
3d8237a34a
Get and show all card details in the landing flow, if the user is logged in
2018-07-04 00:50:44 +02:00
PCoder
1c5ff1f9dd
Add UserCardDetail in the landing non-logged in flow
2018-07-03 23:22:10 +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
f48005166e
Fix bug getting VMTemplate object from vm_template_id
2018-07-01 18:42:11 +02:00
PCoder
900f014d92
Save order specifications in HostingOrder also
2018-07-01 18:33:10 +02:00
PCoder
5851277d9a
Reorganize imports
2018-07-01 16:36:41 +02:00
PCoder
43b3a63958
Reorganize imports
2018-07-01 16:25:02 +02:00
PCoder
081921e846
Merge master into task/3934/move_hosting_order_out_of_celery_task
2018-07-01 16:18:43 +02:00
PCoder
ef8e380ab7
Fix flake8 error
2018-07-01 11:22:42 +02:00
PCoder
c13af95017
Refactor code: get_primary_ip -> get_ipv6 and remove unwanted code
2018-07-01 11:07:39 +02:00
PCoder
8993a7bde1
Reorganize imports + format code
2018-07-01 11:05:23 +02:00
M.Ravi
f1e021e1e9
Improve comments
2018-06-27 12:24:53 +02:00
M.Ravi
88e6d9d216
Separate two error messages with a period
2018-06-27 12:24:16 +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
a3db7f2e1a
Merge branch 'master' into task/4890/ssh_key_manage_for_ipv6
2018-06-27 09:23:48 +02:00
PCoder
60260ccb08
Attempt to fix flake8 error
2018-06-27 09:06:28 +02:00
PCoder
6c2eabbe6a
Use the public ipv4 if it exists; otherwise use the ipv6 to do a
...
cdist cdist ssh configure
2018-06-27 00:01:55 +02:00
PCoder
70cac38f81
Move initialization of VMTemplates out of the plugin
2018-06-24 10:29:07 +02:00
PCoder
79e83b4480
Refactor show_vm_templates to DCLCalculatorPluginModel from VMPricing
2018-06-24 09:08:22 +02:00
PCoder
b872777bda
Filter context templates also by the ids that have been set for the calculator
2018-06-13 11:55:30 +02:00
PCoder
94f520be35
Add migration
2018-06-13 11:17:18 +02:00
PCoder
5748eecedb
Create field for storing os_templates_to_show
2018-06-13 11:16:49 +02:00
PCoder
cf00ff6bd8
Attempt to merge master into task/3747/multiple_cards_support
2018-06-12 08:16:11 +02:00
Arvind Tiwari
2d1805f11d
update fetchvmtemplates command
2018-05-24 04:14:53 +05:30
Arvind Tiwari
a4ca17e2ed
vm template prefix
2018-05-24 03:57:01 +05:30
Arvind Tiwari
8fb0d9a48a
order detail divider lines full width
2018-05-12 21:59:06 +05:30
Arvind Tiwari
3446dcc469
calculator translation
2018-05-12 21:48:57 +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
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
ccf55acbaf
Update navbar_dropdown.html
2018-05-01 04:36:29 +05:30
Arvind Tiwari
6ff03d8f48
Merge pull request #627 from tiwariav/task/dcl_calculator_on_non_cms_pages
...
Task/4527 dcl calculator on non-cms pages
2018-05-01 02:35:22 +05:30
Arvind Tiwari
86188b1fb0
Merge pull request #626 from tiwariav/task/4474/slider_padding
...
Task/4474 cms header slider padding
2018-04-30 23:52:23 +05:30
Arvind Tiwari
14548b2f01
flake8 refacoring
2018-04-25 17:26:31 +05:30
Arvind Tiwari
f66d768ecb
hosting payment page
2018-04-25 15:55:58 +05:30
Arvind Tiwari
3b3b73a2ce
alignment calculator plugin
2018-04-25 15:08:28 +05:30
Arvind Tiwari
3bf064a017
add calculator placeholder to cms_integration
2018-04-25 14:52:25 +05:30
Arvind Tiwari
a5bd8347e8
merged master
2018-04-21 21:01:42 +05:30
Arvind Tiwari
564f7a5be8
merge migrations
2018-04-20 20:36:28 +05:30
Arvind Tiwari
275ea47e41
merge master
2018-04-20 20:30:45 +05:30
Arvind Tiwari
71a37972d3
Merge remote-tracking branch 'ungleich/master'
2018-04-20 20:29:09 +05:30
Arvind Tiwari
736253feda
refactor imports
2018-04-20 20:27:26 +05:30
Arvind Tiwari
3debf34118
remove vm creation to util function
2018-04-20 20:25:24 +05:30
Arvind Tiwari
8f6260b063
Update _calculator_form.html
2018-04-20 17:54:23 +05:30
Arvind Tiwari
1e97d0ba38
Update cms_plugins.py
2018-04-20 17:51:46 +05:30
Arvind Tiwari
a25bcc807f
change header slider to container fluid
2018-04-20 17:04:02 +05:30
Arvind Tiwari
da13903ba2
remove padding
2018-04-20 16:42:50 +05:30
M.Ravi
fae1c7fbeb
Update hosting_order in a pythonic way
2018-04-19 07:26:34 +02:00
PCoder
80c3ac5346
Improve create_vm_task test
2018-04-19 01:09:25 +02:00
PCoder
a3a8227007
Check if subscription metadata update response does not have errors
2018-04-19 01:08:52 +02:00
PCoder
791f48513a
Organize imports
2018-04-19 01:07:59 +02:00
PCoder
8a659c153e
Set VM_ID metadata to the created subscription
2018-04-19 00:52:38 +02:00
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
4c21110c00
Remove fuzzy and python-format
2018-04-17 21:47:02 +02:00
PCoder
a454cd2522
Update datacenterlight's django.po
2018-04-17 21:38:53 +02:00
PCoder
c2513dc7c3
Show vat_percent and subtotal for vat exclusive case
2018-04-17 21:38:28 +02:00
PCoder
e4e7d93275
Fix flake8 errors
2018-04-17 20:50:41 +02:00
M.Ravi
d15a4da840
Check if child plugin instances exist before looping over them
2018-04-17 18:03:14 +02:00
PCoder
3fca9dbb0d
Fix a bug creating hostingorder
2018-04-16 05:03:48 +02:00
PCoder
b103772c0d
Pass vm_pricing if available when creating HostingOrder
2018-04-16 03:37:19 +02:00
PCoder
0b9c67166e
Rename variable name: disk_size -> ssd_size
2018-04-16 03:26:51 +02:00
PCoder
c5029d8752
Update datacenterlight's django.po
2018-04-16 01:48:39 +02:00
PCoder
95daa37670
Use total_price for amout to be charged, always
2018-04-16 01:32:38 +02:00
PCoder
4148eff03e
Rename variable: amount_to_be_charged -> price
2018-04-16 01:31:16 +02:00
PCoder
d0276f22c1
Reorganize imports
2018-04-16 01:30:02 +02:00
PCoder
1b37eed53d
Include pricing_name in the email sent to admin
2018-04-16 01:29:07 +02:00
PCoder
8e28756bd8
Check if we have total_price (indicates that we have VAT excluded
...
price);hence,use it as final_price. if not use the previous casei and use it as final_price. If not use the preivous case
2018-04-16 01:27:42 +02:00
PCoder
6d6a8ea597
Refactor: reuse final_price variable
2018-04-16 01:24:21 +02:00
PCoder
903336a46f
Show 2 upto decimal places in order detail
2018-04-16 00:59:42 +02:00
PCoder
ec753eb0d5
Improve string representation of VMPricing
2018-04-16 00:50:34 +02:00
PCoder
68032ec184
Update migration file
2018-04-16 00:49:55 +02:00
PCoder
1cb3fa80cf
Improve logger error
2018-04-16 00:29:43 +02:00
PCoder
896984ef1f
Set vm_pricing context from plugins value
2018-04-16 00:29:23 +02:00
PCoder
665fa7479b
Add 0019_auto_20180415_2129.py
2018-04-15 23:32:14 +02:00
PCoder
09a03783b7
Merge branch 'master' into task/4379/price_without_vat
2018-04-15 23:27:36 +02:00
PCoder
465431d858
Add DCLCustomPricingPlugin
2018-04-15 23:24:15 +02:00
PCoder
fc0bc52ea3
Rename model
...
DCLCalculatorPluginModel -> DCLCustomPricingModelModel
2018-04-15 23:19:18 +02:00
PCoder
6575ff1afe
Increase decimal_places for all VMPricing fields
2018-04-15 23:07:50 +02:00
PCoder
069ba34f94
Remove old migration file
2018-04-15 23:07:07 +02:00
PCoder
d296ce72cb
Register VMPricing with admin site
2018-04-15 21:37:51 +02:00
PCoder
40b984be15
Update order_detail landing template
2018-04-15 21:04:06 +02:00
PCoder
23bd0fa147
Pass context params to various landing templates
2018-04-15 21:03:31 +02:00
PCoder
962c96067f
Add get_vm_pricing_by_name VMPricing method
2018-04-15 20:55:39 +02:00
PCoder
63a12ffe06
Use updated get_vm_price method
2018-04-15 13:42:39 +02:00
PCoder
558e187e11
Update text: including/excluding VAT
2018-04-15 13:39:41 +02:00
PCoder
c738888ab2
Set vm unit price parameters from the passed context
2018-04-15 13:39:01 +02:00
PCoder
aa55c1e868
Update main.js to compute total from the unitprice's defined in the window context
2018-04-15 13:37:06 +02:00
PCoder
82a2014fa5
Pass vm_pricing context from default VMPricing object
2018-04-15 13:34:55 +02:00
PCoder
74393ac6ac
Optimize imports
2018-04-15 13:32:53 +02:00
Arvind Tiwari
00be159285
Merge pull request #621 from tiwariav/task/4376/cms_promo_section_link_color
...
Task/4376 cms promo link color
2018-04-13 18:44:51 +05:30
Arvind Tiwari
ca480ce9c8
darker shade for hover
2018-04-13 16:23:17 +05:30
Arvind Tiwari
479d6fbd4f
change promo link color
2018-04-13 15:45:06 +05:30
PCoder
0ea9051de1
Change the name of the DCL Calculator Plugin
...
DCL Caclulator Plugin -> DCL Calculator Section Plugin
Note: We do not change the plugin name itself because it causes
data loss
2018-04-12 08:38:14 +02:00