update jade integration

This commit is contained in:
Aung Myo
2017-08-23 19:46:00 +06:30
parent 0c89b09249
commit 07b13d8f87
7 changed files with 130 additions and 17 deletions

View File

@@ -114,8 +114,9 @@
</div>
</div>
<div class="col-md-7">
<div class="attributes-list">
</div>
<div class="option-list">
<h4 id="attributes-type"></h4>
</div>
</div>
</div>
@@ -164,7 +165,7 @@ $(function(){
menu_items_list.empty();
menu_items = data.menu_items;
for(var field in menu_items) {
instances = menu_items[field].instances ;
@@ -191,7 +192,7 @@ $(function(){
+'</i></div>'
+'</div>'
+"<div class='menu_item_box' data-id = '"+JSON.stringify(menu_items[field].attributes)+"' data-item = '"+JSON.stringify(item_attributes)+"' data-toggle='modal' data-target='.sx_item_detailModal'>'"
+"<div class='menu_item_box' data-instance = '"+JSON.stringify(menu_items[field].instances)+"' data-id = '"+JSON.stringify(menu_items[field].attributes)+"' data-item = '"+JSON.stringify(item_attributes)+"' data-toggle='modal' data-target='.sx_item_detailModal'>'"
+'<div class="card-block">'
+'<%= image_tag "logo.png" ,width: '75', height: '75', :style => '' %>'
@@ -212,11 +213,14 @@ $(function(){
//click item row for add order
$(document).on('click', '.menu_item_box', function(event){
$('.option-list').empty();
$('.attributes-list').empty();
$('.attributes-list').empty();
data = $(this).parent().children().children('.add_icon');
attributes = $(this).data('id');
selected_item = $(this).data('item');
console.log(attributes);
instances = $(this).data('instance');
for(var field in attributes) {
value = attributes[field]["value"];
type = attributes[field]["type"]
@@ -228,13 +232,12 @@ $(function(){
status = "selected-option";
}
row +='<button id="selected-option" data-type="'+type+'" class="btn btn-default custom-btn '+ status +' '+ type +'">'+value[i]+'</button>';
row +="<button id='selected-option' data-instances='"+JSON.stringify(instances)+"' data-type='"+type+"' data-value='"+value[i]+"' class='btn btn-default attribute_btn "+ status +" "+ type +" '>"+value[i]+"</button>";
});
$(".option-list").append(row);
$(".attributes-list").append(row);
}
$('#change_qty').val(1);
$('#title_name').text(data.attr('data-name'));
$('#total_price').text(data.attr('data-price'));
@@ -242,11 +245,29 @@ $(function(){
});
// click select option icon for add
$(document).on('click', '.custom-btn', function(event){
type = $(this).data('type');
$('+ type +').removeClass('selected-option');
$(document).on('click', '.attribute_btn', function(event){
value = $(this).data('value');
type = $(this).data('type');
instances = $(this).data('instances');
if ($(".attribute_btn").attr("data-type")==type){
$('.'+type).removeClass("selected-option");
}
$(this).addClass('selected-option');
selected_item = $('.selected-option').text();
qty = $('#change_qty').val();
// for(var field in instances) {
// item_attr = instances[field].item_attributes;
// status ="";
// if(parseInt(jQuery.inArray(selected_item, item_attr))!== -1){
// status = "selected-option";
// }
// }
}); //End selecct Click
@@ -445,7 +466,7 @@ $(function(){
color: #fff !important;
background-color: green !important;
}
.custom-btn {
.attribute_btn {
white-space: normal !important;
height: 60px;
width: 90px;

View File

@@ -22,6 +22,7 @@
<%= form_tag path, :id => "filter_form", :method => :get do %>
<div class="input-append col-md-7 form-group pull-left">
<input type="text" name="filter" style="margin-right:10px" id="search" placeholder="Search" class="form-control input-sm col-md-9">
<input type="hidden" name="type" id="type" value="">
<button type="submit" class="btn btn-primary btn-sm">Search</button>
</div>
<% end %>
@@ -258,9 +259,14 @@
$.ajax({
type: "POST",
url: "get_customer" ,
data: { filter : customer_mamber_card_no },
data: { filter : customer_mamber_card_no ,type :"card"},
dataType: "json",
success: function(data) {
success: function(data) {
if (data.status == false) {
alert(data.message)
}
customer_id = data[0].customer_id;
customer_name = data[0].name;
update_sale(customer_id, customer_name,sale_id);
@@ -282,6 +288,7 @@
if(cardNo.length == 16){
$("#paypar_account_no").val(cardNo);
$("#search").val(cardNo);
$("#type").val("card")
}
}