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

update addorder

Browse Source
This commit is contained in:
Aung Myo
2017-09-13 09:21:35 +06:30
parent 101b9511da
commit bbcce13a2e
6 changed files with 86 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/OQS.js
View File

@@ -18,8 +18,6 @@
//= require cable
$(document).ready(function(){
$(".nav-completed").on("click", function(){
$("#completed").removeClass('hide')
@@ -36,9 +34,7 @@ $(document).ready(function(){
var oqs_id = $(this).find(".oqs-id").text();
var url = 'oqs/get_items/'+oqs_id;
show_details(url);
show_details(url);
}); //End Click

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

@@ -8,12 +8,6 @@ $(function(){
});
//End menu category Click
$("#set_change_qty").change(function(){
qty = $(this).val();
price = $("#set_total_price").text();
$("#set_total_price").text(qty*price);
});
//show menu item list when click menu category
function show_menu_item_list(url_item){
var menu_list = $('.menu_items_list');
@@ -152,7 +146,8 @@ $(function(){
$('#set_item_instances').text(instances);
$('#set_name').text(data.attr('data-name'));
$('#set_item_code').text(data.attr('data-item-code'));
$('#set_total_price').text(data.attr('data-price'));
// $('#set_total_price').text(data.attr('data-price'));
$('#set_total_price').text(0);
$('#set_unit_price').text(data.attr('data-price'));
});
// click instance for add item set
@@ -179,7 +174,8 @@ $(function(){
sub_total = $('#set_total_price').text();
name = $(this).data('name');
price = $(this).data('price');
qty = $('#set_change_qty').val();
// qty = $('#set_change_qty').val();
qty = document.getElementById("count").value;
total = qty*price;
var total_price = +sub_total - +total;
$(this).removeClass('selected-instance');
@@ -187,10 +183,12 @@ $(function(){
$(this).removeAttr('data-options');
$('#instance_option').text('')
}else {
sub_total = $('#set_total_price').text();
name = $(this).data('name');
price = $(this).data('price');
qty = $('#set_change_qty').val();
// qty = $('#set_change_qty').val();
qty = document.getElementById("count").value;
total = qty*price;
var total_price = +sub_total + +total;
$(this).addClass('selected-instance');
@@ -273,21 +271,48 @@ $(function(){
for(var field in instances) {
value = instances[field].values;
$(value).each(function(i){
options = value[i];
instance_attributes.push(options);
// options = value[i];
// instance_attributes.push(options);
$.ajax({
type: "GET",
url: '../../api/restaurant/menu_item_attributes/'+value[i],
data: {id:value[i]},
success:function(result){
options = result["name"];
instance_attributes.push(options);
}
});
});
}
selected_arr = []
$(selected_item).each(function(i){
$.ajax({
type: "GET",
url: '../../api/restaurant/menu_item_attributes/'+selected_item[i],
data: {id:selected_item[i]},
success:function(result){
name = result["name"];
selected_arr.push(name);
}
});
});
for(var field in attributes) {
value = attributes[field]["values"];
type = attributes[field]["type"]
row = "<h4>"+attributes[field]["type"]+"</h4>"
row = "<h4>"+attributes[field]["type"]+"</h4>";
console.log(selected_arr);
console.log(value);
console.log(instance_attributes);
$(value).each(function(i){
disabled = ""
status ="";
if(parseInt(jQuery.inArray(value[i], selected_item))!== -1){
if(parseInt(jQuery.inArray(value[i], selected_arr)) !== -1){
status = "selected-attribute";
}
if(parseInt(jQuery.inArray(value[i], instance_attributes)) == -1){
@@ -654,13 +679,18 @@ $(function(){
var count = 1;
var countEl = document.getElementById("count");
$("#plus").on("click", function(){
count++;
countEl.value = count;
price = $("#unit_price").text();
$("#total_price").text(count*price);
set_price = $("#set_unit_price").text();
$("#set_total_price").text(qty*set_price);
});
$("#minus").on("click", function(){
if (count > 1) {
count--;
@@ -668,9 +698,18 @@ $(function(){
price = $("#unit_price").text();
$("#total_price").text(count*price);
set_price = $("#set_unit_price").text();
$("#set_total_price").text(qty*set_price);
}
})
// $("#set_change_qty").change(function(){
// qty = $(this).val();
// price = $("#set_total_price").text();
// $("#set_total_price").text(qty*price);
// });
// $(".change_qty").change(function(){
// qty = $(this).val();
// price = $("#unit_price").text();