small fixes

Author: adonese

helper.go

@@ -0,0 +1,70 @@
+package main
+
+import (
+	"errors"
+	"fmt"
+	"strconv"
+
+	"github.com/noebs/emv-qrcode/emv/mpm"
+)
+
+//QR response to be used in Cashq and other products
+type QR struct {
+	MerchantID     string  `json:"merchant_id,omitempty"`
+	MerchantName   string  `json:"merchant_name,omitempty"`
+	MerchantBankID string  `json:"merchant_bank_id,omitempty"`
+	Amount         float64 `json:"amount,omitempty"`
+	AcquirerID     string  `json:"acquirer_id,omitempty"`
+	RawQR          *mpm.EMVQR
+}
+
+func (qr *QR) parseAccount(e *mpm.EMVQR) error {
+	// We have to iterate through all *possible* tags. Previously it was 26
+	// Merchant ids are from 2...50
+
+	if id, ok := e.MerchantAccountInformation["26"]; ok { // for the common case
+		p := id.Value.PaymentNetworkSpecific
+		// 0 = acquirer id, 1 = merchant account
+		//Acquirer ID and merchant ID are mandatory per EMV Book 4 QR specs
+		if len(p) < 2 {
+			return errors.New("specs are wrong")
+		}
+		qr.AcquirerID = p[0].Value
+		qr.MerchantBankID = p[1].Value
+		qr.MerchantID = p[1].Value
+	} else {
+		// Iterate through EVERY variable!
+		for i := 2; i <= 51; i++ {
+			parsedIndex := fmt.Sprintf("%02d", i)
+			if id, ok := e.MerchantAccountInformation[mpm.ID(parsedIndex)]; ok { // for the common case
+				p := id.Value.PaymentNetworkSpecific
+				// 0 = acquirer id, 1 = merchant account
+				//Acquirer ID and merchant ID are mandatory per EMV Book 4 QR specs
+				if len(p) < 2 {
+					return errors.New("specs are wrong")
+				}
+				qr.AcquirerID = p[0].Value
+				qr.MerchantBankID = p[1].Value
+				qr.MerchantID = p[1].Value
+
+			}
+		}
+	}
+	return nil
+}
+
+func (qr *QR) init(e *mpm.EMVQR) error {
+	var err error
+	qr.RawQR = e
+
+	qr.MerchantName = e.MerchantName.Value
+	qr.Amount, err = strconv.ParseFloat(e.TransactionAmount.Value, 32)
+	if err != nil {
+		return err
+	}
+	if err = qr.parseAccount(e); err != nil {
+		return err
+	}
+	return nil
+
+}

main.go

@@ -16,6 +16,7 @@ func main() {
 	var qr QRCheck
 
 	http.HandleFunc("/encode", qr.DecodeHandler)
+	http.HandleFunc("/decode", qr.DecodeHandler)
 	http.HandleFunc("/", qr.DecodeHtml)
 	http.ListenAndServe(":8012", nil)
 
@@ -46,12 +47,20 @@ func (q QRCheck) DecodeHandler(w http.ResponseWriter, r *http.Request) {
 		w.WriteHeader(http.StatusBadRequest)
 		return
 	}
-	res, err := json.Marshal(qrencoded)
+
+	qr := QR{}
+	if err := qr.init(qrencoded); err != nil {
+		log.Printf("Error in parsing QR: %v", err)
+		w.WriteHeader(http.StatusBadRequest)
+		return
+	}
+	res, err := json.Marshal(qr)
 	if err != nil {
 		log.Printf("Error in parsing QR: %v", err)
 		w.WriteHeader(http.StatusBadRequest)
 		return
 	}
+
 	w.WriteHeader(http.StatusOK)
 	w.Write(res)
 
@@ -73,7 +82,13 @@ func (q QRCheck) DecodeHtml(w http.ResponseWriter, r *http.Request) {
 		w.WriteHeader(http.StatusBadRequest)
 		return
 	}
-	tmpl.Execute(w, qrencoded)
+	qr := QR{}
+	if err := qr.init(qrencoded); err != nil {
+		log.Printf("Error in parsing QR: %v", err)
+		w.WriteHeader(http.StatusBadRequest)
+		return
+	}
+	tmpl.Execute(w, qr)
 
 }
 

static/qr.html

@@ -16,22 +16,25 @@
             <thead>
                 <tr>
 
-                  <th scope="col">MerchantName</th>
-                  <th scope="col">TransactionAmount</th>
-                  <th scope="col">TransactionCurrency</th>
-                  <th scope="col">MerchantCity</th>
+                  <th scope="row">Name</th>
+                  <th scope="row">Amount</th>
+                  <th scope="row">Currency</th>
+                  <th scope="row">City</th>
+                  <th scope="row">Account ID</th>
+                  <th scope="row">Acquirer ID</th>
 
 
                 </tr>
               </thead>
               <tbody>
 
                 <tr>
-                    <td>{{.MerchantName.Value}}</td>
-                    <td>{{.TransactionAmount.Value}}</td>
-                    <td>{{.TransactionCurrency.Value}}</td>
-                    <td>{{.MerchantCity.Value}}</td>
-                   
+                    <td>{{.MerchantName}}</td>
+                    <td>{{.Amount}}</td>
+                    <td>{{.RawQR.TransactionCurrency.Value}}</td>
+                    <td>{{.RawQR.MerchantCity.Value}}</td>
+                    <td>{{.MerchantBankID}}</td> <!--For merchant ID-->
+                   <td>{{.AcquirerID}}</td>
 
                   </tr>