removed receipt_available checkout state, removed receipt ui components, changed ReceiptInfo.getProject to getProjectId

Author: ajungg

CHANGELOG.md

@@ -1,6 +1,13 @@
 # Changelog  
 All notable changes to this project will be documented in this file.
 
+## [0.15.0]
+
+### Breaking Changes
+- Removed RECEIPT_AVAILABLE checkout state
+- Changed ReceiptInfo.getProject to return a string instead of the resolved project
+- Removed receipt ui components 
+
 ## [0.14.18]
 
 ### Fixed

build.gradle

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

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

@@ -43,10 +43,6 @@ public enum State {
          * The payment was approved. We are done.
          */
         PAYMENT_APPROVED,
-        /**
-         * After payment approval, when the receipt is available.
-         */
-        RECEIPT_AVAILABLE,
         /**
          * The payment was denied by the payment provider.
          */
@@ -125,7 +121,6 @@ public void cancel() {
         cancelOutstandingCalls();
 
         if (state != State.PAYMENT_APPROVED
-                && state != State.RECEIPT_AVAILABLE
                 && state != State.DENIED_BY_PAYMENT_PROVIDER
                 && state != State.DENIED_BY_SUPERVISOR
                 && checkoutProcess != null) {
@@ -147,7 +142,6 @@ public void cancel() {
      */
     public void cancelSilently() {
         if (state != State.PAYMENT_APPROVED
-                && state != State.RECEIPT_AVAILABLE
                 && state != State.DENIED_BY_PAYMENT_PROVIDER
                 && state != State.DENIED_BY_SUPERVISOR
                 && checkoutProcess != null) {
@@ -377,13 +371,7 @@ private boolean handleProcessResponse() {
 
         if (checkoutProcess.paymentState == CheckoutApi.PaymentState.SUCCESSFUL) {
             approve();
-
-            if (checkoutProcess.getReceiptLink() != null) {
-                notifyStateChanged(State.RECEIPT_AVAILABLE);
-                return true;
-            } else {
-                return false;
-            }
+            return true;
         } else if (checkoutProcess.paymentState == CheckoutApi.PaymentState.PENDING) {
             if (checkoutProcess.supervisorApproval != null && !checkoutProcess.supervisorApproval) {
                 Logger.d("Payment denied by supervisor");

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

@@ -4,15 +4,15 @@
 
 public class ReceiptInfo {
     private String id;
-    private Project project;
+    private String projectId;
     private Date date;
     private String pdfUrl;
     private String shopName;
     private String price;
 
-    public ReceiptInfo(String id, Project project, Date date, String pdfUrl, String shopName, String price) {
+    public ReceiptInfo(String id, String projectId, Date date, String pdfUrl, String shopName, String price) {
         this.id = id;
-        this.project = project;
+        this.projectId = projectId;
         this.date = date;
         this.pdfUrl = pdfUrl;
         this.shopName = shopName;
@@ -23,8 +23,8 @@ public String getId() {
         return id;
     }
 
-    public Project getProject() {
-        return project;
+    public String getProjectId() {
+        return projectId;
     }
 
     public Date getDate() {

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

@@ -70,7 +70,7 @@ public void cancelDownload() {
      */
     public void download(final ReceiptInfo receiptInfo,
                          final ReceiptDownloadCallback callback) {
-        if (receiptInfo.getPdfUrl() == null || receiptInfo.getProject() == null) {
+        if (receiptInfo.getPdfUrl() == null) {
             callback.failure();
             return;
         }
@@ -94,7 +94,22 @@ public void download(final ReceiptInfo receiptInfo,
             return;
         }
 
-        call = receiptInfo.getProject().getOkHttpClient().newCall(request);
+        Project project = null;
+
+        Snabble snabble = Snabble.getInstance();
+        for (Project p : snabble.getProjects()) {
+            if (p.getId().equals(receiptInfo.getProjectId())) {
+                project = p;
+            }
+            break;
+        }
+
+        if (project == null) {
+            callback.failure();
+            return;
+        }
+
+        call = project.getOkHttpClient().newCall(request);
         call.enqueue(new Callback() {
             @Override
             public void onResponse(Call call, Response response) throws IOException {

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

@@ -86,7 +86,7 @@ public void success(ApiReceipt apiReceipt) {
                             try {
                                 ReceiptInfo receiptInfo = new ReceiptInfo(
                                         apiOrder.id,
-                                        project,
+                                        apiOrder.project,
                                         simpleDateFormat.parse(apiOrder.date),
                                         snabble.absoluteUrl(apiLink.href),
                                         apiOrder.shopName,

sample/src/main/AndroidManifest.xml

@@ -26,7 +26,6 @@
         <activity android:name=".ProductSearchActivity" />
         <activity android:name=".CheckoutActivity" />
         <activity android:name=".ShoppingCartActivity" />
-        <activity android:name=".ReceiptListActivity" />
         <activity android:name=".SEPACardInputActivity" />
         <activity android:name=".PaymentCredentialsListActivity" />
         <activity android:name=".PaymentCredentialsSelectActivity" />

sample/src/main/java/io/snabble/testapp/HomeFragment.java

@@ -1,14 +1,12 @@
 package io.snabble.testapp;
 
-import android.content.Intent;
 import android.os.Bundle;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import io.snabble.sdk.Project;
 import io.snabble.sdk.Snabble;
 import io.snabble.sdk.ui.SnabbleUI;
-import io.snabble.sdk.ui.receipts.ReceiptListView;
 
 import android.view.LayoutInflater;
 import android.view.View;
@@ -45,14 +43,6 @@ public void onClick(View v) {
             }
         });
 
-        v.findViewById(R.id.receipt_list).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Intent intent = new Intent(requireActivity(), ReceiptListActivity.class);
-                startActivity(intent);
-            }
-        });
-
         v.findViewById(R.id.update_db).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {

sample/src/main/java/io/snabble/testapp/ReceiptListActivity.java

@@ -25,12 +25,6 @@
             android:padding="8dp"
             android:id="@+id/scanner"
             android:text="Scanner" />
-        <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:padding="8dp"
-            android:id="@+id/receipt_list"
-            android:text="Receipts" />
         <Button
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"