Changesets: merchant
|
master 52d42480 2016-01-25 17:11 Details Diff |
merge execution page into fulfillment | ||
| rm - src/frontend/execute.js | Diff File | ||
| mod - src/frontend/fulfillment.php | Diff File | ||
| mod - src/frontend_lib/util.php | Diff File | ||
|
master a55410cd 2016-01-25 17:00 Details Diff |
fix wrong logic | ||
| mod - src/frontend/fulfillment.php | Diff File | ||
|
master 3a4e0743 2016-01-25 16:59 Details Diff |
execute contract from fulfillment page | ||
| rm - src/frontend/execute.php | Diff File | ||
| rm - src/frontend/execute.tsx | Diff File | ||
| mod - src/frontend/fulfillment.php | Diff File | ||
|
master d46b7f55 2016-01-25 16:41 Details Diff |
save contract information | ||
| mod - src/frontend/checkout.php | Diff File | ||
| mod - src/frontend/fulfillment.php | Diff File | ||
| mod - src/frontend/generate_taler_contract.php | Diff File | ||
|
master 6b5aa6dd 2016-01-25 16:23 Details Diff |
session state checks | ||
| mod - src/frontend/fulfillment.php | Diff File | ||
|
master 6f8ec0ac 2016-01-25 16:14 Details Diff |
fix missing include | ||
| mod - src/frontend/fulfillment.php | Diff File | ||
|
master 48e87b51 2016-01-25 16:11 Details Diff |
uuid check | ||
| mod - src/frontend/fulfillment.php | Diff File | ||
|
master fa137c5e 2016-01-25 16:07 Details Diff |
don't die; return instead | ||
| mod - src/frontend/fulfillment.php | Diff File | ||
|
master 39939a46 2016-01-25 16:06 Details Diff |
fix html | ||
| mod - src/frontend/fulfillment.php | Diff File | ||
|
master 6426ff70 2016-01-25 16:04 Details Diff |
Merge branch 'master' of ssh://taler.net/var/git/merchant | ||
| mod - src/frontend/pay.php | Diff File | ||
| mod - src/frontend_blog/essay_cc_pay.php | Diff File | ||
| mod - src/frontend_blog/essay_pay.php | Diff File | ||
| mod - src/frontend_lib/util.php | Diff File | ||
|
master cb319933 2016-01-25 16:04 Details Diff |
check fulfillment UUID | ||
| mod - src/frontend/fulfillment.php | Diff File | ||
| mod - src/frontend/pay.php | Diff File | ||
| mod - src/frontend/util.php | Diff File | ||
|
master 0af7437d 2016-01-25 15:57 Details Diff |
Merge branch 'master' of ssh://taler.net/var/git/merchant | ||
| mod - src/frontend/fulfillment.php | Diff File | ||
| mod - src/frontend/generate_taler_contract.php | Diff File | ||
| mod - src/frontend/pay.php | Diff File | ||
|
master bdf26f36 2016-01-25 15:54 Details Diff |
adapting blog to new specs; still to test | ||
| mod - src/frontend/pay.php | Diff File | ||
| mod - src/frontend_blog/essay_cc_pay.php | Diff File | ||
| mod - src/frontend_blog/essay_pay.php | Diff File | ||
| mod - src/frontend_lib/util.php | Diff File | ||
|
master a91b81e6 2016-01-25 15:52 Details Diff |
add fulfillment URL in the right place (next try) | ||
| mod - src/frontend/generate_taler_contract.php | Diff File | ||
|
master 7878dac5 2016-01-25 15:36 Details Diff |
add fulfillment URL in the right place | ||
| mod - src/frontend/generate_taler_contract.php | Diff File | ||
|
master dfb27f3b 2016-01-25 14:45 Details Diff |
Merge branch 'master' of ssh://taler.net/var/git/merchant | ||
| mod - src/frontend_blog/cc_payment.php | Diff File | ||
| add - src/frontend_blog/essay_cc_pay.php | Diff File | ||
| mod - src/frontend_blog/essay_contract.php | Diff File | ||
| mod - src/frontend_blog/essay_fulfillment.php | Diff File | ||
| mod - src/frontend_blog/essay_pay.php | Diff File | ||
| mod - src/frontend_blog/index.html | Diff File | ||
| mod - src/frontend_blog/teaser.php | Diff File | ||
|
master 6fe7b256 2016-01-25 14:45 Details Diff |
New fulfillment URL mechanism. | ||
| mod - src/frontend/fulfillment.php | Diff File | ||
| mod - src/frontend/generate_taler_contract.php | Diff File | ||
| mod - src/frontend/pay.php | Diff File | ||
|
master 81c80fde 2016-01-25 12:04 Details Diff |
Merge branch 'master' of ssh://taler.net/var/git/merchant | ||
| mod - src/backend/taler-merchant-httpd_contract.c | Diff File | ||
| mod - src/frontend/checkout.php | Diff File | ||
| mod - src/frontend/fulfillment.php | Diff File | ||
| mod - src/frontend/generate_taler_contract.php | Diff File | ||
| mod - src/frontend/pay.php | Diff File | ||
| add - src/frontend/util.php | Diff File | ||
|
master 29ace180 2016-01-25 12:02 Details Diff |
blog: making cc payment by dedicated scripts, + deferring | ||
| mod - src/frontend_blog/cc_payment.php | Diff File | ||
| add - src/frontend_blog/essay_cc_pay.php | Diff File | ||
| mod - src/frontend_blog/essay_contract.php | Diff File | ||
| mod - src/frontend_blog/essay_fulfillment.php | Diff File | ||
| mod - src/frontend_blog/essay_pay.php | Diff File | ||
| mod - src/frontend_blog/index.html | Diff File | ||
| mod - src/frontend_blog/teaser.php | Diff File | ||
|
master d1afdc9b 2016-01-24 21:26 Details Diff |
correctly append contract identifier | ||
| mod - src/frontend/generate_taler_contract.php | Diff File | ||
|
master ea402fdb 2016-01-24 20:49 Details Diff |
send JSON as payment response | ||
| mod - src/frontend/pay.php | Diff File | ||
|
master e631c051 2016-01-24 20:11 Details Diff |
type error | ||
| mod - src/frontend/generate_taler_contract.php | Diff File | ||
|
master 5bf86b23 2016-01-24 20:09 Details Diff |
type error | ||
| mod - src/frontend/generate_taler_contract.php | Diff File | ||
|
master 0f9b5928 2016-01-24 19:40 Details Diff |
php syntax | ||
| mod - src/frontend/generate_taler_contract.php | Diff File | ||
|
master 6fa02fce 2016-01-24 19:36 Details Diff |
fix JSON format string | ||
| mod - src/backend/taler-merchant-httpd_contract.c | Diff File | ||
