WebSVN – SmartDukaan – Diff – /trunk/Website/src/main/java/in/shop2020/serving/controllers/OrderController.java

 import in.shop2020.serving.services.HdfcPaymentService;
 import in.shop2020.serving.services.IPaymentService;
 import in.shop2020.serving.services.InnovitiPaymentService;
 import in.shop2020.serving.services.PayuPaymentService;
 import in.shop2020.serving.utils.DesEncrypter;
+import in.shop2020.serving.utils.PaymentUtils;
 import in.shop2020.serving.utils.Utils;
 import in.shop2020.thrift.clients.InventoryClient;
 import in.shop2020.thrift.clients.TransactionClient;
 import in.shop2020.thrift.clients.UserClient;
 import in.shop2020.utils.FedExShipAccountInfo;
     	return "show";
+    }
     // POST /order/
     public String create(){
     	String addressIdString = this.request.getParameter("addressid");
     	if(addressIdString == null){
     		addActionError("Please specify shipping address to continue.");
     		return "proceed-to-pay-redirect";
+    	}
                 return "proceed-to-pay-redirect";
+            }
+    	}
     	String paymentOption = request.getParameter("payment_option");
+    	String paymentType="";
     	log.info("Payment Option Selected: " + paymentOption);
     	if(paymentOption == null || paymentOption.equals("")){
     		addActionError("Please select a payment method to continue.");
     		return "proceed-to-pay-redirect";
+    	}
+    	if(paymentOption.contains("~")){
+    		paymentType = paymentOption.split("~")[0];
+    		paymentOption = paymentOption.split("~")[1];
+    	}
     	long currentCartId = userinfo.getCartId();
     	long currentUserId = userinfo.getUserId();
                 return "proceed-to-pay-redirect";
