Merge remote-tracking branch 'origin/trunk' into issue/10666-see-report-hub

Author: Alejo

CHANGELOG.md

@@ -1,6 +1,9 @@
 <!--
 Contains editorialized release notes. Raw release notes should go into `RELEASE-NOTES.txt`.
 -->
+## 17.2
+This version includes optimizations for speed and reliability. We are committed to continuously improving the app, making managing your online store more efficient and hassle-free.
+
 ## 17.1
 This release focuses on bug fixes and improvements to help you get your business started. Keep your feedback rolling in; it helps us figure out what to work on next.
 

RELEASE-NOTES.txt

@@ -1,4 +1,16 @@
 *** PLEASE FOLLOW THIS FORMAT: [<priority indicator, more stars = higher priority>] <description> [<PR URL>]
+
+17.3
+-----
+
+
+17.3
+-----
+- [*] [Internal] Enhanced user experience in shipping label creation with automatic scrolling to the first invalid field upon form submission failure [https://github.com/woocommerce/woocommerce-android/pull/10657]
+17.2
+-----
+- [**] [Available for users with WooCommerce version of 8.7+, which is not released yet] Every order have a receipt now. The receipts can be shared via many apps installed on the phone [https://github.com/woocommerce/woocommerce-android/pull/10650]
+
 17.1
 -----
 - [*] [Internal] Fixed crash when going to background from the order creation screen [https://github.com/woocommerce/woocommerce-android/pull/10600]

WooCommerce/metadata/PlayStoreStrings.pot

@@ -11,16 +11,16 @@ msgstr ""
 "Project-Id-Version: Release Notes & Play Store Descriptions\n"
 
 #. translators: Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
-msgctxt "release_note_171"
+msgctxt "release_note_172"
 msgid ""
-"17.1:\n"
-"This release focuses on bug fixes and improvements to help you get your business started. Keep your feedback rolling in; it helps us figure out what to work on next.\n"
+"17.2:\n"
+"This version includes optimizations for speed and reliability. We are committed to continuously improving the app, making managing your online store more efficient and hassle-free.\n"
 msgstr ""
 
-msgctxt "release_note_170"
+msgctxt "release_note_171"
 msgid ""
-"17.0:\n"
-"Get ready for a smoother experience with our latest update! We've ironed out the pesky bug that kept gift cards from showing up in the 'totals' section during order creation and editing. Managing your sales with our WooCommerce app is now more seamless than ever. Update now and enjoy the hassle-free enhancements!\n"
+"17.1:\n"
+"This release focuses on bug fixes and improvements to help you get your business started. Keep your feedback rolling in; it helps us figure out what to work on next.\n"
 msgstr ""
 
 #. translators: Short description of the app to be displayed in the Play Store. Limit to 80 characters including spaces and commas!

WooCommerce/metadata/release_notes.txt

@@ -1 +1 @@
-This release focuses on bug fixes and improvements to help you get your business started. Keep your feedback rolling in; it helps us figure out what to work on next.
+This version includes optimizations for speed and reliability. We are committed to continuously improving the app, making managing your online store more efficient and hassle-free.

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

@@ -456,6 +456,7 @@ enum class AnalyticsEvent(val siteless: Boolean = false) {
     RECEIPT_PRINT_CANCELED,
     RECEIPT_PRINT_SUCCESS,
     RECEIPT_VIEW_TAPPED,
+    RECEIPT_URL_FETCHING_FAILS,
 
     // -- Top-level navigation
     MAIN_MENU_SETTINGS_TAPPED,

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/appwidgets/stats/GetWidgetStats.kt

@@ -35,9 +35,9 @@ class GetWidgetStats @Inject constructor(
                 // If siteModel is null, exit the function with WidgetStatsFailure
                 siteModel == null -> WidgetStatsResult.WidgetStatsFailure("No site selected")
                 else -> {
-                    // Fetch stats, always force to refresh data
                     val areVisitorStatsSupported = siteModel.connectionType == SiteConnectionType.Jetpack
 
+                    // Fetch stats, always force to refresh data.
                     val fetchedStats = statsRepository.fetchStats(
                         granularity = granularity,
                         forced = true,
@@ -47,7 +47,7 @@ class GetWidgetStats @Inject constructor(
                     if (fetchedStats.isError) {
                         WidgetStatsResult.WidgetStatsFailure(fetchedStats.error.message)
                     } else {
-                        WidgetStatsResult.WidgetStats(fetchedStats.model!!, areVisitorStatsSupported)
+                        WidgetStatsResult.WidgetStats(fetchedStats.model!!)
                     }
                 }
             }
@@ -62,15 +62,13 @@ class GetWidgetStats @Inject constructor(
         data class WidgetStats(
             private val revenueModel: WCRevenueStatsModel?,
             private val visitorsMap: Map<String, Int>?,
-            val currencyCode: String,
-            val areVisitorStatsSupported: Boolean
+            val currencyCode: String
         ) : WidgetStatsResult() {
             constructor(
                 stats: StatsRepository.SiteStats,
-                areVisitorStatsSupported: Boolean
-            ) : this(stats.revenue, stats.visitors, stats.currencyCode, areVisitorStatsSupported)
+            ) : this(stats.revenue, stats.visitors, stats.currencyCode)
 
-            val visitorsTotal: Int
+            val visitorsTotal: Int?
             val ordersTotal: Int
             val revenueGross: Double
 
@@ -82,7 +80,7 @@ class GetWidgetStats @Inject constructor(
                     orderCount = total.ordersCount ?: 0
                 }
 
-                visitorsTotal = visitorsMap?.values?.sum() ?: 0
+                visitorsTotal = visitorsMap?.values?.sum()
                 ordersTotal = orderCount
                 revenueGross = grossRevenue
             }

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/appwidgets/stats/today/TodayStatsWidgetUIHelper.kt

@@ -67,8 +67,9 @@ class TodayStatsWidgetUIHelper @Inject constructor(
 
         remoteViews.setTextViewText(R.id.widget_revenue_value, revenue)
         remoteViews.setTextViewText(R.id.widget_orders_value, stats.ordersTotal.toString())
-        remoteViews.setTextViewText(R.id.widget_visitors_value, stats.visitorsTotal.toString())
-
+        stats.visitorsTotal?.let {
+            remoteViews.setTextViewText(R.id.widget_visitors_value, it.toString())
+        }
         remoteViews.setViewVisibility(R.id.widget_revenue_value, View.VISIBLE)
         remoteViews.setViewVisibility(R.id.widget_revenue_skeleton, View.INVISIBLE)
 
@@ -80,11 +81,11 @@ class TodayStatsWidgetUIHelper @Inject constructor(
 
         remoteViews.setViewVisibility(
             R.id.widget_visitors_title,
-            if (stats.areVisitorStatsSupported) View.VISIBLE else View.GONE
+            if (stats.visitorsTotal != null) View.VISIBLE else View.GONE
         )
         remoteViews.setViewVisibility(
             R.id.widget_visitors_value,
-            if (stats.areVisitorStatsSupported) View.VISIBLE else View.GONE
+            if (stats.visitorsTotal != null) View.VISIBLE else View.GONE
         )
 
         remoteViews.setTextViewText(

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/mystore/data/StatsRepository.kt

@@ -285,6 +285,11 @@ class StatsRepository @Inject constructor(
         }
     }
 
+    /**
+     * This function will return the site stats optional including visitor stats.
+     * Even if the includeVisitorStats flag is set to true, errors fetching visitor
+     * will be handled as null and only errors fetching the revenue stats will be processed.
+     */
     suspend fun fetchStats(
         granularity: StatsGranularity,
         forced: Boolean,
@@ -314,7 +319,10 @@ class StatsRepository @Inject constructor(
         val revenueStats = fetchRevenueStats.await()
         val siteCurrencyCode = wooCommerceStore.getSiteSettings(site)?.currencyCode.orEmpty()
 
-        return@coroutineScope if (visitorStats.isError || revenueStats.isError) {
+        // If there was an error fetching the visitor stats chances are that is because
+        // jetpack is not properly configure to return stats. So we take into account
+        // only revenue stats to return process the error response.
+        return@coroutineScope if (revenueStats.isError) {
             val error = WooError(
                 type = WooErrorType.GENERIC_ERROR,
                 original = BaseRequest.GenericErrorType.UNKNOWN,

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/details/OrderDetailTracker.kt

@@ -4,11 +4,13 @@ import com.woocommerce.android.analytics.AnalyticsEvent
 import com.woocommerce.android.analytics.AnalyticsTracker
 import com.woocommerce.android.analytics.AnalyticsTrackerWrapper
 import com.woocommerce.android.model.Order
+import com.woocommerce.android.ui.payments.tracking.PaymentsFlowTracker
 import org.wordpress.android.fluxc.store.WCOrderStore
 import javax.inject.Inject
 
 class OrderDetailTracker @Inject constructor(
-    private val trackerWrapper: AnalyticsTrackerWrapper
+    private val trackerWrapper: AnalyticsTrackerWrapper,
+    private val paymentsFlowTracker: PaymentsFlowTracker,
 ) {
     fun trackCustomFieldsTapped() {
         trackerWrapper.track(AnalyticsEvent.ORDER_VIEW_CUSTOM_FIELDS_TAPPED)
@@ -24,9 +26,8 @@ class OrderDetailTracker @Inject constructor(
         )
     }
 
-    fun trackReceiptViewTapped(orderId: Long, orderStatus: Order.Status) {
-        trackerWrapper.track(
-            AnalyticsEvent.RECEIPT_VIEW_TAPPED,
+    suspend fun trackReceiptViewTapped(orderId: Long, orderStatus: Order.Status) {
+        paymentsFlowTracker.trackReceiptViewTapped(
             mapOf(
                 AnalyticsTracker.KEY_ORDER_ID to orderId,
                 AnalyticsTracker.KEY_STATUS to orderStatus

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/details/OrderDetailViewModel.kt

@@ -369,6 +369,9 @@ class OrderDetailViewModel @Inject constructor(
             if (receiptResult.isSuccess) {
                 triggerEvent(PreviewReceipt(order.billingAddress.email, receiptResult.getOrThrow(), order.id))
             } else {
+                paymentsFlowTracker.trackReceiptUrlFetchingFails(
+                    errorDescription = receiptResult.exceptionOrNull()?.message ?: "Unknown error",
+                )
                 triggerEvent(ShowSnackbar(string.receipt_fetching_error))
             }
         }