From 6360a914b402933ed4a09aaf4ad086f70f70e881 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 16 Nov 2017 14:23:51 +0630 Subject: [PATCH] update add order for popup qty --- app/assets/javascripts/addorder.js | 51 +++++++++++++---- app/assets/stylesheets/addorder.scss | 2 +- app/views/layouts/_left_sidebar.html.erb | 9 ++- app/views/origami/addorders/detail.html.erb | 55 ++++++++++++++----- app/views/settings/employees/_form.html.erb | 2 +- .../transactions/shift_sales/index.html.erb | 4 +- 6 files changed, 94 insertions(+), 29 deletions(-) diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js index 2804583a..34c93405 100755 --- a/app/assets/javascripts/addorder.js +++ b/app/assets/javascripts/addorder.js @@ -339,13 +339,14 @@ $(function(){ $(".sx_item_set_detailModal").css({ 'display': "none" }); }else{ $(".sx_item_set_detailModal").css({ 'display': "block" }); - $.alert({ - title: 'Alert!', - content: 'Please Select Minimum ' + min_qty + " items", - type: 'red', - typeAnimated: true, - btnClass: 'btn-danger', - }); + swal("Alert !", 'Please Select Minimum ' + min_qty + " items", "warning"); + // $.alert({ + // title: 'Alert!', + // content: 'Please Select Minimum ' + min_qty + " items", + // type: 'red', + // typeAnimated: true, + // btnClass: 'btn-danger', + // }); } }); //End add order Click @@ -420,7 +421,7 @@ $(function(){ for(var field in attributes) { value = attributes[field]["values"]; type = attributes[field]["type"] - row = "

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

"; + row = "
"+attributes[field]["type"]+"
"; $(value).each(function(i){ disabled = "" @@ -794,11 +795,10 @@ $(function(){ // Get Selected Class function change_qty_plus_minus(id,plus,minus) { - var count = 1; + var count = parseInt($('#'+id).val()) var countEl = document.getElementById(id); $('#'+plus).on("click", function(){ - count++; countEl.value = count; @@ -852,6 +852,37 @@ $(function(){ } }) } + + + $('.keypress_qty').keyup(function(e){ + + id = $(this).attr('id'); + value = $(this).val(); + + if (id=="count") { + price = $("#unit_price").text(); + $("#total_price").text(value*price); + }else{ + var item_row = $('.selected-instance'); + price = $("#set_unit_price").text(); + set_total_price = $("#set_total_price").text(); + $("#set_count").val(value); + if (item_row.length > 1) { + total = 0 ; + $(item_row).each(function(i){ + total += value * $(item_row[i]).attr('data-price'); + total_price = total; + }); + }else{ + total_price = value*price; + } + $("#set_total_price").text(total_price); + } + }); + + /* $("input").keypress(function(){ + $("span").text(i += 1); +});*/ // $("#set_change_qty").change(function(){ // qty = $(this).val(); // price = $("#set_total_price").text(); diff --git a/app/assets/stylesheets/addorder.scss b/app/assets/stylesheets/addorder.scss index b14895df..47b52a07 100755 --- a/app/assets/stylesheets/addorder.scss +++ b/app/assets/stylesheets/addorder.scss @@ -152,6 +152,6 @@ section.content{ } -#count { +#count ,#set_count{ text-align: center; } \ No newline at end of file diff --git a/app/views/layouts/_left_sidebar.html.erb b/app/views/layouts/_left_sidebar.html.erb index 25b196af..1ec77487 100755 --- a/app/views/layouts/_left_sidebar.html.erb +++ b/app/views/layouts/_left_sidebar.html.erb @@ -77,12 +77,12 @@ <%= t :transactions %>
  • diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb index 8fa1b640..6cfe0bbf 100755 --- a/app/views/origami/addorders/detail.html.erb +++ b/app/views/origami/addorders/detail.html.erb @@ -33,7 +33,7 @@
    - ORDER DETAILS | Table<%=@table.name%> + ORDER DETAILS | Table-<%=@table.name%> @@ -98,8 +98,16 @@
    - - +
    +
    + +
    +
    + +
    +
    + +
    @@ -110,7 +118,7 @@ @@ -173,7 +193,7 @@