From 05b5afcafa358e1275b5e51e2d8b79c3532eb0fa Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Wed, 5 Jul 2017 18:27:30 +0630
Subject: [PATCH] update edit

---
 .../origami/sale_edit_controller.rb           | 15 ++++
 app/views/origami/home/show.html.erb          |  2 +
 app/views/origami/payments/show.html.erb      |  4 +-
 app/views/origami/sale_edit/edit.html.erb     | 75 +++++++++++++------
 4 files changed, 72 insertions(+), 24 deletions(-)

diff --git a/app/controllers/origami/sale_edit_controller.rb b/app/controllers/origami/sale_edit_controller.rb
index 8a47da39..a8a767da 100644
--- a/app/controllers/origami/sale_edit_controller.rb
+++ b/app/controllers/origami/sale_edit_controller.rb
@@ -43,6 +43,21 @@ class Origami::SaleEditController < BaseOrigamiController
     @newsaleitem.save
   end
 
+  # def item_edit
+  #   saleitemId = params[:sale_item_id]
+  #   update_qty = params[:update_qty]
+  #   update_price = params[:update_price]
+  #   saleitemObj = SaleItem.find(saleitemId)
+
+  #   saleitemObj.qty           = update_qty
+  #   # saleitemObj.unit_price    = update_price
+  #   saleitemObj.taxable_price = update_price
+  #   saleitemObj.price         = update_price
+  #   # saleitemObj.remark        = 'edit'
+  #   saleitemObj.save
+    
+  # end
+
    # make cancel void item
    def item_void_cancel
      saleitemId = params[:sale_item_id]
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index fd211ccc..60221d95 100644
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -176,12 +176,14 @@
                 unless sale_item.price == 0
                     count += 1
                 %>
+                <% if sale_item.remark != 'void' %>
                <tr>
                  <td><%= count %></td>
                  <td class='item-name'><%= sale_item.product_name %></td>
                  <td class='item-attr'><%= sale_item.qty %></td>
                  <td class='item-attr'><%= sale_item.price %></td>
                </tr>
+               <%end%>
                <%
 
                      end
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 5986ae99..5eeb8c36 100644
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -42,7 +42,7 @@
                 count += 1
                %>
 
-	          		<% sub_total += sale_item.qty*sale_item.unit_price%>
+	          		<% sub_total += sale_item.price%>
 	            	<tr>
                       <td><%= count %></td>
 	                    <td style="width:60%; text-align:left">
@@ -52,7 +52,7 @@
 	                      <span id="item-qty"><%=sale_item.qty%></span>
 	                    </td>
 	                    <td style="width:20%; text-align:right">
-	                       <span id="item-total-price"><%=(sale_item.qty*sale_item.unit_price)%></span>
+	                       <span id="item-total-price"><%=(sale_item.price)%></span>
 	                    </td>
 	                  </tr>
 	            <%end %>
diff --git a/app/views/origami/sale_edit/edit.html.erb b/app/views/origami/sale_edit/edit.html.erb
index d604e654..de44cc15 100644
--- a/app/views/origami/sale_edit/edit.html.erb
+++ b/app/views/origami/sale_edit/edit.html.erb
@@ -48,23 +48,39 @@
                 %>
                <tr>
                  <td><%= count %></td>
-                 <td class='item-name'><%= sale_item.product_name %></td>
+                 <td class='item-name'>
+                     <%= sale_item.product_name %>
+                </td>
                  <% if sale_item.remark != 'void' && sale_item.remark != 'edit' %>
-                 <td class='item-attr-edit'><input id="<%= sale_item.id%>_qty" data-id ="<%= sale_item.id %>" type="text" value="<%= sale_item.qty %>" /></td>
-                 <td class='item-attr-edit'><input id="<%= sale_item.id%>_price" data-id ="<%= sale_item.id %>" type="text" value="<%= sale_item.price %>" /></td>
+                    <td class='item-attr-edit'>
+                        <input id="<%= sale_item.id%>_qty" data-id ="<%= sale_item.id %>" type="text" value="<%= sale_item.qty %>" />
+                    </td>
+                    <td class='item-attr-edit'>
+                        <input id="<%= sale_item.id%>_price" data-id ="<%= sale_item.id %>" type="text" value="<%= sale_item.price %>" />
+                    </td>
                  <td class='item-attr'>
