diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js
index 4984e371..8c910119 100755
--- a/app/assets/javascripts/origami.js
+++ b/app/assets/javascripts/origami.js
@@ -63,7 +63,7 @@ $(document).on('turbolinks:load', function() {
 	                '   <img src="{data}" class="file-preview-image" title="{caption}" alt="{caption}" style="width: 200px;height: 200px;">\n' +
 	                '</div>\n',
 	    }
-	}); 
+	});
 
 	$('.datetimepicker').bootstrapMaterialDatePicker({
 	  format: 'DD-MM-YYYY - HH:mm',
@@ -128,11 +128,11 @@ $(document).on('turbolinks:load', function() {
 			type: "POST",
 		    url: "/origami/" + unique_id,
 		    data: { 'booking_id' : unique_id },
-		    success:function(result){		    	
+		    success:function(result){
 		    	for (i = 0; i < result.length; i++) {
 		    		var data = JSON.stringify(result[i]);
         			var parse_data = JSON.parse(data);
-        			var show_date = "";        			
+        			var show_date = "";
 
         			// Receipt Header
         			receipt_no = result[i].receipt_no;
@@ -140,14 +140,14 @@ $(document).on('turbolinks:load', function() {
 			        if(result[i].receipt_date != null){
 				        receipt_date = new Date(result[i].receipt_date);
 				        show_date = receipt_date.getDate() + "-" + receipt_date.getMonth() + "-" + receipt_date.getFullYear() + ' ' +  receipt_date.getHours()+ ':' +  receipt_date.getMinutes()
-				    }			        
+				    }
 
 			        //Receipt Charges
         			sub_total += parseFloat(parse_data.price);
 
         			discount_amount = parse_data.discount_amount == null? '0.0' : parse_data.discount_amount;
         			tax_amount = parse_data.tax_amount;
-			        grand_total_amount = parse_data.grand_total_amount;			        
+			        grand_total_amount = parse_data.grand_total_amount;
 
 			        // Ordered Items
 			        var order_items_rows = "<tr>" +
@@ -234,7 +234,7 @@ $(document).on('turbolinks:load', function() {
     		window.location.href = "/origami/cashier/credit_sales/"+sale_id;
     	}else{
     		window.location.href = "/origami/quick_service/credit_sales/"+sale_id;
-    	}	
+    	}
     });
 });
 
@@ -261,9 +261,9 @@ function checkReceiptNoInFirstBillData(receipt_no,payment) {
 	if (payment) {
 		if (json_data.length>0) {
 		  return json_data[0]["payment"];
-	    }else{
-	    	return false;
-	    }
+    }else{
+    	return false;
+    }
 	}else{
 		return status;
 	}
@@ -385,7 +385,7 @@ function resCardSaleTrans(card_sale_trans_id,cmd_type,payment_type, bnk_bill_amo
 	}else{
 		payment_type = "Master";
 	}
-	
+
   	$("#loading_wrapper").hide();
     swal({
 		  title: 'Oops',
@@ -512,7 +512,7 @@ if (!String.prototype.formatUnicorn) {
   		}
   		var t=typeof arguments[0],n="string"==t||"number"==t?Array.prototype.slice.call(arguments):arguments[0];
   		for(var i in n){
-    		e=e.replace(new RegExp("\\{"+i+"\\}","gi"),n[i]==null?'':n[i]);                   
+    		e=e.replace(new RegExp("\\{"+i+"\\}","gi"),n[i]==null?'':n[i]);
   		}
   		return e;
 	};
@@ -523,7 +523,7 @@ if (!String.prototype.formatUnicorn) {
 function timeFormat(date){
   var isPM = date.getHours() >= 12;
   var isMidday = date.getHours() == 12;
-  var time = [(date.getHours()>10? date.getHours() : '0'+date.getHours()) - (isPM && !isMidday ? 12 : 0), 
+  var time = [(date.getHours()>10? date.getHours() : '0'+date.getHours()) - (isPM && !isMidday ? 12 : 0),
           (date.getMinutes()>10? date.getMinutes() : '0'+date.getMinutes()) || '00'].join(':') +
          (isPM ? ' PM' : ' AM');
   return time;
@@ -589,4 +589,4 @@ function getCreditSales(filter, customer, cashier_type){
 		}
 	});
 }
-//End of credit sales function
\ No newline at end of file
+//End of credit sales function
diff --git a/app/models/printer/printer_worker.rb b/app/models/printer/printer_worker.rb
index 5d7cce22..d30af42d 100755
--- a/app/models/printer/printer_worker.rb
+++ b/app/models/printer/printer_worker.rb
@@ -42,17 +42,17 @@ class Printer::PrinterWorker
   end
 
   def print(file_path, printer_destination = nil )
-    # if printer_destination.nil?
-    #   printer_destination = self.printer_destination
-    # end
+    if printer_destination.nil?
+      printer_destination = self.printer_destination
+    end
 
-    # copy = self.print_copies
-    # #Print only when printer information is not null
-    # if !self.printer_destination.nil?
-    #   (1..copy).each do
-    #     page = Cups::PrintJob.new(file_path, printer_destination)
-    #     page.print
-    #   end
-    # end
+    copy = self.print_copies
+    #Print only when printer information is not null
+    if !self.printer_destination.nil?
+      (1..copy).each do
+        page = Cups::PrintJob.new(file_path, printer_destination)
+        page.print
+      end
+    end
   end
 end
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 9370f094..e14fdde1 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -814,8 +814,10 @@
         if ($("#server_mode").val() != "cloud") { // first bill not used in cloud
           if (discount) {
             if(checkReceiptNoInFirstBillData(receipt_no,"")){
+              $("button.change_tax").hide();
               $("#pay").show();
             }else{
+              $("button.change_tax").show();
               $("#pay").hide();
             }
           }
diff --git a/config/initializers/action_controller.rb b/config/initializers/action_controller.rb
index 85f38ec5..845d363e 100644
--- a/config/initializers/action_controller.rb
+++ b/config/initializers/action_controller.rb
@@ -20,12 +20,12 @@ class ActionController::Base
 
       end
     else
-      # check for license file
-      # if check_license
-      #   current_license(ENV["SX_PROVISION_URL"])
-      # else
-      #   redirect_to activate_path
-      # end
+      check for license file
+      if check_license
+        current_license(ENV["SX_PROVISION_URL"])
+      else
+        redirect_to activate_path
+      end
     end
 
   end