From 040d60402b85a16a563dbd1372ec0483838a7d41 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 6 Jul 2017 12:54:04 +0630
Subject: [PATCH] update edit qty and price and cash and credit div in payment
 details

---
 app/assets/stylesheets/origami.scss           |  5 +-
 .../origami/sale_edit_controller.rb           | 55 ++++++++---------
 app/models/sale_payment.rb                    |  3 +-
 app/views/origami/home/show.html.erb          |  3 +-
 app/views/origami/sale_edit/edit.html.erb     | 59 +++++++++++--------
 5 files changed, 67 insertions(+), 58 deletions(-)

diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss
index d4c5d647..7935b50e 100644
--- a/app/assets/stylesheets/origami.scss
+++ b/app/assets/stylesheets/origami.scss
@@ -52,7 +52,10 @@
 }
 
 .payment{
-	height:70px;line-height:70px;align:center;color:white;font-size:16px;margin-bottom:1px;
+	height:70px;line-height:70px;
+	align:center;color:white;
+	font-size:16px;
+	margin-top:5px;
 }
 
 .cash-color{
diff --git a/app/controllers/origami/sale_edit_controller.rb b/app/controllers/origami/sale_edit_controller.rb
index a8a767da..3d632403 100644
--- a/app/controllers/origami/sale_edit_controller.rb
+++ b/app/controllers/origami/sale_edit_controller.rb
@@ -23,41 +23,42 @@ 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.remark = 'void'
-    saleitemObj.save
-    @newsaleitem = SaleItem.new
-    @newsaleitem = saleitemObj.dup
-    @newsaleitem.save
-    @newsaleitem.qty = update_qty
-    @newsaleitem.price = update_price
-    @newsaleitem.unit_price = update_price
-    @newsaleitem.taxable_price = update_price
-    @newsaleitem.is_taxable = 0
-    @newsaleitem.remark = 'edit'
-    @newsaleitem.product_name = saleitemObj.product_name + " - updated"
-    @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.remark = 'void'
   #   saleitemObj.save
-    
+  #   @newsaleitem = SaleItem.new
+  #   @newsaleitem = saleitemObj.dup
+  #   @newsaleitem.save
+  #   @newsaleitem.qty = update_qty
+  #   @newsaleitem.price = update_price
+  #   @newsaleitem.unit_price = update_price
+  #   @newsaleitem.taxable_price = update_price
+  #   @newsaleitem.is_taxable = 0
+  #   @newsaleitem.remark = 'edit'
+  #   @newsaleitem.product_name = saleitemObj.product_name + " - updated"
+  #   @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.price         = update_qty.to_f * update_price.to_f
+    saleitemObj.unit_price    = update_price
+    saleitemObj.taxable_price = update_qty.to_f * update_price.to_f
+    # saleitemObj.remark        = 'edit'
+    saleitemObj.product_name  = saleitemObj.product_name + " - updated"
+    saleitemObj.save
+  end
+
+
    # make cancel void item
    def item_void_cancel
      saleitemId = params[:sale_item_id]
diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index 026a89ff..b3455e27 100644
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -262,8 +262,7 @@ class SalePayment < ApplicationRecord
       self.sale.sale_status = "completed"
 
       response = rebat(sObj)
-puts "hhhhhhh"
-puts response.to_json
+      
       if response["status"] == true
         self.sale.rebate_status = 'true'
       end
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 60221d95..8b613409 100644
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -176,14 +176,13 @@
                 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/sale_edit/edit.html.erb b/app/views/origami/sale_edit/edit.html.erb
index de44cc15..6ba861a8 100644
--- a/app/views/origami/sale_edit/edit.html.erb
+++ b/app/views/origami/sale_edit/edit.html.erb
@@ -26,11 +26,12 @@
            <table class="table " id="order-items-table">
              <thead>
                <tr>
-                 <th>#</th>
-                 <th class="item-name">Items</th>
-                 <th style="item-attr-edit">QTY</td>
-                 <th class="item-attr-edit">Price</td>
-                 <th class='item-attr'> Action </th>
+                 <th width="4%">#</th>
+                 <th class="" width="30%">Items</th>
+                 <th style="" width="13%">QTY</td>
+                 <th class="" width="13%">Price</td>
+                 <!-- <th class='' width="17%"> Total </th> -->
+                 <th class='' width="17%"> Action </th>
                </tr>
              </thead>
              <tbody>
@@ -47,39 +48,45 @@
                 unless sale_item.price == 0
                 %>
                <tr>
-                 <td><%= count %></td>
-                 <td class='item-name'>
+                 <td width="4%"><%= count %></td>
+                 <td class='' width="30%">
                      <%= 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 class='' width="13%">
+                        <input id="<%= sale_item.id%>_qty" data-id ="<%= sale_item.id %>" type="text" value="<%= sale_item.qty %>" class="form-control "/>
                     </td>
-                    <td class='item-attr-edit'>
-                        <input id="<%= sale_item.id%>_price" data-id ="<%= sale_item.id %>" type="text" value="<%= sale_item.price %>" />
+                    <td class='' width="13%">
+                        <input id="<%= sale_item.id%>_price" data-id ="<%= sale_item.id %>" type="text" value="<%= sale_item.unit_price %>" class="form-control"/>
                     </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>
+                    <!-- <td class='' width="17%">
+                        <input id="<%= sale_item.id%>_price" data-id ="<%= sale_item.id %>" type="text" value="<%= sale_item.price %>" class="form-control"/>
+                    </td> -->
+                   <td class='' width="17%">
+                       <button data-id ="<%= sale_item.id %>" class='btn btn-primary btn-md update'>Update
+                       </button>
+                       <button data-id ="<%= sale_item.id %>" class='btn btn-danger btn-md 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 class='' width="13%">
+                      <input data-id ="<%= sale_item.id %>" type="text" value="<%= sale_item.qty %>" class="form-control" disabled/>
                  </td>
-                 <td class='item-attr-edit'>
-                    <input data-id ="<%= sale_item.id %>" type="text" value="<%= sale_item.price %>" disabled/>
+                 <td class='' width="13%">
+                    <input data-id ="<%= sale_item.id %>" type="text" value="<%= sale_item.unit_price %>" class="form-control" disabled/>
                  </td>
-                 <td class='item-attr'>
-                   <button data-id ="<%= sale_item.id %>" class='btn btn-primary btn-sm cancel'>Cancel Void/Update</button>
+                 <!-- <td class='' width="17%">
+                    <input data-id ="<%= sale_item.id %>" type="text" value="<%= sale_item.price %>" class="form-control" disabled/>
+                 </td> -->
+                 <td class='' width="17%">
+                   <button data-id ="<%= sale_item.id %>" class='btn btn-primary btn-md 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 class='' width="13%">
+                    <input data-id ="<%= sale_item.id %>" type="text" value="<%= sale_item.qty %>" class="form-control" disabled/>
                 </td>
-                 <td class='item-attr-edit'>
-                      <input data-id ="<%= sale_item.id %>" type="text" value="<%= sale_item.price %>" disabled/>
+                 <td class='' width="13%">
+                      <input data-id ="<%= sale_item.id %>" type="text" value="<%= sale_item.price %>" class="form-control" disabled/>
                  </td>
                  <td></td>
                  <% end %>