-                   <button data-id ="<%= sale_item.id %>" class='btn btn-primary btn-sm update'>Update</button>
-                   <button data-id ="<%= sale_item.id %>" class='btn btn-danger btn-sm void'>Void</button></td>
+                     <button data-id ="<%= sale_item.id %>" class='btn btn-primary btn-sm update'>Update
+                     </button>
+                     <button data-id ="<%= sale_item.id %>" class='btn btn-danger btn-sm void'>Void</button>
                  </td>
+
                  <% elsif sale_item.qty.to_i < 0 || sale_item.remark == 'edit' %>
-                 <td class='item-attr-edit'><input data-id ="<%= sale_item.id %>" type="text" value="<%= sale_item.qty %>" disabled/></td>
-                 <td class='item-attr-edit'><input data-id ="<%= sale_item.id %>" type="text" value="<%= sale_item.price %>" disabled/></td>
+                 <td class='item-attr-edit'>
+                      <input data-id ="<%= sale_item.id %>" type="text" value="<%= sale_item.qty %>" disabled/>
+                 </td>
+                 <td class='item-attr-edit'>
+                    <input data-id ="<%= sale_item.id %>" type="text" value="<%= sale_item.price %>" disabled/>
+                 </td>
                  <td class='item-attr'>
                    <button data-id ="<%= sale_item.id %>" class='btn btn-primary btn-sm cancel'>Cancel Void/Update</button>
                  </td>
                  <% else %>
-                 <td class='item-attr-edit'><input data-id ="<%= sale_item.id %>" type="text" value="<%= sale_item.qty %>" disabled/></td>
-                 <td class='item-attr-edit'><input data-id ="<%= sale_item.id %>" type="text" value="<%= sale_item.price %>" disabled/></td>
+                 <td class='item-attr-edit'>
+                    <input data-id ="<%= sale_item.id %>" type="text" value="<%= sale_item.qty %>" disabled/>
+                </td>
+                 <td class='item-attr-edit'>
+                      <input data-id ="<%= sale_item.id %>" type="text" value="<%= sale_item.price %>" disabled/>
+                 </td>
                  <td></td>
                  <% end %>
                </tr>
@@ -99,20 +115,35 @@
 <script>
 // Bill Request
 $(document).ready(function(){
+  
   $(".update").on('click',function() {
-      var sale_item_id = $(this).attr('data-id');
-      var qty = $('#'+sale_item_id + "_qty").val();
-      var price = $('#'+ sale_item_id + "_price").val();
-      console.log(qty + "|" + price)
-      var ajax_url = "/origami/item_edit";
-      $.ajax({
-  			type: "POST",
-  		    url: ajax_url,
-  		    data: 'sale_item_id='+ sale_item_id + "&update_qty="+qty + "&update_price="+ price,
-  		    success:function(result){
-            location.reload();
-          }
-  		});
+    var sale_item_id = $(this).attr('data-id');
+    var qty = $('#'+sale_item_id + "_qty").val();
+    var price = $('#'+ sale_item_id + "_price").val();
+    console.log(qty + "|" + price)
+    var ajax_url = "/origami/item_edit";
+    $.ajax({
+     type: "POST",
+     url: ajax_url,
+     data: 'sale_item_id='+ sale_item_id + "&update_qty="+qty + "&update_price="+ price,
+     success:function(result){
+      $.confirm({
+        title: 'Alert!',
+        content: 'Qty and Price was successfully Updated',
+        buttons: {
+
+          confirm: {
+            text: 'Ok',
+            btnClass: 'btn-green btn-lg',
+            action: function(){
+              location.reload();
+            }
+          }  
+        }
+      });
+
+    }
+  });
   });
 
   $('.void').on('click',function(){