From 19a2e7b14bffcbfbf85f3100948db3fb83e7384d Mon Sep 17 00:00:00 2001
From: apple <apple@apples-Mac-mini.COMFAST>
Date: Tue, 23 Jul 2019 16:41:13 +0530
Subject: [PATCH] payment integrate

---
 pages/registration.html |   5 +-
 script.js               | 141 ++++++++++++++++++++++++++----------------------
 2 files changed, 82 insertions(+), 64 deletions(-)

diff --git a/pages/registration.html b/pages/registration.html
index 2746318..9546676 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>
@@ -303,7 +306,7 @@
    <span id="delhi"></span>
    <span id="ahmedabad"></span>
    <span id="bengaluru"></span>
-   <span id="jaipur"></span>kanpur
+   <span id="jaipur"></span>
    <span id="kanpur"></span>
    <span id="dharamsala"></span>
 </span>
diff --git a/script.js b/script.js
index ed13ded..51275e2 100644
--- a/script.js
+++ b/script.js
@@ -619,7 +619,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;
@@ -628,7 +631,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');
@@ -785,7 +799,6 @@
 	           }).then(function mySuccess(result) {
 	           		console.log("=====result=====",result)
 					   $scope.detail = result;
-					   $location.path("/confirmation")
 	               data.applicantId = result.data.id;
 	               $scope.userId = result.data.id;
 	                console.log("=====data=====",data)
@@ -819,77 +832,79 @@
 					   data: data,
 					   headers: {}
 					   }).then(function mySuccess(paymentResult) {
-						   $scope.paymentResult = paymentResult;
+						   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) {
-
-			// });
+				// 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) {
+
+			});
+
+		})
 			
 		// })
 
 		//}
-			})
-		})
+
 	}
 	
 });
 
-scotchApp.controller('ambassadorController', function($scope, $http, $location, $route,BASE_URL) {
+scotchApp.controller('ambassadorController', function($scope, $http, $location, $route, BASE_URL) {
 		$scope.data = {};
 		$scope.check = false;
 	    $scope.numberCheck = false;
-- 
2.0.0