From 31a0a8e5759c9b24a9de21bb4494301d50e49526 Mon Sep 17 00:00:00 2001
From: Adrian Hope-Bailie <adrian@hopebailie.com>
Date: Tue, 29 Mar 2016 15:16:32 +0200
Subject: [PATCH 1/2] Update definition of CurrencyAmount to match WG
 resolution #57

Updated definition to allow for flexible currency identifiers and not
allow negative amounts
---
 specs/paymentrequest.html | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/specs/paymentrequest.html b/specs/paymentrequest.html
index f0734b71..84fc7fad 100644
--- a/specs/paymentrequest.html
+++ b/specs/paymentrequest.html
@@ -295,17 +295,17 @@ <h2>PaymentRequest constructor</h2>
                 {
                   "id": "basket",
                   "label": "Sub-total",
-                  "amount": { "currencyCode": "USD", "value" : "55.00" }, // US$55.00
+                  "amount": { "currency": "USD", "amount" : "55.00" }, // US$55.00
                 },
                 {
                   "id": "tax",
                   "label": "Sales Tax",
-                  "amount": { "currencyCode": "USD", "value" : "5.00" }, // US$5.00
+                  "amount": { "currency": "USD", "amount" : "5.00" }, // US$5.00
                 },
                 {
                   "id": "total",
                   "label": "Total due",
-                  "amount": { "currencyCode": "USD", "value" : "60.00" }, // US$60.00
+                  "amount": { "currency": "USD", "amount" : "60.00" }, // US$60.00
                 }
               ]
             }
@@ -578,8 +578,8 @@ <h2>Internal Slots</h2>
       <h2>CurrencyAmount</h2>
       <pre class="idl">
 dictionary CurrencyAmount {
-  required DOMString currencyCode;
-  required DOMString value;
+  required DOMString currency;
+  required DOMString amount;
 };
       </pre>
       <p>
@@ -587,19 +587,20 @@ <h2>CurrencyAmount</h2>
         The following fields MUST be supplied for a <a><code>CurrencyAmount</code></a> to be valid:
       </p>
       <dl>
-        <dt><code><dfn>currencyCode</dfn></code></dt>
+        <dt><code><dfn>currency</dfn></code></dt>
         <dd>
-          <code>currencyCode</code> is a string containing a three-letter alphabetic code for the
-          currency as defined by [[!ISO4217]]. For example, <code>"USD"</code> for US Dollars.
+          <code>currency</code> is a string containing a currency identifier. The most common
+          identifiers are three-letter alphabetic codes as defined by [[!ISO4217]] (for example,
+          <code>"USD"</code> for US Dollars) however any string is considered valid and
+          <dfn data-lt="user agents">user agents</dfn> MUST not attempt to validate this string.
         </dd>
-        <dt><code><dfn>value</dfn></code></dt>
+        <dt><code><dfn>amount</dfn></code></dt>
         <dd>
           A string containing the decimal monetary value. If a decimal separator is needed then the string
-          MUST use a single U+002E FULL STOP character as the decimal separator. The string MUST begin
-          with a single U+002D HYPHEN-MINUS character if the value is negative. All other characters must
+          MUST use a single U+002E FULL STOP character as the decimal separator. All other characters must
           be characters in the range U+0030 DIGIT ZERO (0) to U+0039 DIGIT NINE (9).
           <div class="note">
-            The string should match the regular expression <code>^-?[0-9]+(\.[0-9]+)?$</code>.
+            The string should match the regular expression <code>^[0-9]+(\.[0-9]+)?$</code>.
           </div>
         </dd>
       </dl>
@@ -607,8 +608,8 @@ <h2>CurrencyAmount</h2>
       <p>The following example shows how to represent US$55.00.</p>
       <pre class="example highlight">
 {
-  "currencyCode": "USD",
-  "value" : "55.00"
+  "currency": "USD",
+  "amount" : "55.00"
 }
       </pre>
     </section>

From 98ee708ffeda53806c3edaa6cec0b6814cdcd8a0 Mon Sep 17 00:00:00 2001
From: Adrian Hope-Bailie <adrian@hopebailie.com>
Date: Fri, 1 Apr 2016 23:53:54 +0200
Subject: [PATCH 2/2] Revert "amount" to "value" in the CurrencyAmount type

Per discussion this has been changed to suit the context for FPWD. It
is expected that a new proposal will be made to revise all of these
attribute names
---
 specs/paymentrequest.html | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/specs/paymentrequest.html b/specs/paymentrequest.html
index 84fc7fad..5391e7fe 100644
--- a/specs/paymentrequest.html
+++ b/specs/paymentrequest.html
@@ -295,17 +295,17 @@ <h2>PaymentRequest constructor</h2>
                 {
                   "id": "basket",
                   "label": "Sub-total",
-                  "amount": { "currency": "USD", "amount" : "55.00" }, // US$55.00
+                  "amount": { "currency": "USD", "value" : "55.00" }, // US$55.00
                 },
                 {
                   "id": "tax",
                   "label": "Sales Tax",
-                  "amount": { "currency": "USD", "amount" : "5.00" }, // US$5.00
+                  "amount": { "currency": "USD", "value" : "5.00" }, // US$5.00
                 },
                 {
                   "id": "total",
                   "label": "Total due",
-                  "amount": { "currency": "USD", "amount" : "60.00" }, // US$60.00
+                  "amount": { "currency": "USD", "value" : "60.00" }, // US$60.00
                 }
               ]
             }
@@ -579,7 +579,7 @@ <h2>CurrencyAmount</h2>
       <pre class="idl">
 dictionary CurrencyAmount {
   required DOMString currency;
-  required DOMString amount;
+  required DOMString value;
 };
       </pre>
       <p>
@@ -594,7 +594,7 @@ <h2>CurrencyAmount</h2>
           <code>"USD"</code> for US Dollars) however any string is considered valid and
           <dfn data-lt="user agents">user agents</dfn> MUST not attempt to validate this string.
         </dd>
-        <dt><code><dfn>amount</dfn></code></dt>
+        <dt><code><dfn>value</dfn></code></dt>
         <dd>
           A string containing the decimal monetary value. If a decimal separator is needed then the string
           MUST use a single U+002E FULL STOP character as the decimal separator. All other characters must
@@ -609,7 +609,7 @@ <h2>CurrencyAmount</h2>
       <pre class="example highlight">
 {
   "currency": "USD",
-  "amount" : "55.00"
+  "value" : "55.00"
 }
       </pre>
     </section>