From 8e25d825bc0a8cfa31ba0b1b0c40196dbd679f2b Mon Sep 17 00:00:00 2001 From: palak Date: Wed, 13 Sep 2017 19:09:03 +0530 Subject: [PATCH] changes the rajorpayment --- script.js | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 54 insertions(+), 5 deletions(-) diff --git a/script.js b/script.js index 8435f84..7268cc9 100644 --- a/script.js +++ b/script.js @@ -24,7 +24,7 @@ }) }); - scotchApp.constant("BASE_URL", "http://0.0.0.0:4001/api") + scotchApp.constant("BASE_URL", "http://139.59.68.74:4001/api") // create the controller and inject Angular's $scope scotchApp.controller('mainController', function($scope, $http, $location, $route, $rootScope, BASE_URL) { @@ -229,13 +229,14 @@ data: data, headers: {} }).then(function mySuccess(paymentResult) { + console.log("paymentResult",paymentResult) $scope.paymentResult = paymentResult; }, function myError(error) {}); } var i = 0; $scope.payingAmnt = $scope.payingAmnt * 100; var options = { - "key": "rzp_live_mhSE1uOBlXvFyJ", + "key": "rzp_test_YwHsVFiDIQ2WUQ", "amount": $scope.payingAmnt, "name": "Startup Jalsa", @@ -259,12 +260,13 @@ $scope.paymentResponse = {}; function createPayment(response) { + console.log("response====from===razorpay",response) $route.reload(); $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 = "captured"; + $scope.paymentResponse.status = $scope.paymentResult.data.status; $http({ method: 'PUT', url: BASE_URL + '/payments/' + $scope.paymentResult.data.id, @@ -532,7 +534,8 @@ console.log('pending data', searchResult); var i = 0; var options = { - "key": "rzp_live_mhSE1uOBlXvFyJ", + // "key": "rzp_live_mhSE1uOBlXvFyJ", + "key" : "rzp_test_YwHsVFiDIQ2WUQ", "amount": $scope.amount, "name": "Startup Jalsa", @@ -556,6 +559,7 @@ $scope.paymentResponse = {}; function createPayment(response) { + console.log("response",response); $scope.paymentResponse.razorPaymentId = response.razorpay_payment_id; $scope.paymentResponse.razorOrderId = $scope.paymentResult.data.razorOrderId; $scope.paymentResponse.amount = $scope.amount; @@ -569,7 +573,7 @@ data: $scope.paymentResponse, headers: {} }).then(function mySuccess(searchResult) { - + console.log("finalsearchResult",searchResult) }, function myError(error) { }); @@ -584,6 +588,51 @@ scotchApp.controller('ambassadorController', function($scope, $http, $location, $route,BASE_URL) { $scope.data = {}; + $scope.check = false; + $scope.numberCheck = false; + + $scope.emailcheck = function(val) { + if (val == undefined) { + $('#invalidEmail').css('display', 'block'); + } else { + $http({ + method: 'GET', + url: BASE_URL + '/ambassadors?filter={"where": {"email": {"like":"%25' + $scope.data.email + '%25"}}}', + headers: {} + }).then(function mySuccess(searchResult) { + console.log("searchResult1===>", searchResult) + if (searchResult.data.length == 0) { + $scope.check = false; + } else { + $scope.check = true; + $('#alreadyExist').css('display', 'block'); + } + }, function myError(error) {}); + } + }; + + $scope.removeNoError = function() { + $('#noExist').css('display', 'none'); + }; + + $scope.numbercheck = function(number) { + $http({ + method: 'GET', + url: BASE_URL + '/ambassadors?filter={"where": {"phone": {"like":"%25' + number + '%25"}}}', + data: $scope.data, + headers: {} + }).then(function mySuccess(searchResult) { + console.log("searchResult===>", searchResult) + if (searchResult.data.length == 0) { + $scope.numberCheck = false; + + } else { + $scope.numberCheck = true; + $('#noExist').css('display', 'block'); + } + }, function myError(error) {}); + }; + $scope.submit = function() { console.log($scope.data.name) var randomNumber = ""+Math.random(); -- 2.0.0