Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into cloud

app/controllers/api/check_in_process_controller.rb

@@ -36,6 +36,7 @@ class Api::CheckInProcessController < Api::ApiController
 			if dining_facility.status == "available"
 				lookup_checkout_time = Lookup.collection_of("checkout_time")
 				
+				if !lookup_checkout_time.empty?
 					checkout_at = Time.now.utc
 
 					if !lookup_checkout_time.nil?
@@ -60,6 +61,9 @@ class Api::CheckInProcessController < Api::ApiController
 					booking.save!
 
 					render :json => { :status => true, :checkout_at => booking.checkout_at.utc.getlocal.strftime("%Y-%m-%d %H:%M") }
+				else
+					render :json => { :status => true }
+				end
 			else
       			error_message = "#{dining_facility.type} is not available!"
       			render :json => { :status => false, :error_message => error_message }

app/views/origami/shifts/show.html.erb

@@ -168,6 +168,17 @@
             }
             else if(payment_type == "CUP"){
               $("#loading_wrapper").hide();
+              swal({
+                title: 'Information!',
+                text: 'Settlement is successfully.',
+                type: 'success',
+                html: true,
+                closeOnConfirm: false,
+                closeOnCancel: false,
+                allowOutsideClick: false
+              }, function () {
+                window.location.href = '/origami/shift/close';
+              });
               // reqCBBankAlipaySettlement();
             }
             // else if(payment_type == "Alipay"){