From a15025c8a0de0179c434a29f488a8b020988f125 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 19 Feb 2018 17:45:30 +0630 Subject: [PATCH 1/3] update add orderjs and origami js --- app/assets/javascripts/addorder.js | 5 +++-- app/assets/javascripts/origami.js | 5 +++-- app/views/origami/addorders/detail.html.erb | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js index 237bf321..94d52bbf 100755 --- a/app/assets/javascripts/addorder.js +++ b/app/assets/javascripts/addorder.js @@ -697,7 +697,8 @@ $(function() { qty = parseInt(data.attr('data-qty')); append = 0; - price = parseFloat(data.attr('data-price')).toFixed(2); + price = data.attr('data-price'); + instance_name = data.attr('data-instance'); if (instance_name == "undefined"){ instance = ''; @@ -720,7 +721,7 @@ $(function() { } $(item_row[i]).children('#item_qty').text(qty); - parseFloat($(item_row[i]).children('#item_price').text(price*qty)).toFixed(2); + parseFloat($(item_row[i]).children('#item_price').text(parseFloat(price*qty).toFixed(2))); append =1; }else{ if (qty > 1) { diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js index d2359593..d7afc4db 100755 --- a/app/assets/javascripts/origami.js +++ b/app/assets/javascripts/origami.js @@ -148,13 +148,14 @@ $(document).on('turbolinks:load', function() { function checkReceiptNoInFirstBillData(receipt_no,payment) { // localStorage.removeItem('receipt_lists'); var status = false; + var json_data = []; if((receipt_no!=undefined) && (receipt_no!="")){ if(localStorage.hasOwnProperty("receipt_lists")===true){ var arr_data = JSON.parse(localStorage.getItem("receipt_lists")); if (payment) { - var json_data = arr_data.filter(function(e) { return e.receipt_no == receipt_no }); + json_data = arr_data.filter(function(e) { return e.receipt_no == receipt_no }); }else{ - var json_data = arr_data.filter(function(e) { return e.receipt_no !== receipt_no }); + json_data = arr_data.filter(function(e) { return e.receipt_no !== receipt_no }); } if((arr_data.length) > (json_data.length)){ diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb index ff72d2bc..a49300d2 100755 --- a/app/views/origami/addorders/detail.html.erb +++ b/app/views/origami/addorders/detail.html.erb @@ -154,7 +154,7 @@ <% if type %>
- ORDER DETAILS + ORDER DETAILS
<% if modify_order %> From a2d0aee1ab7a66aba0b1260d84e50e8a3e109cc7 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Tue, 20 Feb 2018 09:37:30 +0630 Subject: [PATCH 2/3] update applicaton contro and request bill --- app/controllers/application_controller.rb | 5 +++++ app/controllers/origami/request_bills_controller.rb | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 3a35a15b..9abc8990 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 c076a820..44d6f784 100755 --- a/app/controllers/origami/request_bills_controller.rb +++ b/app/controllers/origami/request_bills_controller.rb @@ -6,6 +6,7 @@ class Origami::RequestBillsController < ApplicationController sale_order=SaleOrder.new if shift = ShiftSale.current_open_shift(current_user.id) + # if shift_by_terminal = ShiftSale.current_open_shift(get_cashier[0].id) 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) @@ -14,7 +15,7 @@ class Origami::RequestBillsController < ApplicationController # 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 From 6d7da7f99754ed54eb5582eaa6df6c0ab165e207 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Tue, 20 Feb 2018 11:07:00 +0630 Subject: [PATCH 3/3] update request bill controller --- app/controllers/origami/request_bills_controller.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/controllers/origami/request_bills_controller.rb b/app/controllers/origami/request_bills_controller.rb index 44d6f784..83208b31 100755 --- a/app/controllers/origami/request_bills_controller.rb +++ b/app/controllers/origami/request_bills_controller.rb @@ -6,7 +6,6 @@ class Origami::RequestBillsController < ApplicationController sale_order=SaleOrder.new if shift = ShiftSale.current_open_shift(current_user.id) - # if shift_by_terminal = ShiftSale.current_open_shift(get_cashier[0].id) 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)