merge with crm

app/assets/javascripts/CRM.js

@@ -14,4 +14,6 @@
 //= require bootstrap
 //= require jquery_ujs
 //= require turbolinks
-//= require cable
+//= require cable
+//= require jquery-ui
+//= require bootstrap-datepicker

app/assets/javascripts/application.js

@@ -17,9 +17,6 @@
 //= require turbolinks
 //= require cable
 //= require settings/processing_items
-//= 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});

app/assets/javascripts/origami.js

@@ -15,6 +15,8 @@
 //= require jquery_ujs
 //= require turbolinks
 //= require cable
+//= require jquery-ui
+//= require bootstrap-datepicker
 
 $(document).ready(function(){
 	// Enable/Disable Button
@@ -209,13 +211,7 @@ $(document).ready(function(){
 		  			if(data["response_data"]["data"][i]["accountable_type"] == "RebateAccount"){
 		  				var balance = data["response_data"]["data"][i]["balance"];
 		  				console.log(balance);
-		  				if (balance == "0.0") {
-		  					$("#customer_amount").text('0.0');
-		  				}else{
 		  					$("#customer_amount").text(balance);
-		  				}
-
-
 		  			}
 		  		});
 		  	}

app/assets/javascripts/report.js

@@ -0,0 +1,4 @@
+$(document).on("focus", "[data-behaviour~='datepicker']", function(e){
+    $(this).datepicker({"format": "yyyy-M-dd", "weekStart": 1, "autoclose": true});
+	$('.dropdown-toggle').dropdown();	
+});