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

update oqs and add to extisting

Browse Source
This commit is contained in:
Aung Myo
2018-09-11 15:30:43 +06:30
parent a51f927f4c
commit 1dee84d733
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -64,7 +64,8 @@ $(document).on('turbolinks:load', function() {
for (i = 0; i < list.length; i++) { for (i = 0; i < list.length; i++) {
table_id.push(list[i].value); table_id.push(list[i].value);
} }
$('#table_id').val(table_id); console.log(table_id)
$('#table').val(table_id);
oqs_id = $("#oqs_id").val(); oqs_id = $("#oqs_id").val();
status = $("#status").val(); status = $("#status").val();
@@ -85,7 +86,7 @@ $(document).on('turbolinks:load', function() {
// oqs_id = $(this).find(".oqs-id").text(); // oqs_id = $(this).find(".oqs-id").text();
$("#oqs_active").attr('data-id',oqs_id); $("#oqs_active").attr('data-id',oqs_id);
var url = 'oqs/get_items/'+oqs_id; var url = 'oqs/get_items/'+oqs_id;
console.log(table)
show_details(url,table,status); show_details(url,table,status);
}else{ }else{
$("#completed").removeClass('hide') $("#completed").removeClass('hide')

6
app/controllers/oqs/home_controller.rb
View File

@@ -215,8 +215,8 @@ puts items.to_json
.where("assigned_order_items.delivery_status = true AND assigned_order_items.created_at between '#{Time.now.beginning_of_day.utc}' and '#{Time.now.end_of_day.utc}'") .where("assigned_order_items.delivery_status = true AND assigned_order_items.created_at between '#{Time.now.beginning_of_day.utc}' and '#{Time.now.end_of_day.utc}'")
query = query.where("df.name LIKE ? OR odt.order_id LIKE ? OR odt.item_name LIKE ? OR cus.name = '#{filter}'","%#{filter}%","%#{filter}%","%#{filter}%",) query = query.where("df.name LIKE ? OR odt.order_id LIKE ? OR odt.item_name LIKE ? OR cus.name = '#{filter}'","%#{filter}%","%#{filter}%","%#{filter}%",)
.group("assigned_order_items.order_id") .group("assigned_order_items.order_id")
.limit(20) .limit(50)
.order("assigned_order_items.created_at") .order("assigned_order_items.created_at desc")
# completed_order = AssignedOrderItem.group(:order_id).where('delivery_status=true'); # completed_order = AssignedOrderItem.group(:order_id).where('delivery_status=true');
@@ -236,7 +236,7 @@ puts items.to_json
.where("assigned_order_items.created_at between '#{Time.now.beginning_of_day.utc}' and '#{Time.now.end_of_day.utc}'") .where("assigned_order_items.created_at between '#{Time.now.beginning_of_day.utc}' and '#{Time.now.end_of_day.utc}'")
query = query.where("df.name LIKE ? OR odt.order_id LIKE ? OR odt.item_name LIKE ? OR cus.name = '#{filter}'","%#{filter}%","%#{filter}%","%#{filter}%",) query = query.where("df.name LIKE ? OR odt.order_id LIKE ? OR odt.item_name LIKE ? OR cus.name = '#{filter}'","%#{filter}%","%#{filter}%","%#{filter}%",)
.group("odt.order_items_id") .group("odt.order_items_id")
.order("assigned_order_items.created_at") .order("assigned_order_items.created_at desc")
# completed_order = AssignedOrderItem.group(:order_id).where('delivery_status=true'); # completed_order = AssignedOrderItem.group(:order_id).where('delivery_status=true');

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

@@ -1057,6 +1057,7 @@
$('#request_bills').click(function () { $('#request_bills').click(function () {
var order_id = $('#save_order_id').attr('data-order'); var order_id = $('#save_order_id').attr('data-order');
var ajax_url = "/origami/" + order_id + "/request_bills"; var ajax_url = "/origami/" + order_id + "/request_bills";
localStorage.setItem("tax_type", "all");
if(order_id!=undefined && order_id!=null && order_id!=""){ if(order_id!=undefined && order_id!=null && order_id!=""){
if($('#request_bills').is(":visible")) { if($('#request_bills').is(":visible")) {
$('#request_bills').prop("disabled",true); $('#request_bills').prop("disabled",true);
@@ -1104,6 +1105,7 @@
var sale_id = $("#sale_id").val(); //<%= @obj_sale.sale_id rescue "" %> var sale_id = $("#sale_id").val(); //<%= @obj_sale.sale_id rescue "" %>
var ajax_url = "/origami/sale/append_order"; var ajax_url = "/origami/sale/append_order";
var tax_type = localStorage.getItem("tax_type"); var tax_type = localStorage.getItem("tax_type");
console.log(tax_type)
$.ajax({ $.ajax({
type: "POST", type: "POST",
url: ajax_url, url: ajax_url,

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

@@ -1124,6 +1124,7 @@ $('#request_bills').click(function() {
if($('#request_bills').is(":visible")) { if($('#request_bills').is(":visible")) {
$('#request_bills').prop("disabled",true); $('#request_bills').prop("disabled",true);
} }
localStorage.setItem("tax_type", "all");
$.ajax({ $.ajax({
type: "GET", type: "GET",
url: ajax_url, url: ajax_url,