Merge branch 'trunk' into issue/WOOMOB-12-update-disabled-state-text-of-package-buttons

Author: irfano

.github/workflows/dependabot_automerge.yml

@@ -0,0 +1,55 @@
+name: Auto-merge Dependabot PATCH updates
+
+on:
+  pull_request:
+    types: [opened, reopened]
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  auto-merge:
+    runs-on: ubuntu-latest
+    if: github.event.pull_request.user.login == 'dependabot[bot]' && github.repository == 'woocommerce/woocommerce-android'
+    env:
+      PR_URL: ${{ github.event.pull_request.html_url }}
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    steps:
+      - uses: actions/checkout@v5
+
+      - name: Fetch Dependabot metadata
+        id: metadata
+        uses: dependabot/fetch-metadata@v2
+        with:
+          github-token: "${{ secrets.GITHUB_TOKEN }}"
+
+      - name: Assign closest open milestone to PR
+        if: steps.metadata.outputs.update-type == 'version-update:semver-patch'
+        run: |
+          set -e
+          number=$(gh api repos/$GITHUB_REPOSITORY/milestones \
+            --jq '[.[]
+              | select(.state=="open" and .due_on!=null and (.due_on | fromdateiso8601) >= now)
+            ]
+            | sort_by(.due_on)
+            | .[0].number')
+
+          if [ -n "$number" ]; then
+            echo "Assigning milestone #$number to PR #${{ github.event.pull_request.number }}"
+            gh pr edit "${{ github.event.pull_request.number }}" --milestone "$number"
+          else
+            echo "No future open milestones found."
+          fi
+
+      - name: Approve the PR
+        if: steps.metadata.outputs.update-type == 'version-update:semver-patch'
+        run: |
+          set -e
+          gh pr review --approve "$PR_URL"
+
+      - name: Enable auto-merge for Dependabot PRs
+        if: steps.metadata.outputs.update-type == 'version-update:semver-patch'
+        run: |
+          set -e
+          gh pr merge --auto --merge "$PR_URL"

RELEASE-NOTES.txt

@@ -12,7 +12,9 @@
 - [WEAR] Updated UserAgent of API requests to use `http.agent` System Property to fix performance issues related to WebView usage on app launch [https://github.com/woocommerce/woocommerce-android/pull/14431]
 - [***] 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]
+- [*]  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]
+- [*] [Shipping Labels] Fixed displaying incorrect hazardous material option for purchased labels [https://github.com/woocommerce/woocommerce-android/pull/14571]
 - [*] Shipping Labels: Updated the disabled button text on the package selection screen [https://github.com/woocommerce/woocommerce-android/pull/14558]
 
 23.1

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

@@ -1,6 +1,7 @@
 package com.woocommerce.android.model
 
 import android.os.Parcelable
+import com.woocommerce.android.ui.orders.shippinglabels.creation.ShippingLabelHazmatCategory
 import com.woocommerce.android.ui.orders.wooshippinglabels.models.ShippingLabelModel
 import com.woocommerce.android.ui.orders.wooshippinglabels.models.ShippingLabelStatus
 import kotlinx.parcelize.IgnoredOnParcel
@@ -25,6 +26,7 @@ data class ShippingLabel(
     val currency: String = "",
     val productNames: List<String> = emptyList(),
     val productIds: List<Long> = emptyList(),
+    val hazmatCategory: ShippingLabelHazmatCategory? = null,
     val originAddress: Address? = null,
     val destinationAddress: Address? = null,
     val refund: Refund? = null,
@@ -96,6 +98,7 @@ fun ShippingLabel.toShippingLabelModel(): ShippingLabelModel {
         usedDate = null,
         refund = refund?.let { ShippingLabelModel.Refund(status = it.status, requestDate = it.refundDate) },
         products = products,
+        hazmatCategory = hazmatCategory,
         originAddress = originAddress,
         destinationAddress = destinationAddress
     )

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/wooshippinglabels/WooShippingLabelCreationViewModel.kt

@@ -183,6 +183,7 @@ class WooShippingLabelCreationViewModel @Inject constructor(
 
     init {
         launch { observeShippingLabelInformation() }
+        launch { getHazmatSelection() }
         launch { getDestinationAddress() }
         launch { trackScreenShownEvent() }
         launch { getSavedShipments() }
@@ -323,6 +324,14 @@ class WooShippingLabelCreationViewModel @Inject constructor(
             }
     }
 
+    private suspend fun getHazmatSelection() {
+        shipments.filter { it.isNotEmpty() }.first().let { shipmentList ->
+            hazmatStatesFlow.value = shipmentList.map { shipment ->
+                shipment.label?.hazmatCategory?.let { Declared(it) } ?: NoSelection
+            }
+        }
+    }
+
     private suspend fun getDestinationAddress() {
         combine(
             order.drop(1),

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/models/ShippingLabelModel.kt

@@ -6,6 +6,7 @@ import com.woocommerce.android.model.Address
 import com.woocommerce.android.model.Order
 import com.woocommerce.android.model.ShippingLabel
 import com.woocommerce.android.ui.orders.shippinglabels.ShipmentTrackingUrls
+import com.woocommerce.android.ui.orders.shippinglabels.creation.ShippingLabelHazmatCategory
 import com.woocommerce.android.ui.orders.wooshippinglabels.rates.datasource.WooShippingRatesDatasourceMapper.Companion.CARRIER_DHL_EXPRESS_KEY
 import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
@@ -38,6 +39,7 @@ data class ShippingLabelModel(
     val usedDate: Long?,
     val refund: Refund?,
     val products: List<Order.Item> = emptyList(),
+    val hazmatCategory: ShippingLabelHazmatCategory? = null,
     val originAddress: Address? = null,
     val destinationAddress: Address? = null,
     val error: String? = null,

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/networking/DTOs.kt

@@ -95,6 +95,9 @@ data class ShippingLabelDataDTO(
 )
 
 data class StoredDataDTO(
+    @SerializedName("selected_hazmat")
+    @JsonAdapter(MapOrEmptyMapDeserializer::class)
+    val selectedHazmat: Map<String, HazmatDTO>,
     @SerializedName("selected_origin")
     @JsonAdapter(MapOrEmptyMapDeserializer::class)
     val selectedOrigin: Map<String, OriginAddressDTO>,

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/networking/WooShippingLabelRepository.kt

@@ -118,14 +118,15 @@ class WooShippingLabelRepository @Inject constructor(
         labelId = labelId,
     ).also {
         it.result?.shippingLabel?.let { labelDTO ->
-            // The API doesn't return the origin and destination addresses,
+            // The API doesn't return the hazmat category, origin and destination addresses,
             // we get it from the already cached labels in the database after the purchase request
             val currentLabel = wooShippingDao.getLabel(
                 selectedSite.get().localId(),
                 LocalOrRemoteId.RemoteId(orderId),
                 labelId
             )
             val updatedLabel = mapper(labelDTO, site, orderId).copy(
+                hazmatCategory = currentLabel?.hazmatCategory,
                 originAddress = currentLabel?.originAddress,
                 destinationAddress = currentLabel?.destinationAddress
             )