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

Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant

Browse Source
This commit is contained in:
Yan
2017-11-10 14:35:05 +06:30
parent 3a71b86695 8db96beca0
commit 4ad65c5480
7 changed files with 91 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/assets/javascripts/OQS.js
View File

@@ -70,26 +70,26 @@ $(document).on('turbolinks:load', function() {
row ='<div class="card queue_station animated " data-date="'+data[field]["order_id"]+'">' row ='<div class="card queue_station animated " data-date="'+data[field]["order_id"]+'">'
+'<div class="card-block">' +'<div class="card-block">'
+'<h6 class="card-">' // +'<h6 class="card-">'
+'<span class="order-zone-type">'+data[field]["table_type"]+'- </span>' +'<span class="order-zone-type font-14">'+data[field]["table_type"]+'- '+ data[field]["zone"] +' </span>'
+'<span class="order-zone">'+ data[field]["zone"] +'</span>' // +'<span class="order-zone font-14">'+ data[field]["zone"] +'</span>'
+'<small class="float-right">'+ data[field]["order_id"] +'</small>' +'<small class="float-right font-14">'+ data[field]["order_id"] +'</small>'
+'</h6>' // +'</h6>'
+'<h6>' // +'<h6>'
+'<span class="order-item">'+ data[field]["item_name"] +'- </span>' +'<span class="order-item font-16">'+ data[field]["item_name"] +'- </span>'
+'<span class="order-qty">'+ data[field]["qty"] +' </span>' +'<span class="order-qty">'+ data[field]["qty"] +' </span>'
+'</h6>' // +'</h6>'
+'<p class="card-text item-options">'+ options +'</p>' +'<p class="card-text item-options">'+ options +'</p>'
+'<p class="card-text">' +'<span class="card-text">'
+'<small class="text-muted">Order at' +'<span class="text-muted">Order at'
+'<span class="order-at">'+ show_date +'</span> - ' +'<span class="order-at">'+ show_date +'</span> - '
+'<span class="order-by">'+ data[field]["item_order_by"] +'</span> ' +'<span class="order-by">'+ data[field]["item_order_by"] +'</span> '
+'</small> ' +'</span> '
+'</p>' +'</span>'
+'<p class="hidden order-customer">'+ data[field]["customer_name"] +'</p> ' +'<p class="hidden order-customer">'+ data[field]["customer_name"] +'</p> '
+'<p class="hidden assigned-order-item">'+ data[field]["assigned_order_item_id"] +'</p> ' +'<p class="hidden assigned-order-item">'+ data[field]["assigned_order_item_id"] +'</p> '

24
app/assets/javascripts/channels/order_queue_station.js
View File

@@ -37,26 +37,26 @@ App.order_queue_station = App.cable.subscriptions.create('OrderQueueStationChann
row ='<div class="card queue_station animated shake queue_station_box" data-date="'+items[field]["order_id"]+'">' row ='<div class="card queue_station animated shake queue_station_box" data-date="'+items[field]["order_id"]+'">'
+'<strong class="hidden">'+items[field]["order_id"]+'</strong>' +'<strong class="hidden">'+items[field]["order_id"]+'</strong>'
+'<div class="card-block">' +'<div class="card-block">'
+'<h4 class="card-title">' // +'<h4 class="card-title">'
+'<span class="order-zone-type">'+items[field]["table_type"]+'- </span>' +'<span class="order-zone-type font-14">'+items[field]["table_type"]+'- </span>'
+'<span class="order-zone">'+ items[field]["zone"] +'</span>' +'<span class="order-zone font-14">'+ items[field]["zone"] +'</span>'
+'<small class="pull-right">'+ items[field]["order_id"] +'- </small>' +'<small class="pull-right font-14">'+ items[field]["order_id"] +'- </small>'
+'</h4>' // +'</h4>'
+'<h4>' // +'<h4>'
+'<span class="order-item">'+ items[field]["item_name"] +'- </span>' +'<span class="order-item font-16">'+ items[field]["item_name"] +'- </span>'
+'<span class="order-qty">'+ items[field]["qty"] +'- </span>' +'<span class="order-qty">'+ items[field]["qty"] +'- </span>'
+'</h4>' // +'</h4>'
+'<p class="card-text item-options">'+ options +'</p>' +'<p class="card-text item-options">'+ options +'</p>'
+'<p class="card-text">' +'<span class="card-text">'
+'<small class="text-muted">Order at' +'<span class="text-muted">Order at'
+'<span class="order-at">'+ show_date +'</span> - ' +'<span class="order-at">'+ show_date +'</span> - '
+'<span class="order-by">'+ items[field]["item_order_by"] +'</span> ' +'<span class="order-by">'+ items[field]["item_order_by"] +'</span> '
+'</small> ' +'</span> '
+'</p>' +'</span>'
+'<p class="hidden order-customer">'+ items[field]["customer_name"] +'</p> ' +'<p class="hidden order-customer">'+ items[field]["customer_name"] +'</p> '
+'<p class="hidden assigned-order-item">'+ items[field]["assigned_order_item_id"] +'</p> ' +'<p class="hidden assigned-order-item">'+ items[field]["assigned_order_item_id"] +'</p> '

5
app/assets/stylesheets/OQS.scss
View File

@@ -22,10 +22,5 @@
background-color: blue; background-color: blue;
} }
.order-item {
width: 49%;
font-size: 18px;
margin: 0px 0px 5px 0px;
}

1
app/models/dining_facility.rb
View File

@@ -33,7 +33,6 @@ class DiningFacility < ApplicationRecord
def get_current_booking def get_current_booking
booking = Booking.where("dining_facility_id = #{self.id} and booking_status ='assign' and checkin_at between '#{DateTime.now.utc - 5.hours}' and '#{DateTime.now.utc}' and checkout_at is null").limit(1) booking = Booking.where("dining_facility_id = #{self.id} and booking_status ='assign' and checkin_at between '#{DateTime.now.utc - 5.hours}' and '#{DateTime.now.utc}' and checkout_at is null").limit(1)
if booking.count > 0 then if booking.count > 0 then
return booking[0] return booking[0]
else else

28
app/views/oqs/home/index.html.erb
View File

@@ -73,7 +73,7 @@
<!-- Nav tabs - End --> <!-- Nav tabs - End -->
<p class="hidden filter"><%= @filter %></p> <p class="hidden filter"><%= @filter %></p>
<div class="tab-content" id="custom-slimscroll" style="max-height:; overflow:"> <div class="tab-content" id="custom-slimscroll" style="">
<!--- Panel 0 - Completed --> <!--- Panel 0 - Completed -->
<div class="tab-pane in active" id="completed" role="tabpanel"> <div class="tab-pane in active" id="completed" role="tabpanel">
@@ -83,31 +83,31 @@
%> %>
<div class="card queue_station"> <div class="card queue_station">
<div class="card-block"> <div class="card-block">
<h5 class="card-"> <!-- <h5 class="card-"> -->
<span class="order-zone-type"><%= qid.type %> - </span> <span class="order-zone-type font-14"><%= qid.type %> - </span>
<span class="order-zone"><%= qid.zone %></span> <span class="order-zone font-14"><%= qid.zone %></span>
<small class="pull-right"><%= qid.order_id %></small> <small class="pull-right font-14"><%= qid.order_id %></small>
</h5> <!-- </h5> -->
<h5> <!-- <h5> -->
<span class="order-item"> <span class="order-item font-16">
<%= qid.item_name %> <%= qid.item_name %>
</span> [x </span> [x
<span class="order-qty"> <span class="order-qty">
<%= qid.qty %> <%= qid.qty %>
</span> ] </span> ]
</h5> <!-- </h5> -->
<p class="card-text item-options"><%= qid.options == "[]"? "" : qid.options %></p> <p class="card-text item-options"><%= qid.options == "[]"? "" : qid.options %></p>
<p class="card-text"> <p class="card-text">
<small class="text-muted">Order at <span class="text-muted">Order at
<span class="order-at"> <span class="order-at">
<%= qid.created_at.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") %> <%= qid.created_at.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") %>
</span> - </span> -
<span class="order-by"> <span class="order-by">
<%= qid.item_order_by %> <%= qid.item_order_by %>
</span> </span>
</small> </span>
</p> </p>
<p class="hidden order-status">completed</p> <p class="hidden order-status">completed</p>
<p class="hidden order-customer"><%= qid.customer_name %></p> <p class="hidden order-customer"><%= qid.customer_name %></p>
@@ -140,9 +140,9 @@
<table class="table"> <table class="table">
<thead> <thead>
<tr> <tr>
<th style="width:33%; text-align:left">Order By</th> <th style="width:; text-align:left">Order By</th>
<th style="width:33%; text-align:right">Order At</td> <th style="width:; text-align:right">Order At</td>
<th style="width:33%; text-align:right">Customer</td> <th style="width:; text-align:right">Customer</td>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>

