fixed confiixed for print

app/views/origami/addorders/detail.html.erb

@@ -8,6 +8,7 @@
     <div class="col-lg-2 col-md-2 col-sm-2">
         <ul class="nav nav-tabs flex-column" role="tablist" >
             <% @menu.each do |menu| %>
+              <% if !menu.valid_time.nil? %>
                 <% if menu.menu_category_id.nil? %>
                   <% if @table.get_current_checkout_booking.nil? %>
                     <% if !menu.code.include? "SPL" %>
@@ -28,21 +29,10 @@
                       </a>
                     </li>
                   <% end%>
-              <% end%>
+                <% end%>
+              <% end %>
             <%end %>
-            <!-- <li class="nav-item menu_category">
-              <a href="#" class="dropdown-toggle" data-toggle="dropdown">Menu 1 <b class="caret"></b></a>
-              <ul class="dropdown-menu multi-level">
-                <li><a href="#">Action</a></li>
-                <li><a href="#">Another action</a></li>
-                <li><a href="#">Something else here</a></li>
-                <li class="divider"></li>
-                <li><a href="#">Separated link</a></li>
-                <li class="divider"></li>
-                <li><a href="#">One more separated link</a></li>
-                
-              </ul>
-            </li> -->
+            
             <li class="nav-item product" data-ref="<%= origami_get_all_product_path %>">
               <a class="nav-link" data-toggle="tab" href="" role="tab">Products</a>
             </li>

app/views/origami/home/show.html.erb

@@ -390,7 +390,7 @@
               <% if @status_sale == 'sale' %>
                   <button type="button" id="customer" class="btn btn-block bg-blue waves-effect">Customer</button>
                   <button type="button" class="btn btn-block bg-blue waves-effect" id='edit' active="<%= can? :edit, :sale_edit %>">Edit</button>
-                  <button type="button" id="discount" class="btn btn-block bg-blue waves-effect">Discount</button>
+                  <button type="button" id="discount" class="btn btn-block bg-blue waves-effect" active="<%= can? :index, :discount %>">Discount</button>
                   <button type="button" id="other-charges" class="btn btn-block bg-blue waves-effect">Charges</button>
 
                   <button type="button" id="commissions" class="btn btn-block bg-blue waves-effect">Commissions</button>
@@ -416,7 +416,7 @@
                             <h4 class="modal-title" id="paymentModalLabel">Choose Payment</h4>
                         </div>
                         <div class="modal-body">
-                           <select class="form-control show-tick payment_method"  id="payment_method" >
+                           <select class="form-control show-tick payment_method" multiple="true"  id="payment_method" >
                              <option value="Cash">Cash</option>
                              <option value="Credit">Credit</option>
                             <% @payment_methods.each do |pay| %>
@@ -549,6 +549,8 @@
 
         // Discount for Payment
         $('#discount').click(function () {
+
+          if ($(this).attr('active')=== "true") {
             var sale = $('#sale_id').val();
             if (sale != "") {
                 var sale_id = sale
@@ -562,7 +564,9 @@
             else {
               swal ( "Oops" ,  "Please select an table!" ,  "warning" );
             }
-
+          }else{
+                  swal("Opps","You are not authorized for void","warning")
+          }
             return false;
         });
     });

app/views/origami/jcb/index.html.erb

@@ -1,4 +1,7 @@
 <div class="container-fluid">
+	<div id="loading_wrapper" style="display:none;">
+		<div id="loading"></div>
+	</div>
 	<!-- <div class="page-header">
 		<ol class="breadcrumb">
 			<li class="breadcrumb-item"><a href="<%=origami_root_path %>"><%= t :home %></a></li>
@@ -17,6 +20,17 @@
 			<span class="hidden" id="sub-total"><%= @sub_total%></span>
 			<div class="card m-l-10 m-t-10" style="padding:0px 20px;">
 				<div class="rebate-form">
+					<% if @bank_integration == '1' %>
+					<div class="row">
+			          <div class="form-group col-lg-12 col-md-12 col-sm-12">
+			            <label for="com_port_name">Select Device</label>
+			            <select id="com_port_name" name="com_port_name" class="form-control select col-lg-7 col-md-7 col-sm-7">
+			              
+			            </select>
+			          </div>
+			          <hr>
+			        </div>
+			        <% end %>
 					<div class="row">
 						<div class="form-group col-lg-12 col-md-12 col-sm-12">
 							<label>You can pay up to </label>
