Skip to content
This repository was archived by the owner on Feb 22, 2024. It is now read-only.

update financial assessment options #1171

Merged
merged 6 commits into from
Jun 15, 2016
Merged

update financial assessment options #1171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fc33085
update financial assessment options
raunakkathuria Jun 15, 2016
e128e86
proper display for option
raunakkathuria Jun 15, 2016
d4cd7c9
check for null and undefined as well
raunakkathuria Jun 15, 2016
43d7e21
Merge remote-tracking branch 'upstream/master' into raunak/financial_…
raunakkathuria Jun 15, 2016
8d5e75b
update new financial account opening template as per new options
raunakkathuria Jun 15, 2016
d5ac41c
Merge branch 'master' into raunak/financial_assessment
raunakkathuria Jun 15, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/javascript/binary/websocket_pages/user/account/settings/financial_assessment.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ var FinancialAssessmentws = (function(){
var isValid = true,
errors = {};
$('#assessment_form select').each(function(){
if($(this).val() === ''){
if(!$(this).val()){
isValid = false;
errors[$(this).attr("id")] = text.localize('Please select a value.');
}
Expand Down
18 changes: 10 additions & 8 deletions src/templates/new_account/maltainvestws.html.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,10 +375,11 @@
<div class="grd-grid-8">
<select id="net-income">
<option value="">[% l('Please select') %]</option>
<option value="Less than &#36;25,000">[% l('Less than $25,000') %]</option>
<option value="&#36;25,000 - &#36;100,000">[% l('$25,000 - $100,000') %]</option>
<option value="&#36;100,000 - &#36;500,000">[% l('$100,000 - $500,000') %]</option>
<option value="Over &#36;500,000">[% l('Over $500,001') %]</option>
<option value="Less than &#36;25,000">Less than &#36;25,000</option>
<option value="&#36;25,000 - &#36;50,000" >&#36;25,000 - &#36;50,000</option>
<option value="&#36;50,001 - &#36;100,000">&#36;50,001 - &#36;100,000</option>
<option value="&#36;100,001 - &#36;500,000">&#36;100,001 - &#36;500,000</option>
<option value="Over &#36;500,000">Over &#36;500,001</option>
</select>
<p class="errorfield" id="error-net-income" style="display:none"></p>
</div>
Expand All @@ -390,10 +391,11 @@
<div class="grd-grid-8">
<select id="estimated-worth">
<option value="">[% l('Please select') %]</option>
<option value="Less than &#36;100,000">[% l('Less than $100,000') %]</option>
<option value="&#36;100,000 - &#36;250,000">[% l('$100,000 - $250,000') %]</option>
<option value="&#36;250,000 - &#36;1,000,000">[% l('$250,000 - $1,000,000') %]</option>
<option value="Over &#36;1,000,000">[% l('Over $1,000,000') %]</option>
<option value="Less than &#36;100,000">Less than &#36;100,000</option>
<option value="&#36;100,000 - &#36;250,000" >&#36;100,000 - &#36;250,000</option>
<option value="&#36;250,001 - &#36;500,000">&#36;250,001 - &#36;500,000</option>
<option value="&#36;500,001 - &#36;1,000,000">&#36;500,001 - &#36;1,000,000</option>
<option value="Over &#36;1,000,000">Over &#36;1,000,000</option>
</select>
<p class="errorfield" id="error-estimated-worth" style="display:none"></p>
</div>
Expand Down
8 changes: 5 additions & 3 deletions src/templates/user/settings/financial_assessmentws.html.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,8 +240,9 @@
<select id="net_income" name="net_income">
<option value="">Please select</option>
<option value="Less than &#36;25,000">Less than &#36;25,000</option>
<option value="&#36;25,000 - &#36;100,000" >&#36;25,000 - &#36;100,000</option>
<option value="&#36;100,000 - &#36;500,000">&#36;100,000 - &#36;500,000</option>
<option value="&#36;25,000 - &#36;50,000" >&#36;25,000 - &#36;50,000</option>
<option value="&#36;50,001 - &#36;100,000">&#36;50,001 - &#36;100,000</option>
<option value="&#36;100,001 - &#36;500,000">&#36;100,001 - &#36;500,000</option>
<option value="Over &#36;500,000">Over &#36;500,001</option>
</select>
<p class="errorfield" id="errornet_income"></p>
Expand All @@ -256,7 +257,8 @@
<option value="">Please select</option>
<option value="Less than &#36;100,000">Less than &#36;100,000</option>
<option value="&#36;100,000 - &#36;250,000" >&#36;100,000 - &#36;250,000</option>
<option value="&#36;250,000 - &#36;1,000,000">&#36;250,000 - &#36;1,000,000</option>
<option value="&#36;250,001 - &#36;500,000">&#36;250,001 - &#36;500,000</option>
<option value="&#36;500,001 - &#36;1,000,000">&#36;500,001 - &#36;1,000,000</option>
<option value="Over &#36;1,000,000">Over &#36;1,000,000</option>
</select>
<p class="errorfield" id="errorestimated_worth"></p>
Expand Down