Skip to content

Commit 2626048

Browse files
authored
Merge branch 'trunk' into task/bulk-order-update-unit-tests
2 parents ee03135 + 4708660 commit 2626048

File tree

56 files changed

+669
-552
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+669
-552
lines changed

RELEASE-NOTES.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@
55
-----
66
- [*] Fix Dashboard card menu sizing to fit bigger font sizes and longer text. [https://github.com/woocommerce/woocommerce-android/pull/13184]
77
- [*] Fixed overlap issue in Settings > WooCommerce Version [https://github.com/woocommerce/woocommerce-android/pull/13183]
8-
- [*] Fixed a crash on the order details [https://github.com/woocommerce/woocommerce-android/pull/13191]
8+
- [*] Removed Tap To Pay usage survey [https://github.com/woocommerce/woocommerce-android/pull/13207]
99
- [**] Fixed a crash when a shop manager was trying to install or activate plugin in the POS onboarding [https://github.com/woocommerce/woocommerce-android/pull/13203]
10+
- [*] Fixed a crash on the order details [https://github.com/woocommerce/woocommerce-android/pull/13191]
11+
- [**] Introduced fallback logic for the barcode scanner to use the front-facing camera when a back-facing camera is unavailable [https://github.com/woocommerce/woocommerce-android/pull/13230]
1012

1113
21.3
1214
-----

WooCommerce/src/androidTest/kotlin/com/woocommerce/android/AppPrefsTest.kt

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -492,18 +492,6 @@ class AppPrefsTest {
492492
).isFalse
493493
}
494494

495-
@Test
496-
fun givenTTPWasUsedAtLeastOnceNeverInvokedThenIsTTPWasUsedAtLeastOnceReturnsFalse() {
497-
assertThat(AppPrefs.isTTPWasUsedAtLeastOnce()).isFalse
498-
}
499-
500-
@Test
501-
fun givenTTPWasUsedAtLeastOnceInvokedThenIsTTPWasUsedAtLeastOnceReturnsTrue() {
502-
AppPrefs.setTTPWasUsedAtLeastOnce()
503-
504-
assertThat(AppPrefs.isTTPWasUsedAtLeastOnce()).isTrue
505-
}
506-
507495
@Test
508496
fun givenIppWasNotUsedWhenGetCardReaderLastSuccessfulPaymentThenTimeReturnedZero() {
509497
assertThat(AppPrefs.getCardReaderLastSuccessfulPaymentTime()).isEqualTo(0L)

WooCommerce/src/main/kotlin/com/woocommerce/android/AppPrefs.kt

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -191,9 +191,6 @@ object AppPrefs {
191191
// Was the IPP feedback survey banner dismissed forever
192192
IPP_FEEDBACK_SURVEY_BANNER_DISMISSED_FOREVER,
193193

194-
// Was the Tap To Pay used at least once
195-
TTP_WAS_USED_AT_LEAST_ONCE,
196-
197194
// Whether onboarding tasks have been completed or not for a given site
198195
STORE_ONBOARDING_TASKS_COMPLETED,
199196

@@ -941,13 +938,6 @@ object AppPrefs {
941938
setBoolean(UndeletablePrefKey.IPP_FEEDBACK_SURVEY_BANNER_DISMISSED_FOREVER, dismissedForever)
942939
}
943940

944-
fun isTTPWasUsedAtLeastOnce() =
945-
getBoolean(UndeletablePrefKey.TTP_WAS_USED_AT_LEAST_ONCE, false)
946-
947-
fun setTTPWasUsedAtLeastOnce() {
948-
setBoolean(UndeletablePrefKey.TTP_WAS_USED_AT_LEAST_ONCE, true)
949-
}
950-
951941
fun updateOnboardingCompletedStatus(siteId: Int, completed: Boolean) {
952942
setBoolean(
953943
key = getStoreOnboardingKeyFor(siteId),

WooCommerce/src/main/kotlin/com/woocommerce/android/AppUrls.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ object AppUrls {
4747
const val CROWDSIGNAL_STORE_SETUP_SURVEY =
4848
"https://automattic.survey.fm/woo-mobile-%E2%80%93-store-setup-survey-2022"
4949

50-
const val CROWDSIGNAL_TAP_TO_PAY_SURVEY = "https://automattic.survey.fm/woo-app-%E2%80%93-first-ttp-survey"
5150
val CROWDSIGNAL_PRODCUT_CREATION_WITH_AI_SURVEY =
5251
if (BuildConfig.DEBUG) {
5352
"https://automattic.survey.fm/testing-debug-product-creation-with-ai-dec-2023"

WooCommerce/src/main/kotlin/com/woocommerce/android/analytics/AnalyticsEvent.kt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,12 @@ enum class AnalyticsEvent(override val siteless: Boolean = false) : IAnalyticsEv
215215
FILTER_ORDERS_BY_STATUS_DIALOG_OPTION_SELECTED,
216216
ORDER_FILTER_LIST_CLEAR_MENU_BUTTON_TAPPED,
217217

218+
ORDERS_LIST_BULK_UPDATE_SELECTION_ENABLED,
219+
ORDERS_LIST_BULK_UPDATE_REQUESTED,
220+
ORDERS_LIST_BULK_UPDATE_CONFIRMED,
221+
ORDERS_LIST_BULK_UPDATE_SUCCESS,
222+
ORDERS_LIST_BULK_UPDATE_FAILURE,
223+
218224
// -- Payments
219225
PAYMENTS_FLOW_ORDER_COLLECT_PAYMENT_TAPPED,
220226
PAYMENTS_FLOW_COMPLETED,
@@ -533,7 +539,6 @@ enum class AnalyticsEvent(override val siteless: Boolean = false) : IAnalyticsEv
533539
PAYMENTS_HUB_CASH_ON_DELIVERY_TOGGLED_LEARN_MORE_TAPPED,
534540
IN_PERSON_PAYMENTS_LEARN_MORE_TAPPED,
535541
PAYMENTS_HUB_TAP_TO_PAY_TAPPED,
536-
PAYMENTS_HUB_TAP_TO_PAY_FEEDBACK_TAPPED,
537542
PAYMENTS_HUB_TAP_TO_PAY_ABOUT_TAPPED,
538543

539544
// -- Payments Hub - Payout Summary (Previously called Deposit summary)

WooCommerce/src/main/kotlin/com/woocommerce/android/analytics/AnalyticsTracker.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,8 @@ class AnalyticsTracker private constructor(
258258
const val VALUE_SORT_DATE_ASC = "date,ascending"
259259
const val VALUE_SORT_DATE_DESC = "date,descending"
260260

261+
const val KEY_SELECTED_ORDERS_COUNT = "selected_orders_count"
262+
261263
const val VALUE_API_SUCCESS = "success"
262264
const val VALUE_API_FAILED = "failed"
263265
const val VALUE_SHIPMENT_TRACK = "track"
@@ -366,7 +368,6 @@ class AnalyticsTracker private constructor(
366368

367369
const val VALUE_SIMPLE_PAYMENTS_FLOW = "simple_payment"
368370
const val VALUE_SIMPLE_PAYMENTS_FEEDBACK = "simple_payments"
369-
const val VALUE_TAP_TO_PAY_FEEDBACK = "tap_to_pay"
370371
const val VALUE_SIMPLE_PAYMENTS_COLLECT_CARD = "card"
371372
const val VALUE_SIMPLE_PAYMENTS_COLLECT_CASH = "cash"
372373
const val VALUE_SIMPLE_PAYMENTS_COLLECT_LINK = "payment_link"

WooCommerce/src/main/kotlin/com/woocommerce/android/model/FeatureFeedbackSettings.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ data class FeatureFeedbackSettings(
2828
PRODUCT_ADDONS,
2929
SIMPLE_PAYMENTS_AND_ORDER_CREATION,
3030
ANALYTICS_HUB,
31-
TAP_TO_PAY,
3231
ORDER_SHIPPING_LINES
3332
}
3433

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/barcodescanner/BarcodeScanner.kt

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,15 @@ fun BarcodeScanner(
5757
}
5858
}
5959
val selector = remember {
60-
CameraSelector.Builder().requireLensFacing(CameraSelector.LENS_FACING_BACK).build()
60+
val cameraProvider = cameraProviderFuture.get()
61+
val hasBackCamera = cameraProvider.hasCamera(CameraSelector.DEFAULT_BACK_CAMERA)
62+
val hasFrontCamera = cameraProvider.hasCamera(CameraSelector.DEFAULT_FRONT_CAMERA)
63+
64+
when {
65+
hasBackCamera -> CameraSelector.DEFAULT_BACK_CAMERA
66+
hasFrontCamera -> CameraSelector.DEFAULT_FRONT_CAMERA
67+
else -> error(IllegalStateException("No available camera"))
68+
}
6169
}
6270

6371
DisposableEffect(lifecycleOwner) {

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/feedback/FeedbackSurveyFragment.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import com.woocommerce.android.analytics.AnalyticsTracker.Companion.VALUE_ORDER_
2626
import com.woocommerce.android.analytics.AnalyticsTracker.Companion.VALUE_PRODUCT_ADDONS_FEEDBACK
2727
import com.woocommerce.android.analytics.AnalyticsTracker.Companion.VALUE_SHIPPING_LABELS_M4_FEEDBACK
2828
import com.woocommerce.android.analytics.AnalyticsTracker.Companion.VALUE_SIMPLE_PAYMENTS_FEEDBACK
29-
import com.woocommerce.android.analytics.AnalyticsTracker.Companion.VALUE_TAP_TO_PAY_FEEDBACK
3029
import com.woocommerce.android.databinding.FragmentFeedbackSurveyBinding
3130
import com.woocommerce.android.extensions.navigateSafely
3231
import com.woocommerce.android.ui.base.BaseFragment
@@ -56,7 +55,6 @@ class FeedbackSurveyFragment : BaseFragment(R.layout.fragment_feedback_survey) {
5655
SurveyType.SHIPPING_LABELS -> VALUE_SHIPPING_LABELS_M4_FEEDBACK
5756
SurveyType.ADDONS -> VALUE_PRODUCT_ADDONS_FEEDBACK
5857
SurveyType.ANALYTICS_HUB -> VALUE_ANALYTICS_HUB_FEEDBACK
59-
SurveyType.PAYMENTS_HUB_TAP_TO_PAY -> VALUE_TAP_TO_PAY_FEEDBACK
6058
SurveyType.ORDER_SHIPPING_LINES -> VALUE_ORDER_SHIPPING_LINES_FEEDBACK
6159
}
6260
}

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/feedback/SurveyType.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ enum class SurveyType(private val untaggedUrl: String, private val milestone: In
1212
ADDONS(AppUrls.ADDONS_SURVEY),
1313
STORE_ONBOARDING(AppUrls.CROWDSIGNAL_STORE_SETUP_SURVEY),
1414
ANALYTICS_HUB(AppUrls.CROWDSIGNAL_ANALYTICS_HUB_SURVEY),
15-
PAYMENTS_HUB_TAP_TO_PAY(AppUrls.CROWDSIGNAL_TAP_TO_PAY_SURVEY),
1615
ORDER_SHIPPING_LINES(AppUrls.CROWDSIGNAL_ORDER_SHIPPING_LINES_SURVEY);
1716

1817
val url

0 commit comments

Comments
 (0)