From 5b155f729f54f55649babcb31abda7d4a12720d4 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 5 Apr 2018 14:55:32 +0630 Subject: [PATCH 1/2] update addorder --- app/assets/javascripts/addorder.js | 88 ++++++++++++--------- app/views/origami/addorders/detail.html.erb | 2 +- 2 files changed, 53 insertions(+), 37 deletions(-) diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js index a8de44b1..d918265c 100755 --- a/app/assets/javascripts/addorder.js +++ b/app/assets/javascripts/addorder.js @@ -12,6 +12,17 @@ $(function() { var menu_list = $('.menu_items_list'); menu_list.empty(); + + type = window.location.href.indexOf("quick_service"); + modify_order = window.location.href.indexOf("modify_order"); + if (type != -1 && modify_order != -1) { + url_item = '../../../addorders/'+url_item; + }if(modify_order == -1 && type != -1){ + url_item = 'addorders/'+url_item; + } + if (type ==-1 && modify_order == -1){ + url_item = url_item + } //Start Ajax $.ajax({ type: "GET", @@ -36,32 +47,34 @@ $(function() { image_path = "/image/logo.png"; } - row = '
' + row = '
' +'
' +'
'+ product[field].name +'
' - +"
" + +"
" +"" +'view_list' +'
' +'
' - +"
" + +"
" - +"
" - +"" - +"
" + // +"
" + // +"" + // +"
" +'
' +''+ product[field].unit_price +'' @@ -231,6 +244,7 @@ $(function() { $(document).on('click', '.set_item_box', function(event){ $(".instance-list").empty(); $(".options-list").empty(); + $(".selected-set-list").empty(); $('.set_change_qty').val(1); change_qty_plus_minus("set_count","set_plus","set_minus"); data = $(this).parent().children().children('.add_icon'); @@ -353,7 +367,7 @@ $(function() { sub_total = $('#set_total_price').text(); name = $(this).data('name'); price = $(this).data('price'); - options = $(this).attr('data-options',''); + options = $(this).attr('data-options','[]'); // qty = $('#set_change_qty').val(); qty = document.getElementById("set_count").value; total = qty*price; @@ -364,7 +378,8 @@ $(function() { +"' data-name='"+$(this).data('name') +"' data-code='"+code +"' data-price='"+$(this).data('price') - +"' data-option='"+JSON.stringify($(this).data('option')) + +"' data-option='[]" + +"' data-options='"+JSON.stringify($(this).data('options')) +"' data-min-qty='"+$(this).data('min-qty') +"' data-max-qty='"+$(this).data('max-qty') +"' data-parent-code='"+$(this).data('parent-code') @@ -387,7 +402,7 @@ $(function() { +'
' $(".selected-set-list").append(set); }else{ - swal("Alert !", 'Maximum Qty is ' + max_qty + " items", "warning"); + swal("Alert !", 'Maximum Select is ' + max_qty + " items", "warning"); } // } $('#set_unit_price').text(price); @@ -419,8 +434,7 @@ $(function() { default_instance = $('.set-item'); - var items = $('.selected-instance'); - + var items = $('.selected-set'); if (items.length >= min_qty) { item = get_set_item(items); @@ -432,11 +446,10 @@ $(function() { code = $('.set-item').attr('data-code'); name = $('.set-item').attr('data-name'); price = $('.set-item').attr('data-price'); - option_name = ($('.set-item').attr('data-options') === 'undefined') ? '' :$('.set-item').attr('data-options'); + option_name = ($('.set-item').attr('data-options') === 'undefined') ? ' ' :$('.set-item').attr('data-options'); option = ($('.set-item').attr('data-options') === '') ? '[]' :$('.set-item').attr('data-options'); parent = $('.set-item').attr('data-parent'); total = qty * price ; - row ="0) { var instances = jQuery.parseJSON(item_row.attr('data-instances')); @@ -748,6 +763,7 @@ $(function() { $('.add_to_order').attr('data-name',$('#title_name').text()); $('.add_to_order').attr('data-attributes',JSON.stringify(attribute_arr)); $('.add_to_order').attr('data-options',JSON.stringify(option_arr)); + $('.add_to_order').attr('data-opt',JSON.stringify(option_arr)); var item_data = $(this); item = get_item(item_data,"add_to_order"); customer_display_view(item,"add"); @@ -785,8 +801,7 @@ $(function() { option_name = ' '; data_option = '[]'; } - - +console.log(d_option) var rowCount = $('.summary-items tbody tr').length+1; var item_row = $('.summary-items tbody tr'); @@ -794,7 +809,8 @@ $(function() { item_code = $(item_row[i]).attr('data-code'); instance_code = $(item_row[i]).attr('data-instance-code'); r_option = $(item_row[i]).attr('data-opt'); - if (item_code == data.attr('data-item-code') && instance_code == data.attr('data-instance-code')&&r_option == d_option) { + console.log(r_option) + if (item_code == data.attr('data-item-code') && instance_code == data.attr('data-instance-code')&&r_option == d_option) { if (qty > 1) { qty = parseInt($(item_row[i]).children('#item_qty').text()) + qty; }else{ @@ -804,7 +820,7 @@ $(function() { $(item_row[i]).children('#item_qty').text(qty); parseFloat($(item_row[i]).children('#item_price').text(parseFloat(price*qty).toFixed(2))); append =1; - }else{ + }else{ if (qty > 1) { qty = qty; }else{ diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb index 93569170..d88cce17 100755 --- a/app/views/origami/addorders/detail.html.erb +++ b/app/views/origami/addorders/detail.html.erb @@ -405,7 +405,7 @@

-