Skip to content

[Scan to Update Inventory] Hide Scan Barcode Menu Item if store has Woo Square Plugin Active #10279

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
samiuelson merged 8 commits into from
Dec 8, 2023
Merged

[Scan to Update Inventory] Hide Scan Barcode Menu Item if store has Woo Square Plugin Active #10279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6b6bcf4
Check if Square plugin is active
rossanafmenezes Nov 28, 2023
10afb5a
Add ScanIcon visibility based on Square Plugin being active or not
rossanafmenezes Nov 28, 2023
4591a87
Fix tests
rossanafmenezes Nov 28, 2023
40005b6
FluxC version
rossanafmenezes Nov 28, 2023
3b4a772
Simplyfy barcode scan icon visilibity logic
rossanafmenezes Nov 29, 2023
09a307a
Merge branch `trunk`
samiuelson Dec 8, 2023
5d7d432
Update fluxc version
samiuelson Dec 8, 2023
3ebe432
Merge branch 'trunk' into issue/10266-Scan-to-update-inventory-hide-i…
samiuelson Dec 8, 2023
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
3 changes: 3 additions & 0 deletions WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/ProductListFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ class ProductListFragment :
private val skeletonView = SkeletonView()

private var searchMenuItem: MenuItem? = null
private var scanBarcodeMenuItem: MenuItem? = null
private var searchView: SearchView? = null

private var trashProductUndoSnack: Snackbar? = null
Expand Down Expand Up @@ -252,6 +253,7 @@ class ProductListFragment :
searchMenuItem = menu.findItem(R.id.menu_search)
searchView = searchMenuItem?.actionView as SearchView?
searchView?.queryHint = getString(R.string.product_search_hint)
scanBarcodeMenuItem = menu.findItem(R.id.menu_scan_barcode)
}

override fun onPrepareMenu(menu: Menu) {
Expand All @@ -278,6 +280,7 @@ class ProductListFragment :
}
}
}
scanBarcodeMenuItem?.isVisible = !productListViewModel.isSquarePluginActive()
}

private fun getSearchQueryHint(): String {
Expand Down
14 changes: 13 additions & 1 deletion WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/ProductListViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import com.woocommerce.android.extensions.EXPAND_COLLAPSE_ANIMATION_DURATION_MIL
import com.woocommerce.android.model.Product
import com.woocommerce.android.model.RequestResult
import com.woocommerce.android.tools.NetworkStatus
import com.woocommerce.android.tools.SelectedSite
import com.woocommerce.android.ui.media.MediaFileUploadHandler
import com.woocommerce.android.ui.products.ProductListViewModel.ProductListEvent.ScrollToTop
import com.woocommerce.android.ui.products.ProductListViewModel.ProductListEvent.SelectProducts
Expand Down Expand Up @@ -54,6 +55,7 @@ import org.wordpress.android.fluxc.store.WCProductStore.ProductSorting.DATE_DESC
import org.wordpress.android.fluxc.store.WCProductStore.ProductSorting.TITLE_ASC
import org.wordpress.android.fluxc.store.WCProductStore.ProductSorting.TITLE_DESC
import org.wordpress.android.fluxc.store.WCProductStore.SkuSearchOptions
import org.wordpress.android.fluxc.store.WooCommerceStore
import javax.inject.Inject

@HiltViewModel
Expand All @@ -62,7 +64,9 @@ class ProductListViewModel @Inject constructor(
private val productRepository: ProductListRepository,
private val networkStatus: NetworkStatus,
mediaFileUploadHandler: MediaFileUploadHandler,
private val analyticsTracker: AnalyticsTrackerWrapper
private val analyticsTracker: AnalyticsTrackerWrapper,
private val selectedSite: SelectedSite,
private val wooCommerceStore: WooCommerceStore,
) : ScopedViewModel(savedState) {
companion object {
private const val KEY_PRODUCT_FILTER_OPTIONS = "key_product_filter_options"
Expand Down Expand Up @@ -640,6 +644,14 @@ class ProductListViewModel @Inject constructor(
triggerEvent(ShowUpdateDialog.Status(selectedProductsRemoteIds))
}

fun isSquarePluginActive(): Boolean {
val plugin = wooCommerceStore.getSitePlugin(
site = selectedSite.get(),
plugin = WooCommerceStore.WooPlugin.WOO_SQUARE
)
return plugin != null && plugin.isActive
}

object OnProductSortingChanged

@Parcelize
Expand Down
8 changes: 7 additions & 1 deletion WooCommerce/src/test/kotlin/com/woocommerce/android/ui/products/ProductListViewModelTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import com.woocommerce.android.extensions.takeIfNotEqualTo
import com.woocommerce.android.model.Product
import com.woocommerce.android.model.RequestResult
import com.woocommerce.android.tools.NetworkStatus
import com.woocommerce.android.tools.SelectedSite
import com.woocommerce.android.ui.media.MediaFileUploadHandler
import com.woocommerce.android.ui.products.ProductListViewModel.ProductListEvent.ShowProductFilterScreen
import com.woocommerce.android.ui.products.ProductListViewModel.ProductListEvent.ShowProductSortingBottomSheet
Expand All @@ -39,6 +40,7 @@ import org.mockito.kotlin.times
import org.mockito.kotlin.verify
import org.mockito.kotlin.whenever
import org.wordpress.android.fluxc.store.WCProductStore.ProductSorting
import org.wordpress.android.fluxc.store.WooCommerceStore

@ExperimentalCoroutinesApi
class ProductListViewModelTest : BaseUnitTest() {
Expand All @@ -48,6 +50,8 @@ class ProductListViewModelTest : BaseUnitTest() {
private val analyticsTracker: AnalyticsTrackerWrapper = mock()

private val savedStateHandle: SavedStateHandle = SavedStateHandle()
private val wooCommerceStore: WooCommerceStore = mock()
private val selectedSite: SelectedSite = mock()

private val productList = ProductTestUtils.generateProductList()
private lateinit var viewModel: ProductListViewModel
Expand All @@ -65,7 +69,9 @@ class ProductListViewModelTest : BaseUnitTest() {
productRepository,
networkStatus,
mediaFileUploadHandler,
analyticsTracker
analyticsTracker,
selectedSite,
wooCommerceStore
)
)
}
Expand Down