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 into adminbsb_ui_changes

Browse Source
This commit is contained in:
phyusin
2017-11-16 18:19:05 +06:30
parent d648bbf100 059d1fc853
commit b09061d9c2
17 changed files with 53 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/custom.js
View File

@@ -2,8 +2,6 @@ $(document).ready(function() {
$('body').bootstrapMaterialDesign(); $('body').bootstrapMaterialDesign();
var height = ($(window).height() - ($('.legal').outerHeight() + $('.user-info').outerHeight() + $('.navbar').innerHeight())); var height = ($(window).height() - ($('.legal').outerHeight() + $('.user-info').outerHeight() + $('.navbar').innerHeight()));
console.log(height);
console.log($('#order-detail-slimscroll').attr('data-height'))
$('#custom-slimscroll').slimScroll({ $('#custom-slimscroll').slimScroll({
height: height, height: height,

7
app/assets/stylesheets/origami.scss
View File

@@ -139,6 +139,13 @@ select.form-control {
background-color:#795548; background-color:#795548;
} }
.others-color{
background-color:#E1BEE7;
height: 30px !important;
line-height: 30px !important;
}
.cashier_number:hover{ .cashier_number:hover{
background:#A9F5F2; background:#A9F5F2;
} }

1
app/controllers/api/orders_controller.rb
View File

@@ -59,6 +59,7 @@ class Api::OrdersController < Api::ApiController
@order.guest = params[:guest_info] @order.guest = params[:guest_info]
@order.table_id = params[:table_id] # this is dining facilities's id @order.table_id = params[:table_id] # this is dining facilities's id
@order.new_booking = true @order.new_booking = true
@order.waiters = current_login_employee.name
@order.employee_name = current_login_employee.name @order.employee_name = current_login_employee.name
#Create Table Booking or Room Booking #Create Table Booking or Room Booking
if !params["booking_id"].nil? if !params["booking_id"].nil?

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

@@ -124,7 +124,7 @@ class Oqs::HomeController < BaseOqsController
.joins(" left join order_queue_stations as oqs on oqs.id = assigned_order_items.order_queue_station_id .joins(" left join order_queue_stations as oqs on oqs.id = assigned_order_items.order_queue_station_id
left join order_queue_process_by_zones as oqpz on oqpz.order_queue_station_id = oqs.id left join order_queue_process_by_zones as oqpz on oqpz.order_queue_station_id = oqs.id
left join orders as od ON od.order_id = assigned_order_items.order_id left join orders as od ON od.order_id = assigned_order_items.order_id
left join order_items as odt ON odt.item_code = assigned_order_items.item_code AND odt.order_id = assigned_order_items.order_id left join order_items as odt ON odt.item_instance_code = assigned_order_items.instance_code AND odt.order_id = assigned_order_items.order_id
left join customers as cus ON cus.customer_id = od.customer_id left join customers as cus ON cus.customer_id = od.customer_id
left join booking_orders as bo on bo.order_id = assigned_order_items.order_id left join booking_orders as bo on bo.order_id = assigned_order_items.order_id
left join bookings as bk on bk.booking_id = bo.booking_id left join bookings as bk on bk.booking_id = bo.booking_id
@@ -142,7 +142,7 @@ class Oqs::HomeController < BaseOqsController
.joins(" left join order_queue_stations as oqs on oqs.id = assigned_order_items.order_queue_station_id .joins(" left join order_queue_stations as oqs on oqs.id = assigned_order_items.order_queue_station_id
left join order_queue_process_by_zones as oqpz on oqpz.order_queue_station_id = oqs.id left join order_queue_process_by_zones as oqpz on oqpz.order_queue_station_id = oqs.id
left join orders as od ON od.order_id = assigned_order_items.order_id left join orders as od ON od.order_id = assigned_order_items.order_id
left join order_items as odt ON odt.item_code = assigned_order_items.item_code AND odt.order_id = assigned_order_items.order_id left join order_items as odt ON odt.item_instance_code = assigned_order_items.instance_code AND odt.order_id = assigned_order_items.order_id
left join customers as cus ON cus.customer_id = od.customer_id left join customers as cus ON cus.customer_id = od.customer_id
left join booking_orders as bo on bo.order_id = assigned_order_items.order_id left join booking_orders as bo on bo.order_id = assigned_order_items.order_id
left join bookings as bk on bk.booking_id = bo.booking_id left join bookings as bk on bk.booking_id = bo.booking_id
@@ -161,7 +161,7 @@ class Oqs::HomeController < BaseOqsController
query = AssignedOrderItem.select("count(odt.item_code) as total,oqs.id as station_id") query = AssignedOrderItem.select("count(odt.item_code) as total,oqs.id as station_id")
.joins(" left join order_queue_stations as oqs on oqs.id = assigned_order_items.order_queue_station_id .joins(" left join order_queue_stations as oqs on oqs.id = assigned_order_items.order_queue_station_id
left join orders as od ON od.order_id = assigned_order_items.order_id left join orders as od ON od.order_id = assigned_order_items.order_id
left join order_items as odt ON odt.item_code = assigned_order_items.item_code AND odt.order_id = assigned_order_items.order_id left join order_items as odt ON odt.item_instance_code = assigned_order_items.instance_code AND odt.order_id = assigned_order_items.order_id
left join customers as cus ON cus.customer_id = od.customer_id left join customers as cus ON cus.customer_id = od.customer_id
left join booking_orders as bo on bo.order_id = assigned_order_items.order_id left join booking_orders as bo on bo.order_id = assigned_order_items.order_id
left join bookings as bk on bk.booking_id = bo.booking_id left join bookings as bk on bk.booking_id = bo.booking_id

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

@@ -68,6 +68,7 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController
@order.table_id = params[:table_id] # this is dining facilities's id @order.table_id = params[:table_id] # this is dining facilities's id
@order.new_booking = true @order.new_booking = true
@order.waiters = current_login_employee.name @order.waiters = current_login_employee.name
@order.employee_name = current_login_employee.name
#Create Table Booking or Room Booking #Create Table Booking or Room Booking
if !params["booking_id"].nil? if !params["booking_id"].nil?
# check booking id is already completed. # check booking id is already completed.

10
app/controllers/transactions/bookings_controller.rb
View File

@@ -10,12 +10,12 @@ class Transactions::BookingsController < ApplicationController
if filter.nil? && from.nil? && to.nil? if filter.nil? && from.nil? && to.nil?
@bookings = Booking.all.order("sale_id desc") @bookings = Booking.all.order("sale_id desc")
@bookings = Kaminari.paginate_array(@bookings).page(params[:page]).per(2) @bookings = Kaminari.paginate_array(@bookings).page(params[:page]).per(20)
else else
sale = Sale.search(filter,from,to) booking = Booking.search(filter,from,to)
if sale.count > 0 if booking.count > 0
@bookings = sale @bookings = booking
@bookings = Kaminari.paginate_array(@bookings).page(params[:page]).per(2) @bookings = Kaminari.paginate_array(@bookings).page(params[:page]).per(20)
else else
@bookings = 0 @bookings = 0
end end

5
app/models/assigned_order_item.rb
View File

@@ -7,10 +7,11 @@ class AssignedOrderItem < ApplicationRecord
belongs_to :order belongs_to :order
belongs_to :order_queue_station belongs_to :order_queue_station
def self.assigned_order_item (order, item_code, order_queue_station ) def self.assigned_order_item (order, item_code, instance_code, order_queue_station )
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
assigned_order_item.instance_code = instance_code
assigned_order_item.order_queue_station = order_queue_station assigned_order_item.order_queue_station = order_queue_station
assigned_order_item.print_status = false assigned_order_item.print_status = false
assigned_order_item.delivery_status = false assigned_order_item.delivery_status = false
@@ -23,7 +24,7 @@ class AssignedOrderItem < ApplicationRecord
oqs.id as station_id, oqs.station_name, oqs.id as station_id, oqs.station_name,
oqs.is_active, oqpz.zone_id, oqs.is_active, oqpz.zone_id,
df.name as zone, df.type as table_type, df.name as zone, df.type as table_type,
odt.order_id, odt.item_code, odt.item_name, odt.order_id, odt.item_code, odt.item_instance_code, odt.item_name,
odt.price, odt.qty, odt.item_order_by, odt.options, odt.price, odt.qty, odt.item_order_by, odt.options,
cus.name as customer_name, odt.created_at") cus.name as customer_name, odt.created_at")
.joins(" left join order_queue_stations as oqs on oqs.id = assigned_order_items.order_queue_station_id .joins(" left join order_queue_stations as oqs on oqs.id = assigned_order_items.order_queue_station_id

8
app/models/booking.rb
View File

@@ -45,14 +45,14 @@ class Booking < ApplicationRecord
if filter.blank? if filter.blank?
keyword = '' keyword = ''
else else
keyword = "booking_id LIKE ? OR cashier_name LIKE ? OR sale_status ='#{filter}'","%#{filter}%","%#{filter}%" keyword = "booking_id LIKE ? OR checkin_by LIKE ? OR booking_status LIKE? OR checkout_by LIKE? OR sale_id ='#{filter}'","%#{filter}%","%#{filter}%","%#{filter}%","%#{filter}%"
end end
if from.present? && to.present? if from.present? && to.present?
sale = Sale.where("DATE_FORMAT(receipt_date,'%d-%m-%Y') >= ?" + " AND DATE_FORMAT(receipt_date,'%d-%m-%Y') <= ? and NOT sale_status = 'void' ", from,to) booking = Booking.where("DATE_FORMAT(created_at,'%d-%m-%Y') >= ?" + " AND DATE_FORMAT(created_at,'%d-%m-%Y') <= ? and NOT booking_status = 'void' ", from,to)
query = sale.where(keyword) query = booking.where(keyword)
else else
where("receipt_no LIKE ? OR cashier_name LIKE ? OR sale_status ='#{filter}'","%#{filter}%","%#{filter}%",) where("booking_id LIKE ? OR checkin_by LIKE ? OR booking_status LIKE? OR checkout_by LIKE? OR sale_id ='#{filter}'","%#{filter}%","%#{filter}%","%#{filter}%","%#{filter}%")
end end
end end

2
app/models/order_queue_station.rb
View File

@@ -70,7 +70,7 @@ class OrderQueueStation < ApplicationRecord
# else # else
if (order_item.price != 0) if (order_item.price != 0)
AssignedOrderItem.assigned_order_item(order, order_item.item_code, oqs) AssignedOrderItem.assigned_order_item(order, order_item.item_code, order_item.item_instance_code, oqs)
oqs_order_items.push(order_item) oqs_order_items.push(order_item)
end end
# end # end

4
app/models/sale.rb
View File

@@ -605,7 +605,7 @@ end
def self.get_item_query() def self.get_item_query()
query = Sale.select("acc.title as account_name,mi.account_id, i.item_instance_code as item_code, " + query = Sale.select("acc.title as account_name,mi.account_id, i.item_instance_code as item_code, " +
"(SUM(i.qty * i.unit_price)) as grand_total,SUM(i.qty) as total_item," + "(i.qty * i.unit_price) as grand_total,(i.qty) as total_item," +
" i.unit_price as unit_price,i.product_name as product_name, mc.name as" + " i.unit_price as unit_price,i.product_name as product_name, mc.name as" +
" menu_category_name,mc.id as menu_category_id ") " menu_category_name,mc.id as menu_category_id ")
@@ -617,7 +617,7 @@ def self.get_item_query()
query = query.joins(" JOIN accounts acc ON acc.id = mi.account_id") query = query.joins(" JOIN accounts acc ON acc.id = mi.account_id")
query = query.where("i.unit_price > 0") query = query.where("i.unit_price > 0")
query = query.group('i.product_code ').order("mi.account_id, mi.menu_category_id") query = query.group("i.item_instance_code").order("mi.account_id, mi.menu_category_id")
end end
def self.get_by_shift_items(shift_sale_range, shift, from, to, status) def self.get_by_shift_items(shift_sale_range, shift, from, to, status)

16
app/models/sale_payment.rb
View File

@@ -264,8 +264,6 @@ class SalePayment < ApplicationRecord
end end
def sale_update_payment_status(paid_amount) def sale_update_payment_status(paid_amount)
puts paid_amount
puts "parid Masssssssssssssssssssssssssssssssssssssssss"
#update amount_outstanding #update amount_outstanding
self.sale.amount_received = self.sale.amount_received.to_f + paid_amount.to_f self.sale.amount_received = self.sale.amount_received.to_f + paid_amount.to_f
self.sale.save! self.sale.save!
@@ -316,8 +314,6 @@ class SalePayment < ApplicationRecord
self.sale.rebate_status = nil self.sale.rebate_status = nil
end end
end end
puts "rrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr"
puts response.to_json
end end
self.sale.save! self.sale.save!
@@ -375,7 +371,8 @@ class SalePayment < ApplicationRecord
paypar.each do |pp| paypar.each do |pp|
if pp.payment_method == "paypar" if pp.payment_method == "paypar"
payparcost = payparcost + pp.payment_amount payparcost = payparcost + pp.payment_amount
elsif pp.payment_method == "creditnote" end
if pp.payment_method == "creditnote"
credit = 1 credit = 1
end end
end end
@@ -410,7 +407,9 @@ class SalePayment < ApplicationRecord
rescue SocketError rescue SocketError
response = { "status": false, "message": "Can't connect server"} response = { "status": false, "message": "Can't connect server"}
end end
puts response.to_json
puts payparcost
puts overall_dis
redeem_amount = payparcost + overall_dis redeem_amount = payparcost + overall_dis
total_percentage = 0 total_percentage = 0
@@ -431,12 +430,16 @@ class SalePayment < ApplicationRecord
data = {:type => a[:type], :amount => a[:amount]} data = {:type => a[:type], :amount => a[:amount]}
type_arr.each do |si| type_arr.each do |si|
if si[:type] == a[:type] if si[:type] == a[:type]
if credit == 1
data[:amount] = 0
else
amount = (redeem_amount / total_percentage)*si[:percentage] amount = (redeem_amount / total_percentage)*si[:percentage]
actual = a[:amount] - amount actual = a[:amount] - amount
data[:amount] = actual data[:amount] = actual
end end
end end
end
rebate_arr.push(data) rebate_arr.push(data)
end end
@@ -485,6 +488,7 @@ class SalePayment < ApplicationRecord
response = { "status": "no_member", "message": "Not membership"} response = { "status": "no_member", "message": "Not membership"}
end end
end end

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

@@ -148,7 +148,7 @@
<div class="card-title m-l-5 m-r-5"> <div class="card-title m-l-5 m-r-5">
<!-- mpu --> <!-- mpu -->
<% if @other != 0.0 %> <% if @other != 0.0 %>
<div class="row payment other-payment-color"> <div class="row payment others-color">
<div class="col-md-5"></div> <div class="col-md-5"></div>
<div class="col-md-3">MPU</div> <div class="col-md-3">MPU</div>
<div class="col-md-4 mpu is_card" id="others"><%= @other %></div> <div class="col-md-4 mpu is_card" id="others"><%= @other %></div>
@@ -162,7 +162,7 @@
<% end %> <% end %>
<!-- paypar --> <!-- paypar -->
<% if @ppamount != 0.0 %> <% if @ppamount != 0.0 %>
<div class="row payment other-payment-color"> <div class="row payment others-color">
<div class="col-md-5"></div> <div class="col-md-5"></div>
<div class="col-md-3">Redeem</div> <div class="col-md-3">Redeem</div>
<div class="col-md-4" id="ppamount"><%= @ppamount %></div> <div class="col-md-4" id="ppamount"><%= @ppamount %></div>
@@ -176,7 +176,7 @@
<% end %> <% end %>
<!-- Visa --> <!-- Visa -->
<% if @visacount != 0.0 %> <% if @visacount != 0.0 %>
<div class="row payment other-payment-color"> <div class="row payment others-color">
<div class="col-md-5"></div> <div class="col-md-5"></div>
<div class="col-md-3">Visa</div> <div class="col-md-3">Visa</div>
<div class="col-md-4 visa is_card" id="visacount"><%= @visacount %></div> <div class="col-md-4 visa is_card" id="visacount"><%= @visacount %></div>
@@ -190,7 +190,7 @@
<% end %> <% end %>
<!-- JCB --> <!-- JCB -->
<% if @jcbcount != 0.0 %> <% if @jcbcount != 0.0 %>
<div class="row payment other-payment-color"> <div class="row payment others-color">
<div class="col-md-5"></div> <div class="col-md-5"></div>
<div class="col-md-3">JCB</div> <div class="col-md-3">JCB</div>
<div class="col-md-4 jcb is_card" id="jcbcount"><%= @jcbcount %></div> <div class="col-md-4 jcb is_card" id="jcbcount"><%= @jcbcount %></div>
@@ -204,7 +204,7 @@
<% end %> <% end %>
<!-- Master --> <!-- Master -->
<% if @mastercount != 0.0 %> <% if @mastercount != 0.0 %>
<div class="row payment other-payment-color"> <div class="row payment others-color">
<div class="col-md-5"></div> <div class="col-md-5"></div>
<div class="col-md-3">Master</div> <div class="col-md-3">Master</div>
<div class="col-md-4 master is_card" id="mastercount"><%= @mastercount %></div> <div class="col-md-4 master is_card" id="mastercount"><%= @mastercount %></div>

3
app/views/origami/redeem_payments/index.html.erb
View File

@@ -174,9 +174,10 @@
data: {redeem_amount:redeem_amount,membership_id:membership_id,sale_id:sale_id}, data: {redeem_amount:redeem_amount,membership_id:membership_id,sale_id:sale_id},
success: function(result){ success: function(result){
if(result.status == true){ if(result.status == true){
console.log(result)
swal({ swal({
title: "Information!", title: "Information!",
text: result.status, text: result.message,
}, function () { }, function () {
window.location.href = '/origami/sale/'+ sale_id + "/payment" window.location.href = '/origami/sale/'+ sale_id + "/payment"
}); });

2
app/views/reports/saleitem/_shift_sale_report_filter.html.erb
View File

@@ -3,7 +3,7 @@
<% if period_type != false %> <% if period_type != false %>
<div class="row"> <div class="row">
<div class="col-lg-2 col-md-2 col-sm-2"> <div class="col-lg-2 col-md-2 col-sm-2">
<label class="font-14">Select Period<%= t("views.right_panel.detail.select_period") %></label> <label class="font-14"><%= t("views.right_panel.detail.select_period") %></label>
<select name="period" id="sel_period" class="form-control"> <select name="period" id="sel_period" class="form-control">
<option value=""><%= t("views.right_panel.detail.select_period") %></option> <option value=""><%= t("views.right_panel.detail.select_period") %></option>
<option value="0">Today</option> <option value="0">Today</option>

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

@@ -11,6 +11,7 @@
<%= f.input :gateway_url %> <%= f.input :gateway_url %>
<%= f.input :auth_token %> <%= f.input :auth_token %>
<%= f.input :merchant_account_id %> <%= f.input :merchant_account_id %>
<%= f.input :additional_parameter, as: :text %>
<%= f.input :created_by %> <%= f.input :created_by %>
</div> </div>

2
app/views/transactions/bookings/index.html.erb
View File

@@ -15,7 +15,7 @@
<tbody> <tbody>
<tr> <tr>
<td colspan="8"> <td colspan="8">
<%= form_tag transactions_orders_path, :method => :get do %> <%= form_tag transactions_bookings_path, :method => :get do %>
<div class="row clearfix"> <div class="row clearfix">
<div class="col-lg-4 col-md-4 col-sm-4 col-xs-4"> <div class="col-lg-4 col-md-4 col-sm-4 col-xs-4">
<label><%= t("views.right_panel.detail.enter_keyboards") %></label> <label><%= t("views.right_panel.detail.enter_keyboards") %></label>

1
db/migrate/20170414090001_create_assigned_order_items.rb
View File

@@ -3,6 +3,7 @@ class CreateAssignedOrderItems < ActiveRecord::Migration[5.1]
create_table :assigned_order_items, :id => false do |t| create_table :assigned_order_items, :id => false do |t|
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.references :order_queue_station, foreign_key: true t.references :order_queue_station, foreign_key: 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