[taler-taler-mdb] 02/02: Merge branch 'master' of git+ssh://git.taler.net/taler-mdb

[gnunet]

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

marco-boss pushed a commit to branch master
in repository taler-mdb.

commit 90adc8d43444b097a7f0608671238d1d930a4e6d
Merge: 57de4d5 742ae05
Author: Boss Marco <address@hidden>
AuthorDate: Tue Dec 10 16:29:57 2019 +0100

    Merge branch 'master' of git+ssh://git.taler.net/taler-mdb

 configure.ac    |   6 +-
 src/Makefile.am |  12 ++
 src/main.c      |  53 ++++++-
 src/qr-show.c   | 425 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 492 insertions(+), 4 deletions(-)

diff --cc src/main.c
index 29e9acc,8ac2911..37d4887
--- a/src/main.c
+++ b/src/main.c
@@@ -1360,8 -1335,8 +1377,9 @@@ launch_payment (struct Product *product
      return NULL;
    }
    pa = GNUNET_new (struct PaymentActivity);
+   pa->product = product;
    pa->amount = product->price;
 +  /* put the order on the merchant's backend */
    pa->po = TALER_MERCHANT_order_put (ctx,
                                       backendBaseUrl,
                                       orderReq,

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