From 38c947d7712d77070ca521b4718032fb31c0f108 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Thu, 17 Dec 2015 22:56:24 +0100 Subject: Towards payment. --- extension/pages/confirm-contract.html | 8 +++++++- extension/pages/confirm-contract.js | 18 +++++++++--------- extension/pages/confirm-contract.tsx | 17 +++++++++-------- extension/pages/debug.html | 1 + 4 files changed, 26 insertions(+), 18 deletions(-) (limited to 'extension/pages') diff --git a/extension/pages/confirm-contract.html b/extension/pages/confirm-contract.html index 8d68511dd..9959bb489 100644 --- a/extension/pages/confirm-contract.html +++ b/extension/pages/confirm-contract.html @@ -26,6 +26,10 @@

+ + @@ -33,7 +37,9 @@

- + + +
diff --git a/extension/pages/confirm-contract.js b/extension/pages/confirm-contract.js index c59ac90a9..0f6d83744 100644 --- a/extension/pages/confirm-contract.js +++ b/extension/pages/confirm-contract.js @@ -23,16 +23,16 @@ document.addEventListener("DOMContentLoaded", (e) => { let html = template(offer.contract); $_("render-contract").innerHTML = html; document.getElementById("confirm-pay").addEventListener("click", (e) => { - let d = clone(query); + let d = { + offer: JSON.parse(query.offer) + }; chrome.runtime.sendMessage({ type: 'confirm-pay', detail: d }, (resp) => { - if (resp.success === true) { - document.location.href = resp.backlink; - } - else { - document.body.innerHTML = - `Oops, something went wrong. - Here is some more info: - 
${resp.text}
`; + console.log("got response", resp); + if ("error" in resp) { + let source = $_("error-template").innerHTML; + let template = Handlebars.compile(source); + $_("status").innerHTML = template(resp); + return; } }); }); diff --git a/extension/pages/confirm-contract.tsx b/extension/pages/confirm-contract.tsx index 811e2e001..c9d41a2c8 100644 --- a/extension/pages/confirm-contract.tsx +++ b/extension/pages/confirm-contract.tsx @@ -34,15 +34,16 @@ document.addEventListener("DOMContentLoaded", (e) => { $_("render-contract").innerHTML = html; document.getElementById("confirm-pay").addEventListener("click", (e) => { - let d = clone(query); + let d = { + offer: JSON.parse(query.offer) + }; chrome.runtime.sendMessage({type:'confirm-pay', detail: d}, (resp) => { - if (resp.success === true) { - document.location.href = resp.backlink; - } else { - document.body.innerHTML = - `Oops, something went wrong. - Here is some more info: - 
${resp.text}
`; + console.log("got response", resp); + if ("error" in resp) { + let source = $_("error-template").innerHTML; + let template = Handlebars.compile(source); + $_("status").innerHTML = template(resp); + return; } }); }); diff --git a/extension/pages/debug.html b/extension/pages/debug.html index 7dfa7a9cc..24682dd24 100644 --- a/extension/pages/debug.html +++ b/extension/pages/debug.html @@ -7,5 +7,6 @@

Debug Pages

Show DB
Show balance + -- cgit v1.2.3