edit
This commit is contained in:
@@ -23,13 +23,14 @@ class Origami::HomeController < BaseOrigamiController
|
|||||||
@order_items = Array.new
|
@order_items = Array.new
|
||||||
booking.booking_orders.each do |booking_order|
|
booking.booking_orders.each do |booking_order|
|
||||||
order = Order.find(booking_order.order_id)
|
order = Order.find(booking_order.order_id)
|
||||||
if (order.status == "new")
|
if (order.status == "new")
|
||||||
@obj_order = order
|
@obj_order = order
|
||||||
@customer = order.customer
|
@customer = order.customer
|
||||||
@date = order.created_at
|
@date = order.created_at
|
||||||
order.order_items.each do |item|
|
order.order_items.each do |item|
|
||||||
@order_items.push(item)
|
@order_items.push(item)
|
||||||
end
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
@status_order = 'order'
|
@status_order = 'order'
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -5,4 +5,18 @@ class Origami::SaleEditController < BaseOrigamiController
|
|||||||
@table_id = params[:table_id]
|
@table_id = params[:table_id]
|
||||||
@saleobj = Sale.find(sale_id)
|
@saleobj = Sale.find(sale_id)
|
||||||
end
|
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
|
end
|
||||||
|
|||||||
@@ -51,8 +51,12 @@
|
|||||||
<td class='item-name'><%= sale_item.product_name %></td>
|
<td class='item-name'><%= sale_item.product_name %></td>
|
||||||
<td class='item-attr-edit'><input data-id ="<%= sale_item.id %>" type="text" value="<%= sale_item.qty %>" /></td>
|
<td class='item-attr-edit'><input data-id ="<%= sale_item.id %>" type="text" value="<%= sale_item.qty %>" /></td>
|
||||||
<td class='item-attr-edit'><input data-id ="<%= sale_item.id %>" type="text" value="<%= sale_item.price %>" /></td>
|
<td class='item-attr-edit'><input 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>
|
<% if sale_item.remark != 'void' || sale_item.qty.to_i > 0 %>
|
||||||
<button data-id ="<%= sale_item.id %>" class='btn btn-danger btn-sm void'>Void</button></td></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>
|
||||||
|
<% end %>
|
||||||
</tr>
|
</tr>
|
||||||
<%
|
<%
|
||||||
end
|
end
|
||||||
@@ -97,7 +101,7 @@
|
|||||||
$(document).ready(function(){
|
$(document).ready(function(){
|
||||||
$(".update").on('click',function() {
|
$(".update").on('click',function() {
|
||||||
var sale_item_id = $(this).attr('data-id');
|
var sale_item_id = $(this).attr('data-id');
|
||||||
var ajax_url = "/origami/" + order_id + "/request_bills";
|
var ajax_url = "/origami/item_void";
|
||||||
$.ajax({
|
$.ajax({
|
||||||
type: "POST",
|
type: "POST",
|
||||||
url: ajax_url,
|
url: ajax_url,
|
||||||
@@ -110,7 +114,17 @@ $(document).ready(function(){
|
|||||||
|
|
||||||
$('.void').on('click',function(){
|
$('.void').on('click',function(){
|
||||||
var sale_item_id = $(this).attr('data-id');
|
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(){
|
$('#back').on('click',function(){
|
||||||
|
|||||||
1
app/views/origami/sale_edit/item_void.json.jbuilder
Normal file
1
app/views/origami/sale_edit/item_void.json.jbuilder
Normal file
@@ -0,0 +1 @@
|
|||||||
|
json.status true
|
||||||
@@ -77,6 +77,7 @@ Rails.application.routes.draw do
|
|||||||
end
|
end
|
||||||
post 'moving' => "movetable#moving"
|
post 'moving' => "movetable#moving"
|
||||||
get "/table/:table_id/sale/:sale_id/edit" => "sale_edit#edit"
|
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/movetable' => "movetable#move_dining"
|
||||||
get 'table/:dining_id/moveroom' => "moveroom#move_dining"
|
get 'table/:dining_id/moveroom' => "moveroom#move_dining"
|
||||||
get 'sale/:sale_id' => 'sales#show'
|
get 'sale/:sale_id' => 'sales#show'
|
||||||
|
|||||||
Reference in New Issue
Block a user