From 58e779862fd23c08821511d187001ae25552e857 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 10 Jan 2018 18:57:14 +0630
Subject: [PATCH 1/2] change process flow for cb with bank_integration in
 lookups

---
 app/controllers/origami/jcb_controller.rb    |  6 ++
 app/controllers/origami/master_controller.rb |  6 ++
 app/controllers/origami/mpu_controller.rb    |  6 ++
 app/controllers/origami/visa_controller.rb   |  6 ++
 app/views/origami/jcb/index.html.erb         | 60 +++++++++++++------
 app/views/origami/master/index.html.erb      | 57 +++++++++++++-----
 app/views/origami/mpu/index.html.erb         | 61 +++++++++++++------
 app/views/origami/visa/index.html.erb        | 62 +++++++++++++++-----
 8 files changed, 198 insertions(+), 66 deletions(-)

diff --git a/app/controllers/origami/jcb_controller.rb b/app/controllers/origami/jcb_controller.rb
index be4cc94c..9c872325 100755
--- a/app/controllers/origami/jcb_controller.rb
+++ b/app/controllers/origami/jcb_controller.rb
@@ -29,7 +29,13 @@ class Origami::JcbController < BaseOrigamiController
     @member_discount = MembershipSetting.find_by_discount(1)
     @sub_total       = sale_data.total_amount
     @membership_id   = sale_data.customer.membership_id
+    #for bank integration
     @receipt_no      = sale_data.receipt_no
+    bank_integration = Lookup.collection_of('bank_integration')
+    @bank_integration = 0
+    if !bank_integration[0].nil?
+      @bank_integration = bank_integration[0][1]
+    end
   end
 
   def create
diff --git a/app/controllers/origami/master_controller.rb b/app/controllers/origami/master_controller.rb
index 068095ca..0ad47913 100755
--- a/app/controllers/origami/master_controller.rb
+++ b/app/controllers/origami/master_controller.rb
@@ -28,7 +28,13 @@ class Origami::MasterController < BaseOrigamiController
     @member_discount = MembershipSetting.find_by_discount(1)
     @sub_total       = sale_data.total_amount
     @membership_id   = sale_data.customer.membership_id
+    #for bank integration
     @receipt_no      = sale_data.receipt_no
+    bank_integration = Lookup.collection_of('bank_integration')
+    @bank_integration = 0
+    if !bank_integration[0].nil?
+      @bank_integration = bank_integration[0][1]
+    end
   end
 
   def create
diff --git a/app/controllers/origami/mpu_controller.rb b/app/controllers/origami/mpu_controller.rb
index d1cb3c81..51bcabb1 100755
--- a/app/controllers/origami/mpu_controller.rb
+++ b/app/controllers/origami/mpu_controller.rb
@@ -28,7 +28,13 @@ class Origami::MpuController < BaseOrigamiController
     @member_discount = MembershipSetting.find_by_discount(1)
     @sub_total       = sale_data.total_amount
     @membership_id   = sale_data.customer.membership_id
+    #for bank integration
     @receipt_no      = sale_data.receipt_no
+    bank_integration = Lookup.collection_of('bank_integration')
+    @bank_integration = 0
+    if !bank_integration[0].nil?
+      @bank_integration = bank_integration[0][1]
+    end
   end
 
   def create
diff --git a/app/controllers/origami/visa_controller.rb b/app/controllers/origami/visa_controller.rb
index a664e327..af4d31f0 100755
--- a/app/controllers/origami/visa_controller.rb
+++ b/app/controllers/origami/visa_controller.rb
@@ -27,7 +27,13 @@ class Origami::VisaController < BaseOrigamiController
     @member_discount = MembershipSetting.find_by_discount(1)
     @sub_total       = sale_data.total_amount
     @membership_id   = sale_data.customer.membership_id
+    #for bank integration
     @receipt_no      = sale_data.receipt_no
+    bank_integration = Lookup.collection_of('bank_integration')
+    @bank_integration = 0
+    if !bank_integration[0].nil?
+      @bank_integration = bank_integration[0][1]
+    end
   end
 
   def create
