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' %>
| <%= count %> |
<%= sale_item.product_name %> |
<%= sale_item.qty %> |
<%= sale_item.price %> |
+ <%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%>
| <%= count %> |
@@ -52,7 +52,7 @@
<%=sale_item.qty%>
|
- <%=(sale_item.qty*sale_item.unit_price)%>
+ <%=(sale_item.price)%>
|
<%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 @@
%>
| <%= count %> |
- <%= sale_item.product_name %> |
+
+ <%= sale_item.product_name %>
+ |
<% if sale_item.remark != 'void' && sale_item.remark != 'edit' %>
- |
- |
+
+
+ |
+
+
+ |
-
- |
+
+
+
<% elsif sale_item.qty.to_i < 0 || sale_item.remark == 'edit' %>
- |
- |
+
+
+ |
+
+
+ |
|
<% else %>
- |
- |
+
+
+ |
+
+
+ |
|
<% end %>
@@ -99,20 +115,35 @@