3
app/views/origami/home/index.html.erb
View File

@@ -43,6 +43,7 @@
<% if table.get_booking.nil? %> <% if table.get_booking.nil? %>
<div class="card tables red text-white" data-id="<%= table.id %>"> <div class="card tables red text-white" data-id="<%= table.id %>">
<div class="card-block"> <div class="card-block">
<%= table.get_booking %>
Zone <%= table.zone_id %> <br> Zone <%= table.zone_id %> <br>
Table <%= table.name %> ( <%= table.seater %> Seat ) Table <%= table.name %> ( <%= table.seater %> Seat )
</div> </div>
@@ -50,6 +51,7 @@
<% else %> <% else %>
<div class="card tables blue text-white" data-id="<%= table.id %>"> <div class="card tables blue text-white" data-id="<%= table.id %>">
<div class="card-block"> <div class="card-block">
<%= table.get_booking %>
Zone <%= table.zone_id %> <br> Zone <%= table.zone_id %> <br>
Table <%= table.name %> ( <%= table.seater %> Seat ) Table <%= table.name %> ( <%= table.seater %> Seat )
</div> </div>
@@ -58,6 +60,7 @@
<% else %> <% else %>
<div class="card tables green text-white table_<%= table.id %>" data-id="<%= table.id %>"> <div class="card tables green text-white table_<%= table.id %>" data-id="<%= table.id %>">
<div class="card-block"> <div class="card-block">
<%= table.get_booking %>
Zone <%= table.zone_id %> <br> Zone <%= table.zone_id %> <br>
Table <%= table.name %> ( <%= table.seater %> Seat ) Table <%= table.name %> ( <%= table.seater %> Seat )
</div> </div>

107
app/views/settings/promotions/_form.html.erb
View File

@@ -85,7 +85,7 @@
<div class="col-md-3"> <div class="col-md-3">
<label class="control-label"><abbr title="required">*</abbr> Promotion Day</label> <label class="control-label"><abbr title="required">*</abbr> Promotion Day</label>
</div> </div>
<%= f.hidden_field :promo_day, :class => "form-control" %> <%= f.hidden_field :promo_day, :class => "form-control", :id => "promotion_promo_day" %>
<div class="col-md-9"> <div class="col-md-9">
<label><input class="selectDay" type="checkbox" name="Sunday" value="0" id="0"> Sun</label> &nbsp;&nbsp; <label><input class="selectDay" type="checkbox" name="Sunday" value="0" id="0"> Sun</label> &nbsp;&nbsp;
<label><input class="selectDay" type="checkbox" name="Monday" value="1" id="1">Mon</label> &nbsp;&nbsp; <label><input class="selectDay" type="checkbox" name="Monday" value="1" id="1">Mon</label> &nbsp;&nbsp;
@@ -97,15 +97,9 @@
</div> </div>
</div> </div>
<!-- <div class="row"> <!-- <%= f.input :promo_type, collection: %w{Quantity Net_off Net_price Percentage},:input_html=>{:class => 'col-md-5 form-control select'} ,:label => "Promotion Type", :include_blank => 'Choose Promotion Type', :selected => '' %> -->
<div class="col-md-5 form-group"> <%= f.input :promo_type,input_html: { :class => 'form-control col-md-5 form-control select' },
<select name="promotion[promo_type]" class="form-control"> collection: %w{Quantity Net_off Net_price Percentage},:label => "Promotion Type" %>
<option>Choose Promotion Type</option>
<option>Net_off</option>
<option>Net_price</option>
<option>Percentage</option>
</select> -->
<%= f.input :promo_type, collection: %w{Quantity Net_off Net_price Percentage},:input_html=>{:class => 'col-md-5 form-control select'} ,:label => "Promotion Type", :include_blank => 'Choose Promotion Type', :selected => '' %>
<!-- </div> <!-- </div>
</div> </div>
--> -->
@@ -147,7 +141,7 @@
<% end %> <% end %>
<div class="col-md-3 form-group"><%= f.input :original_product,collection: sample %></div> <div class="col-md-3 form-group"><%= f.input :original_product,collection: sample %></div>
<!-- <div class="col-md-6"><%= f.input :original_product,collection: MenuItemInstance.order("item_instance_name desc").pluck(:item_instance_name,:item_instance_code),input_html: { selected: 2 } %></div> --> <!-- <div class="col-md-6"><%= f.input :original_product,collection: MenuItemInstance.order("item_instance_name desc").pluck(:item_instance_name,:item_instance_code),input_html: { selected: 2 } %></div> -->
<div class="col-md-6 form-group"><%= f.input :min_qty %></div> <div class="col-md-6 form-group"><%= f.input :min_qty ,label: "Qualified Qty" %></div>
</div> </div>
<br> <br>
<div class="card"> <div class="card">
@@ -155,10 +149,10 @@
<div class="row"> <div class="row">
<div class="col-md-3" style="text-align:">Item Code</div> <div class="col-md-3" style="text-align:">Item Code</div>
<div class="col-md-2" style="text-align:">Item Instance</div> <div class="col-md-2" style="text-align:">Item Instance</div>
<div class="col-md-1" style="text-align:">Min Qty</div> <div class="col-md-2" style="text-align:">Qualified Qty</div>
<div class="col-md-1" style="text-align:">Net off</div> <div class="col-md-1" style="text-align:">Net off</div>
<div class="col-md-2" style="text-align:">Net Price</div> <div class="col-md-2" style="text-align:">Net Price</div>
<div class="col-md-2" style="text-align:">Percentage</div> <div class="col-md-1" style="text-align:">Percentage</div>
<div class="col-md-1" style="text-align:"></div> <div class="col-md-1" style="text-align:"></div>
</div> </div>
<div class="row"></div > <div class="row"></div >
@@ -183,10 +177,10 @@
<%= pro.input :item_code, :class => 'promoproduct', collection:[],input_html: { selected: 2 }, label: false %> <%= pro.input :item_code, :class => 'promoproduct', collection:[],input_html: { selected: 2 }, label: false %>
</div> </div>
<div class="col-md-1"><%= pro.input :min_qty , label: false%></div> <div class="col-md-2"><%= pro.input :min_qty , label: false%></div>
<div class="col-md-1"><%= pro.input :net_off , label: false %></div> <div class="col-md-1"><%= pro.input :net_off , label: false %></div>
<div class="col-md-2"><%= pro.input :net_price , label: false %></div> <div class="col-md-2"><%= pro.input :net_price , label: false %></div>
<div class="col-md-2"><%= pro.input :percentage , label: false %></div> <div class="col-md-1"><%= pro.input :percentage , label: false %></div>
<div class="col-md-1" style=""><%= pro.link_to_remove "X" ,:class=>"btn-primary btn m-r-25"%></div> <div class="col-md-1" style=""><%= pro.link_to_remove "X" ,:class=>"btn-primary btn m-r-25"%></div>
</div> </div>
<% end %> <% end %>
@@ -250,58 +244,56 @@
$(document).ready(function(){ $(document).ready(function(){
// $('#promotion_promo_start_date').datetimepicker({
// timepicker:false,
// format:'Y-m-d'
// });
// $('#promotion_promo_end_date').datetimepicker({
// timepicker:false,
// format:'Y-m-d'
// });
// $('#promotion_promo_start_hour').datetimepicker({
// datepicker:false,
// format:'H:m'
// });
// $('#promotion_promo_end_hour').datetimepicker({
// datepicker:false,
// format:'H:m'
// });
// $('#promotion_promo_start_hour').on('change', function(event) { $('#promotion_promo_start_hour').on('change', function(event) {
// $('#promotion_promo_start_hour').val($('#promotion_promo_start_hour').val().split(":")[0]+":00"); $('#promotion_promo_start_hour').val($('#promotion_promo_start_hour').val().split(":")[0]+":00");
// }); });
// $('#promotion_promo_end_hour').on('change', function(event) { $('#promotion_promo_end_hour').on('change', function(event) {
// $('#promotion_promo_end_hour').val($('#promotion_promo_end_hour').val().split(":")[0]+":00"); $('#promotion_promo_end_hour').val($('#promotion_promo_end_hour').val().split(":")[0]+":00");
// }); });
// $('.datepicker').bootstrapMaterialDatePicker({ $('.datepicker').bootstrapMaterialDatePicker({
// format: 'dddd DD MM YYYY', format: 'dddd DD MM YYYY',
// clearButton: true, clearButton: true,
// weekStart: 1, weekStart: 1,
// time: false time: false
// }); });
// $('.timepicker').bootstrapMaterialDatePicker({ $('.timepicker').bootstrapMaterialDatePicker({
// format: 'HH:mm', format: 'HH:mm',
// clearButton: true, clearButton: true,
// date: false date: false
// }); });
// var dayy = $("#promotion_promo_day").val().replace("[","").replace("]",""); var dayy = $("#promotion_promo_day").val().replace("[","").replace("]","");
// jQuery.each( dayy.split(","), function( i, d ) { jQuery.each( dayy.split(","), function( i, d ) {
// $("input.selectDay[value='"+d+"']").prop( "checked", true ); $("input.selectDay[value='"+d+"']").prop( "checked", true );
// }); });
var form = document.getElementById("new_promotion"); /*var form = document.getElementById("new_promotion");
var inputs = $("input"); var inputs = $("input");
var arr = []; var arr = [];
var count = 0; var count = 0;
var day = "["; var day = "[";*/
$(".selectDay").click(function() { $(".selectDay").click(function() {
// debugger; // debugger;
day = "["; var item_row = $('.selectDay');
console.log(item_row);
check = $(item_row).prop("checked");
var attribute_arr = [];
$(item_row).each(function(i){
if ($(item_row[i]).prop("checked")) {
value = $(item_row[i]).val();
str = value;
attribute_arr.push(str);
}
});
/*day = "[";
for (var j = 8; j <=15; j += 1){ for (var j = 8; j <=15; j += 1){
if (inputs[j].type === "checkbox" && inputs[j].checked) if (inputs[j].type === "checkbox" && inputs[j].checked)
{ {
@@ -316,9 +308,10 @@ $(".selectDay").click(function() {
{ {
day = day + "]"; day = day + "]";
} }
} }*/
document.getElementById("promotion_promo_day").value = ''; document.getElementById("promotion_promo_day").value = '';
document.getElementById("promotion_promo_day").value = day; document.getElementById("promotion_promo_day").value = "["+attribute_arr+"]";
}); });
// $("#promotion_original_product").select2(); // $("#promotion_original_product").select2();