diff --git a/app/views/origami/jcb/index.html.erb b/app/views/origami/jcb/index.html.erb
index 1d855ad2..ada30a8b 100755
--- a/app/views/origami/jcb/index.html.erb
+++ b/app/views/origami/jcb/index.html.erb
@@ -20,6 +20,7 @@
 			<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>
@@ -29,7 +30,7 @@
 			          </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>
@@ -120,25 +121,28 @@
 <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(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";
-			});
+		
+		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
@@ -191,6 +195,7 @@ $('#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	
@@ -207,7 +212,28 @@ $('#jcb_pay').on('click',function(){
 	        //         });
 			// }
 	    //end member discount
-	    pay_withBank("SALE", "jcb", amount, sale_id, receipt_no);
+	    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" );
diff --git a/app/views/origami/master/index.html.erb b/app/views/origami/master/index.html.erb
index 9601f612..f2f3756c 100755
--- a/app/views/origami/master/index.html.erb
+++ b/app/views/origami/master/index.html.erb
@@ -20,6 +20,7 @@
     <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>
@@ -29,6 +30,7 @@
           </div>
           <hr>
         </div>
+        <% end %>
 
        <div class="row">
         <div class="form-group col-lg-12 col-md-12 col-sm-12">
@@ -120,25 +122,28 @@
 <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_master %>") - parseFloat(localStorage.getItem("cash")));
       }
       
-      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";
-        });
+      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){
@@ -188,6 +193,7 @@
     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  
@@ -204,7 +210,28 @@
         //         });
         // }
       //end member discount
-      pay_withBank("SALE", "master", amount, sale_id, receipt_no);
+      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" );
diff --git a/app/views/origami/mpu/index.html.erb b/app/views/origami/mpu/index.html.erb
index 5393d9b2..747049b9 100755
--- a/app/views/origami/mpu/index.html.erb
+++ b/app/views/origami/mpu/index.html.erb
@@ -21,6 +21,7 @@
 			<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>
@@ -30,7 +31,7 @@
 							</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>
@@ -123,26 +124,28 @@
 <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(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";
-			});
+		
+		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";
+				});
+			}
 		}
 	});
 		
@@ -194,6 +197,7 @@
 		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	
@@ -210,7 +214,28 @@
 		    //          });
 			// }
 	    //end member discount
-	      pay_withBank("SALE", "mpu", amount, sale_id, receipt_no);
+	    	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) {
diff --git a/app/views/origami/visa/index.html.erb b/app/views/origami/visa/index.html.erb
index 4ec6731f..f9a693c1 100755
--- a/app/views/origami/visa/index.html.erb
+++ b/app/views/origami/visa/index.html.erb
@@ -20,6 +20,7 @@
     <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>
@@ -29,6 +30,7 @@
           </div>
           <hr>
         </div>
+        <% end %>
 
        <div class="row">
         <div class="form-group col-lg-12 col-md-12 col-sm-12">
@@ -120,27 +122,32 @@
 <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(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";
-      });
+    
+    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();
@@ -207,7 +214,30 @@
         //         });
         // }
       //end member discount
-      pay_withBank("SALE", "visa", amount, sale_id, receipt_no);
+      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" );

From 8160a435ec66c659146aec308f6a845aa72bde89 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 10 Jan 2018 19:00:10 +0630
Subject: [PATCH 2/2] bank integration settings in readme

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 3412e2ed..5be96143 100755
--- a/README.md
+++ b/README.md
@@ -49,6 +49,10 @@ Order Item & Order Summary Slim
 	5) app/models/printer/order_queue_printer.rb
 	6) app/models/printer/receipt_printer.rb
 
+For Bank Integration setting
+  1) rake db:migrate for card_sale_trans, card_settle_trans
+  2) settings/lookups => { type:bank_integration, name: Bank Integration, value:1 }
+
 * ToDo list
 
 1. Cloud Sync