Skip to content

Conversation

@ajungg
Copy link
Member

@ajungg ajungg commented Jan 17, 2022

No description provided.

ajungg added 30 commits December 3, 2021 16:44
…InputActivity launched from CheckoutActivity not going back to CheckoutActivity
# Conflicts:
#	core/src/main/java/io/snabble/sdk/Snabble.java
#	java-sample/build.gradle
#	java-sample/src/main/java/io/snabble/testapp/BaseActivity.java
#	java-sample/src/main/java/io/snabble/testapp/CheckoutCustomerCardActivity.java
#	java-sample/src/main/java/io/snabble/testapp/HomeFragment.java
#	java-sample/src/main/java/io/snabble/testapp/PaydirektInputActivity.java
#	java-sample/src/main/java/io/snabble/testapp/PaymentOptionsActivity.java
#	kotlin-sample/build.gradle
#	ui-integration/src/main/java/io/snabble/sdk/ui/integration/CheckoutOnlineFragment.java
#	ui-integration/src/main/java/io/snabble/sdk/ui/integration/ShoppingCartFragment.java
#	ui/src/main/java/io/snabble/sdk/ui/SnabbleUI.java
#	ui/src/main/java/io/snabble/sdk/ui/cart/PaymentSelectionHelper.java
#	ui/src/main/java/io/snabble/sdk/ui/checkout/CheckoutCustomerCardView.java
#	ui/src/main/java/io/snabble/sdk/ui/checkout/CheckoutHelper.java
# Conflicts:
#	ui/src/main/java/io/snabble/sdk/ui/cart/PaymentSelectionHelper.java
#	ui/src/main/res/values-de/strings.xml
#	ui/src/main/res/values-en/strings.xml
#	ui/src/main/res/values-hu/strings.xml
#	ui/src/main/res/values-sk/strings.xml
#	ui/src/main/res/values/strings.xml
# Conflicts:
#	ui/src/main/java/io/snabble/sdk/ui/checkout/CheckoutActivity.kt
@ajungg ajungg requested a review from rekire January 17, 2022 14:19
Copy link
Contributor

@rekire rekire left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I still need to test everything on the device, but this looks very solid.

Copy link
Contributor

@rekire rekire left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the Aldi Project I see with an empty cart the payment selector.

@ajungg ajungg merged commit a4357b1 into master Jan 26, 2022
@rekire rekire deleted the routing_targets branch March 3, 2022 13:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants