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

update oqs

Browse Source
This commit is contained in:
Aung Myo
2017-08-11 12:15:30 +06:30
parent 9eaf04778c d32fbf18e0
commit 5684d5d0c7
23 changed files with 345 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,9 +23,13 @@ $(document).ready(function(){
// setTimeout(function(){
// window.location.reload(1);
// }, 10000);
$(".nav-completed").on("click", function(){
$("#completed").removeClass('hide')
});
$(".oqs_click").on("click", function(){
$("#completed").addClass('hide')
var oqs_id = $(this).find(".oqs-id").text();
var url = 'oqs/get_items/'+oqs_id;
show_details(url);
@@ -42,7 +46,7 @@ $(document).ready(function(){
url: url,
data: {},
dataType: "json",
success: function(data) {
success: function(data) {
for(var field in data) {
var price = parseFloat(data[field].price).toFixed(2);
@@ -52,12 +56,13 @@ $(document).ready(function(){
var options = data.options;
}
var date = data[field]["created_at"];
var date = new Date(data[field]["created_at"]);
var show_date = date.getDate() + "-" + date.getMonth() + "-" + date.getFullYear() + ' ' + date.getHours()+ ':' + date.getMinutes();
row ='<div class="card queue_station">'
+'<div class="card-block">'
+'<h4 class="card-title">'
+'<span class="order-zone-type">'+data[field]["zone"]+'- </span>'
+'<span class="order-zone-type">'+data[field]["type"]+'- </span>'
+'<span class="order-zone">'+ data[field]["zone"] +'</span>'
+'<small class="pull-right">'+ data[field]["order_id"] +'- </small>'
+'</h4>'
@@ -71,7 +76,7 @@ $(document).ready(function(){
+'<p class="card-text">'
+'<small class="text-muted">Order at'
+'<span class="order-at">'+ date +'</span> - '
+'<span class="order-at">'+ show_date +'</span> - '
+'<span class="order-by">'+ data[field]["item_order_by"] +'</span> '
+'</small> '
@@ -195,10 +200,7 @@ $(document).ready(function(){
$(document).on('click', '#print_order_item', function(event){
var assigned_item_id = $('.selected-item').children('.card-block').children('.assigned-order-item').text();
var options = $('.selected-item').children('.card-block').find('.item-options').text();
var params = { 'options':options };
console.log(assigned_item_id);
console.log(options);
console.log(params);
var params = { 'options':options };
$.ajax({
type: 'GET',
url: '/oqs/print/print/'+assigned_item_id,