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

change checkin time checked

Browse Source
This commit is contained in:
phyusin
2018-02-01 16:34:18 +06:30
parent 6c33040173
commit ae4746acfc
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/origami/home_controller.rb
View File

@@ -86,12 +86,8 @@ class Origami::HomeController < BaseOrigamiController
end
#for bank integration
bank_integration = Lookup.collection_of('bank_integration')
@bank_integration = 0
if !bank_integration[0].nil?
@bank_integration = bank_integration[0][1]
end
@checkout_time = Lookup.collection_of('checkout_time')
@checkout_alert_time = Lookup.collection_of('checkout_alert_time')
end
private

2
app/views/origami/home/show.html.erb
View File

@@ -431,7 +431,7 @@
<!-- <button type="button" id="re-print" class="btn btn-block bg-blue waves-effect" >Re.Print</button> -->
<% else %>
<% if @bank_integration == '1' %>
<% if !@checkout_time.empty? && !@checkout_alert_time.empty? %>
<button type="button" id="check_in" class="btn btn-block bg-blue waves-effect"><%= t("views.btn.check_in") %></button>
<% end %>
<% end %>