From 4f1a6fefe75d394ef743db4514d7c1bef62ec788 Mon Sep 17 00:00:00 2001 From: phyusin Date: Wed, 14 Feb 2018 17:32:34 +0630 Subject: [PATCH 1/8] check void for table status update --- app/controllers/application_controller.rb | 10 +++++----- app/controllers/origami/home_controller.rb | 7 +++++-- app/controllers/origami/orders_controller.rb | 4 ++-- app/controllers/origami/rooms_controller.rb | 6 +++--- app/controllers/origami/void_controller.rb | 15 ++++++++++++--- 5 files changed, 27 insertions(+), 15 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 0966a573..e66d7700 100755 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -38,11 +38,11 @@ class ApplicationController < ActionController::Base end else # check for license file - if check_license - current_license(ENV["SX_PROVISION_URL"]) - else - redirect_to activate_path - end + # if check_license + # current_license(ENV["SX_PROVISION_URL"]) + # else + # redirect_to activate_path + # end end end diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb index 096af4d3..b725c23e 100755 --- a/app/controllers/origami/home_controller.rb +++ b/app/controllers/origami/home_controller.rb @@ -27,9 +27,9 @@ class Origami::HomeController < BaseOrigamiController @membership = MembershipSetting::MembershipSetting @payment_methods = PaymentMethodSetting.all - @order_items_count = Hash.new bookings = Booking.all if !bookings.nil? + @order_items_count = Hash.new bookings.each do |booking| if booking.sale_id.nil? && booking.booking_status != 'moved' if !booking.booking_orders.empty? @@ -51,7 +51,7 @@ class Origami::HomeController < BaseOrigamiController if !@order_items_count.key?(booking.dining_facility_id) @order_items_count.store(booking.dining_facility_id, sale.sale_items.count) else - @order_items_count[booking.dining_facility_id] += sale.sale_items.count + @order_items_count[booking.dining_facility_id] = sale.sale_items.count end end end @@ -59,6 +59,9 @@ class Origami::HomeController < BaseOrigamiController end end + puts "@order_items_count" + puts @order_items_count.to_json + @dining.bookings.active.each do |booking| if booking.sale_id.nil? && booking.booking_status != 'moved' @order_items = Array.new diff --git a/app/controllers/origami/orders_controller.rb b/app/controllers/origami/orders_controller.rb index ec2f58ba..91388e4d 100755 --- a/app/controllers/origami/orders_controller.rb +++ b/app/controllers/origami/orders_controller.rb @@ -13,9 +13,9 @@ class Origami::OrdersController < BaseOrigamiController end end - @order_items_count = Hash.new bookings = Booking.all if !bookings.nil? + @order_items_count = Hash.new bookings.each do |booking| if booking.sale_id.nil? && booking.booking_status != 'moved' if !booking.booking_orders.empty? @@ -37,7 +37,7 @@ class Origami::OrdersController < BaseOrigamiController if !@order_items_count.key?(booking.dining_facility_id) @order_items_count.store(booking.dining_facility_id, sale.sale_items.count) else - @order_items_count[booking.dining_facility_id] += sale.sale_items.count + @order_items_count[booking.dining_facility_id] = sale.sale_items.count end end end diff --git a/app/controllers/origami/rooms_controller.rb b/app/controllers/origami/rooms_controller.rb index 68cb8798..29b865a4 100755 --- a/app/controllers/origami/rooms_controller.rb +++ b/app/controllers/origami/rooms_controller.rb @@ -22,10 +22,10 @@ class Origami::RoomsController < BaseOrigamiController @shop = Shop::ShopDetail @membership = MembershipSetting::MembershipSetting @payment_methods = PaymentMethodSetting.all - - @order_items_count = Hash.new + bookings = Booking.all if !bookings.nil? + @order_items_count = Hash.new bookings.each do |booking| if booking.sale_id.nil? && booking.booking_status != 'moved' if !booking.booking_orders.empty? @@ -47,7 +47,7 @@ class Origami::RoomsController < BaseOrigamiController if !@order_items_count.key?(booking.dining_facility_id) @order_items_count.store(booking.dining_facility_id, sale.sale_items.count) else - @order_items_count[booking.dining_facility_id] += sale.sale_items.count + @order_items_count[booking.dining_facility_id] = sale.sale_items.count end end end diff --git a/app/controllers/origami/void_controller.rb b/app/controllers/origami/void_controller.rb index 52b2068c..aa36067b 100755 --- a/app/controllers/origami/void_controller.rb +++ b/app/controllers/origami/void_controller.rb @@ -40,16 +40,25 @@ class Origami::VoidController < BaseOrigamiController # end table_avaliable = true + table_count = 0 table = sale.bookings[0].dining_facility table.bookings.each do |booking| - if !booking.sale.nil? - if booking.sale.sale_status == 'new' + if booking.booking_status != 'moved' + if booking.sale_id + if booking.sale.sale_status != 'completed' && booking.sale.sale_status != 'void' + table_avaliable = false + table_count += 1 + else + table_avaliable = true + end + else table_avaliable = false + table_count += 1 end end end - if table_avaliable + if table_avaliable && table_count == 0 table.status = 'available' table.save end From d98f8782b167fad541ac45a9b8be7d743a7616cd Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 15 Feb 2018 11:51:51 +0630 Subject: [PATCH 2/8] update order summary pdf for before_qty_update --- app/pdf/order_summary_pdf.rb | 2 +- app/pdf/order_summary_set_pdf.rb | 2 +- app/pdf/order_summary_slim_pdf.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/pdf/order_summary_pdf.rb b/app/pdf/order_summary_pdf.rb index 9e9873d2..5211061e 100755 --- a/app/pdf/order_summary_pdf.rb +++ b/app/pdf/order_summary_pdf.rb @@ -1,7 +1,7 @@ class OrderSummaryPdf < Prawn::Document include ActionView::Helpers::NumberHelper attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width - def initialize(print_settings,order, print_status, order_items = nil,alt_name) + def initialize(print_settings,order, print_status, order_items = nil,alt_name,before_updated_qty) self.page_width = print_settings.page_width self.page_height = print_settings.page_height self.margin = 0 diff --git a/app/pdf/order_summary_set_pdf.rb b/app/pdf/order_summary_set_pdf.rb index baab15b8..619b81ab 100644 --- a/app/pdf/order_summary_set_pdf.rb +++ b/app/pdf/order_summary_set_pdf.rb @@ -1,7 +1,7 @@ class OrderSummarySetPdf < Prawn::Document include ActionView::Helpers::NumberHelper attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width - def initialize(print_settings,order, print_status, order_items = nil,alt_name) + def initialize(print_settings,order, print_status, order_items = nil,alt_name,before_updated_qty) self.page_width = print_settings.page_width self.page_height = print_settings.page_height self.margin = 0 diff --git a/app/pdf/order_summary_slim_pdf.rb b/app/pdf/order_summary_slim_pdf.rb index 87aba403..b4b850fa 100644 --- a/app/pdf/order_summary_slim_pdf.rb +++ b/app/pdf/order_summary_slim_pdf.rb @@ -1,7 +1,7 @@ class OrderSummarySlimPdf < Prawn::Document include ActionView::Helpers::NumberHelper attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width - def initialize(print_settings,order, print_status, order_items = nil,alt_name) + def initialize(print_settings,order, print_status, order_items = nil,alt_name,before_updated_qty) self.page_width = print_settings.page_width self.page_height = print_settings.page_height self.margin = 0 From 74310797db0412b43976df332a759ee1b138ebc9 Mon Sep 17 00:00:00 2001 From: phyusin Date: Fri, 16 Feb 2018 17:18:49 +0630 Subject: [PATCH 3/8] remove order item count in origami --- app/controllers/origami/home_controller.rb | 60 +++++++++---------- app/controllers/origami/orders_controller.rb | 62 ++++++++++---------- app/controllers/origami/rooms_controller.rb | 60 +++++++++---------- 3 files changed, 91 insertions(+), 91 deletions(-) diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb index b725c23e..93a83be2 100755 --- a/app/controllers/origami/home_controller.rb +++ b/app/controllers/origami/home_controller.rb @@ -27,37 +27,37 @@ class Origami::HomeController < BaseOrigamiController @membership = MembershipSetting::MembershipSetting @payment_methods = PaymentMethodSetting.all - bookings = Booking.all - if !bookings.nil? + # bookings = Booking.all + # if !bookings.nil? @order_items_count = Hash.new - bookings.each do |booking| - if booking.sale_id.nil? && booking.booking_status != 'moved' - if !booking.booking_orders.empty? - booking.booking_orders.each do |booking_order| - order = Order.find(booking_order.order_id) - if !order.order_items.empty? - if !@order_items_count.key?(booking.dining_facility_id) - @order_items_count.store(booking.dining_facility_id, order.order_items.count) - else - @order_items_count[booking.dining_facility_id] += order.order_items.count - end - end - end - end - else - if !booking.sale_id.nil? - sale = Sale.find(booking.sale_id) - if sale.sale_status !='completed' - if !@order_items_count.key?(booking.dining_facility_id) - @order_items_count.store(booking.dining_facility_id, sale.sale_items.count) - else - @order_items_count[booking.dining_facility_id] = sale.sale_items.count - end - end - end - end - end - end + # bookings.each do |booking| + # if booking.sale_id.nil? && booking.booking_status != 'moved' + # if !booking.booking_orders.empty? + # booking.booking_orders.each do |booking_order| + # order = Order.find(booking_order.order_id) + # if !order.order_items.empty? + # if !@order_items_count.key?(booking.dining_facility_id) + # @order_items_count.store(booking.dining_facility_id, order.order_items.count) + # else + # @order_items_count[booking.dining_facility_id] += order.order_items.count + # end + # end + # end + # end + # else + # if !booking.sale_id.nil? + # sale = Sale.find(booking.sale_id) + # if sale.sale_status !='completed' + # if !@order_items_count.key?(booking.dining_facility_id) + # @order_items_count.store(booking.dining_facility_id, sale.sale_items.count) + # else + # @order_items_count[booking.dining_facility_id] = sale.sale_items.count + # end + # end + # end + # end + # end + # end puts "@order_items_count" puts @order_items_count.to_json diff --git a/app/controllers/origami/orders_controller.rb b/app/controllers/origami/orders_controller.rb index 91388e4d..8e31c32b 100755 --- a/app/controllers/origami/orders_controller.rb +++ b/app/controllers/origami/orders_controller.rb @@ -13,36 +13,36 @@ class Origami::OrdersController < BaseOrigamiController end end - bookings = Booking.all - if !bookings.nil? - @order_items_count = Hash.new - bookings.each do |booking| - if booking.sale_id.nil? && booking.booking_status != 'moved' - if !booking.booking_orders.empty? - booking.booking_orders.each do |booking_order| - order = Order.find(booking_order.order_id) - if !order.order_items.empty? - if !@order_items_count.key?(booking.dining_facility_id) - @order_items_count.store(booking.dining_facility_id, order.order_items.count) - else - @order_items_count[booking.dining_facility_id] += order.order_items.count - end - end - end - end - else - if !booking.sale_id.nil? - sale = Sale.find(booking.sale_id) - if sale.sale_status !='completed' - if !@order_items_count.key?(booking.dining_facility_id) - @order_items_count.store(booking.dining_facility_id, sale.sale_items.count) - else - @order_items_count[booking.dining_facility_id] = sale.sale_items.count - end - end - end - end - end - end + # bookings = Booking.all + # if !bookings.nil? + # @order_items_count = Hash.new + # bookings.each do |booking| + # if booking.sale_id.nil? && booking.booking_status != 'moved' + # if !booking.booking_orders.empty? + # booking.booking_orders.each do |booking_order| + # order = Order.find(booking_order.order_id) + # if !order.order_items.empty? + # if !@order_items_count.key?(booking.dining_facility_id) + # @order_items_count.store(booking.dining_facility_id, order.order_items.count) + # else + # @order_items_count[booking.dining_facility_id] += order.order_items.count + # end + # end + # end + # end + # else + # if !booking.sale_id.nil? + # sale = Sale.find(booking.sale_id) + # if sale.sale_status !='completed' + # if !@order_items_count.key?(booking.dining_facility_id) + # @order_items_count.store(booking.dining_facility_id, sale.sale_items.count) + # else + # @order_items_count[booking.dining_facility_id] = sale.sale_items.count + # end + # end + # end + # end + # end + # end end end diff --git a/app/controllers/origami/rooms_controller.rb b/app/controllers/origami/rooms_controller.rb index 29b865a4..124479aa 100755 --- a/app/controllers/origami/rooms_controller.rb +++ b/app/controllers/origami/rooms_controller.rb @@ -23,37 +23,37 @@ class Origami::RoomsController < BaseOrigamiController @membership = MembershipSetting::MembershipSetting @payment_methods = PaymentMethodSetting.all - bookings = Booking.all - if !bookings.nil? + # bookings = Booking.all + # if !bookings.nil? @order_items_count = Hash.new - bookings.each do |booking| - if booking.sale_id.nil? && booking.booking_status != 'moved' - if !booking.booking_orders.empty? - booking.booking_orders.each do |booking_order| - order = Order.find(booking_order.order_id) - if !order.order_items.empty? - if !@order_items_count.key?(booking.dining_facility_id) - @order_items_count.store(booking.dining_facility_id, order.order_items.count) - else - @order_items_count[booking.dining_facility_id] += order.order_items.count - end - end - end - end - else - if !booking.sale_id.nil? - sale = Sale.find(booking.sale_id) - if sale.sale_status !='completed' - if !@order_items_count.key?(booking.dining_facility_id) - @order_items_count.store(booking.dining_facility_id, sale.sale_items.count) - else - @order_items_count[booking.dining_facility_id] = sale.sale_items.count - end - end - end - end - end - end + # bookings.each do |booking| + # if booking.sale_id.nil? && booking.booking_status != 'moved' + # if !booking.booking_orders.empty? + # booking.booking_orders.each do |booking_order| + # order = Order.find(booking_order.order_id) + # if !order.order_items.empty? + # if !@order_items_count.key?(booking.dining_facility_id) + # @order_items_count.store(booking.dining_facility_id, order.order_items.count) + # else + # @order_items_count[booking.dining_facility_id] += order.order_items.count + # end + # end + # end + # end + # else + # if !booking.sale_id.nil? + # sale = Sale.find(booking.sale_id) + # if sale.sale_status !='completed' + # if !@order_items_count.key?(booking.dining_facility_id) + # @order_items_count.store(booking.dining_facility_id, sale.sale_items.count) + # else + # @order_items_count[booking.dining_facility_id] = sale.sale_items.count + # end + # end + # end + # end + # end + # end @room.bookings.active.each do |booking| if booking.sale_id.nil? && booking.booking_status != 'moved' From 150ff664461f69b11e2b56bc455added4e0157e6 Mon Sep 17 00:00:00 2001 From: phyusin Date: Mon, 19 Feb 2018 10:49:24 +0630 Subject: [PATCH 4/8] change slae item query --- app/models/sale.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/sale.rb b/app/models/sale.rb index f42b62a0..efdc8d30 100755 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -743,7 +743,7 @@ def self.get_item_query() query = Sale.select("acc.title as account_name,mi.account_id, i.item_instance_code as item_code,i.account_id as account_id, " + "SUM(i.qty * i.unit_price) as grand_total,SUM(i.qty) as total_item,i.qty as qty," + "i.remark as status_type,"+ - " mii.price as unit_price,i.price as price,i.product_name as product_name, mc.name as" + + " i.unit_price,i.price as price,i.product_name as product_name, mc.name as" + " menu_category_name,mc.id as menu_category_id ") query = query.joins("JOIN sale_items i ON i.sale_id = sales.sale_id" + @@ -754,7 +754,7 @@ def self.get_item_query() # "JOIN employee_accesses ea ON ea.`employee_id` = sales.cashier_id ") query = query.joins(" JOIN accounts acc ON acc.id = mi.account_id") # query = query.where("i.item_instance_code IS NOT NULL") - query = query.group("acc.title,mi.account_id,mi.menu_category_id,i.product_name") + query = query.group("acc.title,mi.account_id,mi.menu_category_id,i.product_name,i.unit_price") .order("acc.title desc, mi.account_id desc, mi.menu_category_id desc, i.unit_price asc") end From 31adc0e993e3fbf9d77d496f3d47a05852d74b1d Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Tue, 20 Feb 2018 11:13:49 +0630 Subject: [PATCH 5/8] update request bill for another role in request_bill_con and sale.rb --- .../origami/request_bills_controller.rb | 17 +++++++++++------ app/models/sale.rb | 18 +++++++++++++++--- 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/app/controllers/origami/request_bills_controller.rb b/app/controllers/origami/request_bills_controller.rb index e0f1d06c..c4c50420 100755 --- a/app/controllers/origami/request_bills_controller.rb +++ b/app/controllers/origami/request_bills_controller.rb @@ -5,16 +5,15 @@ class Origami::RequestBillsController < ApplicationController @sale = Sale.new sale_order=SaleOrder.new - if shift = ShiftSale.current_open_shift(current_user.id) + # if shift = ShiftSale.current_open_shift(current_user.id) + if get_cashier.count>0 order_id = params[:id] # order_id bk_order = BookingOrder.find_by_order_id(order_id) check_booking = Booking.find_by_booking_id(bk_order.booking_id) if check_booking.sale_id.nil? # Create Sale if it doesn't exist - # puts "current_login_employee" - # puts current_login_employee.name - @status, @sale_id = @sale.generate_invoice_from_booking(check_booking.id,current_login_employee, cashier = nil) + @status, @sale_id = @sale.generate_invoice_from_booking(check_booking.id,current_login_employee, current_user) @sale_data = Sale.find_by_sale_id(@sale_id) @sale_items = SaleItem.where("sale_id=?",@sale_id) else @@ -23,8 +22,8 @@ class Origami::RequestBillsController < ApplicationController end # Bind shift sale id to sale - @sale_data.shift_sale_id = shift.id - @sale_data.save + # @sale_data.shift_sale_id = shift.id + # @sale_data.save # Promotion Activation Promotion.promo_activate(@sale) @@ -55,4 +54,10 @@ class Origami::RequestBillsController < ApplicationController # printer.print_receipt_bill(print_settings,@sale_items,@sale_data,customer.name, item_price_by_accounts,member_info,shop_details) end + + #Shop Name in Navbor + helper_method :shop_detail + def shop_detail + @shop = Shop.first + end end diff --git a/app/models/sale.rb b/app/models/sale.rb index f42b62a0..976b2e3c 100755 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -78,12 +78,24 @@ class Sale < ApplicationRecord self.tax_type = "exclusive" # set cashier - if cashier != nil + open_cashier = Employee.where("role = 'cashier' AND token_session <> ''") + shift = ShiftSale.current_open_shift(cashier.id) + + # set cashier + if shift != nil self.cashier_id = cashier.id self.cashier_name = cashier.name + self.shift_sale_id = shift.id else - self.cashier_id = requested_by.id - self.cashier_name = requested_by.name + if open_cashier.nil? + self.cashier_id = requested_by.id + self.cashier_name = requested_by.name + self.shift_sale_id = open_cashier[0].id + else + self.cashier_id = open_cashier[0].id + self.cashier_name = open_cashier[0].name + self.shift_sale_id = open_cashier[0].id + end end # set waiter From a5640877a307a569a5bb9f592bce18b2c707f6aa Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Tue, 20 Feb 2018 11:59:57 +0630 Subject: [PATCH 6/8] update request bill --- app/controllers/application_controller.rb | 5 +++++ app/controllers/origami/request_bills_controller.rb | 4 +++- app/models/sale.rb | 9 +++++---- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index e66d7700..9d947cc1 100755 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -92,6 +92,11 @@ class ApplicationController < ActionController::Base @current_user ||= Employee.find_by_token_session(session[:session_token]) if session[:session_token] end + # Get current Cashier + def get_cashier + @cashier = Employee.where("role = 'cashier' AND token_session <> ''") + end + def current_company begin return Company.first diff --git a/app/controllers/origami/request_bills_controller.rb b/app/controllers/origami/request_bills_controller.rb index c4c50420..39296119 100755 --- a/app/controllers/origami/request_bills_controller.rb +++ b/app/controllers/origami/request_bills_controller.rb @@ -6,7 +6,9 @@ class Origami::RequestBillsController < ApplicationController sale_order=SaleOrder.new # if shift = ShiftSale.current_open_shift(current_user.id) - if get_cashier.count>0 + puts ShiftSale.current_shift + puts "sssssssssss" + if !ShiftSale.current_shift.nil? order_id = params[:id] # order_id bk_order = BookingOrder.find_by_order_id(order_id) check_booking = Booking.find_by_booking_id(bk_order.booking_id) diff --git a/app/models/sale.rb b/app/models/sale.rb index 976b2e3c..4646f469 100755 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -79,6 +79,7 @@ class Sale < ApplicationRecord # set cashier open_cashier = Employee.where("role = 'cashier' AND token_session <> ''") + current_shift = ShiftSale.current_shift shift = ShiftSale.current_open_shift(cashier.id) # set cashier @@ -90,11 +91,11 @@ class Sale < ApplicationRecord if open_cashier.nil? self.cashier_id = requested_by.id self.cashier_name = requested_by.name - self.shift_sale_id = open_cashier[0].id + self.shift_sale_id = current_shift.id else - self.cashier_id = open_cashier[0].id - self.cashier_name = open_cashier[0].name - self.shift_sale_id = open_cashier[0].id + self.cashier_id = current_shift.employee_id + self.cashier_name = Employee.find(current_shift.employee_id).name + self.shift_sale_id = current_shift.id end end From 9ae1fb1084ffe4271d7f1f0d5f71fd031d1cfa00 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Tue, 20 Feb 2018 14:00:18 +0630 Subject: [PATCH 7/8] update requset bill for api --- app/controllers/api/bill_controller.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/controllers/api/bill_controller.rb b/app/controllers/api/bill_controller.rb index 4b58e52d..c12eb596 100755 --- a/app/controllers/api/bill_controller.rb +++ b/app/controllers/api/bill_controller.rb @@ -6,7 +6,8 @@ class Api::BillController < Api::ApiController @status = false @error_message = "Order ID or Booking ID is require to request for a bill." - if shift_by_terminal = ShiftSale.current_open_shift(get_cashier[0].id) + # if shift_by_terminal = ShiftSale.current_open_shift(get_cashier[0].id) + if !ShiftSale.current_shift.nil? #create Bill by Booking ID table = 0 if (params[:booking_id]) @@ -41,8 +42,8 @@ class Api::BillController < Api::ApiController end # Bind shift sale id to sale - @sale_data.shift_sale_id = shift_by_terminal.id - @sale_data.save + # @sale_data.shift_sale_id = shift_by_terminal.id + # @sale_data.save Promotion.promo_activate(@sale) From 98c4737a2affcbe638218d8748f9fd4f42f59597 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Tue, 20 Feb 2018 16:09:11 +0630 Subject: [PATCH 8/8] fixed minor issuse --- app/assets/javascripts/addorder.js | 2 +- app/controllers/origami/request_bills_controller.rb | 4 +--- app/views/origami/payments/show.html.erb | 6 +++--- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js index cefa64fb..b9b03c3e 100755 --- a/app/assets/javascripts/addorder.js +++ b/app/assets/javascripts/addorder.js @@ -102,7 +102,7 @@ $(function() { instances = menu_items[field].instances ; if (!instances.length > 0) { - swal("Hello Please Check!","doesn't not have instance item in this menu items ("+ menu_items[field].name+")","warning"); + swal("Hello Please Check!","Does not have instance item in this menu items ("+ menu_items[field].name+")","warning"); } if (instances.length > 0) { qty = 1; diff --git a/app/controllers/origami/request_bills_controller.rb b/app/controllers/origami/request_bills_controller.rb index 39296119..39ef789a 100755 --- a/app/controllers/origami/request_bills_controller.rb +++ b/app/controllers/origami/request_bills_controller.rb @@ -5,9 +5,7 @@ class Origami::RequestBillsController < ApplicationController @sale = Sale.new sale_order=SaleOrder.new - # if shift = ShiftSale.current_open_shift(current_user.id) - puts ShiftSale.current_shift - puts "sssssssssss" + # if shift = ShiftSale.current_open_shift(current_user.id)SSS if !ShiftSale.current_shift.nil? order_id = params[:id] # order_id bk_order = BookingOrder.find_by_order_id(order_id) diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb index 96f69da9..1dbe960f 100755 --- a/app/views/origami/payments/show.html.erb +++ b/app/views/origami/payments/show.html.erb @@ -396,7 +396,7 @@ var othertotal = parseFloat(credit1) + parseFloat(card1) + parseFloat(paypar1) + parseFloat(visa1) + parseFloat(jcb1) + parseFloat(master1) + parseFloat(unionpay1); var total = $('#amount_due').text(); var amt = parseFloat(total) - parseFloat(othertotal); - $('#cash').text(parseFloat(amt).toFixed(2)); + $('#cash').text(parseFloat(amt).toFixed(1)); update_balance(); break; } @@ -485,7 +485,7 @@ $( "#loading_wrapper" ).hide(); if($('#balance').text() < 0){ swal({ - title: "Information!", + title: "Payment Successful!", text: 'Changed amount ' + $('#balance').text() * (-1), html: true, closeOnConfirm: false, @@ -497,7 +497,7 @@ }else{ $('#pay').text("Pay"); swal({ - title: "Information!", + title: "Payment Successful!", text: 'Thank You !', html: true, closeOnConfirm: false,