diff options
author | Marcello Stanisci <marcello.stanisci@inria.fr> | 2016-02-15 18:40:45 +0100 |
---|---|---|
committer | Marcello Stanisci <marcello.stanisci@inria.fr> | 2016-02-15 18:40:45 +0100 |
commit | a32f8bbd641afd21a27309c6a8e80a7869118aef (patch) | |
tree | 1318907e19af88a5adec4178242dab0620208e65 /src/frontend | |
parent | 2d62433bee7894d6b3d7b06a8f8dc29a6a813e22 (diff) | |
parent | 57e59c69c1196ae882f02f2b9747cdae52491549 (diff) | |
download | merchant-a32f8bbd641afd21a27309c6a8e80a7869118aef.tar.gz merchant-a32f8bbd641afd21a27309c6a8e80a7869118aef.tar.bz2 merchant-a32f8bbd641afd21a27309c6a8e80a7869118aef.zip |
Merge branch 'master' of ssh://taler.net/var/git/merchant
Conflicts:
src/frontend/index.php
Diffstat (limited to 'src/frontend')
-rw-r--r-- | src/frontend/config.php | 19 | ||||
-rw-r--r-- | src/frontend/index.php | 34 |
2 files changed, 51 insertions, 2 deletions
diff --git a/src/frontend/config.php b/src/frontend/config.php new file mode 100644 index 00000000..1680a9b5 --- /dev/null +++ b/src/frontend/config.php @@ -0,0 +1,19 @@ +<?php + +$host = $_SERVER["HTTP_HOST"]; + +switch ($host) { +case "shop.demo.taler.net": + $SHOP_CURRENCY = "KUDOS"; + break; +case "shop.test.taler.net": + $SHOP_CURRENCY = "PUDOS"; + break; +default: + http_response_code ($status_code); + echo "<p>Configuration error: No currency for domain $host</p>\n"; + die(); + break; +} + +?> diff --git a/src/frontend/index.php b/src/frontend/index.php index c0086a85..a616ebc5 100644 --- a/src/frontend/index.php +++ b/src/frontend/index.php @@ -6,8 +6,32 @@ require_once "../frontend_lib/config.php"; <head> <title>Toy "Store" - Taler Demo</title> <link rel="stylesheet" type="text/css" href="style.css"> - <script src="taler-presence.js" type="text/javascript"> - </script> + <script src="taler-presence.js" type="text/javascript"></script> +<script type="text/javascript"> +<?php +echo "\tvar shop_currency = '$SHOP_CURRENCY';\n"; +?> + + function addOption(value, label) { + var s = document.getElementById("taler-donation"); + let e = document.createElement("option"); + e.textContent = label ? label : ("".concat(value, " ", shop_currency)); + e.value = value; + s.appendChild(e); + } + + function init() { + let e = document.getElementById("currency-input"); + e.value = shop_currency; + addOption("0.1"); + addOption("1.0"); + addOption("6.0", "".concat(5, " ", shop_currency)); + addOption("10"); + } + + document.addEventListener("DOMContentLoaded", init); + +</script> </head> <body> @@ -110,12 +134,18 @@ require_once "../frontend_lib/config.php"; <input type="radio" name="donation_receiver" value="GNUnet">GNUnet</input> <br> <select id="taler-donation" name="donation_amount"> +<<<<<<< HEAD:src/frontend/index.php <option value="0.1">0.1 <?php echo $MERCHANT_CURRENCY; ?></option> <option value="1.0">1 <?php echo $MERCHANT_CURRENCY; ?></option> <option value="6.0">5 <?php echo $MERCHANT_CURRENCY; ?> (*)</option> <option value="10.0">10 <?php echo $MERCHANT_CURRENCY; ?></option> </select> <input type="hidden" name="donation_currency" value=<?php echo $MERCHANT_CURRENCY; ?>/> +======= + <!-- options will be added dynamically --> + </select> + <input id="currency-input" type="hidden" name="donation_currency"/> +>>>>>>> 57e59c69c1196ae882f02f2b9747cdae52491549:src/frontend/index.php <input type="submit" name="keyName" value="Donate!"/> <br> <br> |