Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions RELEASE-NOTES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
- [*] Improved the Filters button colors on the Orders and Products screens [https://github.com/woocommerce/woocommerce-android/pull/14832]
- [*] Fixed an issue when images for the card reader flows were not shown on tablets [https://github.com/woocommerce/woocommerce-android/pull/14849]
- [*] Fixed an issue where the count of the filters applied to the orders was not updated correctly [https://github.com/woocommerce/woocommerce-android/pull/14844]
- [**] POS: Allow merchants to view, search, and manage POS orders directly within the POS interface. [https://github.com/woocommerce/woocommerce-android/pull/14866]

23.5
-----
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import com.woocommerce.android.cardreader.connection.CardReaderStatus.Connected
import com.woocommerce.android.cardreader.connection.CardReaderStatus.Connecting
import com.woocommerce.android.cardreader.connection.CardReaderStatus.NotConnected
import com.woocommerce.android.ui.woopos.cardreader.WooPosCardReaderFacade
import com.woocommerce.android.ui.woopos.featureflags.WooPosHistoricalOrdersM1Enabled
import com.woocommerce.android.ui.woopos.home.ChildToParentEvent
import com.woocommerce.android.ui.woopos.home.WooPosChildrenToParentEventSender
import com.woocommerce.android.ui.woopos.home.toolbar.WooPosHomeFloatingToolbarUIEvent.MenuItemClicked
Expand All @@ -35,8 +34,7 @@ class WooPosHomeFloatingToolbarViewModel @Inject constructor(
private val childrenToParentEventSender: WooPosChildrenToParentEventSender,
private val networkStatus: WooPosNetworkStatus,
private val resourceProvider: ResourceProvider,
private val analyticsTracker: WooPosAnalyticsTracker,
private val wooPosHistoricalOrdersM1Enabled: WooPosHistoricalOrdersM1Enabled,
private val analyticsTracker: WooPosAnalyticsTracker
) : ViewModel() {
private val _state = MutableStateFlow(
WooPosHomeFloatingToolbarState(
Expand Down Expand Up @@ -138,17 +136,12 @@ class WooPosHomeFloatingToolbarViewModel @Inject constructor(

private val toolbarMenuItems by lazy {
buildList {
if (wooPosHistoricalOrdersM1Enabled()) {
add(
addAll(
listOf(
WooPosHomeFloatingToolbarState.Menu.MenuItem(
title = R.string.woopos_orders_title,
icon = Icons.Default.Description,
)
)
}

addAll(
listOf(
),
WooPosHomeFloatingToolbarState.Menu.MenuItem(
title = R.string.woopos_settings_title,
icon = Icons.Default.Settings,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ enum class FeatureFlag {
BETTER_CUSTOMER_SEARCH_M2,
ORDER_CREATION_AUTO_TAX_RATE,
WOO_POS_SURVEYS,
WOO_POS_HISTORICAL_ORDERS_M1,
WOO_POS_LOCAL_CATALOG_M1,
BOOKINGS_MVP;

Expand All @@ -21,7 +20,6 @@ enum class FeatureFlag {
PackageUtils.isDebugBuild() || context != null && PackageUtils.isBetaBuild(context)
}

WOO_POS_HISTORICAL_ORDERS_M1,
WC_SHIPPING_BANNER,
WOO_POS_SURVEYS,
BETTER_CUSTOMER_SEARCH_M2,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import androidx.compose.material.icons.filled.Settings
import com.woocommerce.android.R
import com.woocommerce.android.cardreader.connection.CardReaderStatus
import com.woocommerce.android.ui.woopos.cardreader.WooPosCardReaderFacade
import com.woocommerce.android.ui.woopos.featureflags.WooPosHistoricalOrdersM1Enabled
import com.woocommerce.android.ui.woopos.home.ChildToParentEvent
import com.woocommerce.android.ui.woopos.home.WooPosChildrenToParentEventSender
import com.woocommerce.android.ui.woopos.util.WooPosCoroutineTestRule
Expand Down Expand Up @@ -39,7 +38,6 @@ class WooPosHomeFloatingToolbarViewModelTest {
private val networkStatus: WooPosNetworkStatus = mock()
private val resourceProvider: ResourceProvider = mock()
private val analyticsTracker: WooPosAnalyticsTracker = mock()
private val wooPosHistoricalOrdersM1Enabled: WooPosHistoricalOrdersM1Enabled = mock()

@Test
fun `given card reader status is NotConnected, when initialized, then state should be NotConnected`() = runTest {
Expand Down Expand Up @@ -87,6 +85,10 @@ class WooPosHomeFloatingToolbarViewModelTest {
.isEqualTo(
WooPosHomeFloatingToolbarState.Menu.Visible(
listOf(
WooPosHomeFloatingToolbarState.Menu.MenuItem(
title = R.string.woopos_orders_title,
icon = Icons.Default.Description,
),
WooPosHomeFloatingToolbarState.Menu.MenuItem(
title = R.string.woopos_settings_title,
icon = Icons.Default.Settings,
Expand Down Expand Up @@ -260,7 +262,6 @@ class WooPosHomeFloatingToolbarViewModelTest {
childrenToParentEventSender,
networkStatus,
resourceProvider,
analyticsTracker,
wooPosHistoricalOrdersM1Enabled,
analyticsTracker
)
}