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' %>
| # | -Items | -QTY - | Price - | Action | +# | +Items | +QTY + | Price + + | Action | |||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| <%= count %> | -+ | <%= count %> | +<%= 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 %> |