Merge branch 'master' into readme-troubleshooting-updates

franklin-lobb · Apr 30, 2019 · 0d837a1 · 0d837a1
2 parents dff40da + 430bbff
commit 0d837a1
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ This custom skill is a demo store that showcases how to use Amazon Pay for your
 Before you start working on this skill, you will need to create the following accounts:
 *  [Amazon Developer Account](http://developer.amazon.com/alexa)
 *  [Amazon Web Services Account](http://aws.amazon.com/)
-*  [Amazon Pay Merchant Account](https://pay.amazon.com/us)
+*  [Amazon Pay Merchant Account](https://pay.amazon.com/signup)
 *  [Amazon Pay Sandbox Test Account](https://www.youtube.com/watch?v=m5teEFRZB8A)
 
 ## Setting Up the Demo

diff --git a/hooks/post_new_hook.ps1 b/hooks/post_new_hook.ps1
@@ -50,4 +50,4 @@ if ($DO_DEBUG) {
     Write-Output "###########################"
 }
 
-exit 0
+exit 0
diff --git a/hooks/post_new_hook.sh b/hooks/post_new_hook.sh
@@ -37,6 +37,4 @@ grep "sourceDir" $SKILL_NAME/skill.json | cut -d: -f2 |  sed 's/"//g' | sed 's/,
 done
 echo "###########################"
 
-exit 0
-
-
+exit 0
diff --git a/hooks/pre_deploy_hook.ps1 b/hooks/pre_deploy_hook.ps1
@@ -51,4 +51,4 @@ if ($TARGET -eq "all" -Or $TARGET -eq "lambda") {
     }
 }
 
-exit 0
+exit 0
diff --git a/hooks/pre_deploy_hook.sh b/hooks/pre_deploy_hook.sh
@@ -41,5 +41,4 @@ if [[ $TARGET == "all" || $TARGET == "lambda" ]]; then
     echo "###########################"
 fi
 
-exit 0
-
+exit 0
diff --git a/lambda/custom/config.js b/lambda/custom/config.js
@@ -2,7 +2,7 @@
     To run the skill, the minimum values you need configure are: sellerId, sandboxCustomerEmailId, and bucketName
 
     A detailed list of attribute descriptions can be found here:
-    https://developer.integ.amazon.com/docs/amazon-pay/amazon-pay-apis-for-alexa.html    
+    https://developer.amazon.com/docs/amazon-pay/amazon-pay-apis-for-alexa.html    
 **/
 
 'use strict';

diff --git a/lambda/custom/error-handler.js b/lambda/custom/error-handler.js
@@ -4,7 +4,7 @@ const config = require( 'config' );
 
 /**
 	A detailed list of all payment declines and processing errors can be found here:
-	https://developer.integ.amazon.com/docs/amazon-pay/payment-declines-and-processing-errors.html
+	https://developer.amazon.com/docs/amazon-pay/payment-declines-and-processing-errors.html
 **/
 
 

diff --git a/lambda/custom/package.json b/lambda/custom/package.json
@@ -9,4 +9,4 @@
     "ask-sdk-core": "^2.4.0",
     "ask-sdk-s3-persistence-adapter": "^2.4.0"
   }
-}
+}
diff --git a/lambda/custom/utilities.js b/lambda/custom/utilities.js
@@ -99,5 +99,4 @@ module.exports = {
     'getSimulationString':      getSimulationString,
 	'getSlotValues':            getSlotValues,
 	'resetSetup':               resetSetup,
-};
-
+};
-Original file line number
+Diff line change
@@ Expand Up / @@ -50,4 +50,4 @@ if ($DO_DEBUG) { @@
         Write-Output "###########################"
     }
-    exit 0
+    exit 0