From d4f6eab76f9f5645e1cf93ab040969ff9937429f Mon Sep 17 00:00:00 2001
From: digvijay <digvijay@digvijays-MBP.COMFAST>
Date: Fri, 12 Jul 2019 10:43:21 +0530
Subject: [PATCH] paytm integration

---
 pages/registration.html |   3 ++
 script.js               | 127 +++++++++++++++++++++++++++---------------------
 2 files changed, 74 insertions(+), 56 deletions(-)

diff --git a/pages/registration.html b/pages/registration.html
index 1735b8e..d173ff9 100644
--- a/pages/registration.html
+++ b/pages/registration.html
@@ -1,3 +1,4 @@
+
 <div class="header">
   <div>
     <!-- <img src="images/LOGO.png" class="logojalsa"><span class="jalsaheadr" style="">2018</span> -->
@@ -7,9 +8,11 @@
 </div>
 <!-- CLOSE HEADER -->
 <form name="applicantForm">
+     
    <div class="col-xs-12 col-md-8 col-md-offset-2">
       <div class="form-all">
          <h4 class="title">General Information</h4>
+         <p></p>
          <!-- <table style="width: 100%;">
             <tr>
                <td>
diff --git a/script.js b/script.js
index 9e4b8d4..e39b1b8 100644
--- a/script.js
+++ b/script.js
@@ -65,8 +65,8 @@
 
 	}]).run(['Analytics', function(Analytics) { }]);
 
-	scotchApp.constant("BASE_URL", "http://35.154.24.158:4001/v1")
-	//scotchApp.constant("BASE_URL", "http://0.0.0.0:4001/v1")
+	// scotchApp.constant("BASE_URL", "http://35.154.24.158:4001/v1")
+	scotchApp.constant("BASE_URL", "http://0.0.0.0:4001/v1")
 
 	// create the controller and inject Angular's $scope
 	scotchApp.controller('mainController', function($scope, $http, $window, $location, $route, $rootScope, BASE_URL, Analytics) {
@@ -604,7 +604,10 @@
 	    $scope.formPage = false;
 	    $scope.current = 0;
 	    $scope.payingAmnt = 0;
-	    $scope.discountAmount = 0;
+		$scope.discountAmount = 0;
+		$scope.approvedMsg = false;
+		$scope.disApprovedMsg = false;
+
 	    // $scope.data.quantity = "1";
 	    $scope.check = false;
 	    $scope.numberCheck = false;
@@ -613,7 +616,18 @@
 	        "amount": $scope.payingAmnt,
 	        "currency": "INR",
 	        "status": "pending"
-	    }
+		}
+		var myParam =  window.location.href.split('status=').splice(1).join('').split('&')[0]
+		console.log(window.location.href,"myParam",myParam)
+		if(myParam){
+			if(myParam == "approved"){
+				$scope.showResponse = true;
+			}else{
+				$scope.disApprovedMsg = true;
+			}
+		}else{
+			$scope.disApprovedMsg = true;
+		}
 
 	    $scope.removeError = function() {
 	        $('#invalidEmail').css('display', 'none');
@@ -794,61 +808,62 @@
 					   data: data,
 					   headers: {}
 					   }).then(function mySuccess(paymentResult) {
-					       $scope.paymentResult = paymentResult;
-					   }, function myError(error) {
-					});
-				}
-				var i = 0;
-				$scope.payingAmnt =  $scope.payingAmnt * 100;
-				var options = {
-					//"key": "rzp_test_YwHsVFiDIQ2WUQ",
-					"key": "rzp_live_mkmCb4FkstuWaS",
-					"amount": $scope.payingAmnt,
-
-					"name": "Startup Jalsa",
-					"description":"amount",
-					"currency": "INR",
-					"status": "done",
-
-					"prefill": {
-						"email": $scope.detail.email,
-						"contact": $scope.detail.phone
-					},
-
-					"theme": {
-						"color": "#2196f3 ",
-						"image_padding":"NO"
-					},
-					"modal": {
-						"ondismiss": function(){
-						}
-					},
-					"handler": function (response){
-						createPayment(response);
-					}
-				};
-				var rzp1 = new Razorpay(options);
-				rzp1.open();
-				$scope.paymentResponse = {};
-				function createPayment(response){
-					console.log("response12333333",response)
-					$scope.paymentResponse.razorPaymentId = response.razorpay_payment_id;
-					$scope.paymentResponse.razorOrderId = $scope.paymentResult.data.razorOrderId;
-					$scope.paymentResponse.amount = data.amount;
-					$scope.paymentResponse.currency = "INR";
-					$scope.paymentResponse.status = $scope.paymentResult.data.status;
-					console.log("$scope.paymentResponse.amount=====",$scope.paymentResponse.amount)
-					$http({
-					   method: 'PUT',
-					   url: BASE_URL+'/payments/'+$scope.paymentResult.data.id,
-					   data: $scope.paymentResponse,
-					   headers: {}
-					   }).then(function mySuccess(searchResult) {
-					   	console.log("searchResult",searchResult)
-					   	$location.path("/confirmation")
+						   console.log("paymentResult",paymentResult.data.data)
+						   $("p").html(paymentResult.data.data)
 					   }, function myError(error) {
 					});
 				}
+				// var i = 0;
+				// $scope.payingAmnt =  $scope.payingAmnt * 100;
+				// var options = {
+				// 	//"key": "rzp_test_YwHsVFiDIQ2WUQ",
+				// 	"key": "rzp_live_mkmCb4FkstuWaS",
+				// 	"amount": $scope.payingAmnt,
+
+				// 	"name": "Startup Jalsa",
+				// 	"description":"amount",
+				// 	"currency": "INR",
+				// 	"status": "done",
+
+				// 	"prefill": {
+				// 		"email": $scope.detail.email,
+				// 		"contact": $scope.detail.phone
+				// 	},
+
+				// 	"theme": {
+				// 		"color": "#2196f3 ",
+				// 		"image_padding":"NO"
+				// 	},
+				// 	"modal": {
+				// 		"ondismiss": function(){
+				// 		}
+				// 	},
+				// 	"handler": function (response){
+				// 		createPayment(response);
+				// 	}
+				// };
+				// var rzp1 = new Razorpay(options);
+				// rzp1.open();
+				// $scope.paymentResponse = {};
+				// function createPayment(response){
+				// 	console.log("response12333333",response)
+				// 	$scope.paymentResponse.razorPaymentId = response.razorpay_payment_id;
+				// 	$scope.paymentResponse.razorOrderId = $scope.paymentResult.data.razorOrderId;
+				// 	$scope.paymentResponse.amount = data.amount;
+				// 	$scope.paymentResponse.currency = "INR";
+				// 	$scope.paymentResponse.status = $scope.paymentResult.data.status;
+				// 	console.log("$scope.paymentResponse.amount=====",$scope.paymentResponse.amount)
+				// 	$http({
+				// 	   method: 'PUT',
+				// 	   url: BASE_URL+'/payments/'+$scope.paymentResult.data.id,
+				// 	   data: $scope.paymentResponse,
+				// 	   headers: {}
+				// 	   }).then(function mySuccess(searchResult) {
+				// 	   	console.log("searchResult",searchResult)
+				// 	   	$location.path("/confirmation")
+				// 	   }, function myError(error) {
+				// 	});
+				// }
 				//}
 
 	           }, function myError(error) {
-- 
2.0.0