@@ -106,11 +120,31 @@
 </div>
 <script>
 	$(document).ready(function() {
+		var sale_id = "<%= @sale_id %>";
+		var bank_integration = "<%= @bank_integration %>";
 		if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
 			else {
 				$('#validamount').attr("value",parseFloat("<%= @can_jcb %>") - parseFloat(localStorage.getItem("cash")));
 			}
-		});
+		
+		if(bank_integration == '1'){
+			if(typeof code2lab != 'undefined'){
+				code2lab.getCommPorts(); //get comportlists from jade
+			}else{
+				swal({
+				  title: 'Oops',
+				  text: 'JCB is not available in here!',
+				  type: 'error',
+				  html: true,
+				  closeOnConfirm: false,
+				  closeOnCancel: false,
+				  allowOutsideClick: false
+				}, function () {
+					window.location.href = '/origami/sale/'+ sale_id  + "/payment/others_payment";
+				});
+			}
+		}
+	});
 // number key pad
 $(document).on('click', '.cashier_number', function(event){
 	event.stopPropagation();
@@ -160,6 +194,8 @@ $(document).on('click', '.cashier_number', function(event){
 $('#jcb_pay').on('click',function(){
 	var amount = $('#amount').text();
 	var sale_id = "<%= @sale_id %>";
+	var receipt_no = "<%= @receipt_no %>";
+	var bank_integration = "<%= @bank_integration %>";
 	if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) && amount > 0){
 		$(this).off("click");
 		  //start member discount 5% by pay card	
@@ -176,24 +212,28 @@ $('#jcb_pay').on('click',function(){
 	        //         });
 			// }
 	    //end member discount
-	    $.ajax({type: "POST",
-	    	url: "<%= origami_payment_jcb_path  %>",
-	    	data: "amount="+ amount + "&sale_id="+ sale_id,
-	    	success:function(result){
-	    		if(result){
-	    			swal({
-	    				title: "Information!",
-	    				text: "Payment Successfully",
-	    				html: true,
-						closeOnConfirm: false,
-						closeOnCancel: false,
-						allowOutsideClick: false
-	    			},function () {
-	    				window.location.href = '/origami/sale/'+ sale_id  + "/payment";
-	    			});
-	    		}
-	    	}
-	    });
+	    if(bank_integration == '1'){
+		    pay_withBank("SALE", "jcb", amount, sale_id, receipt_no);
+		}else{
+			$.ajax({type: "POST",
+	          url: "<%= origami_payment_jcb_path %>",
+	          data: "amount="+ amount + "&sale_id="+ sale_id,
+	          success:function(result){
+	            if(result){
+	              swal({
+	                title: "Information!",
+	                text: "Payment Successfully",
+	                html: true,
+	            closeOnConfirm: false,
+	            closeOnCancel: false,
+	            allowOutsideClick: false
+	              }, function () {
+	                window.location.href = '/origami/sale/'+ sale_id  + "/payment";
+	              });
+	            }
+	          }
+	        });
+		}
 	}else{
 	  if (amount>0) {
         swal ( "Oops" ,  "Paid Amount is over!" ,  "error" );

app/views/origami/master/index.html.erb

@@ -1,4 +1,7 @@
 <div class="container-fluid">
+  <div id="loading_wrapper" style="display:none;">
+    <div id="loading"></div>
+  </div>
   <!-- <div class="page-header">
     <ol class="breadcrumb">
       <li class="breadcrumb-item"><a href="<%=origami_root_path %>"><%= t :home %></a></li>
@@ -17,6 +20,18 @@
     <span class="hidden" id="sub-total"><%= @sub_total%></span>
     <div class="card m-l-10 m-t-10" style="padding:0px 20px;">
       <div class="rebate-form">
+        <% if @bank_integration == '1' %>
+        <div class="row">
+          <div class="form-group col-lg-12 col-md-12 col-sm-12">
+            <label for="com_port_name">Select Device</label>
+            <select id="com_port_name" name="com_port_name" class="form-control select col-lg-7 col-md-7 col-sm-7">
+              
+            </select>
+          </div>
+          <hr>
+        </div>
+        <% end %>
+
        <div class="row">
         <div class="form-group col-lg-12 col-md-12 col-sm-12">
           <label>You can pay up to </label>
@@ -106,10 +121,30 @@
 </div>
 <script>
   $(document).ready(function() {
-    if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
-     else {
+      var sale_id = "<%= @sale_id %>";
+      var bank_integration = "<%= @bank_integration %>";
+      if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
+      else {
        $('#validamount').attr("value",parseFloat("<%= @can_master %>") - parseFloat(localStorage.getItem("cash")));
-     }
+      }
+      
+      if(bank_integration == '1'){
+        if(typeof code2lab != 'undefined'){
+          code2lab.getCommPorts(); //get comportlists from jade
+        }else{
+          swal({
+            title: 'Oops',
+            text: 'MASTER is not available in here!',
+            type: 'error',
+            html: true,
+            closeOnConfirm: false,
+            closeOnCancel: false,
+            allowOutsideClick: false
+          }, function () {
+            window.location.href = '/origami/sale/'+ sale_id  + "/payment/others_payment";
+          });
+        }
+      }
    });
   $(document).on('click', '.cashier_number', function(event){
     event.stopPropagation();
@@ -157,6 +192,8 @@
   $('#master_pay').on('click',function(){
     var amount = $('#amount').text();
     var sale_id = "<%= @sale_id %>";
+    var receipt_no = "<%= @receipt_no %>";
+    var bank_integration = "<%= @bank_integration %>";
     if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) && amount > 0){
       $(this).off("click");
       //start member discount 5% by pay card  
@@ -173,24 +210,28 @@
         //         });
         // }
       //end member discount
-      $.ajax({type: "POST",
-        url: "<%= origami_payment_master_path  %>",
-        data: "amount="+ amount + "&sale_id="+ sale_id,
-        success:function(result){
-          if(result){
-            swal({
-              title: "Information!",
-              text: "Payment Successfully",
-              html: true,
-              closeOnConfirm: false,
-              closeOnCancel: false,
-              allowOutsideClick: false
-            },function () {
-              window.location.href = '/origami/sale/'+ sale_id  + "/payment";
-            });
+      if(bank_integration == '1'){
+        pay_withBank("SALE", "master", amount, sale_id, receipt_no);
+      }else{
+        $.ajax({type: "POST",
+          url: "<%= origami_payment_master_path %>",
+          data: "amount="+ amount + "&sale_id="+ sale_id,
+          success:function(result){
+            if(result){
+              swal({
+                title: "Information!",
+                text: "Payment Successfully",
+                html: true,
+            closeOnConfirm: false,
+            closeOnCancel: false,
+            allowOutsideClick: false
+              }, function () {
+                window.location.href = '/origami/sale/'+ sale_id  + "/payment";
+              });
+            }
           }
-        }
-      });
+        });
+      }
     }else{
       if (amount>0) {
         swal ( "Oops" ,  "Paid Amount is over!" ,  "error" );

app/views/origami/mpu/index.html.erb

@@ -1,4 +1,7 @@
 <div class="container-fluid">
+	<div id="loading_wrapper" style="display:none;">
+		<div id="loading"></div>
+	</div>
 	<!-- <div class="page-header">
 		<ol class="breadcrumb">
 			<li class="breadcrumb-item"><a href="<%=origami_root_path %>"><%= t :home %></a></li>
@@ -18,6 +21,17 @@
 			<div class="card" style="margin-top:10px;padding:20px;">
 				<div class="card-block">
 					<div class="rebate-form">
+						<% if @bank_integration == '1' %>
+						<div class="row">
+							<div class="form-group col-lg-12 col-md-12 col-sm-12">
+								<label for="com_port_name">Select Device</label>
+								<select id="com_port_name" name="com_port_name" class="form-control select col-lg-7 col-md-7 col-sm-7">
+									
+								</select>
+							</div>
+							<hr>
+						</div>
+						<% end %>
 						<div class="row">
 							<div class="form-group col-lg-12 col-md-12 col-sm-12">
 								<label>You can pay up to </label>
@@ -109,11 +123,32 @@
 </div>
 <script>
 	$(document).ready(function() {
+		var sale_id = "<%= @sale_id %>";
+		var bank_integration = "<%= @bank_integration %>";
 		if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
 			else {
 				$('#validamount').attr("value",parseFloat("<%= @can_mpu %>") - parseFloat(localStorage.getItem("cash")));
 			}
-		});
+		
+		if(bank_integration == '1'){
+			if(typeof code2lab != 'undefined'){
+				code2lab.getCommPorts(); //get comportlists from jade
+			}else{
+				swal({
+				  title: 'Oops',
+				  text: 'MPU is not available in here!',
+				  type: 'error',
+				  html: true,
+				  closeOnConfirm: false,
+				  closeOnCancel: false,
+				  allowOutsideClick: false
+				}, function () {
+					window.location.href = '/origami/sale/'+ sale_id  + "/payment/others_payment";
+				});
+			}
+		}
+	});
+		
 	$(document).on('click', '.cashier_number', function(event){
 		event.stopPropagation();
 		event.preventDefault();
@@ -157,9 +192,12 @@
 			return false;
 		}
 	});
+	
 	$('#mpu_pay').on('click',function(){
 		var amount = $('#amount').text();
 		var sale_id = "<%= @sale_id %>";
+		var receipt_no = "<%= @receipt_no %>";
+		var bank_integration = "<%= @bank_integration %>";
 		if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) && amount > 0){
 			$(this).off("click");
 		//start member discount 5% by pay card	
@@ -176,25 +214,29 @@
 		    //          });
 			// }
 	    //end member discount
-	         //Mpu Payment
-	         $.ajax({type: "POST",
-	         	url: "<%= origami_payment_mpu_path  %>",
-	         	data: "amount="+ amount + "&sale_id="+ sale_id,
-	         	success:function(result){
-	         		if(result){
-	         			swal({
-	         				title: "Information!",
-	         				text: "Payment Successfully",
-	         				html: true,
-							closeOnConfirm: false,
-							closeOnCancel: false,
-							allowOutsideClick: false
-	         			}, function () {
-	         				window.location.href = '/origami/sale/'+ sale_id  + "/payment";
-	         			});
-	         		}
-	         	}
-	         });
+	    	if(bank_integration == '1'){
+	      		pay_withBank("SALE", "mpu", amount, sale_id, receipt_no);
+	      	}else{
+	      		$.ajax({type: "POST",
+		          url: "<%= origami_payment_mpu_path %>",
+		          data: "amount="+ amount + "&sale_id="+ sale_id,
+		          success:function(result){
+		            if(result){
+		              swal({
+		                title: "Information!",
+		                text: "Payment Successfully",
+		                html: true,
+		            closeOnConfirm: false,
+		            closeOnCancel: false,
+		            allowOutsideClick: false
+		              }, function () {
+		                window.location.href = '/origami/sale/'+ sale_id  + "/payment";
+		              });
+		            }
+		          }
+		        });
+	      	}
+
 	     }else{
 	     	if (amount>0) {
 		        swal ( "Oops" ,  "Paid Amount is over!" ,  "error" );
@@ -203,5 +245,5 @@
 		    }
 	     }
 	 })
-	</script>
+</script>
 

app/views/origami/others_payments/index.html.erb

@@ -34,11 +34,12 @@
         }
 
         payment_type =  checkReceiptNoInFirstBillData(receipt_no,"payment");
-	    if(payment_type) {
-	        $(".others-payment").hide();
-	        $("."+payment_type).show();
-	    }
-      
+        if(payment_type) {
+        	$(".others-payment").hide();
+            $(payment_type).each(function(i){		        
+		        $("."+payment_type[i]).show();
+            });
+        }
      /* end check first bill or not*/
 
 	$('.others-payment').on('click',function(){

app/views/origami/payments/show.html.erb

@@ -182,13 +182,13 @@
         <% if @visacount != 0.0 %>
         <div class="row payment others-color">
           <div class="col-md-5"></div>
-          <div class="col-md-3">Visa</div>
+          <div class="col-md-3">VISA</div>
           <div class="col-md-4 visa is_card" id="visacount"><%= @visacount %></div>
         </div>
         <% else %>
         <div class="row hidden">
           <div class="col-md-5"></div>
-          <div class="col-md-3">Visa</div>
+          <div class="col-md-3">VISA</div>
           <div class="col-md-4" id="visacount">0.0</div>
         </div>
         <% end %>
@@ -210,17 +210,31 @@
         <% if @mastercount != 0.0 %>
         <div class="row payment others-color">
           <div class="col-md-5"></div>
-          <div class="col-md-3">Master</div>
+          <div class="col-md-3">MASTER</div>
           <div class="col-md-4 master is_card" id="mastercount"><%= @mastercount %></div>
         </div>
         <% else %>
         <div class="row hidden">
           <div class="col-md-5"></div>
-          <div class="col-md-3">Master</div>
+          <div class="col-md-3">MASTER</div>
           <div class="col-md-4" id="mastercount">0.0</div>
         </div>
         <% end %>
         <!-- <br> -->
+        <!-- UNIONPAY -->
+        <% if @unionpaycount != 0.0 %>
+        <div class="row payment others-color">
+          <div class="col-md-5"></div>
+          <div class="col-md-3">UNIONPAY</div>
+          <div class="col-md-4 master is_card" id="unionpaycount"><%= @unionpaycount %></div>
+        </div>
+        <% else %>
+        <div class="row hidden">
+          <div class="col-md-5"></div>
+          <div class="col-md-3">UNIONPAY</div>
+          <div class="col-md-4" id="unionpaycount">0.0</div>
+        </div>
+        <% end %>
         <div class="row m-l-5 m-r-5">
           <div class="col-md-8"><strong>Balance</strong></div>
           <div class="col-md-4"><strong><span id='balance'><%= @sale_data.grand_total rescue 0 %></span></strong></div>
@@ -296,16 +310,20 @@
           receipt_no = ($("#receipt_no").html()).trim();
         }
 
-      payment_type =  checkReceiptNoInFirstBillData(receipt_no,"payment")
-        if(payment_type=="Cash"){
+        payment_type =  checkReceiptNoInFirstBillData(receipt_no,"payment")
+        // console.log(jQuery.inArray("Credit", payment_type))
+        // console.log(payment_type)
+          if(parseInt(jQuery.inArray("Credit", payment_type)) == -1){
+            $("#credit_payment").hide();             
+          } else{
+            $("#credit_payment").show();
+          }
+
+         if(parseInt(jQuery.inArray("MPU", payment_type)) > 0 || parseInt(jQuery.inArray("VISA", payment_type)) > 0 || parseInt(jQuery.inArray("JCB", payment_type)) > 0 || parseInt(jQuery.inArray("Master", payment_type)) > 0 || parseInt(jQuery.inArray("UNIONPAY", payment_type)) > 0 || parseInt(jQuery.inArray("Redeem", payment_type)) > 0){
+           $("#card_payment").show();      
+         } else{
            $("#card_payment").hide();
-           $("#credit_payment").hide();
-        }else if(payment_type=="Credit"){
-           $("#card_payment").hide();
-           $("#others_payment").hide();
-        }else if(payment_type=="MPU"||payment_type=="VISA"||payment_type=="JCB"||payment_type=="Master"){
-           $("#credit_payment").hide();
-        }
+         }
       /* end check first bill or not*/
 
     var dining_id = "<%= @sale_data.bookings[0].dining_facility_id %>";
@@ -361,17 +379,18 @@
         update_balance();
         break;
         case 'nett':
-        var credit1 = $('#credit').text();
-        var card1 = $('#others').text();
-        var paypar1 = $('#ppamount').text();
-        var visa1 = $('#visacount').text();
-        var jcb1 = $('#jcbcount').text();
-        var master1 = $('#mastercount').text();
-        var othertotal = parseFloat(credit1) + parseFloat(card1) + parseFloat(paypar1) + parseFloat(visa1) + parseFloat(jcb1) + parseFloat(master1);
-        var total = $('#amount_due').text();
-        var amt = parseFloat(total) - parseFloat(othertotal);
-        $('#cash').text(amt);
-        update_balance();
+          var credit1 = $('#credit').text();
+          var card1 = $('#others').text();
+          var paypar1 = $('#ppamount').text();
+          var visa1 = $('#visacount').text();
+          var jcb1 = $('#jcbcount').text();
+          var master1 = $('#mastercount').text();
+          var unionpay1 = $('#unionpaycount').text();
+          var othertotal = parseFloat(credit1) + parseFloat(card1) + parseFloat(paypar1) + parseFloat(visa1) + parseFloat(jcb1) + parseFloat(master1) + parseFloat(unionpay1);
+          var total = $('#amount_due').text();
+          var amt = parseFloat(total) - parseFloat(othertotal);
+          $('#cash').text(parseFloat(amt).toFixed(2));
+          update_balance();
         break;
       }
       event.handled = true;
@@ -412,6 +431,9 @@
       else if(payment_type == "Master" && $('#mastercount').text()==0 && sub_total != 0.0){
           swal("Opps","Please Pay with Master Payment","warning");
       }
+      else if(payment_type == "UNIONPAY" && $('#unionpaycount').text()==0 && sub_total != 0.0){
+          swal("Opps","Please Pay with UNIONPAY Payment","warning");
+      }
       else if(payment_type == "Credit" && $('#credit').text()==0 && sub_total != 0.0){
           swal("Opps","Please Pay with Credit Payment","warning");
       }else{
@@ -515,8 +537,9 @@
     var visa = $('#visacount').text();
     var jcb = $('#jcbcount').text();
     var master = $('#mastercount').text();
+    var unionpay = $('#unionpaycount').text();
     var amount_due = $('#amount_due').text();
-    var total = parseFloat(cash) + parseFloat(credit) + parseFloat(card) + parseFloat(paypar) + parseFloat(visa) + parseFloat(jcb) + parseFloat(master)
+    var total = parseFloat(cash) + parseFloat(credit) + parseFloat(card) + parseFloat(paypar) + parseFloat(visa) + parseFloat(jcb) + parseFloat(master) + parseFloat(unionpay)
     var result = parseFloat(amount_due) - parseFloat(total);
     $('#balance').text(result.toFixed(2));
   }

app/views/origami/rooms/show.html.erb

@@ -390,7 +390,7 @@
                             <h4 class="modal-title" id="paymentModalLabel">Choose Payment</h4>
                         </div>
                         <div class="modal-body">
-                           <select class="form-control show-tick payment_method"  id="payment_method" >
+                           <select class="form-control show-tick payment_method" multiple="true"  id="payment_method" >
                              <option value="Cash">Cash</option>
                             <% @payment_methods.each do |pay| %>
                               <option value="<%= pay.payment_method %>">

app/views/origami/shifts/show.html.erb

@@ -1,4 +1,8 @@
 <div class="container-fluid">
+  <div id="loading_wrapper" style="display:none;">
+    <div id="loading"></div>
+  </div>
+
   <div class='row clearfix'>
     <div class='col-md-10'>
       <h1><%= t :close_cashier %></h1>
@@ -27,6 +31,27 @@
     <div class="col-lg-2 col-md-2 col-sm-2">
     <button type="button" class="btn bg-default btn-block" id='back'><i class="material-icons">reply</i> <%= t("views.btn.back") %> </button>
     <button type="button" class="btn bg-blue btn-block green" id='close_cashier'> <%= t("views.btn.close_cashier") %> </button>
+    <button type="button" class="btn bg-blue btn-block green" id="card_settlement"> <%= t("views.btn.card_settle") %> </button>
+    </div>
+  </div>
+
+  <div class="modal fade" id="cardSettleModal" tabindex="-1" role="dialog">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h4 class="modal-title" id="cardSettleModal">Select Device: </h4>
+            </div>
+            <div class="modal-body">
+               <select class="form-control show-tick sel_com_port"  id="sel_com_port" >
+                 
+                </select>   
+            </div>
+            <div class="modal-footer  p-r-30">
+                <button type="button" class="btn btn-link btn-danger waves-effect" data-dismiss="modal">CLOSE</button>
+                &nbsp;  &nbsp;
+               <button type="button" class="btn btn-link bg-blue waves-effect" id="card_settle">OK</button>
+            </div>
+        </div>
     </div>
   </div>
 </div>
@@ -42,8 +67,175 @@
         window.location.href = '/';
       }
     });
-  })
+  });
+
   $('#back').on('click',function(){
     window.location.href = '/origami';
-  })
+  });
+
+  /** start CB Card Settle process **/
+  $("#card_settlement").on('click', function(){
+    if(typeof code2lab != 'undefined'){
+      $('#cardSettleModal').modal({ keyboard: false, backdrop: false });
+      code2lab.getCommPorts();
+    }else{
+      swal({
+        title: 'Oops',
+        text: 'Settlement can not print out in browser!',
+        type: 'error',
+        html: true,
+        closeOnConfirm: false,
+        closeOnCancel: false,
+        allowOutsideClick: false
+      }, function () {
+        window.location.href = '/origami/shift/close';
+      });
+    }
+  });
+
+  //CB Bank payment settlement ECR integration
+  function setCommPorts(comPortLists) {
+      // alert(comPortLists);
+      $('#sel_com_port').html("");
+      var jsonPortLists = $.parseJSON(comPortLists);
+      if((jsonPortLists!=undefined && jsonPortLists!='') && (jsonPortLists.length > 0)){
+          $.each(jsonPortLists,function(key,value){
+              $('#sel_com_port').append("<option value='"+value+"'>"+value+"</option>");
+          });
+      }
+      else{
+        swal({
+          title: 'Oops',
+          text: 'Payment can not pay in browser!',
+          type: 'error',
+          html: true,
+          closeOnConfirm: false,
+          closeOnCancel: false,
+          allowOutsideClick: false
+        }, function () {
+          window.location.href = '/origami/shift/close';
+        });
+      }
+  }
+
+  $("#card_settle").on('click', function () {
+      $("#loading_wrapper").show();
+      $('#cardSettleModal').modal('hide');
+      reqCBBankMPUSettlement();
+  });
+
+  //add req data to card_settle_trans table
+  function reqCardSettleTrans(cmd_type,payment_type,com_port) {
+    var jobj = {"cmd_type" : cmd_type, "payment_type" : payment_type};
+    $.ajax({
+        type: "POST",
+        url: "/origami/bank_integration/settle_trans",
+        data: {type:"request", data: jobj},
+        dataType: "json",
+        success: function(data) {
+            if (data.status == "success"){
+               resCardSettleTrans(data.card_settle_trans_id,cmd_type,payment_type,com_port);
+            }
+         }
+      });
+  }
+
+  //add res data to card_settle_trans table
+  function resCardSettleTrans(card_settle_trans_id,cmd_type,payment_type,com_port) {
+    var resMsg = "";
+    if($("#loading_wrapper").is(':visible')){
+      resMsg = code2lab.reqBankPayment(cmd_type, payment_type, 1, "", com_port);
+    }
+    
+    if(resMsg.includes("STATUS")){
+      var jobj = $.parseJSON(resMsg);
+
+      $.ajax({
+        type: "POST",
+        url: "/origami/bank_integration/settle_trans",
+        data: {type:"response", card_settle_trans_id: card_settle_trans_id, data: jobj},
+        dataType: "json",
+        success: function(data) {
+          if(data.status == "success"){
+            if(payment_type == "MPU"){
+              reqCBBankVMJSettlement();
+            }
+            else if(payment_type == "VMJ"){
+              reqCBBankJCBSettlement();
+            }
+            else if(payment_type == "JCB"){
+              reqCBBankCUPSettlement();
+            }
+            else if(payment_type == "CUP"){
+              $("#loading_wrapper").hide();
+              // reqCBBankAlipaySettlement();
+            }
+            // else if(payment_type == "Alipay"){
+            //   reqCBBankIPPSettlement();
+            //   $('#loading').hide();
+            // }
+          }
+        }
+      });
+    }
+    else{
+      $("#loading_wrapper").hide();
+      swal ( "Oops" ,  resMsg.toString() ,  "error" );
+    }
+  }
+
+  //settle for MPU / MPU-UPI
+  function reqCBBankMPUSettlement() {
+    var com_port = $('#sel_com_port').val();
+    var cmd_type = "SETTLEMENT";
+    var payment_type = "MPU";
+    $("#loading_wrapper").show();
+    reqCardSettleTrans(cmd_type,payment_type,com_port);
+  }
+
+  //settle for VMJ (VISA, MASTER)
+  function reqCBBankVMJSettlement() {
+    var com_port = $('#sel_com_port').val();
+    var cmd_type = "SETTLEMENT";
+    var payment_type = "VMJ"; //VISA,Master and JCB
+    $("#loading_wrapper").show();
+    reqCardSettleTrans(cmd_type,payment_type,com_port);
+  }
+
+  //settle for JCB
+  function reqCBBankJCBSettlement() {
+    var com_port = $('#sel_com_port').val();
+    var cmd_type = "SETTLEMENT";
+    var payment_type = "JCB";
+    $("#loading_wrapper").show();
+    reqCardSettleTrans(cmd_type,payment_type,com_port);
+  }
+
+  //settle for International Union Pay (CUP)
+  function reqCBBankCUPSettlement() {
+    var com_port = $('#sel_com_port').val();
+    var cmd_type = "SETTLEMENT";
+    var payment_type = "CUP";
+    $("#loading_wrapper").show();
+    reqCardSettleTrans(cmd_type,payment_type,com_port);
+  }
+
+  //settle for Alipay
+  function reqCBBankAlipaySettlement() {
+    var com_port = $('#sel_com_port').val();
+    var cmd_type = "SETTLEMENT";
+    var payment_type = "Alipay";
+    $("#loading_wrapper").show();
+    reqCardSettleTrans(cmd_type,payment_type,com_port);
+  }
+
+  //settle for insert/direct swipe (now does not using this state - future one)
+  function reqCBBankIPPSettlement() {
+    var com_port = $('#sel_com_port').val();
+    var cmd_type = "SETTLEMENT";
+    var payment_type = "IPP";
+    $("#loading_wrapper").show();
+    reqCardSettleTrans(cmd_type,payment_type,com_port);
+  }
+  /** end CB Card Settle process **/
 </script>

