git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change split bill ui

Browse Source
This commit is contained in:
phyusin
2018-02-07 15:50:36 +06:30
parent 41aa840eb2
commit 492bf93185
5 changed files with 508 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/stylesheets/origami.scss
View File

@@ -390,3 +390,9 @@ i.logout_icon{
}
/* End Notify */
/* selected color for split bills */
.selected-split-item {
color: #fff !important;
background-color: #5DADE2 !important;
}

62
app/controllers/origami/split_bill_controller.rb
View File

@@ -5,6 +5,7 @@ class Origami::SplitBillController < BaseOrigamiController
dining_id = params[:dining_id]
@table = DiningFacility.find(dining_id)
@booking = @table.get_booking
@orders = Array.new
@order_items = Array.new
@sale_data = Array.new
@@ -19,7 +20,18 @@ class Origami::SplitBillController < BaseOrigamiController
@booking.booking_orders.each do |booking_order|
@order = Order.find(booking_order.order_id)
if (@order.status == "new")
@orders.push(@order)
@order.order_items.each do |item|
if !item.set_menu_items.nil?
instance_item_sets = JSON.parse(item.set_menu_items)
arr_instance_item_sets = Array.new
instance_item_sets.each do |instance_item|
item_instance_name = MenuItemInstance.find_by_item_instance_code(instance_item["item_instance_code"]).item_instance_name
arr_instance_item_sets.push(item_instance_name)
end
item.set_menu_items = arr_instance_item_sets
end
@order_items.push(item)
end
end
@@ -31,8 +43,15 @@ class Origami::SplitBillController < BaseOrigamiController
def create
order_ids = params[:order_ids]
orders = nil
if !params[:orders].empty?
orders = JSON.parse(params[:orders])
end
order_items = nil
if !params[:order_items].empty?
order_items = JSON.parse(params[:order_items])
# byebug
end
status = false
if shift_by_terminal = ShiftSale.current_open_shift(get_cashier[0].id)
#create Bill by Booking ID
@@ -69,7 +88,13 @@ class Origami::SplitBillController < BaseOrigamiController
:checkin_at => Time.now.utc, :checkin_by => current_user.name,
:booking_status => "assign" })
if !orders.nil?
orders.each do |order|
BookingOrder.create({:booking_id => booking.booking_id, :order_id => order["id"]})
end
elsif !order_items.nil?
order_item_count = 0
order_id_count = 0
order_id = nil
order_items.each do |order_item|
@@ -77,13 +102,44 @@ class Origami::SplitBillController < BaseOrigamiController
order = Order.find(order_item["order_id"])
if order.order_items.count == 1
order_id = order.id
break
order_id_count += 1
else
order_item_count += 1
end
end
if !order_id.nil?
if order_id_count > 1
updated_order_id = Array.new
order_ids.each do |odr_id|
odr = Order.find(odr_id)
if odr.order_items.count > 1
updated_order_id.push(odr_id)
end
end
if !updated_order_id.empty?
order_ids.each do |odr_id|
unless updated_order_id.include?(odr_id)
BookingOrder.find_by_order_id(odr_id).delete
BookingOrder.create({:booking_id => booking.booking_id, :order_id => odr_id})
end
end
order_items.each do |order_item|
if updated_order_id.include?(order_item["order_id"])
orderItem = OrderItem.find(order_item["id"])
orderItem.order_id = order_id
orderItem.save!
end
end
else
order_ids.each do |odr_id|
BookingOrder.find_by_order_id(odr_id).delete
BookingOrder.create({:booking_id => booking.booking_id, :order_id => odr_id})
end
end
else
BookingOrder.find_by_order_id(order_id).delete
BookingOrder.create({:booking_id => booking.booking_id, :order_id => order_id})
@@ -92,6 +148,7 @@ class Origami::SplitBillController < BaseOrigamiController
orderItem.order_id = order_id
orderItem.save!
end
end
else
if order_ids.count == 1 && order_item_count == 1
BookingOrder.create({:booking_id => booking.booking_id, :order_id => order_ids[0]})
@@ -128,6 +185,7 @@ class Origami::SplitBillController < BaseOrigamiController
end
end
end
end
sale = Sale.new
status, sale_id = sale.generate_invoice_from_booking(booking.booking_id, current_user, get_cashier_by_terminal)

33
app/views/origami/home/show.html.erb
View File

