diff --git a/app/assets/javascripts/custom.js b/app/assets/javascripts/custom.js index 2460031d..f33f6d11 100644 --- a/app/assets/javascripts/custom.js +++ b/app/assets/javascripts/custom.js @@ -2,8 +2,6 @@ $(document).ready(function() { $('body').bootstrapMaterialDesign(); 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({ height: height, diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss index 8b269d92..9f7de6dd 100755 --- a/app/assets/stylesheets/origami.scss +++ b/app/assets/stylesheets/origami.scss @@ -139,6 +139,13 @@ select.form-control { background-color:#795548; } +.others-color{ + background-color:#E1BEE7; + height: 30px !important; + line-height: 30px !important; +} + + .cashier_number:hover{ background:#A9F5F2; } diff --git a/app/controllers/api/orders_controller.rb b/app/controllers/api/orders_controller.rb index 15f5f423..db6dd039 100755 --- a/app/controllers/api/orders_controller.rb +++ b/app/controllers/api/orders_controller.rb @@ -59,6 +59,7 @@ class Api::OrdersController < Api::ApiController @order.guest = params[:guest_info] @order.table_id = params[:table_id] # this is dining facilities's id @order.new_booking = true + @order.waiters = current_login_employee.name @order.employee_name = current_login_employee.name #Create Table Booking or Room Booking if !params["booking_id"].nil? diff --git a/app/controllers/oqs/home_controller.rb b/app/controllers/oqs/home_controller.rb index af843c7e..8e92f52d 100755 --- a/app/controllers/oqs/home_controller.rb +++ b/app/controllers/oqs/home_controller.rb @@ -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 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 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 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 @@ -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 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 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 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 @@ -161,7 +161,7 @@ class Oqs::HomeController < BaseOqsController 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 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 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 diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb index 7bde1e98..8098dfe9 100755 --- a/app/controllers/origami/addorders_controller.rb +++ b/app/controllers/origami/addorders_controller.rb @@ -68,6 +68,7 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController @order.table_id = params[:table_id] # this is dining facilities's id @order.new_booking = true @order.waiters = current_login_employee.name + @order.employee_name = current_login_employee.name #Create Table Booking or Room Booking if !params["booking_id"].nil? # check booking id is already completed. diff --git a/app/controllers/transactions/bookings_controller.rb b/app/controllers/transactions/bookings_controller.rb index b826cd52..66418caa 100644 --- a/app/controllers/transactions/bookings_controller.rb +++ b/app/controllers/transactions/bookings_controller.rb @@ -10,12 +10,12 @@ class Transactions::BookingsController < ApplicationController if filter.nil? && from.nil? && to.nil? @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 - sale = Sale.search(filter,from,to) - if sale.count > 0 - @bookings = sale - @bookings = Kaminari.paginate_array(@bookings).page(params[:page]).per(2) + booking = Booking.search(filter,from,to) + if booking.count > 0 + @bookings = booking + @bookings = Kaminari.paginate_array(@bookings).page(params[:page]).per(20) else @bookings = 0 end diff --git a/app/models/assigned_order_item.rb b/app/models/assigned_order_item.rb index 34c97c6f..85dd71c7 100755 --- a/app/models/assigned_order_item.rb +++ b/app/models/assigned_order_item.rb @@ -7,10 +7,11 @@ class AssignedOrderItem < ApplicationRecord belongs_to :order 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.order = order 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.print_status = false assigned_order_item.delivery_status = false @@ -23,7 +24,7 @@ class AssignedOrderItem < ApplicationRecord oqs.id as station_id, oqs.station_name, oqs.is_active, oqpz.zone_id, 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, 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 diff --git a/app/models/booking.rb b/app/models/booking.rb index b65063a4..826d585d 100755 --- a/app/models/booking.rb +++ b/app/models/booking.rb @@ -45,14 +45,14 @@ class Booking < ApplicationRecord if filter.blank? keyword = '' 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 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) - query = sale.where(keyword) + 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 = booking.where(keyword) 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 diff --git a/app/models/order_queue_station.rb b/app/models/order_queue_station.rb index d85dffa7..9ed86b85 100755 --- a/app/models/order_queue_station.rb +++ b/app/models/order_queue_station.rb @@ -70,7 +70,7 @@ class OrderQueueStation < ApplicationRecord # else 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) end # end diff --git a/app/models/sale.rb b/app/models/sale.rb index c2bfbdd2..696e0598 100755 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -605,7 +605,7 @@ end def self.get_item_query() 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" + " 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.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 def self.get_by_shift_items(shift_sale_range, shift, from, to, status) diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index b4b29303..e712ed9d 100755 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -264,8 +264,6 @@ class SalePayment < ApplicationRecord end def sale_update_payment_status(paid_amount) - puts paid_amount - puts "parid Masssssssssssssssssssssssssssssssssssssssss" #update amount_outstanding self.sale.amount_received = self.sale.amount_received.to_f + paid_amount.to_f self.sale.save! @@ -316,8 +314,6 @@ class SalePayment < ApplicationRecord self.sale.rebate_status = nil end end - puts "rrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr" - puts response.to_json end self.sale.save! @@ -375,7 +371,8 @@ class SalePayment < ApplicationRecord paypar.each do |pp| if pp.payment_method == "paypar" payparcost = payparcost + pp.payment_amount - elsif pp.payment_method == "creditnote" + end + if pp.payment_method == "creditnote" credit = 1 end end @@ -410,7 +407,9 @@ class SalePayment < ApplicationRecord rescue SocketError response = { "status": false, "message": "Can't connect server"} end - + puts response.to_json + puts payparcost + puts overall_dis redeem_amount = payparcost + overall_dis total_percentage = 0 @@ -431,15 +430,19 @@ class SalePayment < ApplicationRecord data = {:type => a[:type], :amount => a[:amount]} type_arr.each do |si| if si[:type] == a[:type] - amount = (redeem_amount / total_percentage)*si[:percentage] - actual = a[:amount] - amount - data[:amount] = actual + if credit == 1 + data[:amount] = 0 + else + amount = (redeem_amount / total_percentage)*si[:percentage] + actual = a[:amount] - amount + data[:amount] = actual + end + end - end rebate_arr.push(data) end - + total_amount = rebate_prices - payparcost - overall_dis if credit == 1 @@ -485,6 +488,7 @@ class SalePayment < ApplicationRecord response = { "status": "no_member", "message": "Not membership"} end + end diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb index 846487be..a911acf4 100755 --- a/app/views/origami/payments/show.html.erb +++ b/app/views/origami/payments/show.html.erb @@ -148,7 +148,7 @@
<% if @other != 0.0 %> -
+
MPU
<%= @other %>
@@ -162,7 +162,7 @@ <% end %> <% if @ppamount != 0.0 %> -
+
Redeem
<%= @ppamount %>
@@ -176,7 +176,7 @@ <% end %> <% if @visacount != 0.0 %> -
+
Visa
<%= @visacount %>
@@ -190,7 +190,7 @@ <% end %> <% if @jcbcount != 0.0 %> -
+
JCB
<%= @jcbcount %>
@@ -204,7 +204,7 @@ <% end %> <% if @mastercount != 0.0 %> -
+
Master
<%= @mastercount %>
diff --git a/app/views/origami/redeem_payments/index.html.erb b/app/views/origami/redeem_payments/index.html.erb index 50347dd1..23b6dc29 100755 --- a/app/views/origami/redeem_payments/index.html.erb +++ b/app/views/origami/redeem_payments/index.html.erb @@ -174,9 +174,10 @@ data: {redeem_amount:redeem_amount,membership_id:membership_id,sale_id:sale_id}, success: function(result){ if(result.status == true){ + console.log(result) swal({ title: "Information!", - text: result.status, + text: result.message, }, function () { window.location.href = '/origami/sale/'+ sale_id + "/payment" }); diff --git a/app/views/reports/saleitem/_shift_sale_report_filter.html.erb b/app/views/reports/saleitem/_shift_sale_report_filter.html.erb index b6dfe98f..c913b592 100755 --- a/app/views/reports/saleitem/_shift_sale_report_filter.html.erb +++ b/app/views/reports/saleitem/_shift_sale_report_filter.html.erb @@ -3,7 +3,7 @@ <% if period_type != false %>
- +