app/views/origami/unionpay/create.json.jbuilder

@@ -0,0 +1,5 @@
+if(@status)
+  json.status @status
+else
+  json.status false
+end

app/views/origami/unionpay/index.html.erb

@@ -0,0 +1,247 @@
+<div class="container-fluid">
+  <div id="loading_wrapper" style="display:none;">
+    <div id="loading"></div>
+  </div>
+  <!-- <div class="page-header">
+    <ol class="breadcrumb">
+      <li class="breadcrumb-item"><a href="<%=origami_root_path %>"><%= t :home %></a></li>
+      <li class="breadcrumb-item"><a href="/origami/sale/<%=@sale_id %>/payment"><%= t("views.btn.payment") %></a></li>
+      <li class="breadcrumb-item active"><%= t("views.btn.unionpay") %></li>
+      <span class="float-right">
+        <%= link_to t('.back',:default => t("views.btn.back")),'/origami/sale/'+@sale_id+'/payment/others_payment'%>
+      </span>
+    </ol>
+  </div> -->
+  <h5>UNIONPAY Payment</h5>
+  <div class="row">
+   <div class="col-lg-5 col-md-5 col-sm-5">
+    <span class="hidden" id="membership_id"><%= @membership_id%></span>
+    <span class="hidden" id="member_discount"><%= @member_discount%></span>
+    <span class="hidden" id="sub-total"><%= @sub_total%></span>
+    <div class="card m-l-10 m-t-10" style="padding:0px 20px;">
+      <div class="rebate-form">
+        <% if @bank_integration == '1' %>
+        <div class="row">
+          <div class="form-group col-lg-12 col-md-12 col-sm-12">
+            <label for="com_port_name">Select Device</label>
+            <select id="com_port_name" name="com_port_name" class="form-control select col-lg-7 col-md-7 col-sm-7">
+              
+            </select>
+          </div>
+          <hr>
+        </div>
+        <% end %>
+
+       <div class="row">
+        <div class="form-group col-lg-12 col-md-12 col-sm-12">
+          <label>You can pay up to </label>
+          <%@can_unionpay = @can_unionpay +@rounding_adj%>
+          <input type="text" name="validamount" id="validamount" class="form-control col-lg-7 col-md-7 col-sm-7"  readonly="" value="<%=@can_unionpay %>" data-member-value="">
+        </div>
+        <hr>
+      </div>
+      <% if @unionpaycount != 0 %>
+      <div class="row">
+        <div class="form-group col-lg-12 col-md-12 col-sm-12">
+          <label>Recent Visa paid amount </label>
+          <input type="text" name="" id="" class="form-control col-lg-7 col-md-7 col-sm-7"  readonly="" value="<%=@unionpaycount %>" data-member-value="">
+        </div>
+        <hr>
+      </div>
+      <% end %>
+      <div class="row">
+       <div class="form-group col-lg-12 col-md-12 col-sm-12">
+        <label>Reference Number</label>
+        <input type="text" name="valid_amount" id="valid_amount" class="form-control col-lg-7 col-md-7 col-sm-7" value="" data-value="<%=@sale_id %>" data-member-value="">
+      </div>
+      <hr>
+    </div>
+    <div class="row">
+     <div class="form-group col-lg-12 col-md-12 col-sm-12">
+      <label>Amount</label>
+      <div id="amount" class="form-control col-lg-7 col-md-7 col-sm-7">0.0</div>
+    </div>
+    <hr>
+  </div>
+</div>
+</div>
+</div>
+
+<div class="col-lg-6 col-md-6 col-sm-6" style="">
+  <div class=" m-t-10 p-l-20">
+   <div class="row">
+     <div class="col-lg-6 col-md-6 col-sm-6">
+       <div class="row bottom">
+         <div class="col-md-4 cashier_number " data-value="1" data-type="num">1</div>
+         <div class="col-md-4 cashier_number border-left" data-value="2" data-type="num">2</div>
+         <div class="col-md-4 cashier_number border-left" data-value="3" data-type="num">3</div>
+       </div>
+       <div class="row bottom">
+         <div class="col-md-4 cashier_number  border-left" data-value="4" data-type="num">4</div>
+         <div class="col-md-4 cashier_number border-left" data-value="5" data-type="num">5</div>
+         <div class="col-md-4 cashier_number border-left" data-value="6" data-type="num">6</div>
+       </div>
+       <div class="row bottom">
+         <div class="col-md-4 cashier_number  border-left" data-value="7" data-type="num">7</div>
+         <div class="col-md-4 cashier_number border-left" data-value="8" data-type="num">8</div>
+         <div class="col-md-4 cashier_number border-left" data-value="9" data-type="num">9</div>
+       </div>
+       <div class="row bottom">
+         <div class="col-md-4 cashier_number  border-left" data-value="0" data-type="num">0</div>
+         <div class="col-md-4 cashier_number border-left" data-value="." data-type="num">.</div>
+         <div class="col-md-4 cashier_number border-left" data-value="00" data-type="num">00</div>
+       </div>
+       <div class="row bottom">
+         <div class="col-md-4 cashier_number green border-left" data-type="nett" >Nett</div>
+         <div class="col-md-4 cashier_number red border-left" data-type="del">Del</div>
+         <div class="col-md-4 cashier_number orange border-left" data-type="clr">Clr</div>
+       </div>
+     </div>
+     <div class="col-lg-6 col-md-6 col-sm-6">
+       <div class="row bottom m-l-5">
+         <div class="cashier_number long border-left" data-value="1000" data-type="add">1000</div>
+         <div class="cashier_number long left" data-value="3000" data-type="add">3000</div>
+       </div>
+       <div class="row bottom m-l-5">
+         <div class="cashier_number long border-left" data-value="5000" data-type="add">5000</div>
+         <div class="cashier_number long left" data-value="10000" data-type="add">10000</div>
+       </div>
+       <div class="row bottom m-l-5">
+         <div class="pay purple left" id="unionpay_pay">Pay</div>
+       </div>
+     </div>
+   </div>
+ </div>
+</div>
+
+<div class="col-lg-1 col-md-1 col-sm-1">
+ <button type="button" class="btn bg-default m-t-10 btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment/others_payment';"><i class="material-icons m-t--5">reply</i> Back </button>
+</div>
+</div>
+</div>
+<script>
+  $(document).ready(function() {
+    var sale_id = "<%= @sale_id %>";
+    var bank_integration = "<%= @bank_integration %>";
+
+    if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
+     else {
+       $('#validamount').attr("value",parseFloat("<%= @can_unionpay %>") - parseFloat(localStorage.getItem("cash")));
+     }
+    
+    if(bank_integration == '1'){
+      if(typeof code2lab != 'undefined'){
+        code2lab.getCommPorts(); //get comportlists from jade
+      }
+      else{
+        swal({
+          title: 'Oops',
+          text: 'UNIONPAY is not available in here!',
+          type: 'error',
+          html: true,
+          closeOnConfirm: false,
+          closeOnCancel: false,
+          allowOutsideClick: false
+        }, function () {
+          window.location.href = '/origami/sale/'+ sale_id  + "/payment/others_payment";
+        });
+      }
+    }
+    
+   });
+  $(document).on('click', '.cashier_number', function(event){
+    event.stopPropagation();
+    event.preventDefault();
+    if(event.handled !== true) {
+      var original_value;
+      original_value = $('#amount').text();
+
+      var input_value = $(this).attr("data-value");
+
+      var input_type = $(this).attr("data-type");
+      switch (input_type) {
+        case 'num':
+        if (original_value == "0.0"){
+         $('#amount').text(input_value);
+       }else{
+         $('#amount').append(input_value);
+       }
+       break;
+
+       case 'add':
+       var input_value = $(this).attr("data-value");
+       amount = parseInt(input_value) + parseInt(original_value);
+       $('#amount').html(amount);
+
+       break;
+       case 'clr':
+       $('#amount').html("0.0");
+       break;
+       case 'del' :
+       var cash=$('#amount').text();
+       $('#amount').text(cash.substr(0,cash.length-1));
+       break;
+       case 'nett':
+       var remain_amount = $('#validamount').val();
+       $('#amount').text(remain_amount);
+       break;
+
+     }
+     event.handled = true;
+   } else {
+    return false;
+  }
+});
+  $('#unionpay_pay').on('click',function(){
+    var amount = $('#amount').text();
+    var sale_id = "<%= @sale_id %>";
+    var receipt_no = "<%= @receipt_no %>";
+    if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) && amount > 0){
+      $(this).off("click");
+      //start member discount 5% by pay card  
+        // var sub_total = $('#sub-total').text();
+        // var member_id = $('#membership_id').text();
+        // var member_discount = $('#member_discount').text();
+        // if (member_id && member_discount) {
+        //   $.ajax({
+        //     type: "POST",
+        //     url: "/origami/" + sale_id + "/member_discount",
+        //     data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':true },
+        //            success:function(result){           
+        //            }
+        //         });
+        // }
+      //end member discount
+      var bank_integration = "<%= @bank_integration %>";
+      if(bank_integration == '1'){
+        pay_withBank("SALE", "unionpay", amount, sale_id, receipt_no);
+      }
+      else{
+        $.ajax({type: "POST",
+          url: "<%= origami_payment_unionpay_path %>",
+          data: "amount="+ amount + "&sale_id="+ sale_id,
+          success:function(result){
+            if(result){
+              swal({
+                title: "Information!",
+                text: "Payment Successfully",
+                html: true,
+                closeOnConfirm: false,
+                closeOnCancel: false,
+                allowOutsideClick: false
+              }, function () {
+                window.location.href = '/origami/sale/'+ sale_id  + "/payment";
+              });
+            }
+          }
+         });
+      }
+    }else{
+      if (amount>0) {
+        swal ( "Oops" ,  "Paid Amount is over!" ,  "error" );
+      }else{
+        swal ( "Oops" ,  "Enter Amount!" ,  "error" );
+      }
+    }
+  })
+</script>

