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

Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes

Browse Source
This commit is contained in:
phyusin
2018-04-12 16:19:27 +06:30
parent bf38beb066 859080d4a1
commit de5bbb27f7
2 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -82,6 +82,7 @@ class Origami::MovetableController < BaseOrigamiController
@get_type = Booking.update_dining_facility(booking_array,change_to,change_from) @get_type = Booking.update_dining_facility(booking_array,change_to,change_from)
if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
# get printer info # get printer info
@from = (DiningFacility.find(change_from)).name @from = (DiningFacility.find(change_from)).name
@to = (DiningFacility.find(change_to)).name @to = (DiningFacility.find(change_to)).name
@@ -103,4 +104,5 @@ class Origami::MovetableController < BaseOrigamiController
end end
end end
end end
end
end end

4
app/views/origami/payments/show.html.erb
View File

@@ -437,10 +437,12 @@
<div class="row m-b-10 m-r-30"> <div class="row m-b-10 m-r-30">
<div class="col-md-5 m-r-20"> <div class="col-md-5 m-r-20">
<% if ENV["SERVER_MODE"] != "cloud" %>
<button type="button" class="btn btn-link bg-red waves-effect print_receipt">Print</button> <button type="button" class="btn btn-link bg-red waves-effect print_receipt">Print</button>
<% end %>
</div> </div>
<div class="col-md-5"> <div class="col-md-5 m-r-20">
<button type="button" class="btn btn-link bg-blue waves-effect btn_pdf_close" data-dismiss="modal">CLOSE</button> <button type="button" class="btn btn-link bg-blue waves-effect btn_pdf_close" data-dismiss="modal">CLOSE</button>
</div> </div>
</div> </div>