@@ -367,6 +367,9 @@
%>
</table>
<button class='btn btn-primary' id='add_invoice'> Add to existing invoice</button>
<% if !@spit_bill.nil? && @spit_bill == '1' %>
<button class='btn btn-primary' id='split_bill'> Split Bill</button>
<% end %>
<% end %>
<% if @sale_array.size > 1 %>
<br><br>
@@ -692,11 +695,11 @@
var lookup_split_bill = '<%= @spit_bill %>';
if(lookup_split_bill == '1'){
swal({
title: "Alert",
text: "Are you sure, you want to Split bill?",
type: "warning",
title: "Information!",
text: "Do you want to Split bill?",
type: "success",
showCancelButton: true,
confirmButtonColor: "#DD6B55",
confirmButtonColor: "#009900",
confirmButtonText: "Yes, split it!",
closeOnConfirm: false
}, function (isConfirm) {
@@ -740,8 +743,8 @@
})
$('#add_invoice').on('click', function () {
var dining_id = "<%= @dining.id %>"
var sale_id = "<%= @obj_sale.sale_id rescue "" %>"
var dining_id = "<%= @dining.id %>";
var sale_id = $("#sale_id").val(); //<%= @obj_sale.sale_id rescue "" %>
var ajax_url = "/origami/sale/append_order";
$.ajax({
type: "POST",
@@ -867,4 +870,22 @@
}
});
});
/* split bill in add to existing invoice*/
$('#split_bill').on('click', function(){
swal({
title: "Alert",
text: "Are you sure, you want to split bill?",
type: "warning",
showCancelButton: true,
confirmButtonColor: "#DD6B55",
confirmButtonText: "Yes, split it!",
closeOnConfirm: false
}, function (isConfirm) {
if(isConfirm){
var dining_id = "<%= @dining.id %>";
window.location.href = '/origami/table/' + dining_id + "/split_bills";
}
});
});
</script>

31
app/views/origami/rooms/show.html.erb
View File

