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

remove conflict

Browse Source
This commit is contained in:
phyusin
2018-07-09 09:44:36 +06:30
parent 794c4e9ed2 146f727f46
commit a60f80a874
35 changed files with 257 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -42,7 +42,7 @@ pickle-email-*.html
/config/initializers/* /config/initializers/*
config/deploy/config/* config/deploy/config/*
config/puma.rb config/puma.rb
#config/shops.json config/shops.json
!/log/.keep !/log/.keep
!/tmp/.keep !/tmp/.keep
.ruby-version .ruby-version

2
README.md
View File

@@ -241,6 +241,8 @@ Menu Image (Import guideline)
=> Second, import [menu].xlsx file in /settings/menus and then checked image is uploaded into Application/[sxrestaurant]/public/image/menu_images and insert into menu_items table in database. => Second, import [menu].xlsx file in /settings/menus and then checked image is uploaded into Application/[sxrestaurant]/public/image/menu_images and insert into menu_items table in database.
=> Last, if shop has shop_code, update marked/noted shop_code into shops table again. => Last, if shop has shop_code, update marked/noted shop_code into shops table again.
For Edit Order Open & Close
1) settings/lookups => {type:edit_order, name:EditOrderOrigami, value: {1 or 0}}
* ToDo list * ToDo list

11
app/assets/javascripts/addorder.js
View File

@@ -1,6 +1,7 @@
$(function() { $(function() {
var role = $('#role').val(); var role = $('#role').val();
var second_display_lookup = $("#display_type");
console.log(second_display_lookup)
type = window.location.href.indexOf("quick_service"); type = window.location.href.indexOf("quick_service");
modify_order = window.location.href.indexOf("modify_order"); modify_order = window.location.href.indexOf("modify_order");
@@ -428,7 +429,7 @@ $(function() {
var items = $('.selected-set'); var items = $('.selected-set');
if (items.length >= min_qty) { if (items.length >= min_qty) {
if ($('#server_mode').val() != "cloud") { if ($('#server_mode').val() != "cloud" && second_display_lookup == 2) {
item = get_set_item(items); item = get_set_item(items);
customer_display_view(item,"set_add"); customer_display_view(item,"set_add");
} }
@@ -756,7 +757,7 @@ $(function() {
$('.add_to_order').attr('data-options',JSON.stringify(option_arr)); $('.add_to_order').attr('data-options',JSON.stringify(option_arr));
$('.add_to_order').attr('data-opt',JSON.stringify(option_arr)); $('.add_to_order').attr('data-opt',JSON.stringify(option_arr));
var item_data = $(this); var item_data = $(this);
if ($('#server_mode').val() != "cloud") { if ($('#server_mode').val() != "cloud" && second_display_lookup == 2) {
item = get_item(item_data,"add_to_order"); item = get_item(item_data,"add_to_order");
customer_display_view(item,"add"); customer_display_view(item,"add");
} }
@@ -768,7 +769,7 @@ $(function() {
// click plus icon for add // click plus icon for add
$(document).on('click', '.add_icon', function(event){ $(document).on('click', '.add_icon', function(event){
var item_data = $(this); var item_data = $(this);
if ($('#server_mode').val() != "cloud") { if ($('#server_mode').val() != "cloud" && second_display_lookup == 2) {
item = get_item(item_data,"add_icon"); item = get_item(item_data,"add_icon");
customer_display_view(item,"add"); customer_display_view(item,"add");
} }
@@ -895,7 +896,7 @@ $(function() {
window.location.href = "/origami/room/" + table_id window.location.href = "/origami/room/" + table_id
} }
} }
if ($('#server_mode').val() != "cloud") { if ($('#server_mode').val() != "cloud" && second_display_lookup == 2){
customer_display_view(null,"reload"); customer_display_view(null,"reload");
} }
} }

7
app/controllers/origami/addorders_controller.rb
View File

@@ -18,7 +18,12 @@ class Origami::AddordersController < BaseOrigamiController
if check_mobile if check_mobile
@webview = true @webview = true
end end
display_type = Lookup.find_by_lookup_type("display_type")
if !display_type.nil? && display_type.value==2
@display_type = display_type.value
else
@display_type = nil
end
# if params[:menu] == "true" # if params[:menu] == "true"
@menus = [] @menus = []
@menu = [] @menu = []

13
app/controllers/origami/home_controller.rb
View File

@@ -111,6 +111,19 @@ class Origami::HomeController < BaseOrigamiController
if !lookup_spit_bill[0].nil? if !lookup_spit_bill[0].nil?
@split_bill = lookup_spit_bill[0][1] @split_bill = lookup_spit_bill[0][1]
end end
#for edit order open & close
@edit_order_origami = true
lookup_edit_order = Lookup.collection_of('edit_order')
if !lookup_edit_order.empty?
lookup_edit_order.each do |edit_order|
if edit_order[0].downcase == "editorderorigami"
if edit_order[1] == '0' && (current_login_employee.role == 'cashier' || current_login_employee.role == 'waiter')
@edit_order_origami = false
end
end
end
end
end end
def check_emp_access_code def check_emp_access_code

13
app/controllers/origami/rooms_controller.rb
View File

@@ -137,6 +137,19 @@ class Origami::RoomsController < BaseOrigamiController
if !lookup_spit_bill[0].nil? if !lookup_spit_bill[0].nil?
@split_bill = lookup_spit_bill[0][1] @split_bill = lookup_spit_bill[0][1]
end end
#for edit order open & close
@edit_order_origami = true
lookup_edit_order = Lookup.collection_of('edit_order')
if !lookup_edit_order.empty?
lookup_edit_order.each do |edit_order|
if edit_order[0].downcase == "editorderorigami"
if edit_order[1] == '0' && (current_login_employee.role == 'cashier' || current_login_employee.role == 'waiter')
@edit_order_origami = false
end
end
end
end
end end
end end

31
app/controllers/origami/second_display_controller.rb
View File

@@ -8,24 +8,27 @@ class Origami::SecondDisplayController < BaseOrigamiController
end end
def customer_view def customer_view
if params[:status]!= "billed" display_type = Lookup.find_by_lookup_type("display_type")
tax_profiles = TaxProfile.all.order("order_by asc") if !display_type.nil? && display_type.value==2
else if params[:status]!= "billed"
tax_profiles = nil tax_profiles = TaxProfile.all.order("order_by asc")
end else
if ENV["SERVER_MODE"] == 'cloud' tax_profiles = nil
from = request.subdomain + "." + request.domain end
else if ENV["SERVER_MODE"] == 'cloud'
from = "" from = request.subdomain + "." + request.domain
else
from = ""
end
ActionCable.server.broadcast "second_display_view_channel",data: params[:data],tax_profiles: tax_profiles,status:params[:status],from:from
end end
ActionCable.server.broadcast "second_display_view_channel",data: params[:data],tax_profiles: tax_profiles,status:params[:status],from:from
# end # end
end end
#Shop Name in Navbor #Shop Name in Navbor
helper_method :shop_detail # helper_method :shop_detail
def shop_detail # def shop_detail
@shop = Shop.first # @shop = Shop.first
end # end
end end

2
app/models/assigned_order_item.rb
View File

@@ -8,7 +8,6 @@ class AssignedOrderItem < ApplicationRecord
belongs_to :order_queue_station belongs_to :order_queue_station
def self.assigned_order_item (order, item_code, instance_code, order_queue_station ) def self.assigned_order_item (order, item_code, instance_code, order_queue_station )
AssignedOrderItem.transaction do
assigned_order_item = AssignedOrderItem.new() assigned_order_item = AssignedOrderItem.new()
assigned_order_item.order = order assigned_order_item.order = order
assigned_order_item.item_code = item_code assigned_order_item.item_code = item_code
@@ -17,7 +16,6 @@ class AssignedOrderItem < ApplicationRecord
assigned_order_item.print_status = false assigned_order_item.print_status = false
assigned_order_item.delivery_status = false assigned_order_item.delivery_status = false
assigned_order_item.save! assigned_order_item.save!
end
end end
def self.assigned_order_item_by_job(order_id) def self.assigned_order_item_by_job(order_id)

4
app/models/order_queue_station.rb
View File

@@ -207,7 +207,7 @@ class OrderQueueStation < ApplicationRecord
private private
#Print order_items in 1 slip #Print order_items in 1 slip
def print_slip(oqs, order, order_items) def print_slip(oqs, order, order_items)
printer = PrintSetting.all printer = PrintSetting.all.order("id ASC")
unique_code="OrderSummaryPdf" unique_code="OrderSummaryPdf"
if !printer.empty? if !printer.empty?
@@ -245,7 +245,7 @@ class OrderQueueStation < ApplicationRecord
#Print order_item in 1 slip per item #Print order_item in 1 slip per item
def print_slip_item(oqs, order, assigned_items) def print_slip_item(oqs, order, assigned_items)
printer = PrintSetting.all printer = PrintSetting.all.order("id ASC")
unique_code="OrderItemPdf" unique_code="OrderItemPdf"
if !printer.empty? if !printer.empty?

4
app/models/printer/order_queue_printer.rb
View File

@@ -70,7 +70,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
print_settings.save! print_settings.save!
end end
print_setting = PrintSetting.all print_setting = PrintSetting.all.order("id ASC")
order=print_query('order_summary', order_id) order=print_query('order_summary', order_id)
# For Print Per Item # For Print Per Item
if oqs.cut_per_item if oqs.cut_per_item
@@ -170,7 +170,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
print_settings.save! print_settings.save!
end end
print_setting = PrintSetting.all print_setting = PrintSetting.all.order("id ASC")
order=print_query('booking_summary', booking_id) order=print_query('booking_summary', booking_id)
# For Print Per Item # For Print Per Item

2
app/models/sale_order.rb
View File

@@ -8,12 +8,10 @@ class SaleOrder < ApplicationRecord
belongs_to :order belongs_to :order
def create_sale_order(sale, order) def create_sale_order(sale, order)
SaleOrder.transaction do
sale_order = SaleOrder.new sale_order = SaleOrder.new
sale_order.sale_id = sale sale_order.sale_id = sale
sale_order.order_id = order sale_order.order_id = order
sale_order.save! sale_order.save!
end
end end
private private

1
app/views/origami/addorders/detail.html.erb
View File

@@ -11,6 +11,7 @@
</div> </div>
<input type="hidden" name="type" id="role" value="<%= current_user.role%>"> <input type="hidden" name="type" id="role" value="<%= current_user.role%>">
<input type="hidden" name="cashier_type" id="cashier_type" value="<%= type%>"> <input type="hidden" name="cashier_type" id="cashier_type" value="<%= type%>">
<input type="hidden" name="display_type" id="display_type" value="<%= @display_type%>">
<div class="row m-t--20"> <div class="row m-t--20">
<div class="col-lg-2 col-md-2 col-sm-2 hidden" id="menu_data"> <div class="col-lg-2 col-md-2 col-sm-2 hidden" id="menu_data">
<li class="list-menu"> <li class="list-menu">

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

@@ -289,7 +289,6 @@
<table class="table table-striped" id="order-items-table"> <table class="table table-striped" id="order-items-table">
<thead> <thead>
<tr> <tr>
<th>#</th> <th>#</th>
<th class="item-name">Items</th> <th class="item-name">Items</th>
<th class="item-attr">QTY <th class="item-attr">QTY
@@ -299,6 +298,48 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<% if @status_order == 'order' && @status_sale != 'sale'
puts
unless @order_items.nil? || @order_items.empty?
count = 0
@order_items.each do |order_item|
set_item_prices = 0
count += 1
sub_total = sub_total + (order_item.price * order_item.qty)
# unless order_item.price == 0 %>
<tr class="<%= @edit_order_origami==true ? 'edit_order' : '' %>" data-id='<%= order_item.order_items_id %>'>
<td><%= count %></td>
<td class='item-name'>
<%= order_item.item_name %>
<% if !order_item.options.nil? && !order_item.options.empty? && order_item.options != "undefined" %>
<% JSON.parse(order_item.options).each do |option| %>
<br><span class="font-13">
<%= option %>
</span>
<% end %>
<% end %>
<% if !order_item.set_menu_items.nil? && order_item.set_menu_items != '[]'
JSON.parse(order_item.set_menu_items).each do |item_instance|
set_item_prices += (item_instance["quantity"].to_f * item_instance["price"].to_f).to_f %>
<br><span class="font-13">
<%= item_instance["item_instance_name"] %>
<% if !item_instance["options"].nil? && !item_instance["options"].empty? %>
<% (item_instance["options"]).each do |set_item_option| %>
<br><span class="font-13">
<%= set_item_option %>
</span>
<% end %>
<% end %>
</span>
<% end
sub_total += set_item_prices
end %>
</td>
<td class='item-attr'><%= order_item.qty %></td>
<td class='item-attr'><%= (order_item.qty*order_item.price).to_f + set_item_prices %></td>
</tr>
<% <%
count = 0 count = 0
sub_total = 0 sub_total = 0
@@ -340,6 +381,15 @@
<%= order_item.item_name %> <%= order_item.item_name %>
<% if !order_item.options.nil? && !order_item.options.empty? && order_item.options != "undefined" %> <% if !order_item.options.nil? && !order_item.options.empty? && order_item.options != "undefined" %>
<% JSON.parse(order_item.options).each do |option| %> <% JSON.parse(order_item.options).each do |option| %>
=======
%>
<tr class="<%= @edit_order_origami==true ? 'edit_order' : '' %>" data-id='<%= order_item.order_items_id %>'>
<td><%= count %>
<td class='item-name'>
<%= order_item.item_name %>
<% if !order_item.options.nil? && !order_item.options.empty? && order_item.options != "undefined" %>
<% JSON.parse(order_item.options).each do |option| %>
>>>>>>> 146f727f462174b1daa31972b597448c12e26d8c
<br><span class="font-13"> <br><span class="font-13">
<%= option %> <%= option %>
</span> </span>
@@ -747,7 +797,7 @@
<script> <script>
var cashier_type = "cashier"; var cashier_type = "cashier";
$(document).ready(function () { $(document).ready(function () {
localStorage.removeItem("tax_type"); // localStorage.removeItem("tax_type");
/* check webview loaded*/ /* check webview loaded*/
var webview = <%= @webview %>; var webview = <%= @webview %>;
showHideNavbar(webview); showHideNavbar(webview);
@@ -942,33 +992,68 @@
$( "#loading_wrapper").show(); $( "#loading_wrapper").show();
var sale_id = $('#sale_id').val(); var sale_id = $('#sale_id').val();
// type = $('.payment_method').val(); // type = $('.payment_method').val();
type = get_selected_attributes('selected-payment'); type = get_selected_attributes('selected-payment');
if(parseInt(jQuery.inArray("Credit", type)) == -1){ var tax_type = localStorage.getItem("tax_type") ? localStorage.getItem("tax_type") : 'all';
if (parseInt(jQuery.inArray("MPU", type)) != -1 || parseInt(jQuery.inArray("VISA", type)) != -1 || parseInt(jQuery.inArray("JCB", type)) != -1 || parseInt(jQuery.inArray("Master", type)) != -1 || parseInt(jQuery.inArray("UNIONPAY", type)) != -1 || parseInt(jQuery.inArray("Redeem", type)) != -1 || parseInt(jQuery.inArray("PAYMAL",type))!= -1) {
calculate_member_discount(sale_id,"Card");
}else{ if(parseInt(jQuery.inArray("Credit", type)) == -1){
calculate_member_discount(sale_id,"Cash"); if (parseInt(jQuery.inArray("MPU", type)) != -1 || parseInt(jQuery.inArray("VISA", type)) != -1 || parseInt(jQuery.inArray("JCB", type)) != -1 || parseInt(jQuery.inArray("Master", type)) != -1 || parseInt(jQuery.inArray("UNIONPAY", type)) != -1 || parseInt(jQuery.inArray("Redeem", type)) != -1 || parseInt(jQuery.inArray("PAYMAL",type))!= -1) {
} calculate_member_discount(sale_id,"Card",tax_type);
}else{
calculate_member_discount(sale_id,"Cash",tax_type);
} }
var ajax_url = "/origami/sale/" + sale_id + "/first_bill"; }
});
function calculate_member_discount(sale_id,type,tax_type) {
var sub_total = $('#sub-total').text();
if (type == "Cash") {
is_card = false
}else{
is_card = true
}
$.ajax({ $.ajax({
type: "GET", type: "POST",
url: ajax_url, url: "/origami/" + sale_id + "/member_discount",
success: function (result) { data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':is_card,'cashier_type':'cashier','tax_type':tax_type },
$( "#loading_wrapper" ).hide(); async: false,
receipt_no = ($("#receipt_no").html()).trim(); success:function(result){
if((receipt_no!=undefined) && (receipt_no!="")) }
createReceiptNoInFirstBillData(receipt_no,type); });
// For Server Print - from jade }
if ($("#server_mode").val() == "cloud") {
code2lab.printFile(result.filepath.substr(6), result.printer_url); $(".choose_payment").on('click', function () {
} $( "#loading_wrapper").show();
location.reload();
} var sale_id = $('#sale_id').val();
}); // type = $('.payment_method').val();
type = get_selected_attributes('selected-payment');
if(parseInt(jQuery.inArray("Credit", type)) == -1){
if (parseInt(jQuery.inArray("MPU", type)) != -1 || parseInt(jQuery.inArray("VISA", type)) != -1 || parseInt(jQuery.inArray("JCB", type)) != -1 || parseInt(jQuery.inArray("Master", type)) != -1 || parseInt(jQuery.inArray("UNIONPAY", type)) != -1 || parseInt(jQuery.inArray("Redeem", type)) != -1 || parseInt(jQuery.inArray("PAYMAL",type))!= -1) {
calculate_member_discount(sale_id,"Card");
}else{
calculate_member_discount(sale_id,"Cash");
}
}
var ajax_url = "/origami/sale/" + sale_id + "/first_bill";
$.ajax({
type: "GET",
url: ajax_url,
success: function (result) {
$( "#loading_wrapper" ).hide();
receipt_no = ($("#receipt_no").html()).trim();
if((receipt_no!=undefined) && (receipt_no!=""))
createReceiptNoInFirstBillData(receipt_no,type);
// For Server Print - from jade
if ($("#server_mode").val() == "cloud") {
code2lab.printFile(result.filepath.substr(6), result.printer_url);
}
location.reload();
}
}); });
});
function calculate_member_discount(sale_id,type) { function calculate_member_discount(sale_id,type) {
var sub_total = $('#sub-total').text(); var sub_total = $('#sub-total').text();
@@ -1301,7 +1386,7 @@ $('#pay').on('click', function () {
}); });
$("button[name=tax_type]").on("click", function(){ $("button[name=tax_type]").on("click", function(){
var type = $(this).attr("data-value"); var tax_type = $(this).attr("data-value");
var cashier_type = 'cashier'; var cashier_type = 'cashier';
var sale_id = $('#sale_id').text(); var sale_id = $('#sale_id').text();
var dining_id = "<%= @dining.id rescue "" %> "; var dining_id = "<%= @dining.id rescue "" %> ";
@@ -1320,15 +1405,15 @@ $('#pay').on('click', function () {
$.ajax({ $.ajax({
type: "POST", type: "POST",
url: "/origami/payment/"+cashier_type+"/change_tax", url: "/origami/payment/"+cashier_type+"/change_tax",
data: {sale_id: sale_id, cashier_type: cashier_type, tax_type: type}, data: {sale_id: sale_id, cashier_type: cashier_type, tax_type: tax_type},
success:function(data){ success:function(data){
if(data.status){ if(data.status){
// console.log(type); // console.log(type);
localStorage.setItem("tax_type", type); localStorage.setItem("tax_type", type);
window.location.href = '/origami/table/'+dining_id; window.location.href = '/origami/table/'+dining_id;
} }
} }
}); });
}else{ }else{
swal.close(); swal.close();
} }

8
app/views/origami/payments/show.html.erb
View File

@@ -674,7 +674,7 @@ var pdf_view = '<%=@pdf_view%>';
payment_type = ''; payment_type = '';
if ($("#server_mode").val() != "cloud") { // first bill not used in cloud // if ($("#server_mode").val() != "cloud") { // first bill not used in cloud
payment_type = checkReceiptNoInFirstBillData(receipt_no,"payment"); payment_type = checkReceiptNoInFirstBillData(receipt_no,"payment");
// console.log(payment_type) // console.log(payment_type)
// console.log(parseInt(jQuery.inArray("MPU", payment_type))) // console.log(parseInt(jQuery.inArray("MPU", payment_type)))
@@ -700,7 +700,7 @@ var pdf_view = '<%=@pdf_view%>';
$("#card_payment").hide(); $("#card_payment").hide();
} }
} }
} // }
/* end check first bill or not*/ /* end check first bill or not*/
var dining_id = "<%= @sale_data.bookings[0].dining_facility_id %>"; var dining_id = "<%= @sale_data.bookings[0].dining_facility_id %>";
@@ -792,8 +792,7 @@ var pdf_view = '<%=@pdf_view%>';
var credit = $('#credit').text(); var credit = $('#credit').text();
var card = $('#card').text(); var card = $('#card').text();
var tax_type = localStorage.getItem("tax_type") ? localStorage.getItem("tax_type") : ''; var tax_type = localStorage.getItem("tax_type") ? localStorage.getItem("tax_type") : 'all';
if (credit <= 0) { if (credit <= 0) {
calculate_member_discount(sale_id,tax_type); calculate_member_discount(sale_id,tax_type);
} }
@@ -1059,7 +1058,6 @@ var pdf_view = '<%=@pdf_view%>';
var member_id = $('#membership_id').text(); var member_id = $('#membership_id').text();
var member_discount = $('#member_discount').text(); var member_discount = $('#member_discount').text();
var item_row = $('.is_card'); var item_row = $('.is_card');
if (member_id && member_discount) { if (member_id && member_discount) {
if (item_row.length < 1) { if (item_row.length < 1) {
is_card = false is_card = false

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

@@ -323,7 +323,7 @@
sub_total = sub_total + (order_item.price * order_item.qty) sub_total = sub_total + (order_item.price * order_item.qty)
# unless order_item.price == 0 %> # unless order_item.price == 0 %>
<tr class="edit_order" data-id='<%= order_item.order_items_id %>'> <tr class="<%= @edit_order_origami== true ? 'edit_order' : ''%>" data-id='<%= order_item.order_items_id %>'>
<td><%= count %></td> <td><%= count %></td>
<td class='item-name'> <td class='item-name'>
<%= order_item.item_name %> <%= order_item.item_name %>
@@ -427,7 +427,7 @@
set_item_prices = 0 set_item_prices = 0
count += 1 count += 1
%> %>
<tr class="edit_order" data-id='<%= order_item.order_items_id %>'> <tr class="<%= @edit_order_origami== true ? 'edit_order' : ''%>" data-id='<%= order_item.order_items_id %>'>
<td><%= count %> <td><%= count %>
<td class='item-name'> <td class='item-name'>
<%= order_item.item_name %> <%= order_item.item_name %>
@@ -742,7 +742,7 @@
<script> <script>
var cashier_type = "cashier"; var cashier_type = "cashier";
$(document).ready(function(){ $(document).ready(function(){
localStorage.removeItem("tax_type"); // localStorage.removeItem("tax_type");
/* check webview loaded*/ /* check webview loaded*/
var webview = <%= @webview %>; var webview = <%= @webview %>;
showHideNavbar(webview); showHideNavbar(webview);
@@ -963,14 +963,14 @@ $(".choose_payment").on('click', function () {
$( "#loading_wrapper").show(); $( "#loading_wrapper").show();
var sale_id = $('#sale_id').val(); var sale_id = $('#sale_id').val();
type = get_selected_attributes('selected-payment'); type = get_selected_attributes('selected-payment');
var tax_type = localStorage.getItem("tax_type") ? localStorage.getItem("tax_type") : 'all';
// type = $('.payment_method').val(); // type = $('.payment_method').val();
if(parseInt(jQuery.inArray("Credit", type)) == -1){ if(parseInt(jQuery.inArray("Credit", type)) == -1){
if (parseInt(jQuery.inArray("MPU", type)) != -1 || parseInt(jQuery.inArray("VISA", type)) != -1 || parseInt(jQuery.inArray("JCB", type)) != -1 || parseInt(jQuery.inArray("Master", type)) != -1 || parseInt(jQuery.inArray("UNIONPAY", type)) != -1 || parseInt(jQuery.inArray("Redeem", type)) != -1 || parseInt(jQuery.inArray("PAYMAL", type)) != -1) { if (parseInt(jQuery.inArray("MPU", type)) != -1 || parseInt(jQuery.inArray("VISA", type)) != -1 || parseInt(jQuery.inArray("JCB", type)) != -1 || parseInt(jQuery.inArray("Master", type)) != -1 || parseInt(jQuery.inArray("UNIONPAY", type)) != -1 || parseInt(jQuery.inArray("Redeem", type)) != -1 || parseInt(jQuery.inArray("PAYMAL", type)) != -1) {
calculate_member_discount(sale_id,"Card"); calculate_member_discount(sale_id,"Card",tax_type);
}else{ }else{
calculate_member_discount(sale_id,"Cash"); calculate_member_discount(sale_id,"Cash",tax_type);
} }
} }
var ajax_url = "/origami/sale/" + sale_id + "/first_bill"; var ajax_url = "/origami/sale/" + sale_id + "/first_bill";
@@ -992,7 +992,7 @@ $(".choose_payment").on('click', function () {
} }
}); });
}); });
function calculate_member_discount(sale_id,type) { function calculate_member_discount(sale_id,type,tax_type) {
var sub_total = $('#sub-total').text(); var sub_total = $('#sub-total').text();
if (type == "Cash") { if (type == "Cash") {
is_card = false is_card = false
@@ -1002,12 +1002,11 @@ function calculate_member_discount(sale_id,type) {
$.ajax({ $.ajax({
type: "POST", type: "POST",
url: "/origami/" + sale_id + "/member_discount", url: "/origami/" + sale_id + "/member_discount",
data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':is_card }, data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':is_card,'cashier_type':'cashier','tax_type':tax_type },
async: false, async: false,
success:function(result){ success:function(result){
} }
}); });
} }
$('#pay').on('click',function() { $('#pay').on('click',function() {
@@ -1369,7 +1368,7 @@ $('#add_invoice').on('click',function(){
}); });
$("button[name=tax_type]").on("click", function(){ $("button[name=tax_type]").on("click", function(){
var type = $(this).attr("data-value"); var tax_type = $(this).attr("data-value");
var cashier_type = 'cashier'; var cashier_type = 'cashier';
var sale_id = $('#sale_id').text(); var sale_id = $('#sale_id').text();
var dining_id = "<%= @room.id rescue "" %> "; var dining_id = "<%= @room.id rescue "" %> ";
@@ -1388,11 +1387,11 @@ $('#add_invoice').on('click',function(){
$.ajax({ $.ajax({
type: "POST", type: "POST",
url: "/origami/payment/"+cashier_type+"/change_tax", url: "/origami/payment/"+cashier_type+"/change_tax",
data: {sale_id: sale_id, cashier_type: cashier_type, tax_type: type}, data: {sale_id: sale_id, cashier_type: cashier_type, tax_type: tax_type},
success:function(data){ success:function(data){
if(data.status){ if(data.status){
// console.log(type); // console.log(tax_type);
localStorage.setItem("tax_type", type); localStorage.setItem("tax_type", tax_type);
window.location.href = '/origami/room/'+dining_id; window.location.href = '/origami/room/'+dining_id;
} }
} }

2
db/migrate/20170331024749_create_menu_items.rb
View File

@@ -1,7 +1,7 @@
class CreateMenuItems < ActiveRecord::Migration[5.1] class CreateMenuItems < ActiveRecord::Migration[5.1]
def change def change
create_table :menu_items do |t| create_table :menu_items do |t|
t.string :item_code, :null => false t.string :item_code, :null => false, :index => true
t.string :name, :null => false t.string :name, :null => false
t.string :alt_name t.string :alt_name
t.string :image_path t.string :image_path

7
db/migrate/20170403135934_create_orders.rb
View File

@@ -2,17 +2,18 @@ class CreateOrders < ActiveRecord::Migration[5.1]
def change def change
create_table :orders, :id => false do |t| create_table :orders, :id => false do |t|
t.string :order_id, :limit => 16, :primary_key => true #custom foreign_key to prevent conflict during sync t.string :order_id, :limit => 16, :primary_key => true #custom foreign_key to prevent conflict during sync
t.datetime :date, :null => false t.datetime :date, :index => true, :null => false
t.string :source, :null => false, :default => "emenu" t.string :source, :index => true, :null => false, :default => "emenu"
t.string :order_type, :null => false, :default => "dine-in" t.string :order_type, :null => false, :default => "dine-in"
t.string :customer_id, foreign_key: true, :limit => 16 t.string :customer_id, foreign_key: true, :limit => 16
t.integer :item_count, :null => false, :default => 0 t.integer :item_count, :null => false, :default => 0
t.integer :quantity_count, :null => false, :default => 0 t.integer :quantity_count, :null => false, :default => 0
t.string :status, :null => false, :default => "new" t.string :status, :index => true, :null => false, :default => "new"
t.json :waiters t.json :waiters
t.json :guest_info t.json :guest_info
t.timestamps t.timestamps
end end
add_index :orders, [:date, :source, :status], name: 'index_date_source_status'
end end
end end

2
db/migrate/20170403140820_create_order_items.rb
View File

@@ -2,7 +2,7 @@ class CreateOrderItems < ActiveRecord::Migration[5.1]
def change def change
create_table :order_items, :id => false do |t| create_table :order_items, :id => false do |t|
t.string :order_items_id, :limit => 16, :primary_key => true #custom primary key - to ensure consistence for cloud syncing t.string :order_items_id, :limit => 16, :primary_key => true #custom primary key - to ensure consistence for cloud syncing
t.string :order_id, foreign_key: true, :null => false, :limit => 16 t.string :order_id, foreign_key: true, :index => true, :null => false, :limit => 16
t.string :order_item_status, :null => false, :default => "new" t.string :order_item_status, :null => false, :default => "new"
t.string :item_order_by #person who order this t.string :item_order_by #person who order this
t.string :item_code, :null => false t.string :item_code, :null => false

7
db/migrate/20170403142424_create_dining_facilities.rb
View File

@@ -3,15 +3,16 @@ class CreateDiningFacilities < ActiveRecord::Migration[5.1]
create_table :dining_facilities do |t| create_table :dining_facilities do |t|
t.references :zone, foreign_key: true t.references :zone, foreign_key: true
t.string :name, :null => false t.string :name, :null => false
t.string :status, :null => false, :default => "available" t.string :status, :null => false, :default => "available", :index => true
t.string :type, :null => false, :default => "Table" t.string :type, :null => false, :default => "Table", :index => true
t.integer :seater, :null => false, :default => 2 t.integer :seater, :null => false, :default => 2
t.integer :order_by t.integer :order_by
t.string :created_by t.string :created_by
t.boolean :is_active, :null => false, :default => true t.boolean :is_active, :null => false, :default => true, :index => true
t.timestamps t.timestamps
end end
add_index :dining_facilities, [:status, :type, :is_active]
end end
end end

5
db/migrate/20170403155230_create_employees.rb
View File

@@ -3,15 +3,16 @@ class CreateEmployees < ActiveRecord::Migration[5.1]
create_table :employees do |t| create_table :employees do |t|
t.string :name, :null => false t.string :name, :null => false
t.string :role, :null => false, :default => "cashier" t.string :role, :null => false, :default => "cashier"
t.boolean :is_active, :default => true t.boolean :is_active, :default => true, :index=>true
t.string :emp_id, :null => false t.string :emp_id, :null => false
t.string :password_digest, :null => false t.string :password_digest, :null => false
t.string :token_session t.string :token_session, :index=>true
t.datetime :session_expiry t.datetime :session_expiry
t.datetime :session_last_login t.datetime :session_last_login
t.string :created_by t.string :created_by
t.string :image_path t.string :image_path
t.timestamps t.timestamps
end end
add_index :employees, [:is_active, :token_session]
end end
end end

19
db/migrate/20170403161857_create_sale_items.rb
View File

@@ -2,21 +2,22 @@ class CreateSaleItems < ActiveRecord::Migration[5.1]
def change def change
create_table :sale_items, :id => false do |t| create_table :sale_items, :id => false do |t|
t.string :sale_item_id, :limit => 16, :primary_key => true#custom primary key - to ensure consistence for cloud syncing t.string :sale_item_id, :limit => 16, :primary_key => true#custom primary key - to ensure consistence for cloud syncing
t.string :sale_id, foreign_key: true, :limit => 16 t.string :sale_id, foreign_key: true, :limit => 16, :index => true
t.string :product_code, :null => false t.string :product_code, :null => false
t.string :item_instance_code t.string :item_instance_code
t.string :product_name, :null => false t.string :product_name, :null => false
t.string :product_alt_name, :null => false t.string :product_alt_name, :null => false
t.integer :account_id, :limit => 8, :null => false, :default => 1 t.integer :account_id, :index => true, :limit => 8, :null => false, :default => 1
t.string :status t.string :status, :index => true
t.string :remark t.string :remark, :index => true
t.decimal :qty, :precision => 10, :scale => 2, :null => false, :default => 0.00 t.decimal :qty, :index => true, :precision => 10, :scale => 2, :null => false, :default => 0.00
t.decimal :unit_price, :precision => 10, :scale => 2, :null => false, :default => 0.00 t.decimal :unit_price, :index => true, :precision => 10, :scale => 2, :null => false, :default => 0.00
t.decimal :taxable_price, :precision => 10, :scale => 2, :null => false, :default => 0.00 t.decimal :taxable_price, :index => true, :precision => 10, :scale => 2, :null => false, :default => 0.00
t.decimal :price, :precision => 10, :scale => 2, :null => false, :default => 0.00 t.decimal :price, :index => true, :precision => 10, :scale => 2, :null => false, :default => 0.00
t.boolean :is_taxable, :null => false, :default => true t.boolean :is_taxable, :index => true, :null => false, :default => true
t.timestamps t.timestamps
end end
add_index :sale_items, [:sale_id, :account_id, :status, :remark, :qty, :unit_price, :taxable_price, :price, :is_taxable], name: 'index_sale_items'
end end
end end

2
db/migrate/20170403163219_create_sale_taxes.rb
View File

@@ -3,7 +3,7 @@ class CreateSaleTaxes < ActiveRecord::Migration[5.1]
create_table :sale_taxes, :id => false do |t| create_table :sale_taxes, :id => false do |t|
t.string :sale_tax_id, :limit => 16, :primary_key => true #custom primary key - to ensure consistence for cloud syncing t.string :sale_tax_id, :limit => 16, :primary_key => true #custom primary key - to ensure consistence for cloud syncing
t.string :sale_id, foreign_key: true, :limit => 16 t.string :sale_id, foreign_key: true, :limit => 16, :index => true, :null => false
t.string :tax_name, :null => false t.string :tax_name, :null => false
t.decimal :tax_rate, :precision => 10, :scale => 2, :null => false, :default => 0.00 t.decimal :tax_rate, :precision => 10, :scale => 2, :null => false, :default => 0.00
t.decimal :tax_payable_amount, :precision => 10, :scale => 2, :null => false, :default => 0.00 t.decimal :tax_payable_amount, :precision => 10, :scale => 2, :null => false, :default => 0.00

5
db/migrate/20170403163734_create_sale_payments.rb
View File

@@ -3,8 +3,8 @@ class CreateSalePayments < ActiveRecord::Migration[5.1]
create_table :sale_payments, :id => false do |t| create_table :sale_payments, :id => false do |t|
t.string :sale_payment_id, :limit => 16, :primary_key => true #custom primary key - to ensure consistence for cloud syncing t.string :sale_payment_id, :limit => 16, :primary_key => true #custom primary key - to ensure consistence for cloud syncing
t.string :sale_id, foreign_key: true, :limit => 16 t.string :sale_id, foreign_key: true, :limit => 16, :index => true
t.string :payment_method, :null => false, :default => "cash" t.string :payment_method, :null => false, :default => "cash", :index => true
t.decimal :payment_amount, :precision => 10, :scale => 2, :null => false, :default => 0.00 t.decimal :payment_amount, :precision => 10, :scale => 2, :null => false, :default => 0.00
t.decimal :outstanding_amount, :precision => 10, :scale => 2, :null => false, :default => 0.00 t.decimal :outstanding_amount, :precision => 10, :scale => 2, :null => false, :default => 0.00
t.string :payment_reference t.string :payment_reference
@@ -12,5 +12,6 @@ class CreateSalePayments < ActiveRecord::Migration[5.1]
t.timestamps t.timestamps
end end
add_index :sale_payments, [:sale_id, :payment_method]
end end
end end

5
db/migrate/20170403174029_create_sale_orders.rb
View File

@@ -3,10 +3,11 @@ class CreateSaleOrders < ActiveRecord::Migration[5.1]
create_table :sale_orders, :id => false do |t| create_table :sale_orders, :id => false do |t|
t.string :sale_order_id, :limit => 16, :primary_key => true t.string :sale_order_id, :limit => 16, :primary_key => true
t.string :sale_id, foreign_key: true,:limit => 16 t.string :sale_id, foreign_key: true,:limit => 16, :index => true
t.string :order_id, foreign_key: true, :limit => 16 t.string :order_id, foreign_key: true, :limit => 16, :index => true
t.timestamps t.timestamps
end end
add_index :sale_orders, [:sale_id, :order_id], name: 'index_sale_id_order_id'
end end
end end

2
db/migrate/20170403174309_create_lookups.rb
View File

@@ -1,7 +1,7 @@
class CreateLookups < ActiveRecord::Migration[5.1] class CreateLookups < ActiveRecord::Migration[5.1]
def change def change
create_table :lookups do |t| create_table :lookups do |t|
t.string :lookup_type, :null => false t.string :lookup_type, :null => false, :index => true
t.string :name, :null => false t.string :name, :null => false
t.string :value, :null => false t.string :value, :null => false
end end

9
db/migrate/20170404034234_create_bookings.rb
View File

@@ -5,17 +5,18 @@ class CreateBookings < ActiveRecord::Migration[5.1]
t.references :dining_facility, foreign_key: true t.references :dining_facility, foreign_key: true
t.string :type, :null => false, :default => "Table" t.string :type, :null => false, :default => "Table"
t.datetime :checkin_at, :null => false t.datetime :checkin_at, :index => true, :null => false
t.string :checkin_by t.string :checkin_by
t.datetime :checkout_at t.datetime :checkout_at
t.string :checkout_by t.string :checkout_by, :index => true
t.datetime :reserved_at t.datetime :reserved_at
t.string :reserved_by t.string :reserved_by, :index => true
t.string :booking_status, :null => false, :default => "new" t.string :booking_status, :index => true, :null => false, :default => "new"
t.string :sale_id, foreign_key: true, :limit => 16 t.string :sale_id, foreign_key: true, :limit => 16
t.string :customer_id, foreign_key: true, :limit => 16 t.string :customer_id, foreign_key: true, :limit => 16
t.timestamps t.timestamps
end end
add_index :bookings, [:checkin_at, :checkout_by, :reserved_by, :booking_status], name: 'index_bookings'
end end
end end

2
db/migrate/20170408105938_create_seed_generators.rb
View File

@@ -1,7 +1,7 @@
class CreateSeedGenerators < ActiveRecord::Migration[5.1] class CreateSeedGenerators < ActiveRecord::Migration[5.1]
def change def change
create_table :seed_generators do |t| create_table :seed_generators do |t|
t.string :model, :null => false, :default => "sale" t.string :model, :null => false, :default => "sale", :index => true
t.integer :increase_by, :null => false, :default => 1 t.integer :increase_by, :null => false, :default => 1
t.bigint :current, :null => false ,:default => 1 t.bigint :current, :null => false ,:default => 1
t.bigint :next, :null => false, :default => 2 t.bigint :next, :null => false, :default => 2

6
db/migrate/20170414090001_create_assigned_order_items.rb
View File

@@ -4,12 +4,14 @@ class CreateAssignedOrderItems < ActiveRecord::Migration[5.1]
t.string :assigned_order_item_id, :limit => 16, :primary_key => true #custom primary key - to ensure consistence for cloud syncing t.string :assigned_order_item_id, :limit => 16, :primary_key => true #custom primary key - to ensure consistence for cloud syncing
t.string :item_code, :null => false, :index => true t.string :item_code, :null => false, :index => true
t.string :instance_code, :null => false, :index => true t.string :instance_code, :null => false, :index => true
t.references :order_queue_station, foreign_key: true t.references :order_queue_station, foreign_key: true, :index => true
t.string :order_id, foreign_key: true, :limit => 16 t.string :order_id, foreign_key: true, :limit => 16
t.boolean :print_status t.boolean :print_status
t.boolean :delivery_status t.boolean :delivery_status, :index => true
t.timestamps t.timestamps
end end
add_index :assigned_order_items, :created_at
add_index :assigned_order_items, [:item_code, :instance_code, :order_queue_station_id, :delivery_status, :created_at], name: 'index_assigned_order_items'
end end
end end

5
db/migrate/20170414110918_create_booking_orders.rb
View File

@@ -3,10 +3,11 @@ class CreateBookingOrders < ActiveRecord::Migration[5.1]
create_table :booking_orders, :id => false do |t| create_table :booking_orders, :id => false do |t|
#t.string :booking_order_id, :limit => 16, :null => false, :index => true, :unique => true #custom primary key - to ensure consistence for cloud syncing #t.string :booking_order_id, :limit => 16, :null => false, :index => true, :unique => true #custom primary key - to ensure consistence for cloud syncing
t.primary_key :booking_order_id t.primary_key :booking_order_id
t.string :booking_id, foreign_key: true, :limit => 16 t.string :booking_id, foreign_key: true, :index => true, :limit => 16
t.string :order_id, foreign_key: true, :limit => 16 t.string :order_id, foreign_key: true, :index => true, :limit => 16
t.timestamps t.timestamps
end end
add_index :booking_orders, [:booking_id, :order_id], name: 'index_booking_id_order_id'
end end
end end

5
db/migrate/20170622050926_create_customers.rb
View File

@@ -13,12 +13,13 @@ class CreateCustomers < ActiveRecord::Migration[5.1]
t.string :address t.string :address
t.string :card_no, :unique => true t.string :card_no, :unique => true
t.string :paypar_account_no, :unique => true t.string :paypar_account_no, :unique => true
t.string :membership_id t.string :membership_id, :index => true
t.string :membership_type t.string :membership_type
t.string :membership_authentication_code t.string :membership_authentication_code
t.string :customer_type, :default => "Dinein" t.string :customer_type, :default => "Dinein", :index => true
t.json :tax_profiles t.json :tax_profiles
t.string :image_path t.string :image_path
end end
add_index :customers, [:membership_id, :customer_type]
end end
end end

5
db/migrate/20170626191519_create_shift_sales.rb
View File

@@ -2,8 +2,8 @@ class CreateShiftSales < ActiveRecord::Migration[5.1]
def change def change
create_table :shift_sales do |t| create_table :shift_sales do |t|
t.references :cashier_terminal, foreign_key: true, :null => false t.references :cashier_terminal, foreign_key: true, :null => false
t.datetime :shift_started_at t.datetime :shift_started_at, :index => true
t.datetime :shift_closed_at t.datetime :shift_closed_at, :index => true
t.references :employee, foreign_key: true #cashier t.references :employee, foreign_key: true #cashier
t.decimal :opening_balance, :precision => 10, :scale => 2, :null => false, :default => 0.00 t.decimal :opening_balance, :precision => 10, :scale => 2, :null => false, :default => 0.00
t.decimal :closing_balance, :precision => 10, :scale => 2, :null => false, :default => 0.00 t.decimal :closing_balance, :precision => 10, :scale => 2, :null => false, :default => 0.00
@@ -26,5 +26,6 @@ class CreateShiftSales < ActiveRecord::Migration[5.1]
t.decimal :total_void, :default => 0 t.decimal :total_void, :default => 0
t.timestamps t.timestamps
end end
add_index :shift_sales, [:shift_started_at, :shift_closed_at]
end end
end end

2
db/migrate/20170628103624_create_print_settings.rb
View File

@@ -2,7 +2,7 @@ class CreatePrintSettings < ActiveRecord::Migration[5.1]
def change def change
create_table :print_settings do |t| create_table :print_settings do |t|
t.string :name, :null => false t.string :name, :null => false
t.string :unique_code, :null => false t.string :unique_code, :null => false, :index => true
t.string :template t.string :template
t.string :font, :default => "" t.string :font, :default => ""
t.integer :header_font_size, :null => false, :default => 10 t.integer :header_font_size, :null => false, :default => 10

10
db/migrate/20170701101420_create_sales.rb
View File

@@ -8,10 +8,10 @@ class CreateSales < ActiveRecord::Migration[5.1]
t.string :requested_by, :null => false t.string :requested_by, :null => false
t.datetime :requested_at, :null => false t.datetime :requested_at, :null => false
t.string :receipt_no, :null => false t.string :receipt_no, :null => false
t.datetime :receipt_date, :null => false t.datetime :receipt_date, :index => true, :null => false
t.string :customer_id, foreign_key: true, :limit => 16 t.string :customer_id, foreign_key: true, :limit => 16
t.string :payment_status, :null => false, :default => "outstanding" t.string :payment_status, :index => true, :null => false, :default => "outstanding"
t.string :sale_status, :null => false, :default => "new" t.string :sale_status, :index => true, :null => false, :default => "new"
t.decimal :total_amount, :precision => 10, :scale => 2, :null => false, :default => 0.00 t.decimal :total_amount, :precision => 10, :scale => 2, :null => false, :default => 0.00
t.string :discount_type, :default => "overall" t.string :discount_type, :default => "overall"
t.decimal :total_discount, :precision => 10, :scale => 2, :null => false, :default => 0.00 t.decimal :total_discount, :precision => 10, :scale => 2, :null => false, :default => 0.00
@@ -21,11 +21,13 @@ class CreateSales < ActiveRecord::Migration[5.1]
t.decimal :rounding_adjustment, :precision => 10, :scale => 2, :null => false, :default => 0.00 t.decimal :rounding_adjustment, :precision => 10, :scale => 2, :null => false, :default => 0.00
t.decimal :amount_received, :precision => 10, :scale => 2, :null => false, :default => 0.00 t.decimal :amount_received, :precision => 10, :scale => 2, :null => false, :default => 0.00
t.decimal :amount_changed, :precision => 10, :scale => 2, :null => false, :default => 0.00 t.decimal :amount_changed, :precision => 10, :scale => 2, :null => false, :default => 0.00
t.integer :shift_sale_id t.integer :shift_sale_id, :index => true
t.decimal :old_grand_total t.decimal :old_grand_total
t.string :rebate_status t.string :rebate_status
t.integer :equal_persons t.integer :equal_persons
t.timestamps t.timestamps
end end
add_index :sales, :created_at, name: 'index_created_at'
add_index :sales, [:cashier_id, :receipt_date, :payment_status, :sale_status, :shift_sale_id, :created_at], name: 'index_sales'
end end
end end

9
db/migrate/20170815044557_create_promotion.rb
View File

@@ -3,10 +3,10 @@ class CreatePromotion < ActiveRecord::Migration[5.1]
create_table :promotions do |t| create_table :promotions do |t|
t.string :promo_code, :limit => 16 t.string :promo_code, :limit => 16
t.date :promo_start_date, :null => false t.date :promo_start_date, :null => false, :index => true
t.date :promo_end_date, :null => false t.date :promo_end_date, :null => false, :index => true
t.time :promo_start_hour, :null => false t.time :promo_start_hour, :null => false, :index => true
t.time :promo_end_hour, :null => false t.time :promo_end_hour, :null => false, :index => true
t.string :promo_day, :null => false, :default => "[0,1,2,3,4,5,6]" t.string :promo_day, :null => false, :default => "[0,1,2,3,4,5,6]"
t.string :promo_type, :null => false, :default => "Quantity" t.string :promo_type, :null => false, :default => "Quantity"
t.string :original_product t.string :original_product
@@ -14,5 +14,6 @@ class CreatePromotion < ActiveRecord::Migration[5.1]
t.string :created_by, :null => false t.string :created_by, :null => false
t.timestamps t.timestamps
end end
add_index :promotions, [:promo_start_date, :promo_end_date, :promo_start_hour, :promo_end_hour], name: 'index_promotions'
end end
end end

2
db/migrate/20180109085256_create_card_sale_trans.rb
View File

@@ -1,7 +1,7 @@
class CreateCardSaleTrans < ActiveRecord::Migration[5.1] class CreateCardSaleTrans < ActiveRecord::Migration[5.1]
def change def change
create_table :card_sale_trans do |t| create_table :card_sale_trans do |t|
t.string :sale_id t.string :sale_id, :index=>true
t.date :req_date t.date :req_date
t.time :req_time t.time :req_time
t.float :req_amt, :limit=>50 t.float :req_amt, :limit=>50