git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update addorder adn survey form select for foreigner

Browse Source
This commit is contained in:
Aung Myo
2017-11-21 17:00:20 +06:30
parent 59dca270c9
commit 789cc179d7
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/addorder.js
View File

@@ -102,7 +102,7 @@ $(function() {
instances = menu_items[field].instances ; instances = menu_items[field].instances ;
if (!instances.length > 0) { if (!instances.length > 0) {
swal("Hello Please!","doesn't not have instance item in this menu items ("+ menu_items[field].name+")","warning"); swal("Hello Please Check!","doesn't not have instance item in this menu items ("+ menu_items[field].name+")","warning");
} }
if (instances.length > 0) { if (instances.length > 0) {
qty = 1; qty = 1;

17
app/views/origami/surveys/_form.html.erb
View File

@@ -16,7 +16,13 @@
<div class="col-lg-4 col-md-4 col-sm-4 col-xs-4 "> <div class="col-lg-4 col-md-4 col-sm-4 col-xs-4 ">
<div class="form-group p-l-10 p-r-10"> <div class="form-group p-l-10 p-r-10">
<label class="p-l-10">Foreigner</label> <label class="p-l-10">Foreigner</label>
<input type="text" class="form-control" name="survey[foreigner][]"> <!-- <input type="text" class="form-control" name="survey[foreigner][]"> -->
<select class="form-control col-md-12 selectpicker show-tick" name="survey[foreigner][]" style="height: " >
<% Lookup.where("lookup_type = ?", "country" ).each do |ct| %>
<option value="<%= ct.value %>">
<%= ct.name %></option>
<%end %>
</select>
</div> </div>
</div> </div>
<div class="col-lg-4 col-md-4 col-sm-4 col-xs-4 "> <div class="col-lg-4 col-md-4 col-sm-4 col-xs-4 ">
@@ -30,7 +36,6 @@
<button type="button" class="btn btn-success" id="addForeigner">Add</button> <button type="button" class="btn btn-success" id="addForeigner">Add</button>
</div> </div>
</div> </div>
<div class="hidden" id="newTemplate" > <div class="hidden" id="newTemplate" >
</div> </div>
@@ -100,7 +105,13 @@
var text_box = '<div id="newRow" class="row clearfix">' var text_box = '<div id="newRow" class="row clearfix">'
+'<div class="col-lg-4 col-md-4 col-sm-4 col-xs-4 ">' +'<div class="col-lg-4 col-md-4 col-sm-4 col-xs-4 ">'
+'<div class="form-group p-l-10 p-r-10">' +'<div class="form-group p-l-10 p-r-10">'
+' <input type="text" class="form-control" name="survey[foreigner][]">' +' <select class="form-control col-md-12 selectpicker show-tick" '
+' name="survey[foreigner][]" style="height: " >'
+'<% Lookup.where("lookup_type = ?", "country" ).each do |ct| %>'
+'<option value="<%= ct.value %>">'
+'<%= ct.name %></option>'
+'<%end %>'
+'</select>'
+'</div>' +'</div>'
+'</div>' +'</div>'
+'<div class="col-lg-4 col-md-4 col-sm-4 col-xs-4 ">' +'<div class="col-lg-4 col-md-4 col-sm-4 col-xs-4 ">'