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();	
+});

app/assets/stylesheets/CRM.scss

@@ -1,6 +1,8 @@
 @import "bootstrap";
 @import "font-awesome";
 @import "theme";
+@import "jquery-ui";
+@import "bootstrap-datepicker3";
 
 /* Show it is fixed to the top */
 // body {

app/assets/stylesheets/application.scss

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

app/assets/stylesheets/origami.scss

@@ -1,6 +1,8 @@
 @import "bootstrap";
 @import "font-awesome";
 @import "theme";
+@import "jquery-ui";
+@import "bootstrap-datepicker3";
 
 /* Show it is fixed to the top */
 // body {
@@ -33,6 +35,10 @@
 	// cursor:pointer;
 }
 
+.del_cashier_number{
+	opacity:0.6,
+}
+
 .pay{
 	width: 98%;
   height:211px;