Shilpi Saini / startup_jalsa_frontend

Download as
Browse Code ยป

Commit 8e25d825bc0a8cfa31ba0b1b0c40196dbd679f2b

Authored by Palak Handa
1 parent 8d58b37daa
Exists in master and in 1 other branch paytm

changes the rajorpayment

Showing 1 changed file with 54 additions and 5 deletions   Show diff stats
... ... @@ -24,7 +24,7 @@
24 24 })
25 25 });
26 26  
27   - scotchApp.constant("BASE_URL", "http://0.0.0.0:4001/api")
  27 + scotchApp.constant("BASE_URL", "http://139.59.68.74:4001/api")
28 28  
29 29 // create the controller and inject Angular's $scope
30 30 scotchApp.controller('mainController', function($scope, $http, $location, $route, $rootScope, BASE_URL) {
... ... @@ -229,13 +229,14 @@
229 229 data: data,
230 230 headers: {}
231 231 }).then(function mySuccess(paymentResult) {
  232 + console.log("paymentResult",paymentResult)
232 233 $scope.paymentResult = paymentResult;
233 234 }, function myError(error) {});
234 235 }
235 236 var i = 0;
236 237 $scope.payingAmnt = $scope.payingAmnt * 100;
237 238 var options = {
238   - "key": "rzp_live_mhSE1uOBlXvFyJ",
  239 + "key": "rzp_test_YwHsVFiDIQ2WUQ",
239 240 "amount": $scope.payingAmnt,
240 241  
241 242 "name": "Startup Jalsa",
... ... @@ -259,12 +260,13 @@
259 260 $scope.paymentResponse = {};
260 261  
261 262 function createPayment(response) {
  263 + console.log("response====from===razorpay",response)
262 264 $route.reload();
263 265 $scope.paymentResponse.razorPaymentId = response.razorpay_payment_id;
264 266 $scope.paymentResponse.razorOrderId = $scope.paymentResult.data.razorOrderId;
265 267 $scope.paymentResponse.amount = data.amount;
266 268 $scope.paymentResponse.currency = "INR";
267   - $scope.paymentResponse.status = "captured";
  269 + $scope.paymentResponse.status = $scope.paymentResult.data.status;
268 270 $http({
269 271 method: 'PUT',
270 272 url: BASE_URL + '/payments/' + $scope.paymentResult.data.id,
... ... @@ -532,7 +534,8 @@
532 534 console.log('pending data', searchResult);
533 535 var i = 0;
534 536 var options = {
535   - "key": "rzp_live_mhSE1uOBlXvFyJ",
  537 + // "key": "rzp_live_mhSE1uOBlXvFyJ",
  538 + "key" : "rzp_test_YwHsVFiDIQ2WUQ",
536 539 "amount": $scope.amount,
537 540  
538 541 "name": "Startup Jalsa",
... ... @@ -556,6 +559,7 @@
556 559 $scope.paymentResponse = {};
557 560  
558 561 function createPayment(response) {
  562 + console.log("response",response);
559 563 $scope.paymentResponse.razorPaymentId = response.razorpay_payment_id;
560 564 $scope.paymentResponse.razorOrderId = $scope.paymentResult.data.razorOrderId;
561 565 $scope.paymentResponse.amount = $scope.amount;
... ... @@ -569,7 +573,7 @@
569 573 data: $scope.paymentResponse,
570 574 headers: {}
571 575 }).then(function mySuccess(searchResult) {
572   -
  576 + console.log("finalsearchResult",searchResult)
573 577 }, function myError(error) {
574 578  
575 579 });
... ... @@ -584,6 +588,51 @@
584 588  
585 589 scotchApp.controller('ambassadorController', function($scope, $http, $location, $route,BASE_URL) {
586 590 $scope.data = {};
  591 + $scope.check = false;
  592 + $scope.numberCheck = false;
  593 +
  594 + $scope.emailcheck = function(val) {
  595 + if (val == undefined) {
  596 + $('#invalidEmail').css('display', 'block');
  597 + } else {
  598 + $http({
  599 + method: 'GET',
  600 + url: BASE_URL + '/ambassadors?filter={"where": {"email": {"like":"%25' + $scope.data.email + '%25"}}}',
  601 + headers: {}
  602 + }).then(function mySuccess(searchResult) {
  603 + console.log("searchResult1===>", searchResult)
  604 + if (searchResult.data.length == 0) {
  605 + $scope.check = false;
  606 + } else {
  607 + $scope.check = true;
  608 + $('#alreadyExist').css('display', 'block');
  609 + }
  610 + }, function myError(error) {});
  611 + }
  612 + };
  613 +
  614 + $scope.removeNoError = function() {
  615 + $('#noExist').css('display', 'none');
  616 + };
  617 +
  618 + $scope.numbercheck = function(number) {
  619 + $http({
  620 + method: 'GET',
  621 + url: BASE_URL + '/ambassadors?filter={"where": {"phone": {"like":"%25' + number + '%25"}}}',
  622 + data: $scope.data,
  623 + headers: {}
  624 + }).then(function mySuccess(searchResult) {
  625 + console.log("searchResult===>", searchResult)
  626 + if (searchResult.data.length == 0) {
  627 + $scope.numberCheck = false;
  628 +
  629 + } else {
  630 + $scope.numberCheck = true;
  631 + $('#noExist').css('display', 'block');
  632 + }
  633 + }, function myError(error) {});
  634 + };
  635 +
587 636 $scope.submit = function() {
588 637 console.log($scope.data.name)
589 638 var randomNumber = ""+Math.random();
... ...