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

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

Browse Source
This commit is contained in:
Yan
2018-03-20 17:11:34 +06:30
parent 510e3aabec 27a3026c2a
commit 0a9b3b5407
35 changed files with 509 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/views/oqs/edit/index.html.erb
View File

@@ -144,9 +144,12 @@ $(document).ready(function(){
});
$('#back').on('click', function () {
var booking_id = '<%= @booking.booking_id %>';
<% if !@link_type.nil? %>
<% if @link_type == 'oqs' %>
window.location.href = '/oqs';
<% elsif @link_type == 'pending' %>
window.location.href = '/origami/quick_service/pending_order/'+booking_id;
<% else %>
<% if !@dining_type.nil? %>
<% if @dining_type == 'Table' %>

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

@@ -913,7 +913,7 @@
}, function (isConfirm) {
if (isConfirm) {
var sale_id = "<%= @obj_sale.sale_id rescue "" %>"
var ajax_url = "/origami/sale/" + sale_id + '/void';
var ajax_url = "/origami/sale/" + sale_id + '/cashier/void';
var remark = $("#remark").val();
$.ajax({

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

@@ -705,7 +705,7 @@ var customer_name = "<%= @customer.name %>";
if (isConfirm) {
var sale_id = $('#sale_id').text();
var remark = $("#remark").val();
var ajax_url = "/origami/sale/" + sale_id + '/void';
var ajax_url = "/origami/sale/" + sale_id +'/'+cashier_type+ '/void';
$.ajax({
type: 'POST',
url: ajax_url,
@@ -913,7 +913,7 @@ var customer_name = "<%= @customer.name %>";
if (isConfirm) {
$.ajax({
type: "POST",
url: "<%= origami_payment_foc_path %>",
url: "/origami/payment/"+cashier_type+"/foc",
data: params,
success:function(result){
customer_display_view(null,"reload");

0
app/views/origami/pending_order/index.html.erb Executable file → Normal file
View File

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

@@ -97,13 +97,15 @@
<% end%>
<% else%>
<% sub_total = 0
total = 0
@order_items.each do |order_item|
sub_total = sub_total + order_item.price %>
total = order_item.qty * order_item.price
sub_total = sub_total + total %>
<input type="hidden" id="sale_id" value="<%= @bookings.booking_id %>">
<tr class="edit_order" data-id='<%= order_item.order_items_id %>'>
<td class='item-name'><%= order_item.item_name %></td>
<td class='item-attr'><%= order_item.qty %></td>
<td class='item-attr'><%= order_item.price %></td>
<td class='item-attr'><%= total %></td>
</tr>
<% end%>
<% end%>
@@ -210,7 +212,7 @@ $(document).ready(function(){
swal("Information!", result.error_message);
}
else {
location.reload();
window.location.href = '/origami/quick_service/pending_order';
}
}
});

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

@@ -889,7 +889,7 @@ $('#add_invoice').on('click',function(){
var sure = confirm("Are you sure want to Void");
if (sure == true) {
var sale_id = $('#sale_id').val();
var ajax_url = "/origami/sale/" + sale_id + '/void';
var ajax_url = "/origami/sale/" + sale_id + '/cashier/void';
$.ajax({
type: 'POST',
url: ajax_url,

4
app/views/origami/sale_edit/edit.html.erb
View File

@@ -331,7 +331,7 @@ var cashier_type = "<%= @cashier_type %>";
$.ajax({
type: "POST",
url: ajax_url,
data: 'sale_id=' + sale_id,
data: 'sale_id=' + sale_id +'&type='+cashier_type,
success: function (result) {
location.reload();
}
@@ -345,7 +345,7 @@ var cashier_type = "<%= @cashier_type %>";
$.ajax({
type: "POST",
url: ajax_url,
data: 'sale_id=' + sale_id,
data: 'sale_id=' + sale_id+'&type='+cashier_type,
success: function (result) {
if (cashier_type=="quick_service") {
window.location.href = '/origami/sale/'+sale_id+'/'+cashier_type+'/payment/';

4
app/views/origami/table_invoices/show.html.erb
View File

@@ -261,7 +261,7 @@ $('#void').on('click',function () {
if (isConfirm) {
var sale_id = $('#sale_id').val();
var remark = $("#remark").val();
var ajax_url = "/origami/sale/" + sale_id + '/void';
var ajax_url = "/origami/sale/" + sale_id + '/cashier/void';
$.ajax({
type: 'POST',
url: ajax_url,
@@ -291,7 +291,7 @@ $('#foc').click(function() {
if ($(this).attr('active')=== "true") {
$.ajax({
type: "POST",
url: "<%= origami_payment_foc_path %>",
url: "/origami/payment/cashier/foc",
data: params,
success:function(result){
if (cash >= 0) {

5
app/views/settings/menus/index.html.erb
View File

@@ -7,11 +7,12 @@
</span>
</ol>
</div>
<!-- <h4>Import</h4>
<h4>Import</h4>
<%= form_tag import_settings_menus_path, multipart:true do%>
<%=file_field_tag :file%>
<%=submit_tag "Import CSV"%>
<%end%> -->
<%end%>
<%= link_to "Export users as spreadsheet", settings_menus_path(format: "xlsx") %>
<div class="row">
<div class="col-xs-12 col-sm-12 col-md-2 col-lg-2">
<br><br>

86
app/views/settings/menus/index.xlsx.axlsx Normal file
View File

@@ -0,0 +1,86 @@
wb = xlsx_package.workbook
wb.styles do |s|
date = s.add_style(:format_code => "yyyy-mm-dd", :border => Axlsx::STYLE_THIN_BORDER)
wrap_text = s.add_style :sz => 11,
:alignment => { :horizontal => :left,:vertical => :center ,
:wrap_text => true}
header_text = s.add_style :fg_color=> "FFFFFF",
:b => true,
:bg_color => "004586",
:sz => 12,
:border => { :style => :thin, :color => "00" },
:alignment => { :horizontal => :left,
:vertical => :center ,
:header_text => true}
wb.add_worksheet(name: "Menu") do |sheet|
sheet.add_row %w( name is_active valid_days valid_time_from valid_time_to created_by ), :style=>header_text
@settings_menus.each do |menu|
sheet.add_row [ menu.name, menu.is_active, menu.valid_days, menu.valid_time_from,menu.valid_time_to, menu.created_by], :style=>[date,wrap_text]
end
end
wb.add_worksheet(name: "Menu Category") do |sheet|
sheet.add_row %w(menu_id code name alt_name order_by created_by menu_category_id is_available created_at updated_at), :style=>header_text
MenuCategory.all.each do |mc|
sheet.add_row [mc.menu_id, mc.code, mc.name, mc.alt_name, mc.order_by, mc.created_by, mc.menu_category_id, mc.is_available, mc.created_at, mc.updated_at], :style=>wrap_text
end
end
wb.add_worksheet(name: "Menu Item") do |sheet|
sheet.add_row %w(item_code name alt_name image_path description information unit type menu_category_id item_attributes item_options account_id _qty taxable is_sub_item is_available created_by created_at updated_at), :style=>header_text
MenuItem.all.each do |mi|
sheet.add_row [mi.item_code, mi.name, mi.alt_name, mi.image_path, mi.description, mi.information, mi.unit, mi.type, mi.menu_category_id, mi.item_attributes, mi.item_options, mi.account_id, mi.min_qty, mi.taxable, mi.is_sub_item, mi.is_available, mi.created_by, mi.created_at, mi.updated_at], :style=>wrap_text
end
end
wb.add_worksheet(name: "Menu Item Instance") do |sheet|
sheet.add_row %w(menu_item_id item_instance_code item_instance_name item_attributes price is_on_promotion promotion_price is_available is_default created_at updated_at), :style=>header_text
MenuItemInstance.all.each do |mii|
sheet.add_row [mii.menu_item_id, mii.item_instance_code, mii.item_instance_name, mii.item_attributes, mii.price, mii.is_on_promotion, mii.promotion_price, mii.is_available, mii.is_default, mii.created_at, mii.updated_at], :style=>wrap_text
end
end
wb.add_worksheet(name: "Menu Options") do |sheet|
sheet.add_row %w(option_type name value created_at updated_at), :style=>header_text
MenuItemOption.all.each do |option|
sheet.add_row [option.option_type, option.name, option.value, option.created_at, option.updated_at], :style=>wrap_text
end
end
wb.add_worksheet(name: "Item Attributes") do |sheet|
sheet.add_row %w(attribute_type name value created_at updated_at), :style=>header_text
MenuItemAttribute.all.each do |attr|
sheet.add_row [ attr.attribute_type,attr.name,attr.value,attr.created_at,attr.updated_at], :style=>wrap_text
end
end
wb.add_worksheet(name: "Account") do |sheet|
sheet.add_row %w(title account_type discount point bonus rebate created_at updated_at), :style=>header_text
Account.all.each do |acc|
sheet.add_row [acc.title,acc.account_type,acc.discount,acc.point,acc.bonus,acc.rebate,acc.created_at,acc.updated_at], :style=>wrap_text
end
end
wb.add_worksheet(name: "Item Set") do |sheet|
sheet.add_row %w(name alt_name min_selectable_qty max_selectable_qty created_at updated_at), :style=>header_text
ItemSet.all.each do |set|
sheet.add_row [set.name, set.alt_name, set.min_selectable_qty, set.max_selectable_qty, set.created_at, set.updated_at], :style=>wrap_text
end
end
wb.add_worksheet(name: "Menu Instance Item Set") do |sheet|
sheet.add_row %w(item_set_id menu_item_instance_id created_at updated_at), :style=>header_text
MenuInstanceItemSet.all.each do |miis|
sheet.add_row [miis.item_set_id, miis.menu_item_instance_id, miis.created_at, miis.updated_at], :style=>wrap_text
end
end
wb.add_worksheet(name: "Menu Item Set") do |sheet|
sheet.add_row %w(item_set_id menu_item_id created_at updated_at), :style=>header_text
MenuItemSet.all.each do |mis|
sheet.add_row [mis.item_set_id, mis.menu_item_id, mis.created_at, mis.updated_at], :style=>wrap_text
end
end
end