fixed conflict

app/assets/javascripts/application.js

@@ -17,5 +17,11 @@
 //= require turbolinks
 //= require cable
 //= require settings/processing_items
-//= require bootstrap-datepicker
+//= require bootstrap-datepicker/core
+//= require bootstrap-datepicker/locales/bootstrap-datepicker.es
 
+
+$(document).on("focus", "[data-behaviour~='datepicker']", function(e){
+    $(this).datepicker({"format": "yyyy-M-dd", "weekStart": 1, "autoclose": true});
+	$('.dropdown-toggle').dropdown();	
+});

app/assets/javascripts/cable.js

@@ -5,9 +5,10 @@
 //= require_self
 //= require_tree ./channels
 
-(function() {
-  this.App || (this.App = {});
+// Temp Disable
+// (function() {
+//   this.App || (this.App = {});
 
-  App.cable = ActionCable.createConsumer();
+//   App.cable = ActionCable.createConsumer();
 
-}).call(this);
+// }).call(this);

app/assets/javascripts/origami.js

@@ -28,7 +28,7 @@ $(document).ready(function(){
         $("#order-Tax").text('');
         $("#order-grand-total").text('');
 
-		var zone_name=$(this).find(".orders-table").text();		
+		var zone_name=$(this).find(".orders-table").text();
 		var receipt_no=$(this).find(".orders-receipt-no").text();
 		var unique_id = $(this).find(".orders-id").text();
 		var order_status=$(this).find(".orders-order-status").text().trim();
@@ -38,11 +38,11 @@ $(document).ready(function(){
 
 		//for customer button
         $("#customer").removeAttr('disabled');
-		
+
 
 		var customer_id=$(this).find(".customer-id").text();
 		show_customer_details(customer_id);
-		 
+
 
 		var cashier="";
 		var receipt_date="";
@@ -60,7 +60,7 @@ $(document).ready(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);
@@ -77,7 +77,7 @@ $(document).ready(function(){
 
 			        //Receipt Charges
         			sub_total += (parse_data.qty*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;
@@ -186,7 +186,7 @@ $(document).ready(function(){
 		return false;
 	});
 
-	function show_customer_details(customer_id){ 
+	function show_customer_details(customer_id){
 
 		if(window.location.pathname.substring(0, 12) == "/origami/SAL"){
 	    	var url = customer_id+"/get_customer/"
@@ -218,7 +218,7 @@ $(document).ready(function(){
 		  		});
 		  	}
 		  });
-		    //End Ajax 
+		    //End Ajax
 	}
 
 	/* For Receipt - Calculate discount or tax */

app/assets/stylesheets/application.scss

@@ -2,7 +2,7 @@
 @import "bootstrap";
 @import "font-awesome";
 @import "theme";
-@import "bootstrap-datepicker3";
+@import 'bootstrap-datepicker';
 
 /* Show it is fixed to the top */
 // body {