gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] [taler-merchant] branch master updated (caacf61 -> a42bfbd)


From: gnunet
Subject: [GNUnet-SVN] [taler-merchant] branch master updated (caacf61 -> a42bfbd)
Date: Mon, 13 Mar 2017 16:45:22 +0100

This is an automated email from the git hooks/post-receive script.

marcello pushed a change to branch master
in repository merchant.

 discard caacf61  Making /track/transfer response's fields names match the ones 
used by the frontend logic to render results.

This update removed existing revisions from the reference, leaving the
reference pointing at a previous point in the repository history.

 * -- * -- N   refs/heads/master (a42bfbd)
            \
             O -- O -- O   (caacf61)

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 src/backend/taler-merchant-httpd_track-transfer.c | 2 +-
 src/include/taler_merchant_service.h              | 2 +-
 src/lib/merchant_api_track_transfer.c             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/backend/taler-merchant-httpd_track-transfer.c 
b/src/backend/taler-merchant-httpd_track-transfer.c
index 5a84e15..150c8e6 100644
--- a/src/backend/taler-merchant-httpd_track-transfer.c
+++ b/src/backend/taler-merchant-httpd_track-transfer.c
@@ -230,7 +230,7 @@ build_deposits_response (void *cls,
   /*FIXME put error check*/
   element = json_pack ("{s:s, s:o, s:o}",
                        "order_id", json_string_value (order_id),
-                       "amount", TALER_JSON_from_amount 
(&entry->deposit_value),
+                       "deposit_value", TALER_JSON_from_amount 
(&entry->deposit_value),
                        "deposit_fee", TALER_JSON_from_amount 
(&entry->deposit_fee));
 
   /*FIXME put error check*/
diff --git a/src/include/taler_merchant_service.h 
b/src/include/taler_merchant_service.h
index 7b8fa28..0d37111 100644
--- a/src/include/taler_merchant_service.h
+++ b/src/include/taler_merchant_service.h
@@ -378,7 +378,7 @@ struct TALER_MERCHANT_TrackTransferDetails {
   /**
    * Order ID associated whit this payment.
    */
-  const char *order_id;
+  char *order_id;
 
 };
 
diff --git a/src/lib/merchant_api_track_transfer.c 
b/src/lib/merchant_api_track_transfer.c
index 4e68e82..94dac1e 100644
--- a/src/lib/merchant_api_track_transfer.c
+++ b/src/lib/merchant_api_track_transfer.c
@@ -119,7 +119,7 @@ check_track_transfer_response_ok (struct 
TALER_MERCHANT_TrackTransferHandle *wdh
       json_t *deposit = json_array_get (deposits, i);
       struct GNUNET_JSON_Specification spec_detail[] = {
         GNUNET_JSON_spec_string ("order_id", &detail->order_id),
-        TALER_JSON_spec_amount ("amount", &detail->deposit_value),
+        TALER_JSON_spec_amount ("deposit_value", &detail->deposit_value),
         TALER_JSON_spec_amount ("deposit_fee", &detail->deposit_fee),
         GNUNET_JSON_spec_end()
       };

-- 
To stop receiving notification emails like this one, please contact
address@hidden



reply via email to

[Prev in Thread] Current Thread [Next in Thread]