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

Merge branch 'quick_service' of bitbucket.org:code2lab/sxrestaurant into split_bill

Browse Source
This commit is contained in:
phyusin
2018-02-20 13:34:48 +06:30
parent 5ec255ad33 8f239cbb0b
commit c4c57680a1
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/javascripts/addorder.js
View File

@@ -697,7 +697,8 @@ $(function() {
qty = parseInt(data.attr('data-qty')); qty = parseInt(data.attr('data-qty'));
append = 0; append = 0;
price = parseFloat(data.attr('data-price')).toFixed(2); price = data.attr('data-price');
instance_name = data.attr('data-instance'); instance_name = data.attr('data-instance');
if (instance_name == "undefined"){ if (instance_name == "undefined"){
instance = ''; instance = '';
@@ -720,7 +721,7 @@ $(function() {
} }
$(item_row[i]).children('#item_qty').text(qty); $(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; append =1;
}else{ }else{
if (qty > 1) { if (qty > 1) {

5
app/assets/javascripts/origami.js
View File

@@ -148,13 +148,14 @@ $(document).on('turbolinks:load', function() {
function checkReceiptNoInFirstBillData(receipt_no,payment) { function checkReceiptNoInFirstBillData(receipt_no,payment) {
// localStorage.removeItem('receipt_lists'); // localStorage.removeItem('receipt_lists');
var status = false; var status = false;
var json_data = [];
if((receipt_no!=undefined) && (receipt_no!="")){ if((receipt_no!=undefined) && (receipt_no!="")){
if(localStorage.hasOwnProperty("receipt_lists")===true){ if(localStorage.hasOwnProperty("receipt_lists")===true){
var arr_data = JSON.parse(localStorage.getItem("receipt_lists")); var arr_data = JSON.parse(localStorage.getItem("receipt_lists"));
if (payment) { 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{ }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)){ if((arr_data.length) > (json_data.length)){

2
app/controllers/origami/request_bills_controller.rb
View File

@@ -6,8 +6,6 @@ class Origami::RequestBillsController < ApplicationController
sale_order=SaleOrder.new sale_order=SaleOrder.new
# if shift = ShiftSale.current_open_shift(current_user.id) # if shift = ShiftSale.current_open_shift(current_user.id)
puts ShiftSale.current_shift
puts "sssssssssss"
if !ShiftSale.current_shift.nil? if !ShiftSale.current_shift.nil?
order_id = params[:id] # order_id order_id = params[:id] # order_id
bk_order = BookingOrder.find_by_order_id(order_id) bk_order = BookingOrder.find_by_order_id(order_id)

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

@@ -154,7 +154,7 @@
<% if type %> <% if type %>
<div class="row clearfix"> <div class="row clearfix">
<div class="col-md-6 col-lg-6 col-sm-12"> <div class="col-md-6 col-lg-6 col-sm-12">
<strong id="order-title" class="font-14">ORDER DETAILS </strong> <strong id="order-title" class="font-13">ORDER DETAILS </strong>
</div> </div>
<% if modify_order %> <% if modify_order %>