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

change order reservation

Browse Source
This commit is contained in:
phyusin
2018-04-12 11:05:10 +06:30
parent 49ebc6c0dc 926ce2f259
commit b4ccd02fc2
6 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/order_reservation.js
View File

@@ -46,7 +46,7 @@ $(function() {
var item_list = $('.summary-items');
item_list.empty();
for(var i in items) {
for(var i in items) {
var item_price = 0;
if(items[i].price > 0){
item_price = items[i].price;

1
app/controllers/origami/order_reservation_controller.rb
View File

@@ -68,5 +68,4 @@ class Origami::OrderReservationController < BaseOrigamiController
render :json => response
end
end

2
app/models/order_reservation.rb
View File

@@ -81,7 +81,7 @@ class OrderReservation < ApplicationRecord
@status, @booking = @order.generate
# Order.send_customer_view(@booking)
# Order.send_customer_view(@booking)
if @status && @booking
@status, @sale = Sale.request_bill(@order,current_user,current_login_employee)

6
app/views/origami/surveys/_form.html.erb
View File

@@ -67,12 +67,12 @@
<div class="row clearfix">
<div class="col-lg-6 col-md-6 col-sm-6 col-xs-6 ">
<div class="form-group p-l-10 p-r-10">
<%= f.input :child , input_html: { class: 'col-md-10' }%>
<%= f.input :child , input_html: { class: 'col-md-10' , :onChange => "total_customer();"}%>
</div>
</div>
<div class="col-lg-6 col-md-6 col-sm-6 col-xs-6 ">
<div class="form-group p-l-10 p-r-10">
<%= f.input :adult , input_html: { class: 'col-md-10' }%>
<%= f.input :adult , input_html: { class: 'col-md-10' , :onChange => "total_customer();"}%>
</div>
</div>
</div>
@@ -88,7 +88,7 @@
</div>
</div>
</div>
<%= f.input :total_customer, input_html: { class: 'col-md-11'} %>
<%= f.input :total_customer, input_html: { :readonly => true, class: 'col-md-11'} %>
<%= f.input :local , input_html: { class: 'col-md-11' }%>
<fieldset style="border: 1px solid #BDBDBD;padding: 20px; width: 92%;margin: 20px 0 20px 0;">

10
app/views/print_settings/_form.html.erb
View File

@@ -13,14 +13,10 @@
<%= f.input :header_font_size %>
<%= f.input :item_font_size %>
<%
if(@server_mode != 'cloud')
%>
<% if(@server_mode != 'cloud') %>
<%= f.input :printer_name, :as => :select, :collection => Printer::PrinterWorker.printers, include_blank: false %>
<%
else
%>
<%= f.input :printer_name, :as => :select, :collection => [], include_blank: false %>
<% else %>
<%= f.input :printer_name %>
<% end %>
<%= f.input :brand_name %>
<%= f.input :printer_type %>

2
config/routes.rb
View File

@@ -268,7 +268,7 @@ scope "(:locale)", locale: /en|mm/ do
resources :order_reservation
get 'order_reservation/get_order/:id' => "order_reservation#get_order",:as => "get_order", :defaults => { :format => 'json' }
post 'order_reservation/update', to: "order_reservation#update" , :defaults => { :format => 'json' }
post 'order_reservation/send_status', to: "order_reservation#send_status"
post 'order_reservation/send_status', to: "order_reservation#send_status", :defaults => { :format => 'json' }
end
#--------- Waiter/Ordering Station ------------#