add popper.js.map and remove .idea

This commit is contained in:
Yan
2017-11-21 16:30:56 +06:30
parent 861e554d63
commit ad66a6570b
19 changed files with 17 additions and 1479 deletions

View File

@@ -100,16 +100,13 @@ $(document).on('turbolinks:load', function() {
+'</div>'
+'</div>';
$('.oqs_append').append(row);
}
}
}
});
//end Ajax
}
}
$(document).on('click', '.queue_station', function(event){
var orderZone=$(this).children().children().children('.order-zone').text().trim();
@@ -156,7 +153,7 @@ $(document).on('turbolinks:load', function() {
$(this).addClass('selected-item');
});
$(document).on('click', '.order-item-edit', function(event){
$(document).on('click', '.order-item-edit', function(event){
var _self = $(this); // To know in ajax return
var assigned_item_id=$(this).attr('id').substr(5);
window.location.href = '/oqs/'+ assigned_item_id + "/edit"

File diff suppressed because one or more lines are too long

View File

@@ -16,7 +16,7 @@ class Oqs::PrintController < ApplicationController
# print when complete click
print_settings = PrintSetting.find_by_unique_code(unique_code)
order_queue_printer = Printer::OrderQueuePrinter.new(print_settings)
order_queue_printer.print_order_item(print_settings,oqs, assigned_item.order_id, assigned_item.item_code, print_status, options )
order_queue_printer.print_order_item(print_settings,oqs, assigned_item.order_id, assigned_item.instance_code, print_status, options )
# update print status for completed same order items
assigned_items.each do |ai|

View File

@@ -78,7 +78,7 @@ class License
has_license = true #verify_license()
if has_license
puts "VERIFIED"
# puts "VERIFIED"
end
# if cache_license.nil?

View File

@@ -39,7 +39,7 @@ class MenuItem < ApplicationRecord
menu_item_hash[:item_code] = menu_item.item_code
menu_item_hash[:item_instance_code] = mt_instance.item_instance_code
menu_item_hash[:name] = menu_item.name.to_s + " - " + mt_instance.item_instance_name.to_s
menu_item_hash[:alt_name] = menu_item.alt_name.to_s + " - " + mt_instance.item_instance_name.to_s
menu_item_hash[:alt_name] = menu_item.alt_name.to_s # + " - " + mt_instance.item_instance_name.to_s
menu_item_hash[:price] = mt_instance.price
menu_item_hash[:promotion_price] = mt_instance.promotion_price
menu_item_hash[:is_on_promotion] = mt_instance.is_on_promotion

View File

@@ -123,7 +123,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
left join dining_facilities AS df ON df.id = b.dining_facility_id
left join customers as cus ON cus.customer_id = orders.customer_id
left join menu_items as item ON item.item_code = order_items.item_code")
.where("order_items.item_code = '#{ id }' AND order_items.price != 0")
.where("order_items.item_instance_code = '#{ id }' AND order_items.price != 0")
.group("order_items.item_code")
elsif type == "order_summary"
OrderItem.select("order_items.order_id, order_items.item_code, order_items.item_name, order_items.qty, order_items.price, order_items.options, order_items.item_order_by as order_by, order_items.created_at as order_at, cus.name as customer, df.type, df.name as dining,item.alt_name as alt_name")

View File

@@ -2,7 +2,7 @@ class MenuItemImageUploader < CarrierWave::Uploader::Base
# Include RMagick or MiniMagick support:
# include CarrierWave::RMagick
# include CarrierWave::MiniMagick
include CarrierWave::MiniMagick
# Choose what kind of storage to use for this uploader:
storage :file
@@ -33,6 +33,8 @@ class MenuItemImageUploader < CarrierWave::Uploader::Base
# Process files as they are uploaded:
# process scale: [200, 300]
process :resize_to_fit => [200, 150]
#
# def scale(width, height)
# # do something

View File

@@ -2,7 +2,7 @@ class ProductImageUploader < CarrierWave::Uploader::Base
# Include RMagick or MiniMagick support:
# include CarrierWave::RMagick
# include CarrierWave::MiniMagick
include CarrierWave::MiniMagick
# Choose what kind of storage to use for this uploader:
storage :file
@@ -33,6 +33,7 @@ class ProductImageUploader < CarrierWave::Uploader::Base
# Process files as they are uploaded:
# process scale: [200, 300]
process :resize_to_fit => [200, 150]
#
# def scale(width, height)
# # do something