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

pull from master 23.5.2018

Browse Source
This commit is contained in:
San Wai Lwin
2018-05-23 09:36:49 +06:30
parent f1733d9f06
commit dbfc00435b
12 changed files with 89 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/api/restaurant/menu/_menu.json.jbuilder
View File

@@ -17,7 +17,7 @@ if (menu.menu_categories)
if category.menu_items
json.items category.menu_items do |item|
json.partial! 'api/restaurant/menu/menu_item', item: item
json.partial! 'api/restaurant/menu/menu_item', item: item, request_url: request_url
end
end
end

6
app/views/api/restaurant/menu/_menu_item.json.jbuilder
View File

@@ -53,7 +53,11 @@ json.id item.id
json.code item.item_code
json.name item.name
json.alt_name item.alt_name
json.image item.image_path.url
if !request_url.nil? && request_url != ''
json.image request_url + item.image_path.url.to_s
else
json.image item.image_path.url
end
json.description item.description
json.information item.information
json.type item.type

2
app/views/api/restaurant/menu/index.json.jbuilder
View File

@@ -5,7 +5,7 @@ menu_json = json.array! @menus do |menu|
json.valid_time_from menu.valid_time_from.strftime("%H:%M")
json.valid_time_to menu.valid_time_to.strftime("%H:%M")
json.partial! 'api/restaurant/menu/menu', menu: menu
json.partial! 'api/restaurant/menu/menu', menu: menu, request_url: @request_url
# if (@current_menu)
# json.current_menu do
# json.partial! 'api/restaurant/menu/menu', menu: @current_menu

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

@@ -5,7 +5,7 @@
<% type = request.path_info.include?('quick_service')%>
<% modify_order = request.path_info.include?('modify_order')%>
<div class="container-fluid ">
<div class="container-fluid " style="padding:0px 3px 0px 3px;">
<div id="oqs_loading_wrapper" style="display:none;">
<div id="oqs_loading"></div>
</div>

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

@@ -570,8 +570,8 @@ var customer_name = "<%= @customer.name %>";
if ($("#server_mode").val() != "cloud") { // first bill not used in cloud
payment_type = checkReceiptNoInFirstBillData(receipt_no,"payment");
console.log(payment_type)
console.log(parseInt(jQuery.inArray("MPU", payment_type)))
// console.log(payment_type)
// console.log(parseInt(jQuery.inArray("MPU", payment_type)))
if (member_id && member_discount) {
if(parseInt(jQuery.inArray("Credit", payment_type)) == -1){
$("#credit_payment").hide();
@@ -636,7 +636,7 @@ var customer_name = "<%= @customer.name %>";
$('#pay').click(function() {
sub_total = $('#sub-total').text();
member = $('#membership_id').text();
console.log(member)
// console.log(member)
if (parseInt(jQuery.inArray("MPU", payment_type)) != -1 && $('.mpu').text() == 0 && sub_total != 0.0 && member) {
swal("Oops","Please Pay with MPU Payment","warning");
}else if(parseInt(jQuery.inArray("Redeem", payment_type)) != -1 && $('#ppamount').text()==0 && sub_total != 0.0 && member){
@@ -1195,7 +1195,7 @@ var customer_name = "<%= @customer.name %>";
url: url,
data: {},
success: function (result) {
console.log(result)
// console.log(result)
if (result.status == true) {
createAccessCode(code);
if (type == "edit") {
@@ -1330,7 +1330,7 @@ var customer_name = "<%= @customer.name %>";
url: url,
data: "remark="+ remark + "&sale_id=" + sale_id+ "&access_code=" + access_code,
success: function (result) {
console.log(result)
// console.log(result)
// For Server Print - from jade
if ($("#server_mode").val() == "cloud") {
code2lab.printFile(result.filepath.substr(6), result.printer_url);

1
app/views/settings/employees/_form.html.erb
View File

@@ -7,6 +7,7 @@
<div class="form-inputs p-l-15">
<%= f.input :name %>
<%= f.input :is_active,:input_html=>{:class=>"col-md-9"} %>
<% if current_user.role == "administrator" %>
<%= f.input :role, :collection => Lookup.collection_of("employee_roles"),:class=>'form-group' %>
<% else %>