@@ -344,7 +344,10 @@
end
%>
</table>
<button class='btn bg-blue' id='add_invoice'> Add to existing invoice </button>
<button class='btn bg-primary' id='add_invoice'> Add to existing invoice </button>
<% if !@spit_bill.nil? && @spit_bill == '1' %>
<button class='btn btn-primary' id='split_bill'> Split Bill</button>
<% end %>
<% end %>
<% if @sale_array.size > 1 %>
<br><br>
@@ -694,11 +697,11 @@ $('#request_bills').click(function() {
var lookup_split_bill = '<%= @spit_bill %>';
if(lookup_split_bill == '1'){
swal({
title: "Alert",
text: "Are you sure, you want to Split bill?",
type: "warning",
title: "Information!",
text: "Do you want to Split bill?",
type: "success",
showCancelButton: true,
confirmButtonColor: "#DD6B55",
confirmButtonColor: "#009900",
confirmButtonText: "Yes, split it!",
closeOnConfirm: false
}, function (isConfirm) {
@@ -871,4 +874,22 @@ $('#add_invoice').on('click',function(){
var dining_id = "<%= @room.id %>"
window.location.href = '/origami/addorders/' + dining_id;
});
/* split bill in add to existing invoice*/
$('#split_bill').on('click', function(){
swal({
title: "Alert",
text: "Are you sure, you want to split bill?",
type: "warning",
showCancelButton: true,
confirmButtonColor: "#DD6B55",
confirmButtonText: "Yes, split it!",
closeOnConfirm: false
}, function (isConfirm) {
if(isConfirm){
var dining_id = "<%= @room.id %>";
window.location.href = '/origami/table/' + dining_id + "/split_bills";
}
});
});
</script>

209
app/views/origami/split_bill/index.html.erb
View File

@@ -7,9 +7,6 @@
<div class="col-lg-7 col-md-7 col-sm-7">
<!-- Order Details -->
<div class="card" >
<!-- <div class="card-header">
<div><strong id="order-title">ORDER DETAILS</strong></div>
</div> -->
<div class="card-block">
<div class="card-title row">
<div class="col-lg-12 col-md-12 col-sm-12">
@@ -21,7 +18,37 @@
<p class="m-l-15">Order Lists</p>
</div>
</div>
<div id="order-detail-slimscroll" data-height="160">
<div id="split-order-slimscroll" data-height="100">
<div class="card-text dining">
<% if !@orders.nil? %>
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="row m-l-5">
<div class="col-lg-3 col-md-3 col-sm-3">
<ul class="nav nav-tabs tabs-left sideways">
<% @orders.each.with_index(0) do |order, order_index| %>
<% active_class = "" %>
<% if order_index == 0 %>
<% active_class = "active" %>
<% end %>
<li class="order-row <%= active_class %>">
<a href="#<%= order.order_id %>" data-toggle="tab"><%= order.order_id %></a>
</li>
<% end %>
</ul>
</div>
<div class="col-lg-8 col-md-8 col-sm-8">
<div class="tab-content">
<% @orders.each.with_index(0) do |order, order_index| %>
<% active_class = "" %>
<% if order_index == 0 %>
<% active_class = "active" %>
<% end %>
<div class="tab-pane <%= active_class %>" id="<%= order.order_id %>">
<div class="card-title">
<p class="m-l-2">Order Items</p>
</div>
<div id="order-detail-slimscroll-<%= order.order_id %>" data-height="200">
<div class="card-text dining">
<table class="table table-default" id="order-items-table">
<thead>
@@ -32,8 +59,9 @@
</tr>
</thead>
<tbody>
<% if !order.order_items.nil? %>
<% sub_total = 0 %>
<% @order_items.each do |order_item| %>
<% order.order_items.each do |order_item| %>
<%
sub_total += order_item.qty*order_item.price
%>
@@ -41,7 +69,14 @@
<td style="width:60%; text-align:left">
<span id="item-order-id" class="hidden"><%=order_item.order_id%></span>
<span id="item-account-type" class="hidden"><%=order_item.account_id%></span>
<span id="item-name-price"><%=order_item.item_name%></span>
<span id="item-name-price">
<%=order_item.item_name%>
<% if !order_item.set_menu_items.nil?
order_item.set_menu_items.each do |item_instance| %>
<br><span class="font-13"><%= item_instance %></span>
<% end
end %>
</span>
</td>
<td style="width:20%; text-align:right">
<span id="item-qty"><%=order_item.qty%></span>
@@ -53,17 +88,28 @@
<%
end
%>
<% end %>
</tbody>
</table>
</div>
</div>
<div class="card-footer">
<table class="table" id="order-charges-table" border="0">
<!-- <div class="card-footer"> -->
<table class="table m-b-20" id="order-charges-table" border="0">
<tr>
<td class="charges-name"><strong>Sub Total:</strong></td>
<td class="item-attr"><strong id="order-sub-total"><%=sub_total%></strong></td>
<td class="item-attr align-right"><strong id="order-sub-total"><%=sub_total%></strong></td>
</tr>
</table>
<!-- </div> -->
</div>
<% end %>
</div>
</div>
</div>
</div>
</div>
<% end %>
</div>
</div>
</div>
</div>
@@ -76,7 +122,7 @@
<div class="card-title row">
<p class="m-l-15">Receipt Lists</p>
</div>
<div id="order-detail-slimscroll" data-height="160">
<div id="split-receipt-slimscroll" data-height="160">
<div class="card-text dining">
<% if !@sale_data.nil? %>
<table class="table table-default">
@@ -101,7 +147,8 @@
<!-- Action Panel -->
<div>
<button type="button" class="btn bg-default btn-block" id="back" ><i class="material-icons">reply</i> Back </button>
<button id="order_item_split" class="btn btn-primary btn- action-btn">Order Items Split</button>
<button id="order_split" class="btn btn-primary text-center action-btn" style="width:100%">Orders Split</button>
<button id="order_item_split" class="btn btn-primary text-center action-btn">Order Items Split</button>
</div>
</div>
<!-- Column Three -->
@@ -154,11 +201,11 @@
// Select Sale Item
$('.item-row').on('click',function(){
if($(this).hasClass('selected-item') == true){
$(this).removeClass('selected-item');
if($(this).hasClass('selected-split-item') == true){
$(this).removeClass('selected-split-item');
}
else {
$(this).addClass('selected-item');
$(this).addClass('selected-split-item');
}
});
@@ -179,15 +226,54 @@
closeOnConfirm: false
}, function (isConfirm) {
if(isConfirm){
splitBillProcess(cnt_items);
orderItemSplitBillProcess(cnt_items);
}
});
// }
// else{
// splitBillProcess(cnt_items);
// orderItemSplitBillProcess(cnt_items);
// }
}else{
swal("Opps","Please select at least on item!","warning");
swal("Opps","Please select at least one item!","warning");
}
});
// Selected Order
$('.order-row').on('click',function(){
if($(this).hasClass('selected-split-item') == true){
$(this).removeClass('selected-split-item');
}
else {
$(this).addClass('selected-split-item');
}
});
//order_item_split
$('#order_split').on('click',function () {
var cnt_orders = "<%= @orders.count %>";
var orders = get_selected_orders();// Selected Order Items
var cnt_odrs = parseInt(cnt_orders) - parseInt(orders.length);
if (orders.length > 0){
// if(cnt_odrs > 0){
swal({
title: "Alert",
text: "Are you sure, you want to Split?",
type: "warning",
showCancelButton: true,
confirmButtonColor: "#DD6B55",
confirmButtonText: "Yes, split it!",
closeOnConfirm: false
}, function (isConfirm) {
if(isConfirm){
orderSplitBillProcess(cnt_odrs);
}
});
// }
// else{
// orderSplitBillProcess(cnt_odrs);
// }
}else{
swal("Opps","Please select at least one order!","warning");
}
});
@@ -197,10 +283,45 @@
var sale_id = $(this).attr('id').substr(0,16);
window.location = '/origami/table/' + dining_id + "/table_invoice/" + sale_id;
});
//slimscroll for order, order items, reciept
var height = ($(window).height() - ($('.legal').outerHeight() + $('.user-info').outerHeight() + $('.navbar').innerHeight()));
$('#split-order-slimscroll').slimScroll({
height: height-$('#split-order-slimscroll').attr('data-height'),
size: '5px',
color: 'rgba(0,0,0,0.5)',
alwaysVisible: false,
borderRadius: '0',
railBorderRadius: '0'
});
/* function for split bill process */
function splitBillProcess(cnt_items){
$('#split-receipt-slimscroll').slimScroll({
height: height-$('#split-receipt-slimscroll').attr('data-height'),
size: '5px',
color: 'rgba(0,0,0,0.5)',
alwaysVisible: false,
borderRadius: '0',
railBorderRadius: '0'
});
var orders = JSON.parse('<%= @orders.to_json.html_safe %>');
if(orders.length > 0){
$.each(orders, function(key,order){
$('#order-detail-slimscroll-'+order.order_id).slimScroll({
height: height-$('#split-receipt-slimscroll').attr('data-height'),
size: '5px',
color: 'rgba(0,0,0,0.5)',
alwaysVisible: false,
borderRadius: '0',
railBorderRadius: '0'
});
});
}
});
/* function for order items split bill process */
function orderItemSplitBillProcess(cnt_items){
var dining_id = $("#table_id").text();
var type = $("#table_type").text();
var customer_id = $("#customer_id").text();
@@ -225,7 +346,40 @@ function splitBillProcess(cnt_items){
type: "POST",
url: ajax_url,
dataType: 'JSON',
data: {'dining_id' : dining_id, 'type': type, 'customer_id' : customer_id, 'booking_id' : booking_id, 'order_ids' : order_ids, 'order_items' : JSON.stringify(order_items)},
data: {'dining_id' : dining_id, 'type': type, 'customer_id' : customer_id, 'booking_id' : booking_id, 'order_ids' : order_ids, 'order_items' : JSON.stringify(order_items), 'orders' : ''},
success: function (result) {
if (!result.status) {
swal("Information!", result.error_message);
}
else {
// if (cnt_items > 0){
window.location.reload();
// }else{
// backToOrigami();
// }
}
}
});
}
/* function for order items split bill process */
function orderSplitBillProcess(cnt_orders){
var dining_id = $("#table_id").text();
var type = $("#table_type").text();
var customer_id = $("#customer_id").text();
var orders = get_selected_orders();// Selected Orders
var json_booking = JSON.parse('<%= @booking.to_json.html_safe %>');
var booking_id = "";
if(cnt_orders == 0){
booking_id = json_booking.booking_id;
}
var ajax_url = "/origami/split_bills";
$.ajax({
type: "POST",
url: ajax_url,
dataType: 'JSON',
data: {'dining_id' : dining_id, 'type': type, 'customer_id' : customer_id, 'booking_id' : booking_id, 'order_ids' : [], 'order_items' : '', 'orders' : JSON.stringify(orders)},
success: function (result) {
if (!result.status) {
swal("Information!", result.error_message);
@@ -252,10 +406,10 @@ function backToOrigami(){
}
}
/* Get Selected Sale Item's ID and Price */
/* Get Selected Order Items */
function get_selected_order_items(){
var order_items = [];
$('.item-row.selected-item').each(function(i){
$('.item-row.selected-split-item').each(function(i){
var order_item = {};
order_item.id = $(this).attr('id').substr(0,16);
order_item.order_id = $(this).find('#item-order-id').text().trim();
@@ -267,6 +421,17 @@ function get_selected_order_items(){
return order_items;
}
/* Get Selected Orders */
function get_selected_orders(){
var orders = [];
$('.order-row.selected-split-item').each(function(i){
var order = {};
order.id = $(this).find('a').attr('href').substr(1);
orders.push(order);
});
return orders;
}
//check for isNumber
function isNumberKey(evt) {
var charCode = (evt.which) ? evt.which : event.keyCode;