From e787974aa878ac3c72b5f742432a4fec4d0b7257 Mon Sep 17 00:00:00 2001 From: phyusin Date: Fri, 8 Dec 2017 15:11:05 +0630 Subject: [PATCH 1/2] change update btn UI in settings/OQS --- app/views/settings/processing_items/_form.html.erb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/views/settings/processing_items/_form.html.erb b/app/views/settings/processing_items/_form.html.erb index 48b45dfc..f7346135 100755 --- a/app/views/settings/processing_items/_form.html.erb +++ b/app/views/settings/processing_items/_form.html.erb @@ -51,14 +51,14 @@ <% end %> + +
+
+ <%= f.submit "Update",:class => 'btn btn-primary btn-lg waves-effect', :style => "width: 150px" %> +
+
- - -
- <%= f.submit "Update",:class => 'btn btn-primary btn-lg waves-effect' %> -
-
<% end %>
From 2415adff9827c3a79406a621474c19d2919c1926 Mon Sep 17 00:00:00 2001 From: phyusin Date: Fri, 8 Dec 2017 16:09:37 +0630 Subject: [PATCH 2/2] check min for api checkin process --- app/models/dining_facility.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/dining_facility.rb b/app/models/dining_facility.rb index 8fdeef6c..1b245b24 100755 --- a/app/models/dining_facility.rb +++ b/app/models/dining_facility.rb @@ -85,7 +85,7 @@ class DiningFacility < ApplicationRecord checkout_at = booking.checkout_at.utc checkout_at_hr = (checkout_at.utc.strftime("%H").to_i).to_int checkout_at_min = (checkout_at.utc.strftime("%M").to_i).to_int - # checkout_at_min -= min + checkout_at_min -= min if (checkout_at_hr <= hr) && (checkout_at_min <= 15) return booking else