From c65c466399a2533dae0c5d9fbad46b66cadadf4c Mon Sep 17 00:00:00 2001 From: Nweni Date: Mon, 26 Jun 2017 06:28:09 +0630 Subject: [PATCH] edit --- app/controllers/origami/home_controller.rb | 3 ++- .../origami/sale_edit_controller.rb | 14 +++++++++++++ app/views/origami/sale_edit/edit.html.erb | 20 ++++++++++++++++--- .../origami/sale_edit/item_void.json.jbuilder | 1 + config/routes.rb | 1 + 5 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 app/views/origami/sale_edit/item_void.json.jbuilder diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb index 4a070788..3f70ad01 100644 --- a/app/controllers/origami/home_controller.rb +++ b/app/controllers/origami/home_controller.rb @@ -23,13 +23,14 @@ class Origami::HomeController < BaseOrigamiController @order_items = Array.new booking.booking_orders.each do |booking_order| order = Order.find(booking_order.order_id) - if (order.status == "new") + if (order.status == "new") @obj_order = order @customer = order.customer @date = order.created_at order.order_items.each do |item| @order_items.push(item) end + end end @status_order = 'order' else diff --git a/app/controllers/origami/sale_edit_controller.rb b/app/controllers/origami/sale_edit_controller.rb index 93e98d03..88cdf315 100644 --- a/app/controllers/origami/sale_edit_controller.rb +++ b/app/controllers/origami/sale_edit_controller.rb @@ -5,4 +5,18 @@ class Origami::SaleEditController < BaseOrigamiController @table_id = params[:table_id] @saleobj = Sale.find(sale_id) end + + def item_void + saleitemId = params[:sale_item_id] + saleitemObj = SaleItem.find(saleitemId) + saleitemObj.remark = 'void' + saleitemObj.save + @newsaleitem = SaleItem.new + @newsaleitem = saleitemObj.dup + @newsaleitem.save + @newsaleitem.qty = saleitemObj.qty * -1 + @newsaleitem.price = saleitemObj.price * -1 + @newsaleitem.product_name = saleitemObj.product_name + " - void" + @newsaleitem.save + end end diff --git a/app/views/origami/sale_edit/edit.html.erb b/app/views/origami/sale_edit/edit.html.erb index f04561e0..c5317c4c 100644 --- a/app/views/origami/sale_edit/edit.html.erb +++ b/app/views/origami/sale_edit/edit.html.erb @@ -51,8 +51,12 @@ <%= sale_item.product_name %> - - + <% if sale_item.remark != 'void' || sale_item.qty.to_i > 0 %> + + + + + <% end %> <% end @@ -97,7 +101,7 @@ $(document).ready(function(){ $(".update").on('click',function() { var sale_item_id = $(this).attr('data-id'); - var ajax_url = "/origami/" + order_id + "/request_bills"; + var ajax_url = "/origami/item_void"; $.ajax({ type: "POST", url: ajax_url, @@ -110,7 +114,17 @@ $(document).ready(function(){ $('.void').on('click',function(){ var sale_item_id = $(this).attr('data-id'); + var ajax_url = "/origami/item_void"; + $.ajax({ + type: "POST", + url: ajax_url, + data: 'sale_item_id='+ sale_item_id, + success:function(result){ + location.reload(); + } + }); }) + }) $('#back').on('click',function(){ diff --git a/app/views/origami/sale_edit/item_void.json.jbuilder b/app/views/origami/sale_edit/item_void.json.jbuilder new file mode 100644 index 00000000..08bf292c --- /dev/null +++ b/app/views/origami/sale_edit/item_void.json.jbuilder @@ -0,0 +1 @@ +json.status true diff --git a/config/routes.rb b/config/routes.rb index c93beb92..bf5d6483 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -77,6 +77,7 @@ Rails.application.routes.draw do end post 'moving' => "movetable#moving" get "/table/:table_id/sale/:sale_id/edit" => "sale_edit#edit" + post 'item_void' => "sale_edit#item_void" get 'table/:dining_id/movetable' => "movetable#move_dining" get 'table/:dining_id/moveroom' => "moveroom#move_dining" get 'sale/:sale_id' => 'sales#show'