app/views/origami/visa/index.html.erb

@@ -1,4 +1,7 @@
 <div class="container-fluid">
+  <div id="loading_wrapper" style="display:none;">
+    <div id="loading"></div>
+  </div>
   <!-- <div class="page-header">
     <ol class="breadcrumb">
       <li class="breadcrumb-item"><a href="<%=origami_root_path %>"><%= t :home %></a></li>
@@ -17,6 +20,18 @@
     <span class="hidden" id="sub-total"><%= @sub_total%></span>
     <div class="card m-l-10 m-t-10" style="padding:0px 20px;">
       <div class="rebate-form">
+        <% if @bank_integration == '1' %>
+        <div class="row">
+          <div class="form-group col-lg-12 col-md-12 col-sm-12">
+            <label for="com_port_name">Select Device</label>
+            <select id="com_port_name" name="com_port_name" class="form-control select col-lg-7 col-md-7 col-sm-7">
+              
+            </select>
+          </div>
+          <hr>
+        </div>
+        <% end %>
+
        <div class="row">
         <div class="form-group col-lg-12 col-md-12 col-sm-12">
           <label>You can pay up to </label>
@@ -106,10 +121,33 @@
 </div>
 <script>
   $(document).ready(function() {
+    var sale_id = "<%= @sale_id %>";
+    var bank_integration = "<%= @bank_integration %>";
+
     if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
      else {
        $('#validamount').attr("value",parseFloat("<%= @can_visa %>") - parseFloat(localStorage.getItem("cash")));
      }
+    
+    if(bank_integration == '1'){
+      if(typeof code2lab != 'undefined'){
+        code2lab.getCommPorts(); //get comportlists from jade
+      }
+      else{
+        swal({
+          title: 'Oops',
+          text: 'VISA is not available in here!',
+          type: 'error',
+          html: true,
+          closeOnConfirm: false,
+          closeOnCancel: false,
+          allowOutsideClick: false
+        }, function () {
+          window.location.href = '/origami/sale/'+ sale_id  + "/payment/others_payment";
+        });
+      }
+    }
+    
    });
   $(document).on('click', '.cashier_number', function(event){
     event.stopPropagation();
@@ -157,6 +195,7 @@
   $('#visa_pay').on('click',function(){
     var amount = $('#amount').text();
     var sale_id = "<%= @sale_id %>";
+    var receipt_no = "<%= @receipt_no %>";
     console.log(amount);
     console.log($("#validamount").attr("value"));
     if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) && amount > 0){
@@ -175,24 +214,30 @@
         //         });
         // }
       //end member discount
-      $.ajax({type: "POST",
-        url: "<%= origami_payment_visa_path  %>",
-        data: "amount="+ amount + "&sale_id="+ sale_id,
-        success:function(result){
-          if(result){
-            swal({
-             title: "Information!",
-             text: "Payment Successfully",
-             html: true,
-             closeOnConfirm: false,
-             closeOnCancel: false,
-             allowOutsideClick: false
-           }, function () {
-             window.location.href = '/origami/sale/'+ sale_id  + "/payment";
-           });
+      var bank_integration = "<%= @bank_integration %>";
+      if(bank_integration == '1'){
+        pay_withBank("SALE", "visa", amount, sale_id, receipt_no);
+      }
+      else{
+        $.ajax({type: "POST",
+          url: "<%= origami_payment_visa_path %>",
+          data: "amount="+ amount + "&sale_id="+ sale_id,
+          success:function(result){
+            if(result){
+              swal({
+                title: "Information!",
+                text: "Payment Successfully",
+                html: true,
+            closeOnConfirm: false,
+            closeOnCancel: false,
+            allowOutsideClick: false
+              }, function () {
+                window.location.href = '/origami/sale/'+ sale_id  + "/payment";
+              });
+            }
           }
-        }
-      });
+         });
+      }
     }else{
       if (amount>0) {
         swal ( "Oops" ,  "Paid Amount is over!" ,  "error" );