Skip to content

Commit a53a64e

Browse files
jeffharrelljeffharrell
committed
Merge pull request #45 from cbetta/qr_code_fix
Fixes QR code URL containing uninerpolated env variable
2 parents f211973 + 663ec7e commit a53a64e

File tree

5 files changed

+15
-12
lines changed

5 files changed

+15
-12
lines changed

‎dist/paypal-button-minicart.js‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*!
22
* PayPalJSButtons
33
* JavaScript integration for PayPal's payment buttons
4-
* @version 1.0.1 - 2013-04-13
4+
* @version 1.0.1 - 2013-04-29
55
* @author Jeff Harrell <https://github.com/jeffharrell/>
66
*/
77
/*!
@@ -2010,8 +2010,10 @@ PAYPAL.apps = PAYPAL.apps || {};
20102010
* @return {HTMLElement}
20112011
*/
20122012
function buildQR(data, size) {
2013+
var baseUrl = paypalURL.replace('{env}', data.items.env.value);
2014+
20132015
var img = document.createElement('img'),
2014-
url = paypalURL + '?',
2016+
url = baseUrl + '?',
20152017
pattern = 13,
20162018
items = data.items,
20172019
item, key;
@@ -2026,7 +2028,6 @@ PAYPAL.apps = PAYPAL.apps || {};
20262028

20272029
url = encodeURIComponent(url);
20282030
img.src = qrCodeURL.replace('{env}', data.items.env.value).replace('{url}', url).replace('{pattern}', pattern).replace('{size}', size);
2029-
20302031
return img;
20312032
}
20322033

‎dist/paypal-button-minicart.min.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/paypal-button.js‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*!
22
* PayPalJSButtons
33
* JavaScript integration for PayPal's payment buttons
4-
* @version 1.0.1 - 2013-04-13
4+
* @version 1.0.1 - 2013-04-29
55
* @author Jeff Harrell <https://github.com/jeffharrell/>
66
*/
77
if (typeof PAYPAL === 'undefined' || !PAYPAL) {
@@ -277,8 +277,10 @@ PAYPAL.apps = PAYPAL.apps || {};
277277
* @return {HTMLElement}
278278
*/
279279
function buildQR(data, size) {
280+
var baseUrl = paypalURL.replace('{env}', data.items.env.value);
281+
280282
var img = document.createElement('img'),
281-
url = paypalURL + '?',
283+
url = baseUrl + '?',
282284
pattern = 13,
283285
items = data.items,
284286
item, key;
@@ -293,7 +295,6 @@ PAYPAL.apps = PAYPAL.apps || {};
293295

294296
url = encodeURIComponent(url);
295297
img.src = qrCodeURL.replace('{env}', data.items.env.value).replace('{url}', url).replace('{pattern}', pattern).replace('{size}', size);
296-
297298
return img;
298299
}
299300

0 commit comments

Comments
 (0)