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

check induties process

Browse Source
This commit is contained in:
phyusin
2018-06-26 18:22:53 +06:30
parent 279b5976ae
commit 86916fb7e7
7 changed files with 39 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -487,6 +487,7 @@
<!-- <button type="button" id="discount" class="btn btn-block bg-blue waves-effect" disabled>Discount</button> -->
<!-- <button type="button" id="other-charges" class="btn btn-block bg-blue waves-effect" disabled>Charges</button> -->
<button type="button" class="btn btn-block bg-blue waves-effect" id='move'>Move</button>
<button type="button" id="in_duties" class="btn btn-block bg-blue waves-effect">In Duties</button>
<button type="button" id="request_bills" class="btn btn-block bg-blue waves-effect">Req.Bill</button>
<% if !@split_bill.nil? %>
<% if @split_bill == '1' %>
@@ -1061,8 +1062,8 @@
$('#in_duties').on('click', function () {
var dining_id = "<%= @dining.id %>";
var sale_id = "<%= @obj_sale.sale_id rescue "" %>";
window.location.href = '/origami/assign_in_duty/'+ sale_id;
var booking_id = "<%= @booking.booking_id rescue "" %>";
window.location.href = '/origami/assign_in_duty/'+ booking_id;
});
$('#void').on('click', function () {

1
app/views/origami/in_duties/_form.html.erb
View File

@@ -6,7 +6,6 @@
<%= f.error_notification %>
<%= f.hidden_field :id, :class => "form-control col-md-6 " %>
<%= f.hidden_field :booking_id, :value => @booking_id %>
<%= f.hidden_field :sale_id, :value => @sale_id %>
<div class="form-inputs form-group">
<%= f.hidden_field :dinning_id, :value => @table.id, :class => "form-control col-md-4 " %>
<label>Commissioner Name:</label>

8
app/views/origami/in_duties/index_in_duty.html.erb
View File

@@ -32,7 +32,7 @@
<td><%= in_duty.in_time.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") rescue '-' %></td>
<td><%= in_duty.out_time.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") rescue '-' %></td>
<td>
<button class="delete btn btn-danger btn-sm waves-effect" data-ref="../table/<%=in_duty.dining_facility.id%>/<%= @sale_id %>/destroy_in_duty/<%=in_duty.id%>" data-method="delete">
<button class="delete btn btn-danger btn-sm waves-effect" data-ref="../table/<%=in_duty.dining_facility.id%>/<%= @booking_id %>/destroy_in_duty/<%=in_duty.id%>" data-method="delete">
Remove
</button>
@@ -67,9 +67,9 @@
$(this).closest('tr').find('.checkbox_check').prop("checked", true);
var in_duty_id = $(this).attr('data-ref');
var table_id = "<%= @table.id %>";
var sale_id = "<%= @sale_id %>";
var url = "/origami/assign_in_duty/table/" + sale_id + "/in_duty/" + in_duty_id + "/edit";
// var table_id = "<%= @table.id %>";
// var sale_id = "<%= @sale_id %>";
var url = "/origami/assign_in_duty/" + in_duty_id + "/edit";
$.ajax({
type: "GET",

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

@@ -470,6 +470,7 @@
<!-- <button type="button" id="other-charges" class="btn bg-blue btn-block" disabled>Charges</button> -->
<button type="button" id="customer" class="btn bg-blue btn-block" >Customer</button>
<button type="button" class="btn bg-blue btn-block" id='move'>Move</button>
<button type="button" id="in_duties" class="btn btn-block bg-blue waves-effect">In Duties</button>
<button type="button" id="request_bills" class="btn bg-blue btn-block">Req.Bill</button>
<% if !@split_bill.nil? %>
<% if @split_bill == '1' %>
@@ -1171,8 +1172,9 @@ $('#add_invoice').on('click',function(){
});
$('#in_duties').on('click', function () {
var dining_id = "<%= @room.id %>"
window.location.href = '/origami/assign_in_duty/'+ dining_id;
var dining_id = "<%= @room.id %>";
var booking_id = "<%= @booking.booking_id rescue "" %>";
window.location.href = '/origami/assign_in_duty/'+ booking_id;
});
// Ordering