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

update request bill msg box error

Browse Source
This commit is contained in:
Aung Myo
2018-04-10 17:29:02 +06:30
parent 0e39e4577f
commit 0e5269c66f
5 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -974,7 +974,7 @@ console.log(d_option)
dataType: "json", dataType: "json",
success:function(result){ success:function(result){
if (result.status) { if (result.status) {
console.log(result)
if (result.data == null){ if (result.data == null){
swal({ swal({
title: "Please Open Shift !", title: "Please Open Shift !",
@@ -984,11 +984,13 @@ console.log(d_option)
confirmButtonText: "Ok", confirmButtonText: "Ok",
closeOnConfirm: false closeOnConfirm: false
}, function () { }, function () {
window.location.href = '/origami/quick_service/pending_order/' + $('#sale_id').text(); window.location.href = '/origami/quick_service/pending_order/' + $('#sale_id').text();
}); });
}else if(result.data == 'OK'){
window.location.href = '/origami/quick_service/pending_order/' + $('#sale_id').text();
}else{ }else{
window.location.href = "/origami/sale/"+result.data["sale_id"]+"/"+type+"/payment" window.location.href = "/origami/sale/"+result.data["sale_id"]+"/"+type+"/payment"
} }
} }
} }

5
app/controllers/origami/quick_service_controller.rb
View File

@@ -155,9 +155,12 @@ class Origami::QuickServiceController < ApplicationController
result = {:status=> true, :data => @sale } result = {:status=> true, :data => @sale }
render :json => result.to_json render :json => result.to_json
end end
elsif (params[:sale_id][0,3] == "BKI")
result = {:status=> true, :data => 'OK' }
render :json => result.to_json
else else
result = {:status=> true, :data => nil } result = {:status=> true, :data => nil }
render :json => result.to_json render :json => result.to_json
end end
end end

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

@@ -16,7 +16,12 @@ class Origami::RequestBillsController < ApplicationController
bk_order = BookingOrder.find_by_order_id(order_id) bk_order = BookingOrder.find_by_order_id(order_id)
order = Order.find(order_id) order = Order.find(order_id)
check_booking = Booking.find_by_booking_id(bk_order.booking_id) check_booking = Booking.find_by_booking_id(bk_order.booking_id)
table = DiningFacility.find(check_booking.dining_facility_id) if check_booking.dining_facility_id.to_i > 0
table = DiningFacility.find(check_booking.dining_facility_id)
else
table = nil
end
if check_booking.sale_id.nil? if check_booking.sale_id.nil?
# Create Sale if it doesn't exist # Create Sale if it doesn't exist
@status, @sale_id = @sale.generate_invoice_from_booking(check_booking.id,current_login_employee, current_user, order.source) @status, @sale_id = @sale.generate_invoice_from_booking(check_booking.id,current_login_employee, current_user, order.source)

1
app/models/sale.rb
View File

@@ -2592,6 +2592,7 @@ end
query = query.joins("join sale_orders as sale_orders on sale_orders.sale_id = sales.sale_id") query = query.joins("join sale_orders as sale_orders on sale_orders.sale_id = sales.sale_id")
.joins("join orders as orders on orders.order_id = sale_orders.order_id") .joins("join orders as orders on orders.order_id = sale_orders.order_id")
query = query.where("sales.sale_status = 'new' AND orders.status = 'billed' AND orders.source =? ","quick_service") query = query.where("sales.sale_status = 'new' AND orders.status = 'billed' AND orders.source =? ","quick_service")
.group("sales.sale_id")
end end
def self.pending_order def self.pending_order
query = Booking.all query = Booking.all

18
app/views/origami/pending_order/index.html.erb
View File

@@ -10,19 +10,19 @@
<div id="custom-slimscroll"> <div id="custom-slimscroll">
<div class="card-columns"> <div class="card-columns">
<% @sale.each do |sale| %> <% @sale.each do |sale| %>
<div class="card sales bg-red text-white" data-id = "<%= sale.sale_id %>"> <div class="card sales bg-red text-white" data-id = "<%= sale.sale_id %>">
<div class="card-block"> <div class="card-block">
<%= sale.receipt_no %><span style="font-size:12px;float:right;line-height:inherit;">Billed</span> <%= sale.receipt_no %><span style="font-size:12px;float:right;line-height:inherit;">Billed</span>
</div> </div>
</div> </div>
<% end %> <% end %>
<% @order.each do |order| %> <% @order.each do |order| %>
<div class="card sales blue text-white" data-id = "<%= order.booking_id %>"> <div class="card sales blue text-white" data-id = "<%= order.booking_id %>">
<div class="card-block"> <div class="card-block">
<%= order.booking_id %><span style="font-size:12px;float:right;line-height:inherit;">new</span> <%= order.booking_id %><span style="font-size:12px;float:right;line-height:inherit;">new</span>
</div> </div>
</div> </div>
<% end %> <% end %>
</div> </div>
</div> </div>
</div> </div>