diff --git a/app/views/origami/addorders/show.html.erb b/app/views/origami/addorders/show.html.erb index fdea2efc..8f9b1c08 100644 --- a/app/views/origami/addorders/show.html.erb +++ b/app/views/origami/addorders/show.html.erb @@ -109,11 +109,14 @@

Total

-

+

-
+
+
@@ -124,7 +127,7 @@
- +
@@ -163,13 +166,10 @@ $(function(){ success: function(data) { var menu_items_list = $('.menu_items_list'); menu_items_list.empty(); - menu_items = data.menu_items; for(var field in menu_items) { - instances = menu_items[field].instances ; - $(instances).each(function(i){ if (instances[i].is_default === true) { code = instances[i].code; @@ -177,22 +177,22 @@ $(function(){ price = parseFloat(instances[i].price).toFixed(2); is_available = instances[i].is_available ; is_on_promotion = instances[i].is_on_promotion; - item_attributes = instances[i].item_attributes; + item_attributes = instances[i].values; promotion_price = instances[i].promotion_price; code = instances[i].code; } }); - + row = '
' +'
' +''+ menu_items[field].name +'' - +"
'" + +"
" +'' +'
' +'
' - +"
'" + +"
" +'
' +'<%= image_tag "logo.png" ,width: '75', height: '75', :style => '' %>' @@ -214,7 +214,7 @@ $(function(){ //click item row for add order $(document).on('click', '.menu_item_box', function(event){ $('.attributes-list').empty(); - $('.attributes-list').empty(); + $('.attr-alert').addClass('hide'); data = $(this).parent().children().children('.add_icon'); attributes = $(this).data('id'); @@ -222,7 +222,7 @@ $(function(){ instances = $(this).data('instance'); for(var field in attributes) { - value = attributes[field]["value"]; + value = attributes[field]["values"]; type = attributes[field]["type"] row = "

"+attributes[field]["type"]+"

" @@ -231,46 +231,93 @@ $(function(){ if(parseInt(jQuery.inArray(value[i], selected_item))!== -1){ status = "selected-option"; } - - row +=""; - + row +=""; }); $(".attributes-list").append(row); } $('#change_qty').val(1); $('#title_name').text(data.attr('data-name')); + $('#item_code').text(data.attr('data-item-code')); $('#total_price').text(data.attr('data-price')); $('#unit_price').text(data.attr('data-price')); }); // click select option icon for add $(document).on('click', '.attribute_btn', function(event){ + value = $(this).data('value'); type = $(this).data('type'); instances = $(this).data('instances'); + console.log(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(); + total_price = 0; - // for(var field in instances) { - // item_attr = instances[field].item_attributes; + for(var field in instances) { + item_attr = instances[field].values; + if(parseInt(jQuery.inArray(selected_item, item_attr))!== -1){ + unit_price = instances[field].price + total_price = qty * unit_price + $('#instance_name').text(instances[field].name); + $('#instance_code').text(instances[field].code); + $('#promotion_price').text(instances[field].promotion_price); + $('#total_price').text(total_price); + $('#unit_price').text(unit_price); + } + } + if (total_price == 0) { + $('.attr-alert').removeClass('hide'); + $('#total_price').text(total_price); + }else{ + $('.attr-alert').addClass('hide'); + $('#total_price').text(total_price); + } + }); //End selecct attribute buttom - // status =""; - // if(parseInt(jQuery.inArray(selected_item, item_attr))!== -1){ - // status = "selected-option"; - // } - - // } + // click add order + $(document).on('click', '.add_to_order', function(event){ + total_price = $('#total_price').text(); + unit_price = $('#unit_price').text(); + qty = $('#change_qty').val(); + var item_row = $('.selected-option'); + var arr = []; - }); //End selecct Click + var attribute_arr = []; + $(item_row).each(function(i){ + value = $(item_row[i]).attr('data-value'); + arr = {value}; + }); + console.log(arr); + if(total_price > 0){ + + $('.add_to_order').attr('data-item-code',$('#item_code').text()); + $('.add_to_order').attr('data-name',$('#title_name').text()); + $('.add_to_order').attr('data-price',unit_price); + $('.add_to_order').attr('data-instance-code',$('#instance_code').text()); + $('.add_to_order').attr('data-instance',$('#instance_name').text()); + $('.add_to_order').attr('data-promotion-price',$('#promotion_price').text()); + $('.add_to_order').attr('data-attributes',$('#instance_name').text()); + + var item_data = $(this); + show_item_detail(item_data); + calculate_sub_total(); + }else{ + $.alert({ + title: 'Alert!', + content: 'Please select another item', + type: 'red', + typeAnimated: true, + btnClass: 'btn-danger', + }); + } + + }); //End Add Icon Click // click plus icon for add $(document).on('click', '.add_icon', function(event){ @@ -295,11 +342,13 @@ $(function(){ var item_row = $('.summary-items tbody tr'); $(item_row).each(function(i){ - if ($(item_row[i]).attr('data-code') == data.attr('data-item-code')) { + item_code = $(item_row[i]).attr('data-code'); + instance_code = $(item_row[i]).attr('data-instance-code'); + + if (item_code == data.attr('data-item-code') && instance_code == data.attr('data-instance-code')) { qty = parseInt($(item_row[i]).children('#item_qty').text()) +1; $(item_row[i]).children('#item_qty').text(qty); parseFloat($(item_row[i]).children('#item_price').text(price*qty)).toFixed(2); - append = 1; }else{ qty = 1; @@ -309,7 +358,7 @@ $(function(){ if (append===0) { row ="" +''+rowCount+'' - +'' + data.attr('data-name')+ ' ' + instance + data.attr('data-attributes')+'' + +'' + data.attr('data-name')+ ' ' + instance +'' +'' + qty + '' +'' + parseFloat(price).toFixed(2) @@ -317,7 +366,6 @@ $(function(){ +''; $(".summary-items tbody").append(row); } - } //click item row for update qty @@ -377,7 +425,6 @@ $(function(){ function summary_items_filter(){ $('.summary-items tr').filter(function(){ - if ($(this).attr('data-active') == 'true'){ qty = $('#modal-qty').val(); price = parseFloat($(this).attr('data-price'));