+            }
+    	}
     	try {
     		if(!createOrders(addressId, currentCartId, currentUserId, Long.parseLong(paymentOption))) {
     			addActionError("We are experiencing some problems. Please try later.");
     			return "proceed-to-pay-redirect";
+    		}
     		//If tin is available push it to order attribute table
     		addActionError("We are experiencing some problems. Please try later.");
     		log.error("Exception in createOrders function. Something went wrong.", e);
     		return "proceed-to-pay-redirect";
+		}
-    	int gatewayId = (int)findGatewayId(paymentOption);
+    	int gatewayId = (int)findGatewayId(paymentType+paymentOption);
     	switch (gatewayId) {
     	case 4:
     		IPaymentService codPaymentService = new CodPaymentService();
-    	    paymentId = codPaymentService.createPayment(userinfo.getUserId(), txnId, paymentOption, 4);
+    	    paymentId = codPaymentService.createPayment(userinfo.getUserId(), txnId, paymentOption, 4, paymentType);
             if (paymentId == IPaymentService.PAYMENT_NOT_CREATED) {
                 //Very unlikely. The only possible reason can be that the payment service is down.
                 log.error("Unable to process the COD payment.");
                 addActionError("We are experiencing some problems. Please try later.");
                 return "proceed-to-pay-redirect";
                 CommonPaymentService.processCodTxn(txnId, orderType);
                 return "cod-redirect";
+            }
     	case 5:
+    		IPaymentService payuPaymentService = new PayuPaymentService();
+        	paymentId = payuPaymentService.createPayment(userinfo.getUserId(), txnId, paymentOption, gatewayId, paymentType);
+        	 if (paymentId == IPaymentService.PAYMENT_NOT_CREATED) {
+                 //Very unlikely. The only possible reason can be that the payment service is down.
+        		 log.error("Unable to process the payu payment.");
+ 				addActionError("We are experiencing some problems. Please try later.");
+ 				return "proceed-to-pay-redirect";
-    	case 10:
+             } else {
+            	 log.info("Successfully created payment for Innoviti to process. Redirecting to /payu-pay/" + paymentId);
-    	case 11:
+ 				return "payu-pay-redirect";
-    	case 12:
+             }
     	case 14:
 			IPaymentService hdfcEmiPaymentService = new HdfcEmiPaymentService();
-            paymentId = hdfcEmiPaymentService.createPayment(userinfo.getUserId(), txnId, paymentOption, gatewayId);
+            paymentId = hdfcEmiPaymentService.createPayment(userinfo.getUserId(), txnId, paymentOption, gatewayId, paymentType);
             if(paymentId == IPaymentService.PAYMENT_NOT_CREATED){
                 addActionError("We are experiencing some problems. Please try later.");
                 log.error("Unable to process payment through HDFC EMI.");
                 return "proceed-to-pay-redirect";
             } else {
                 return "success";
+            }
     	case 13:
 			IPaymentService innovitiPaymentService = new InnovitiPaymentService();
-			paymentId = innovitiPaymentService.createPayment(userinfo.getUserId(), txnId, paymentOption, gatewayId);
+			paymentId = innovitiPaymentService.createPayment(userinfo.getUserId(), txnId, paymentOption, gatewayId, paymentType);
 			if (paymentId == IPaymentService.PAYMENT_NOT_CREATED) {
 				//Very unlikely. The only possible reason can be that the payment service is down.
-				log.error("Unable to process the COD payment.");
+				log.error("Unable to process the innoviti payment.");
 				addActionError("We are experiencing some problems. Please try later.");
 				return "proceed-to-pay-redirect";
 			} else {
 	            log.info("Successfully created payment for Innoviti to process. Redirecting to /innoviti-pay/" + paymentId);
 				return "innoviti-pay-redirect";
+			}
     	case 17:
             IPaymentService couponPaymentService = new CouponPaymentService();
-            paymentId = couponPaymentService.createPayment(userinfo.getUserId(), txnId, paymentOption, 17);
+            paymentId = couponPaymentService.createPayment(userinfo.getUserId(), txnId, paymentOption, 17, paymentType);
             if (paymentId == IPaymentService.PAYMENT_NOT_CREATED) {
                 //Very unlikely. The only possible reason can be that the payment service is down.
                 log.error("Unable to process the Coupon payment.");
                 addActionError("We are experiencing some problems. Please try later.");
                 return "proceed-to-pay-redirect";
             } else {
                 CommonPaymentService.processCouponTxn(txnId, orderType);
                 return "cod-redirect";
+            }
+    	case 18:
+    		IPaymentService ebsPaymentService = new EbsPaymentService();
+            paymentId = ebsPaymentService.createPayment(userinfo.getUserId(), txnId, paymentOption, 2, paymentType);
+            if(paymentId == IPaymentService.PAYMENT_NOT_CREATED){
+                addActionError("We are experiencing some problems. Please try later.");
+                log.error("Unable to process payment through EBS.");
+                return "proceed-to-pay-redirect";
+            } else {
+                log.info("Successfully created payment for EBS to process. Redirecting to /ebs-pay/" + paymentId);
+                return "ebs-pay-redirect";
+            }
 		default:
 			break;
+		}
-		if(paymentOption.equals(IPaymentService.HDFC_MASTERCARD_CREDIT) || paymentOption.equals(IPaymentService.HDFC_MASTERCARD_DEBIT) ||
+		/*if(paymentOption.equals(IPaymentService.HDFC_MASTERCARD_CREDIT) || paymentOption.equals(IPaymentService.HDFC_MASTERCARD_DEBIT) ||
 		        paymentOption.equals(IPaymentService.HDFC_VISA) || paymentOption.equals(IPaymentService.HDFC_VISA_ELECTRON)) {
             // User has selected Visa or MasterCard
             IPaymentService hdfcPaymentService = new HdfcPaymentService();
             paymentId = hdfcPaymentService.createPayment(userinfo.getUserId(), txnId, paymentOption, 1);
             if (paymentId == IPaymentService.PAYMENT_NOT_CREATED) {
             } else {
                 this.redirectURL = ((HdfcPaymentService)hdfcPaymentService).getRedirectUrl();
                 log.info(this.redirectURL);
                 return "success";
+            }
-        }
+        }*/
-        if(paymentOption.equals(IPaymentService.HDFC_VISA))
-            paymentOption = IPaymentService.EBS_VISA;
-        else if(paymentOption.equals(IPaymentService.HDFC_MASTERCARD_DEBIT) || paymentOption.equals(IPaymentService.HDFC_MASTERCARD_CREDIT))
-            paymentOption = IPaymentService.EBS_MASTERCARD;
-        else if(paymentOption.equals(IPaymentService.HDFC_VISA_ELECTRON)) {
-            paymentOption = null;           //Since we don't know the bank's name in this case, we'll let the user select the bank on the EBS page.
-        } else if(paymentOption.equals(IPaymentService.PAYU_CC) || Utils.NET_BANKING_CODES_MAP.containsKey(paymentOption)){
-        	IPaymentService payuPaymentService = new PayuPaymentService();
-        	paymentId = payuPaymentService.createPayment(userinfo.getUserId(), txnId, paymentOption, gatewayId);
-        	return "payu-pay-redirect";
-        }else if (paymentOption.equals("91000")){
+/*    	if (paymentOption.equals("91000")){
         	IPaymentService payuPaymentService = new HdfcPaymentService();
         	paymentId = payuPaymentService.createPayment(userinfo.getUserId(), txnId, paymentOption, gatewayId);
         	return "hdfc-pay-redirect";
-        }
+        }*/
-        IPaymentService ebsPaymentService = new EbsPaymentService();
-        paymentId = ebsPaymentService.createPayment(userinfo.getUserId(), txnId, paymentOption, 2);
-        if(paymentId == IPaymentService.PAYMENT_NOT_CREATED){
-            addActionError("We are experiencing some problems. Please try later.");
-            log.error("Unable to process payment through EBS.");
-            return "proceed-to-pay-redirect";
-        } else {
-            log.info("Successfully created payment for EBS to process. Redirecting to /ebs-pay/" + paymentId);
-            return "ebs-pay-redirect";
+        return "payu-pay-redirect";
-        }
+	}
     private boolean isCouponValid(Cart cart) {
     	String couponCode = cart.getCouponCode();
     	double totalAmountD;
+        }
+    }
     private long findGatewayId(String paymentOption){
     	long gatewayId = 0;
-    	gatewayId = ProceedToPayController.getGatewayId(Long.parseLong(paymentOption));
+    	gatewayId = PaymentUtils.getGatewayId(paymentOption);
-    	if(gatewayId==0){
-    		if(paymentOption.equals(IPaymentService.COD)){
-    			gatewayId = 4;
-    		}
-    		if(paymentOption.equals(IPaymentService.COUPON)){
-                gatewayId = 17;
-            }
-    	}
     	return gatewayId;
+    }
     /**
      * Verifies if the recaptcha response matches the recaptcha challenge.

Subversion Repositories SmartDukaan

(root)/trunk/Website/src/main/java/in/shop2020/serving/controllers/OrderController.java – Rev 20112 → 20278