check for order id in receipts

Author: ajungg

CHANGELOG.md

@@ -1,6 +1,12 @@
 # Changelog  
 All notable changes to this project will be documented in this file.
 
+## [0.14.3]
+
+### Changes
+- Now exposing orderId in Checkout
+- ReceiptListView is now checking for orderId while fetching
+ 
 ## [0.14.2]
 
 ### Fixed

build.gradle

@@ -23,7 +23,7 @@ allprojects {
     }
 
     project.ext {
-        sdkVersion='0.14.2'
+        sdkVersion='0.14.3'
         versionCode=1
 
         compileSdkVersion=28

core/src/main/java/io/snabble/sdk/Checkout.java

@@ -471,6 +471,10 @@ public void approveOfflineMethod() {
         }
     }
 
+    public String getOrderId() {
+        return checkoutProcess != null ? checkoutProcess.orderId : null;
+    }
+
     public void setClientAcceptedPaymentMethods(PaymentMethod[] acceptedPaymentMethods) {
         clientAcceptedPaymentMethods = acceptedPaymentMethods;
     }

core/src/main/java/io/snabble/sdk/CheckoutApi.java

@@ -128,6 +128,8 @@ public static class CheckoutProcessResponse {
         public Map<String, Href> links;
         public Boolean supervisorApproval;
         public Boolean paymentApproval;
+        @SerializedName("orderID")
+        public String orderId;
         public boolean aborted;
         public JsonObject checkoutInfo;
         public PaymentMethod paymentMethod;

ui/src/main/java/io/snabble/sdk/ui/receipts/ReceiptListView.java

@@ -105,7 +105,17 @@ public void success(ReceiptInfo[] newReceiptInfos) {
                 receiptInfos = newReceiptInfos;
 
                 if (checkout != null && checkout.getState() == Checkout.State.PAYMENT_APPROVED) {
-                    showProgressBar = true;
+                    boolean containsOrder = false;
+                    for (ReceiptInfo receiptInfo : newReceiptInfos) {
+                        if (receiptInfo.getId().equals(checkout.getOrderId())) {
+                            containsOrder = true;
+                            break;
+                        }
+                    }
+
+                    if (!containsOrder) {
+                        showProgressBar = true;
+                    }
                 }
 
                 recyclerView.getAdapter().notifyDataSetChanged();