update conflict oragimi.scss

app/assets/javascripts/application.js

@@ -30,134 +30,3 @@ function export_to(path)
 	var form_params = $("#frm_report").serialize();
 	window.location = path+"?"+ form_params;
 }
-
-/*
-*	ToDo Move to here from pages
-*
-*
-
-
-
-$(function(){
-	$('#custom_excel').hide();
-	
-	$('#custom_excel').click(function(){
-		var url = $('#custom_excel').attr('data-url');
-		$('#frm_report').attr('action',url)
-		$('#frm_report').submit();
-		// window.location = url;
-	});
-	
-	var item = $('#item').val();
-	var payment_type = $('#payment_type');
-	
-	if(item == 'order'){
-		$('#cashier').hide();
-		$('#waiter').show();
-		if(payment_type){
-			$('#payment_type').hide();
-		}		
-	}
-	else if(item == 'sale'){
-		$('#waiter').hide();
-		$('#cashier').show();
-	}
-	else{
-		$('#waiter').hide();
-		$('#cashier').show();		
-		$("#item").val('sale');
-	}
-});
-
-//Reset the form to pervious values
-$("#branch").val(<%=params[:branch]%>);
-$("#waiter").val("<%=params[:waiter]%>");
-$("#cashier").val(<%=params[:cashier]%>);
-$("#product").val(<%=params[:product]%>);
-$("#singer").val(<%=params[:singer]%>);
-$("#item").val('<%=params[:item]%>');
-$("#guest_role").val('<%=params[:guest_role]%>');
-
-
-$("#from").val("<%=params[:from]%>");
-$("#to").val("<%=params[:to]%>");
-$("#sel_period").val(<%=params[:period]%>);
-$("#sel_sale_type").val(<%=params[:sale_type]%>);
-
-<% if params[:period_type] == 1 || params[:period_type] == "1" %>
-	$("#rd_period_type_1").attr("checked","checked");
-<% else %>
-	$("#rd_period_type_0").attr("checked","checked");
-<% end %>
-$(".btn-group button").removeClass("active");
-<% report_type = params[:report_type].blank? ? "0" : params[:report_type] %>
-$("#btn_report_type_<%= report_type %>").addClass("active");
-
-$('#item').change(function(){
-	var item = $('#item').val();
-	var payment_type = $('#payment_type');
-
-	if(item == 'sale'){
-		$('#waiter').hide();
-		$('#cashier').show();		
-		if(payment_type){
-			$('#payment_type').show();
-		}
-	}
-	else{
-		$('#cashier').hide();
-		$('#waiter').show();
-		if(payment_type){
-			$('#payment_type').hide();
-		}
-	}
-});
-
-$(function(){
-	var check_arr = [];   	
-	var search = '<%= params[:period_type] %>';	
-	if(search){
-		if(parseInt(search) == 0){
-			search_by_period();	
-		}
-		else{
-			search_by_date();				
-		}
-	}else{
-		search_by_period();		
-	}
-    $('#sel_period').change(function(){	   
-	   search_by_period();	   
-    });   
-	function search_by_period(){
- 	   var period = $('#sel_period').val();
- 	   var period_type = 0;
- 	   var from = "";
- 	   var to = ""; 	
-	}   
-   
-    $('#from').change(function(){
-	   search_by_date();	   
-    });
-   
-    $('#to').change(function(){
-	   search_by_date();
-    });      
-    function search_by_date(){
-	   var from = $('#from').val();
-	   var to = $('#to').val();
-	   var period = 0;
-	   var period_type = 1;	   
-	   if(to != '' && from != ''){
-		   shift_name = from + ',' + to;
-		   check_arr.push(to);		   
-		   // console.log(check_arr.length)
-		   if(check_arr.length == 1){ 		   			   	
-		   }
-		   if(check_arr.length == 3){
-			   check_arr = [];
-		   }
-	   }	   
-   }    
-});
-*/

app/assets/stylesheets/CRM.scss

@@ -52,4 +52,33 @@
   @include media-breakpoint-only(xl) {
     column-count: 5;
   }
+}
+
+#sxModal {
+  display: none;
+    overflow: auto;
+    width: 100%;
+    height: 100%;
+    background-color: #000;
+    background-color: rgba(0,0,0,0.4);
+    position: fixed;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    z-index: 1100;
+}
+
+#sxModal-Content {  
+  position: relative;
+  left: 42%;
+  top: 30%;
+  background-color: #32ad1a;  
+  color: #fff;
+  text-align: center;
+    width: 200px;
+    height: 200px;
+    padding-top: 5%;
+    border-radius: 100px;
+    z-index: 1101;
 }

app/assets/stylesheets/OQS.scss

@@ -24,4 +24,4 @@
 	width: 49%;
 	font-size: 18px;
 	margin: 0px 0px 5px 0px;	
-}
+}

app/assets/stylesheets/origami.scss

@@ -10,7 +10,8 @@
 //   padding-top: 4.5rem;
 // }
 .card-columns {
-	font-size: 18px !important;}
+	font-size: 18px !important;
+}
 
 .others-payment{
 	line-height:100px;
@@ -53,7 +54,8 @@
 
 .payment{
 	height:70px;line-height:70px;
-	align:center;color:white;
+	align:center;
+	color:white;
 	font-size:16px;
 	margin-top:5px;
 }
@@ -161,15 +163,15 @@
 }
 
 .green{
-	background-color: #009900
+	background-color: #009900;
 }
 
 .orange{
-	background-color: #FF8C00
+	background-color: #FF8C00;
 }
 
 .blue{
-	background-color: blue
+	background-color: blue;
 }
 
 /* End Colors */
@@ -212,3 +214,57 @@ tr.discount-item-row:hover {
 	margin-top:-40px !important;
 }
 
+#sxModal {
+	display: none;
+    overflow: auto;
+    width: 100%;
+    height: 100%;
+    background-color: #000;
+    background-color: rgba(0,0,0,0.4);
+    position: fixed;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    z-index: 1100;
+}
+
+#sxModal-Content {	
+	position: relative;
+	left: 42%;
+	top: 30%;
+	background-color: #d9534f;	
+	color: #fff;
+	text-align: center;
+    width: 200px;
+    height: 200px;
+    padding-top: 5%;
+    border-radius: 100px;
+    z-index: 1101;
+}
+
+/*Loading gif for payment*/
+
+#loading_wrapper{
+
+    position: fixed;
+    background-color: #C8C8C8 ;
+    height: 100%;
+    width: 100%;
+    left: 0;
+    opacity: 0.6;
+    top: 0;
+    z-index: 9999999;
+}
+#loading{
+    position: relative;
+    height: 100%;
+    width: 100%;
+    background-image: url('../../../image/loading-ajax.gif');
+    background-position:  center center;
+    background-repeat: no-repeat;
+    opacity: 1;
+    filter: alpha(opacity=100); /* ie */
+    -moz-opacity: 1; /* mozilla */
+        
+}