summaryrefslogtreecommitdiff
path: root/src/frontend
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2016-01-25 14:36:40 +0100
committerFlorian Dold <florian.dold@gmail.com>2016-01-25 14:36:40 +0100
commit7878dac503af039f2fcbc17585187af0554da3e7 (patch)
tree49ef40090607de6b14acc709126166017317148d /src/frontend
parentdfb27f3b6d3de7b28c298eaa1d8d84b70467d61f (diff)
downloadmerchant-7878dac503af039f2fcbc17585187af0554da3e7.tar.gz
merchant-7878dac503af039f2fcbc17585187af0554da3e7.tar.bz2
merchant-7878dac503af039f2fcbc17585187af0554da3e7.zip
add fulfillment URL in the right place
Diffstat (limited to 'src/frontend')
-rw-r--r--src/frontend/generate_taler_contract.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/frontend/generate_taler_contract.php b/src/frontend/generate_taler_contract.php
index 1fdfdc34..1e3c1fb1 100644
--- a/src/frontend/generate_taler_contract.php
+++ b/src/frontend/generate_taler_contract.php
@@ -107,9 +107,8 @@ $contract = array(
'province' => 'Test Province',
'ZIP code' => 4908)));
-$json = json_encode( array(
- 'contract' => $contract,
- 'fulfillment_url' => (url_rel("fulfillment.php") . '?uuid=${H_contract}')
+$json = json_encode(array(
+ 'contract' => $contract
), JSON_PRETTY_PRINT);
$url = url_join("http://".$_SERVER["HTTP_HOST"], "backend/contract");
@@ -143,6 +142,7 @@ if ($status_code != 200)
else
{
$got_json = json_decode($resp->body->toString(), true);
+ $got_json['fulfillment_url']= url_rel("fulfillment.php") . '?uuid=${H_contract}';
$_SESSION['H_contract'] = $got_json["H_contract"];
echo json_encode ($got_json, JSON_PRETTY_PRINT);
}