Merge branch 'trunk' into issue/WOOMOB-887-cache-carrier-packages-data

# Conflicts:
#	libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/60.json

Author: irfano

RELEASE-NOTES.txt

@@ -13,6 +13,8 @@
 - [***] POS: A new settings to customize the POS [https://github.com/woocommerce/woocommerce-android/pull/14527]
 - [*] [Login] Improved the detection of WooCommerce API version during login flow [https://github.com/woocommerce/woocommerce-android/pull/14524]
 - [*] Shipping Labels: Adds caching to the "Select a Package" screen [https://github.com/woocommerce/woocommerce-android/pull/14541]
+- [*]  Add more filter options to orders filters sales channel [https://github.com/woocommerce/woocommerce-android/pull/14546]
+- [*] Automatically populate the weight field in the create shipment flow [https://github.com/woocommerce/woocommerce-android/pull/14525]
 
 23.1
 -----

WooCommerce/src/androidTest/assets/mocks/mappings/jetpack-blogs/rest_api.json

@@ -6,8 +6,8 @@
       "json": {
         "equalTo": "true"
       },
-      "query": {
-        "matches": "(.*)fields(.*)authentication,namespaces(.*)"
+      "path": {
+        "equalTo": "/&_method=get"
       },
       "locale": {
         "matches": "(.*)"
@@ -19,13 +19,6 @@
     "jsonBody": {
       "data": {
         "namespaces": ["oembed\/1.0", "wpcomsh\/v1", "akismet\/v1", "jetpack\/v4", "wc\/v1", "wc\/v2", "amp\/v1", "wc-admin", "wc-analytics", "wc-product-add-ons\/v1", "wpcom\/v2", "wc\/v3", "wc\/store", "wccom-site\/v1", "wc-calypso-bridge\/v1", "wp\/v2", "wp-site-health\/v1"],
-        "authentication": {
-          "application-passwords": {
-            "endpoints": {
-              "authorization": "https:\/\/automatticwidgets.wpcomstaging.com\/wp-admin\/authorize-application.php"
-            }
-          }
-        },
         "_links": {
           "help": [{
             "href": "https:\/\/developer.wordpress.org\/rest-api\/"

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

@@ -78,6 +78,7 @@ object AppPrefs {
         LOGIN_SITE_ADDRESS,
         DATABASE_DOWNGRADED,
         ORDER_SUMMARY_MIGRATED,
+        GATEWAY_MIGRATED,
         IS_PRODUCTS_FEATURE_ENABLED,
         IS_PRODUCT_ADDONS_ENABLED,
         LOGIN_USER_BYPASSED_JETPACK_REQUIRED,
@@ -296,6 +297,10 @@ object AppPrefs {
         get() = getBoolean(DeletablePrefKey.ORDER_SUMMARY_MIGRATED, false)
         set(value) = setBoolean(DeletablePrefKey.ORDER_SUMMARY_MIGRATED, value)
 
+    var gatewayMigrated: Boolean
+        get() = getBoolean(DeletablePrefKey.GATEWAY_MIGRATED, false)
+        set(value) = setBoolean(DeletablePrefKey.GATEWAY_MIGRATED, value)
+
     fun getProductSortingChoice(currentSiteId: Int) = getString(getProductSortingKey(currentSiteId)).orNullIfEmpty()
 
     fun setProductSortingChoice(currentSiteId: Int, value: String) {

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

@@ -40,6 +40,7 @@ open class AppPrefsWrapper @Inject constructor() {
     var isSiteWPComSuspended by AppPrefs::isSiteWPComSuspended
 
     open var orderSummaryMigrated by AppPrefs::orderSummaryMigrated
+    open var gatewayMigrated by AppPrefs::gatewayMigrated
 
     fun getAppInstallationDate() = AppPrefs.installationDate
 

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/jetpack/JetpackActivationRepository.kt

@@ -165,12 +165,9 @@ class JetpackActivationRepository @Inject constructor(
                 WooLog.d(WooLog.T.LOGIN, "Jetpack Activation: Site $siteUrl is missing from account sites")
                 Result.failure(IllegalStateException("Site missing"))
             } else {
-                if (!site.hasWooCommerce) {
-                    // If the site doesn't have WooCommerce, let's do one additional fetch using `fetchSite`,
-                    // this function will make sure to fetch data from the remote site, which might result in more
-                    // accurate result
-                    siteStore.fetchSite(site)
-                }
+                // Fetch full site details from the remote site, this will also allow us to fetch the
+                // Applications Passwords support on the site
+                siteStore.fetchSite(site)
                 Result.success(site)
             }
         }

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/filters/OrderFilterCategoriesViewModel.kt

@@ -16,6 +16,7 @@ import com.woocommerce.android.ui.orders.filters.data.OrderListFilterCategory.DA
 import com.woocommerce.android.ui.orders.filters.data.OrderListFilterCategory.ORDER_STATUS
 import com.woocommerce.android.ui.orders.filters.data.OrderListFilterCategory.PRODUCT
 import com.woocommerce.android.ui.orders.filters.data.OrderListFilterCategory.SALES_CHANNEL
+import com.woocommerce.android.ui.orders.filters.data.SalesChannel
 import com.woocommerce.android.ui.orders.filters.domain.GetDateRangeFilterOptions
 import com.woocommerce.android.ui.orders.filters.domain.GetOrderStatusFilterOptions
 import com.woocommerce.android.ui.orders.filters.domain.GetTrackingForFilterSelection
@@ -390,9 +391,19 @@ class OrderFilterCategoriesViewModel @Inject constructor(
 
         return mutableListOf(
             OrderFilterOptionUiModel(
-                key = "pos",
+                key = SalesChannel.POS.key,
                 displayName = resourceProvider.getString(R.string.point_of_sale),
-                isSelected = currentSelection.contains("pos")
+                isSelected = currentSelection.contains(SalesChannel.POS.key)
+            ),
+            OrderFilterOptionUiModel(
+                key = SalesChannel.WEB_CHECKOUT.key,
+                displayName = resourceProvider.getString(R.string.orderfilters_sales_channel_filter_web_checkout),
+                isSelected = currentSelection.contains(SalesChannel.WEB_CHECKOUT.key)
+            ),
+            OrderFilterOptionUiModel(
+                key = SalesChannel.WP_ADMIN.key,
+                displayName = resourceProvider.getString(R.string.orderfilters_sales_channel_filter_wp_admin),
+                isSelected = currentSelection.contains(SalesChannel.WP_ADMIN.key)
             )
         ).apply {
             addFilterOptionAll(resourceProvider)

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/filters/data/OrderFilterDataModels.kt

@@ -8,6 +8,16 @@ enum class OrderListFilterCategory {
     SALES_CHANNEL
 }
 
+enum class SalesChannel(val key: String, val apiValue: String) {
+    POS("pos", "pos-rest-api"),
+    WEB_CHECKOUT("checkout", "checkout"),
+    WP_ADMIN("admin", "admin");
+
+    companion object {
+        fun fromKey(key: String): SalesChannel? = entries.find { it.key == key }
+    }
+}
+
 enum class DateRange(val filterKey: String) {
     TODAY("Today"),
     LAST_2_DAYS("Last2Days"),

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/filters/domain/GetWCOrderListDescriptorWithFilters.kt

@@ -11,6 +11,7 @@ import com.woocommerce.android.ui.orders.filters.data.OrderFiltersRepository
 import com.woocommerce.android.ui.orders.filters.data.OrderListFilterCategory
 import com.woocommerce.android.ui.orders.filters.data.OrderListFilterCategory.DATE_RANGE
 import com.woocommerce.android.ui.orders.filters.data.OrderListFilterCategory.SALES_CHANNEL
+import com.woocommerce.android.ui.orders.filters.data.SalesChannel
 import com.woocommerce.android.util.DateUtils
 import org.wordpress.android.fluxc.model.WCOrderListDescriptor
 import javax.inject.Inject
@@ -30,7 +31,10 @@ class GetWCOrderListDescriptorWithFilters @Inject constructor(
             .joinToString(separator = ",")
 
         val salesChannelFilters = orderFiltersRepository.getCurrentFilterSelection(SALES_CHANNEL)
-        val createdViaFilter = if (salesChannelFilters.contains("pos")) "pos-rest-api" else null
+        val createdViaFilter = salesChannelFilters
+            .firstNotNullOfOrNull { key ->
+                SalesChannel.fromKey(key)?.apiValue
+            }
 
         return WCOrderListDescriptor(
             site = selectedSite.get(),

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListRepository.kt

@@ -109,7 +109,7 @@ class OrderListRepository @Inject constructor(
         }
     }
 
-    fun getAllPaymentGateways(site: SiteModel): List<WCGatewayModel> {
+    suspend fun getAllPaymentGateways(site: SiteModel): List<WCGatewayModel> {
         return gatewayStore.getAllGateways(site)
     }
 

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/ShouldUpdateOrdersList.kt

@@ -13,13 +13,20 @@ class ShouldUpdateOrdersList @Inject constructor(
     private val listStore: ListStore,
     private val appPrefs: AppPrefsWrapper
 ) {
+    @Suppress("ReturnCount")
     suspend operator fun invoke(listDescriptor: ListDescriptor): Boolean {
         // 23-07-2025: Consider removing this in the future
         // AINFRA-986
         if (!appPrefs.orderSummaryMigrated) {
             appPrefs.orderSummaryMigrated = true
             return true
         }
+        // 26-08-2025: Consider removing this in the future
+        // AINFRA-1190
+        if (!appPrefs.gatewayMigrated) {
+            appPrefs.gatewayMigrated = true
+            return true
+        }
 
         val listId = listDescriptor.uniqueIdentifier.value
         val shouldUpdateByState = listStore.getListState(listDescriptor) == ListState.NEEDS_REFRESH