From dbccc588972de34f54433271f852adac9d414bff Mon Sep 17 00:00:00 2001
From: MohamedAliSmk <mohamedalismk@cgmail.com>
Date: Mon, 9 Mar 2026 14:41:03 +0200
Subject: [PATCH 1/8] PN-27: Add brands filter to POS items

- Add POS Brands Detail child table doctype for POS Profile
- Add custom_brands_table custom field to POS Profile via fixtures
- Add get_brands API and brand parameter to get_items/get_items_count
- Add brand-aware filter handling in itemSearch store
- Update ItemsSelector UI with dynamic brand/item_group tab switching
- Add brand sort option with context-aware sort menu
---
 POS/src/components/sale/ItemsSelector.vue     | 107 +++++++++--
 POS/src/stores/itemSearch.js                  | 172 +++++++++++++++++-
 pos_next/api/items.py                         |  81 ++++++++-
 pos_next/api/pos_profile.py                   |  25 ++-
 pos_next/hooks.py                             |   3 +-
 .../doctype/pos_brands_detail/__init__.py     |   0
 .../pos_brands_detail/pos_brands_detail.json  |  36 ++++
 .../pos_brands_detail/pos_brands_detail.py    |   9 +
 8 files changed, 401 insertions(+), 32 deletions(-)
 create mode 100644 pos_next/pos_next/doctype/pos_brands_detail/__init__.py
 create mode 100644 pos_next/pos_next/doctype/pos_brands_detail/pos_brands_detail.json
 create mode 100644 pos_next/pos_next/doctype/pos_brands_detail/pos_brands_detail.py

diff --git a/POS/src/components/sale/ItemsSelector.vue b/POS/src/components/sale/ItemsSelector.vue
index dc7698ea..c1fb230e 100644
--- a/POS/src/components/sale/ItemsSelector.vue
+++ b/POS/src/components/sale/ItemsSelector.vue
@@ -4,10 +4,10 @@
 		<div class="px-1.5 sm:px-3 pt-1.5 sm:pt-3 pb-1.5 sm:pb-2 bg-white border-b border-gray-200">
 			<div class="flex items-center gap-1 sm:gap-2 overflow-x-auto pb-1 scrollbar-hide snap-x snap-mandatory">
 				<button
-					@click="itemStore.setSelectedItemGroup(null)"
+					@click="handleAllFilterClick"
 					:class="[
 						'flex items-center px-2 sm:px-3 py-1.5 sm:py-2 rounded-lg text-[10px] sm:text-xs font-medium whitespace-nowrap transition-[background-color,border-color] duration-75 touch-manipulation snap-start flex-shrink-0',
-						!selectedItemGroup
+						!activeFilterValue
 							? 'bg-blue-50 text-blue-600 border-2 border-blue-500 shadow-sm'
 							: 'bg-white text-gray-700 border border-gray-200 hover:bg-gray-50 active:bg-gray-100',
 					]"
@@ -15,20 +15,20 @@
 					<svg class="w-3.5 h-3.5 sm:w-4 sm:h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
 						<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 6h16M4 12h16M4 18h16"/>
 					</svg>
-					<span>{{ __('All Items') }}</span>
+					<span>{{ isBrandSortActive ? __('All Brands') : __('All Items') }}</span>
 				</button>
 				<button
-					v-for="group in itemGroups"
-					:key="group.item_group"
-					@click="itemStore.setSelectedItemGroup(group.item_group)"
+					v-for="option in activeFilterOptions"
+					:key="option.value"
+					@click="handleFilterClick(option.value)"
 					:class="[
 						'flex items-center px-2 sm:px-3 py-1.5 sm:py-2 rounded-lg text-[10px] sm:text-xs font-medium whitespace-nowrap transition-[background-color,border-color] duration-75 touch-manipulation snap-start flex-shrink-0',
-						selectedItemGroup === group.item_group
+						activeFilterValue === option.value
 							? 'bg-blue-50 text-blue-600 border-2 border-blue-500 shadow-sm'
 							: 'bg-white text-gray-700 border border-gray-200 hover:bg-gray-50 active:bg-gray-100',
 					]"
 				>
-					<span>{{ __(group.item_group) }}</span>
+					<span>{{ __(option.label) }}</span>
 				</button>
 			</div>
 		</div>
@@ -201,7 +201,7 @@
 
 								<!-- Sort Options Loop -->
 								<button
-									v-for="option in SORT_OPTIONS"
+									v-for="option in sortOptions"
 									:key="option.field"
 									@click="handleSortToggle(option.field)"
 									:class="[
@@ -260,9 +260,9 @@
 						d="M20 7l-8-4-8 4m16 0l-8 4m8-4v10l-8 4m0-10L4 7m8 4v10M4 7v10l8 4"
 					/>
 				</svg>
-				<p v-if="searchTerm || selectedItemGroup" class="mt-2 text-xs font-medium text-gray-700">
-					<span v-if="searchTerm && selectedItemGroup">{{ __('No results for {0} in {1}', [searchTerm, selectedItemGroup]) }}</span>
-					<span v-else-if="selectedItemGroup">{{ __('No results in {0}', [selectedItemGroup]) }}</span>
+				<p v-if="searchTerm || selectedFilterLabel" class="mt-2 text-xs font-medium text-gray-700">
+					<span v-if="searchTerm && selectedFilterLabel">{{ __('No results for {0} in {1}', [searchTerm, selectedFilterLabel]) }}</span>
+					<span v-else-if="selectedFilterLabel">{{ __('No results in {0}', [selectedFilterLabel]) }}</span>
 					<span v-else>{{ __('No results for {0}', [searchTerm]) }}</span>
 				</p>
 				<p v-else class="mt-2 text-xs text-gray-500">{{ __('No items available') }}</p>
@@ -762,7 +762,9 @@ const {
 	filteredItems,
 	searchTerm,
 	selectedItemGroup,
+	selectedBrand,
 	itemGroups,
+	brands,
 	loading,
 	loadingMore,
 	hasMore,
@@ -843,7 +845,7 @@ const SEARCH_PLACEHOLDERS = Object.freeze({
 })
 
 // Sort configuration
-const SORT_OPTIONS = Object.freeze([
+const BASE_SORT_OPTIONS = Object.freeze([
 	{
 		field: 'name',
 		label: __('Name'),
@@ -854,11 +856,6 @@ const SORT_OPTIONS = Object.freeze([
 		label: __('Quantity'),
 		icon: 'M20 7l-8-4-8 4m16 0l-8 4m8-4v10l-8 4m0-10L4 7m8 4v10M4 7v10l8 4'
 	},
-	{
-		field: 'item_group',
-		label: __('Item Group'),
-		icon: 'M19 11H5m14 0a2 2 0 012 2v6a2 2 0 01-2 2H5a2 2 0 01-2-2v-6a2 2 0 012-2m14 0V9a2 2 0 00-2-2M5 11V9a2 2 0 012-2m0 0V5a2 2 0 012-2h6a2 2 0 012 2v2M7 7h10'
-	},
 	{
 		field: 'price',
 		label: __('Price'),
@@ -871,6 +868,19 @@ const SORT_OPTIONS = Object.freeze([
 	}
 ])
 
+const CONTEXT_SORT_OPTIONS = Object.freeze({
+	brand: {
+		field: 'brand',
+		label: __('Brand'),
+		icon: 'M20 13V7a2 2 0 00-2-2h-4V3H10v2H6a2 2 0 00-2 2v6M8 21h8a2 2 0 002-2v-5H6v5a2 2 0 002 2z'
+	},
+	item_group: {
+		field: 'item_group',
+		label: __('Item Group'),
+		icon: 'M9 12l2 2 4-4m5.586 1.414l-6.172 6.172a2 2 0 01-2.828 0L3.414 9.414a2 2 0 010-2.828l6.172-6.172a2 2 0 012.828 0l8.172 8.172a2 2 0 010 2.828z'
+	},
+})
+
 const SORT_ICONS = Object.freeze({
 	ascending: 'M3 4h13M3 8h9m-9 4h6m4 0l4-4m0 0l4 4m-4-4v12',
 	descending: 'M3 4h13M3 8h9m-9 4h9m5-4v12m0 0l-4-4m4 4l4-4',
@@ -890,6 +900,32 @@ const searchMode = computed(() => {
 })
 
 const searchPlaceholder = computed(() => SEARCH_PLACEHOLDERS[searchMode.value])
+const isBrandSortActive = computed(() => sortBy.value === 'brand')
+const sortOptions = computed(() => {
+	// Context switcher:
+	// - In Item Group mode, offer Brand.
+	// - In Brand mode, offer Item Group.
+	const contextSort = isBrandSortActive.value
+		? CONTEXT_SORT_OPTIONS.item_group
+		: CONTEXT_SORT_OPTIONS.brand
+
+	return [
+		BASE_SORT_OPTIONS[0],
+		contextSort,
+		BASE_SORT_OPTIONS[1],
+		BASE_SORT_OPTIONS[2],
+		BASE_SORT_OPTIONS[3],
+	]
+})
+const activeFilterValue = computed(() => (
+	isBrandSortActive.value ? selectedBrand.value : selectedItemGroup.value
+))
+const activeFilterOptions = computed(() => (
+	isBrandSortActive.value
+		? (brands.value || []).map((b) => ({ value: b.brand, label: b.brand }))
+		: (itemGroups.value || []).map((g) => ({ value: g.item_group, label: g.item_group }))
+))
+const selectedFilterLabel = computed(() => selectedBrand.value || selectedItemGroup.value || null)
 
 // Watch for cart items and pos profile changes (optimized - uses length + hash instead of deep watch)
 // Tracks: length, item_code, quantity, and amount to detect all cart changes including array replacements
@@ -1164,6 +1200,22 @@ function setViewMode(mode) {
 	userManuallySetView.value = true
 }
 
+function handleAllFilterClick() {
+	if (isBrandSortActive.value) {
+		itemStore.setSelectedBrand(null)
+		return
+	}
+	itemStore.setSelectedItemGroup(null)
+}
+
+function handleFilterClick(value) {
+	if (isBrandSortActive.value) {
+		itemStore.setSelectedBrand(value)
+		return
+	}
+	itemStore.setSelectedItemGroup(value)
+}
+
 // Pagination functions — each page fetches fresh data from server
 function goToPage(page) {
 	if (page >= 1 && page <= totalPages.value && page !== currentPage.value) {
@@ -1243,9 +1295,24 @@ function handleSortToggle(field) {
 	}
 }
 
+watch(sortBy, async (newSortBy, oldSortBy) => {
+	if (newSortBy === 'brand') {
+		await itemStore.loadBrands()
+		if (selectedItemGroup.value) {
+			await itemStore.setSelectedItemGroup(null)
+		}
+		return
+	}
+
+	if (oldSortBy === 'brand' && selectedBrand.value) {
+		await itemStore.setSelectedBrand(null)
+	}
+})
+
 function getSortLabel(sortByValue) {
-	const option = SORT_OPTIONS.find(opt => opt.field === sortByValue)
-	return option?.label || sortByValue
+	return CONTEXT_SORT_OPTIONS[sortByValue]?.label
+		|| BASE_SORT_OPTIONS.find(opt => opt.field === sortByValue)?.label
+		|| sortByValue
 }
 
 function getSortIconState(field) {
diff --git a/POS/src/stores/itemSearch.js b/POS/src/stores/itemSearch.js
index 310b5690..964eb452 100644
--- a/POS/src/stores/itemSearch.js
+++ b/POS/src/stores/itemSearch.js
@@ -86,7 +86,9 @@ export const useItemSearchStore = defineStore("itemSearch", () => {
 	const searchResults = ref([]) // For search results (cache + server)
 	const searchTerm = ref("")
 	const selectedItemGroup = ref(null)
+	const selectedBrand = ref(null)
 	const itemGroups = ref([])
+	const brands = ref([])
 	const profileItemGroups = ref([]) // Item groups from POS Profile filter
 	const loading = ref(false)
 	const loadingMore = ref(false)
@@ -95,7 +97,7 @@ export const useItemSearchStore = defineStore("itemSearch", () => {
 	const cartItems = ref([])
 
 	// Sorting state - for user-triggered sorting filters
-	const sortBy = ref(null) // Options: 'name', 'quantity', 'item_group', null (no sorting)
+	const sortBy = ref(null) // Options: 'name', 'quantity', 'item_group', 'brand', null (no sorting)
 	const sortOrder = ref('asc') // Options: 'asc', 'desc'
 
 	// Lazy loading state - dynamically adjusted based on device performance
@@ -337,6 +339,23 @@ export const useItemSearchStore = defineStore("itemSearch", () => {
 		},
 	})
 
+	const brandsResource = createResource({
+		url: "pos_next.api.items.get_brands",
+		makeParams() {
+			return {
+				pos_profile: posProfile.value,
+			}
+		},
+		auto: false,
+		onSuccess(data) {
+			brands.value = (data?.message || data || [])
+		},
+		onError(error) {
+			log.error("Error fetching brands", error)
+			brands.value = []
+		},
+	})
+
 	const searchByBarcodeResource = createResource({
 		url: "pos_next.api.items.search_by_barcode",
 		auto: false,
@@ -485,7 +504,7 @@ export const useItemSearchStore = defineStore("itemSearch", () => {
 		// Step 2: Create cache key based on current filter state
 		// Key format: "itemGroup_version_searchTerm"
 		// This ensures cache invalidates when data or filters change
-		const filterKey = `${selectedItemGroup.value || 'all'}_${allItemsVersion.value}_${searchTerm.value || ''}`
+		const filterKey = `${selectedItemGroup.value || 'all'}_${selectedBrand.value || 'all'}_${allItemsVersion.value}_${searchTerm.value || ''}`
 
 		// Step 3: Check cache for filtered results
 		let list
@@ -507,6 +526,9 @@ export const useItemSearchStore = defineStore("itemSearch", () => {
 				// Items are ALREADY server-filtered, but verify for safety
 				const groupsToFilter = getGroupsToFilter(selectedItemGroup.value)
 				list = sourceItems.filter(i => groupsToFilter.has(i.item_group))
+			} else if (selectedBrand.value) {
+				// Brand tab selected — verify for safety (server already filters)
+				list = sourceItems.filter(i => (i.brand || '') === selectedBrand.value)
 			} else if (profileItemGroups.value && profileItemGroups.value.length > 0) {
 				// "All Items" tab - items fetched without group filter
 				// Still filter by allowed groups as sanity check
@@ -565,6 +587,13 @@ export const useItemSearchStore = defineStore("itemSearch", () => {
 						compareResult = nameA.localeCompare(nameB)
 						break
 
+					case 'brand':
+						// Sort by brand alphabetically
+						const brandA = (a.brand || '').toLowerCase()
+						const brandB = (b.brand || '').toLowerCase()
+						compareResult = brandA.localeCompare(brandB)
+						break
+
 					case 'quantity':
 						// Sort by stock quantity
 						compareResult = (a.actual_qty ?? 0) - (b.actual_qty ?? 0)
@@ -1045,6 +1074,31 @@ export const useItemSearchStore = defineStore("itemSearch", () => {
 		}
 	}
 
+	/**
+	 * Fetch items for a specific brand (on-demand when user clicks brand tab)
+	 */
+	async function fetchItemsForBrand(profile, brand, start = 0, limit = null) {
+		if (!brand) return []
+
+		const effectiveLimit = limit || itemsPerPage.value
+
+		try {
+			const response = await call("pos_next.api.items.get_items", {
+				pos_profile: profile,
+				search_term: "",
+				item_group: null,
+				brand: brand,
+				start: start,
+				limit: effectiveLimit,
+				show_variants_as_items: getShowVariantsFlag(),
+			})
+			return response?.message || response || []
+		} catch (error) {
+			log.error(`Failed to fetch items for brand ${brand}`, error)
+			return []
+		}
+	}
+
 	/**
 	 * Fetch a specific page of items for pagination.
 	 * Uses cache-first strategy: IndexedDB when cache is ready (has all items),
@@ -1101,11 +1155,19 @@ export const useItemSearchStore = defineStore("itemSearch", () => {
 					start,
 					pageSize,
 				)
+			} else if (selectedBrand.value) {
+				items = await fetchItemsForBrand(
+					posProfile.value,
+					selectedBrand.value,
+					start,
+					pageSize,
+				)
 			} else {
 				const response = await call("pos_next.api.items.get_items", {
 					pos_profile: posProfile.value,
 					search_term: "",
 					item_group: null,
+					brand: undefined,
 					start: start,
 					limit: pageSize,
 					show_variants_as_items: getShowVariantsFlag(),
@@ -1190,12 +1252,21 @@ export const useItemSearchStore = defineStore("itemSearch", () => {
 					currentOffset.value,
 					itemsPerPage.value,
 				)
+			} else if (selectedBrand.value) {
+				// User has a specific brand tab selected — fetch more from that brand
+				list = await fetchItemsForBrand(
+					posProfile.value,
+					selectedBrand.value,
+					currentOffset.value,
+					itemsPerPage.value,
+				)
 			} else {
 				// "All Items" tab — fetch next batch without group filter
 				const response = await call("pos_next.api.items.get_items", {
 					pos_profile: posProfile.value,
 					search_term: "",
 					item_group: null,
+						brand: undefined,
 					start: currentOffset.value,
 					limit: itemsPerPage.value,
 					show_variants_as_items: getShowVariantsFlag(),
@@ -1549,6 +1620,7 @@ export const useItemSearchStore = defineStore("itemSearch", () => {
 						pos_profile: posProfile.value,
 						search_term: term,
 						item_group: selectedItemGroup.value,
+						brand: selectedBrand.value,
 						start: 0,
 						limit: searchLimit, // Dynamically adjusted based on device performance
 						show_variants_as_items: getShowVariantsFlag(),
@@ -1601,6 +1673,12 @@ export const useItemSearchStore = defineStore("itemSearch", () => {
 		}
 	}
 
+	async function loadBrands() {
+		if (posProfile.value) {
+			await brandsResource.reload()
+		}
+	}
+
 	async function searchByBarcode(barcode) {
 		try {
 			if (!posProfile.value) {
@@ -1666,7 +1744,7 @@ export const useItemSearchStore = defineStore("itemSearch", () => {
 
 	/**
 	 * Set sorting filter - triggers sorting only when explicitly called
-	 * @param {string} field - Field to sort by: 'name', 'quantity', 'item_group', 'price', 'item_code'
+	 * @param {string} field - Field to sort by: 'name', 'quantity', 'item_group', 'brand', 'price', 'item_code'
 	 * @param {string} order - Sort order: 'asc' or 'desc' (default: 'asc')
 	 */
 	function setSortFilter(field, order = 'asc') {
@@ -1711,6 +1789,7 @@ export const useItemSearchStore = defineStore("itemSearch", () => {
 
 	async function setSelectedItemGroup(group) {
 		selectedItemGroup.value = group
+		selectedBrand.value = null
 		clearBaseCache()
 
 		// LARGE CATALOG OPTIMIZATION: Fetch items from server when group changes
@@ -1781,6 +1860,7 @@ export const useItemSearchStore = defineStore("itemSearch", () => {
 				const countPromise = call("pos_next.api.items.get_items_count", {
 					pos_profile: posProfile.value,
 					item_group: group || undefined,
+					brand: undefined,
 					show_variants_as_items: getShowVariantsFlag(),
 				}).catch(err => {
 					log.warn("Could not fetch item count:", err.message)
@@ -1798,6 +1878,7 @@ export const useItemSearchStore = defineStore("itemSearch", () => {
 						pos_profile: posProfile.value,
 						search_term: "",
 						item_group: null,
+						brand: undefined,
 						start: 0,
 						limit: pageSize,
 						show_variants_as_items: getShowVariantsFlag(),
@@ -1877,6 +1958,83 @@ export const useItemSearchStore = defineStore("itemSearch", () => {
 		}
 	}
 
+	async function setSelectedBrand(brand) {
+		selectedBrand.value = brand
+		selectedItemGroup.value = null
+		clearBaseCache()
+
+		if (!posProfile.value) return
+
+		loading.value = true
+		try {
+			const pageSize = itemsPerPage.value
+			const offline = isOffline()
+
+			if (offline) {
+				const cached = await offlineWorker.searchCachedItems("", 5000, 0)
+				const filtered = brand
+					? (cached || []).filter(item => (item.brand || '') === brand)
+					: (cached || [])
+				const pageItems = filtered.slice(0, pageSize)
+
+				replaceAllItems(pageItems)
+				totalItemsLoaded.value = pageItems.length
+				currentOffset.value = pageItems.length
+				totalServerItems.value = filtered.length
+				hasMore.value = filtered.length > pageItems.length
+				return
+			}
+
+			const countPromise = call("pos_next.api.items.get_items_count", {
+				pos_profile: posProfile.value,
+				item_group: undefined,
+				brand: brand || undefined,
+				show_variants_as_items: getShowVariantsFlag(),
+			}).catch(err => {
+				log.warn("Could not fetch item count:", err.message)
+				return 0
+			})
+
+			let items = []
+			if (brand) {
+				items = await fetchItemsForBrand(posProfile.value, brand, 0, pageSize)
+				log.info(`Loaded ${items.length} items for brand: ${brand}`)
+			} else {
+				const response = await call("pos_next.api.items.get_items", {
+					pos_profile: posProfile.value,
+					search_term: "",
+					item_group: null,
+					brand: undefined,
+					start: 0,
+					limit: pageSize,
+					show_variants_as_items: getShowVariantsFlag(),
+				})
+				items = response?.message || response || []
+				log.info(`Loaded ${items.length} items for "All Items" tab`)
+			}
+
+			const countResult = await countPromise
+			totalServerItems.value = countResult?.message ?? countResult ?? items.length
+
+			replaceAllItems(items)
+			totalItemsLoaded.value = items.length
+			currentOffset.value = items.length
+			hasMore.value = items.length >= pageSize
+		} catch (error) {
+			log.error(`Failed to load items for brand ${brand || 'All Items'}`, error)
+		} finally {
+			loading.value = false
+		}
+
+		if (searchTerm.value?.trim()) {
+			if (searchDebounceTimer) {
+				clearTimeout(searchDebounceTimer)
+				searchDebounceTimer = null
+			}
+			searchItems(searchTerm.value)
+		}
+	}
+
 	/**
 	 * Update cart items - delegates to stock store
 	 */
@@ -1911,6 +2069,8 @@ export const useItemSearchStore = defineStore("itemSearch", () => {
 		if (!profile) {
 			profileItemGroups.value = []
 			itemGroups.value = []
+			brands.value = []
+			selectedBrand.value = null
 			return
 		}
 
@@ -1974,6 +2134,7 @@ export const useItemSearchStore = defineStore("itemSearch", () => {
 
 			profileItemGroups.value = []
 			itemGroups.value = []
+			brands.value = []
 		}
 	}
 
@@ -1994,7 +2155,9 @@ export const useItemSearchStore = defineStore("itemSearch", () => {
 		searchResults,
 		searchTerm,
 		selectedItemGroup,
+		selectedBrand,
 		itemGroups,
+		brands,
 		profileItemGroups,
 		loading,
 		loadingMore,
@@ -2024,11 +2187,13 @@ export const useItemSearchStore = defineStore("itemSearch", () => {
 		fetchPage,
 		searchItems,
 		loadItemGroups,
+		loadBrands,
 		searchByBarcode,
 		getItem,
 		setSearchTerm,
 		clearSearch,
 		setSelectedItemGroup,
+		setSelectedBrand,
 		setCartItems, // Delegates to stock store for reservations
 		setPosProfile,
 		startBackgroundCacheSync,
@@ -2053,6 +2218,7 @@ export const useItemSearchStore = defineStore("itemSearch", () => {
 		// RESOURCES
 		// ========================================================================
 		itemGroupsResource,
+		brandsResource,
 		searchByBarcodeResource,
 	}
 })
diff --git a/pos_next/api/items.py b/pos_next/api/items.py
index b29fffc7..bacdd9f4 100644
--- a/pos_next/api/items.py
+++ b/pos_next/api/items.py
@@ -694,9 +694,25 @@ def _get_item_group_with_descendants(item_group):
 	)
 
 	return [item_group] + list(descendants)
-
-
-def _build_item_base_conditions(pos_profile_doc, item_group=None, exclude_variants=True, exclude_templates=False, hide_unavailable=False, warehouse=None):
+def _get_allowed_profile_brands(pos_profile):
+	"""Get brand names configured in POS Profile brands child table."""
+	brands = frappe.get_all(
+		"POS Brands Detail",
+		filters={"parent": pos_profile},
+		fields=["brand"],
+		pluck="brand"
+	)
+	return brands
+
+def _build_item_base_conditions(
+	pos_profile_doc,
+	item_group=None,
+	brand=None,
+	exclude_variants=True,
+	exclude_templates=False,
+	hide_unavailable=False,
+	warehouse=None,
+):
 	"""Build base SQL conditions for POS item search with hierarchical item group support.
 
 	Returns:
@@ -726,6 +742,16 @@ def _build_item_base_conditions(pos_profile_doc, item_group=None, exclude_varian
 		conditions.append(f"i.item_group IN ({placeholders})")
 		where_params.extend(item_groups)
 
+	allowed_brands = _get_allowed_profile_brands(pos_profile_doc.name)
+	if allowed_brands:
+		placeholders = ", ".join(["%s"] * len(allowed_brands))
+		conditions.append(f"IFNULL(i.brand, '') IN ({placeholders})")
+		where_params.extend(allowed_brands)
+
+	if brand:
+		conditions.append("i.brand = %s")
+		where_params.append(brand)
+
 	extra_joins = ""
 	join_params = []
 
@@ -1067,7 +1093,7 @@ def _get_bundle_warehouse_availability_bulk(bundle_codes, warehouses):
 
 
 @frappe.whitelist()
-def get_items(pos_profile, search_term=None, item_group=None, start=0, limit=20, include_variants=0, show_variants_as_items=0):
+def get_items(pos_profile, search_term=None, item_group=None, start=0, limit=20, include_variants=0, show_variants_as_items=0, brand=None):
 	"""Get items for POS with stock, price, and tax details"""
 	try:
 		pos_profile_doc = frappe.get_cached_doc("POS Profile", pos_profile)
@@ -1096,7 +1122,7 @@ def get_items(pos_profile, search_term=None, item_group=None, start=0, limit=20,
 			exclude_templates = False
 		hide_unavailable = getattr(pos_profile_doc, "hide_unavailable_items", 0)
 		conditions, params, extra_joins = _build_item_base_conditions(
-			pos_profile_doc, item_group, exclude_variants=exclude_variants,
+			pos_profile_doc, item_group, brand, exclude_variants=exclude_variants,
 			exclude_templates=exclude_templates,
 			hide_unavailable=hide_unavailable, warehouse=pos_profile_doc.warehouse,
 		)
@@ -1613,7 +1639,7 @@ def get_items_bulk(pos_profile, item_groups=None, start=0, limit=2000, include_v
 
 
 @frappe.whitelist()
-def get_items_count(pos_profile, item_group=None, include_variants=0, show_variants_as_items=0):
+def get_items_count(pos_profile, item_group=None, brand=None, include_variants=0, show_variants_as_items=0):
 	"""
 	Get total count of POS-eligible items for progress tracking and smart pagination.
 
@@ -1640,7 +1666,7 @@ def get_items_count(pos_profile, item_group=None, include_variants=0, show_varia
 			exclude_templates = False
 		hide_unavailable = getattr(pos_profile_doc, "hide_unavailable_items", 0)
 		conditions, params, extra_joins = _build_item_base_conditions(
-			pos_profile_doc, item_group, exclude_variants=exclude_variants,
+			pos_profile_doc, item_group, brand, exclude_variants=exclude_variants,
 			exclude_templates=exclude_templates,
 			hide_unavailable=hide_unavailable, warehouse=pos_profile_doc.warehouse,
 		)
@@ -1759,6 +1785,47 @@ def get_item_groups(pos_profile):
 		frappe.throw(_("Error fetching item groups: {0}").format(str(e)))
 
 
+@frappe.whitelist()
+def get_brands(pos_profile):
+	"""Get brands configured in POS Profile for filtering."""
+	cache_key = f"pos_brands:{pos_profile}"
+	cached = frappe.cache().get_value(cache_key)
+	if cached:
+		return cached
+
+	try:
+		POSBrandsDetail = DocType("POS Brands Detail")
+		Brand = DocType("Brand")
+
+		configured_brands = (
+			frappe.qb.from_(POSBrandsDetail)
+			.select(POSBrandsDetail.brand)
+			.distinct()
+			.where(POSBrandsDetail.parent == pos_profile)
+			.orderby(POSBrandsDetail.brand)
+			.run(pluck="brand")
+		)
+
+		if not configured_brands:
+			result = (
+				frappe.qb.from_(Brand)
+				.select(Brand.name.as_("brand"))
+				.orderby(Brand.name)
+				.limit(50)
+				.run(as_dict=True)
+			)
+			frappe.cache().set_value(cache_key, result, expires_in_sec=300)
+			return result
+
+		result = [{"brand": brand_name} for brand_name in configured_brands]
+		frappe.cache().set_value(cache_key, result, expires_in_sec=300)
+		return result
+
+	except Exception as e:
+		frappe.log_error(frappe.get_traceback(), "Get Brands Error")
+		frappe.throw(_("Error fetching brands: {0}").format(str(e)))
+
+
 @frappe.whitelist()
 def get_stock_quantities(item_codes, warehouse):
 	"""
diff --git a/pos_next/api/pos_profile.py b/pos_next/api/pos_profile.py
index 1e57d565..6a8cac48 100644
--- a/pos_next/api/pos_profile.py
+++ b/pos_next/api/pos_profile.py
@@ -373,6 +373,7 @@ def get_create_pos_profile(*args, **kwargs):
 		- posa_cash_mode_of_payment: Cash payment methods
 		- item_groups: Available item groups
 		- customer_groups: Available customer groups
+		- brands: Available brands
 	"""
 	try:
 		user_company = check_user_company()
@@ -437,7 +438,10 @@ def get_create_pos_profile(*args, **kwargs):
 			"Customer Group",
 			filters={"is_group": 0},
 		)
-		
+		brands = frappe.get_list(
+			"Brand",
+			order_by="name",
+		)
 		data = {
 			"warehouses": warehouses,
 			"customers": customers,
@@ -449,6 +453,7 @@ def get_create_pos_profile(*args, **kwargs):
 			"posa_cash_mode_of_payment": posa_cash_mode_of_payment,
 			"item_groups": item_groups,
 			"customer_groups": customer_groups,
+			"brands": brands,
 			"apply_discount_on_options": [
 				{"value": "Grand Total", "label": "Grand Total"},
 				{"value": "Net Total", "label": "Net Total"},
@@ -479,6 +484,7 @@ def create_pos_profile(*arg ,**parameters):
 		- posa_cash_mode_of_payment: Cash payment method
 		- item_groups: List of item groups (filters)
 		- customer_groups: List of customer groups (filters)
+		- brands: List of brands (filters)
 		- apply_discount_on: Discount application method
 	"""
 
@@ -488,12 +494,14 @@ def create_pos_profile(*arg ,**parameters):
 	applicable_for_users = parameters.pop("applicable_for_users", [])
 	item_groups = parameters.pop("item_groups", [])
 	customer_groups = parameters.pop("customer_groups", [])
+	brands = parameters.pop("brands", [])
 	
 	# parse list parameters
 	payments = _parse_list_parameter(payments, "payments")
 	applicable_for_users = _parse_list_parameter(applicable_for_users, "applicable_for_users")
 	item_groups = _parse_list_parameter(item_groups, "item_groups")
 	customer_groups = _parse_list_parameter(customer_groups, "customer_groups")
+	brands = _parse_list_parameter(brands, "brands")
 	
 	# Get user's company
 	user_company_data = check_user_company()
@@ -541,6 +549,12 @@ def create_pos_profile(*arg ,**parameters):
 			customer_group_name = customer_group if isinstance(customer_group, str) else customer_group.get("customer_group")
 			pos_profile.append("customer_groups", {"customer_group": customer_group_name})
 
+	if isinstance(brands, list) and len(brands) > 0:
+		for brand in brands:
+			brand_name = brand if isinstance(brand, str) else brand.get("brand") or brand.get("name")
+			if brand_name:
+				pos_profile.append("brands", {"brand": brand_name})
+
 	pos_profile.insert()
 	return pos_profile
 
@@ -558,12 +572,14 @@ def update_pos_profile(*args, **parameters):
 	applicable_for_users = parameters.pop("applicable_for_users", None)
 	item_groups = parameters.pop("item_groups", None)
 	customer_groups = parameters.pop("customer_groups", None)
+	brands = parameters.pop("brands", None)
 	pos_profile_name = parameters.pop("pos_profile_name", None)
 	# parse list parameters
 	payments = _parse_list_parameter(payments, "payments")
 	applicable_for_users = _parse_list_parameter(applicable_for_users, "applicable_for_users")
 	item_groups = _parse_list_parameter(item_groups, "item_groups")
 	customer_groups = _parse_list_parameter(customer_groups, "customer_groups")
+	brands = _parse_list_parameter(brands, "brands")
 	
 	pos_profile = frappe.get_doc("POS Profile", pos_profile_name)
 	
@@ -613,6 +629,13 @@ def update_pos_profile(*args, **parameters):
 			customer_group_name = customer_group if isinstance(customer_group, str) else customer_group.get("customer_group") or customer_group.get("name")
 			if customer_group_name:
 				pos_profile.append("customer_groups", {"customer_group": customer_group_name})
+
+	if brands is not None:
+		pos_profile.brands = []
+		for brand in brands:
+			brand_name = brand if isinstance(brand, str) else brand.get("brand") or brand.get("name")
+			if brand_name:
+				pos_profile.append("brands", {"brand": brand_name})
 		
 	pos_profile.save()
 	return pos_profile
diff --git a/pos_next/hooks.py b/pos_next/hooks.py
index df4727f8..b74fa16b 100644
--- a/pos_next/hooks.py
+++ b/pos_next/hooks.py
@@ -102,7 +102,8 @@
 					"POS Profile-posa_block_sale_beyond_available_qty",
 					"Mode of Payment-is_wallet_payment",
 					"Promotional Scheme-pos_only",
-					"Pricing Rule-pos_only"
+					"Pricing Rule-pos_only",
+					"POS Profile-custom_brands_table"
 				]
 			]
 		]
diff --git a/pos_next/pos_next/doctype/pos_brands_detail/__init__.py b/pos_next/pos_next/doctype/pos_brands_detail/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/pos_next/pos_next/doctype/pos_brands_detail/pos_brands_detail.json b/pos_next/pos_next/doctype/pos_brands_detail/pos_brands_detail.json
new file mode 100644
index 00000000..6721708d
--- /dev/null
+++ b/pos_next/pos_next/doctype/pos_brands_detail/pos_brands_detail.json
@@ -0,0 +1,36 @@
+{
+ "actions": [],
+ "allow_rename": 1,
+ "creation": "2026-02-19 15:22:36.371369",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "brand"
+ ],
+ "fields": [
+  {
+   "fieldname": "brand",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Brand",
+   "options": "Brand",
+   "reqd": 1
+  }
+ ],
+ "grid_page_length": 50,
+ "index_web_pages_for_search": 1,
+ "istable": 1,
+ "links": [],
+ "modified": "2026-02-19 15:25:06.565480",
+ "modified_by": "Administrator",
+ "module": "POS Next",
+ "name": "POS Brands Detail",
+ "owner": "Administrator",
+ "permissions": [],
+ "row_format": "Dynamic",
+ "rows_threshold_for_grid_search": 20,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "states": []
+}
\ No newline at end of file
diff --git a/pos_next/pos_next/doctype/pos_brands_detail/pos_brands_detail.py b/pos_next/pos_next/doctype/pos_brands_detail/pos_brands_detail.py
new file mode 100644
index 00000000..6a3e8f22
--- /dev/null
+++ b/pos_next/pos_next/doctype/pos_brands_detail/pos_brands_detail.py
@@ -0,0 +1,9 @@
+# Copyright (c) 2026, BrainWise and contributors
+# For license information, please see license.txt
+
+# import frappe
+from frappe.model.document import Document
+
+
+class POSBrandsDetail(Document):
+	pass

From 08af819711942412aca1283ab175192401eafd75 Mon Sep 17 00:00:00 2001
From: MohamedAliSmk <mohamedalismk@cgmail.com>
Date: Tue, 10 Mar 2026 23:27:18 +0200
Subject: [PATCH 2/8] Refactor brand handling in POS Profile and items API

- Update brand condition in items API to remove IFNULL check
- Change field name from 'brands' to 'custom_brands_table' in POS Profile creation and update methods
- Add custom field 'custom_brands_table' to POS Profile via fixtures for better brand management
---
 pos_next/api/items.py       | 2 +-
 pos_next/api/pos_profile.py | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pos_next/api/items.py b/pos_next/api/items.py
index 7571de1e..309c1f5e 100644
--- a/pos_next/api/items.py
+++ b/pos_next/api/items.py
@@ -745,7 +745,7 @@ def _build_item_base_conditions(
 	allowed_brands = _get_allowed_profile_brands(pos_profile_doc.name)
 	if allowed_brands:
 		placeholders = ", ".join(["%s"] * len(allowed_brands))
-		conditions.append(f"IFNULL(i.brand, '') IN ({placeholders})")
+		conditions.append(f"i.brand IN ({placeholders})")
 		where_params.extend(allowed_brands)
 
 	if brand:
diff --git a/pos_next/api/pos_profile.py b/pos_next/api/pos_profile.py
index 6a8cac48..e45e6612 100644
--- a/pos_next/api/pos_profile.py
+++ b/pos_next/api/pos_profile.py
@@ -553,7 +553,7 @@ def create_pos_profile(*arg ,**parameters):
 		for brand in brands:
 			brand_name = brand if isinstance(brand, str) else brand.get("brand") or brand.get("name")
 			if brand_name:
-				pos_profile.append("brands", {"brand": brand_name})
+				pos_profile.append("custom_brands_table", {"brand": brand_name})
 
 	pos_profile.insert()
 	return pos_profile
@@ -631,11 +631,11 @@ def update_pos_profile(*args, **parameters):
 				pos_profile.append("customer_groups", {"customer_group": customer_group_name})
 
 	if brands is not None:
-		pos_profile.brands = []
+		pos_profile.custom_brands_table = []
 		for brand in brands:
 			brand_name = brand if isinstance(brand, str) else brand.get("brand") or brand.get("name")
 			if brand_name:
-				pos_profile.append("brands", {"brand": brand_name})
+				pos_profile.append("custom_brands_table", {"brand": brand_name})
 		
 	pos_profile.save()
 	return pos_profile

From 23ccee071c5aee296a2a05aca40eb2728c04a8b8 Mon Sep 17 00:00:00 2001
From: MohamedAliSmk <mohamedalismk@cgmail.com>
Date: Wed, 11 Mar 2026 13:51:32 +0200
Subject: [PATCH 3/8] Enhance item filtering in get_items API

- Update docstring to clarify filtering behavior for item_group and brand.
- Implement validation to enforce mutual exclusivity between item_group and brand filters, raising an error if both are provided in a request.
---
 pos_next/api/items.py | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/pos_next/api/items.py b/pos_next/api/items.py
index 309c1f5e..ea2ef5d2 100644
--- a/pos_next/api/items.py
+++ b/pos_next/api/items.py
@@ -1094,7 +1094,20 @@ def _get_bundle_warehouse_availability_bulk(bundle_codes, warehouses):
 
 @frappe.whitelist()
 def get_items(pos_profile, search_term=None, item_group=None, start=0, limit=20, include_variants=0, show_variants_as_items=0, brand=None):
-	"""Get items for POS with stock, price, and tax details"""
+	"""Get items for POS with stock, price, and tax details.
+
+	Filter behaviour:
+	- You may filter by either ``item_group`` (with hierarchical descendants) OR ``brand``.
+	- Providing BOTH ``item_group`` and ``brand`` in the same request is not allowed and will raise a validation error.
+	  This matches the POS frontend behaviour where these filters are mutually exclusive.
+	"""
+	# Enforce the same mutual exclusivity as the frontend:
+	# brand filter and item_group filter cannot be used together.
+	if item_group and brand:
+		frappe.throw(
+			_("You can filter by either Item Group or Brand, not both at the same time."),
+		)
+
 	try:
 		pos_profile_doc = frappe.get_cached_doc("POS Profile", pos_profile)
 

From 3c0c2a451709463290034c4b37522cfcd5954895 Mon Sep 17 00:00:00 2001
From: MohamedAliSmk <mohamedalismk@cgmail.com>
Date: Wed, 11 Mar 2026 13:53:53 +0200
Subject: [PATCH 4/8] Refactor get_brands function to improve brand handling

- Remove unused Brand DocType declaration.
- Update logic to return an empty list when no brands are configured in the POS Profile, ensuring consistent behavior with item filtering.
- Simplify result assignment for configured brands.
---
 pos_next/api/items.py | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/pos_next/api/items.py b/pos_next/api/items.py
index ea2ef5d2..bb082f0d 100644
--- a/pos_next/api/items.py
+++ b/pos_next/api/items.py
@@ -1808,7 +1808,6 @@ def get_brands(pos_profile):
 
 	try:
 		POSBrandsDetail = DocType("POS Brands Detail")
-		Brand = DocType("Brand")
 
 		configured_brands = (
 			frappe.qb.from_(POSBrandsDetail)
@@ -1819,18 +1818,18 @@ def get_brands(pos_profile):
 			.run(pluck="brand")
 		)
 
+		# When no brands are configured in the POS Profile, we intentionally
+		# return an empty list instead of falling back to the first N brands
+		# in the system. This keeps the behaviour consistent with the
+		# "allowed brands" logic in `_build_item_base_conditions`, which
+		# interprets an empty configured set as "no brand restriction" on
+		# items, and avoids confusing brand tabs that don't match the
+		# underlying item filter.
 		if not configured_brands:
-			result = (
-				frappe.qb.from_(Brand)
-				.select(Brand.name.as_("brand"))
-				.orderby(Brand.name)
-				.limit(50)
-				.run(as_dict=True)
-			)
-			frappe.cache().set_value(cache_key, result, expires_in_sec=300)
-			return result
+			result = []
+		else:
+			result = [{"brand": brand_name} for brand_name in configured_brands]
 
-		result = [{"brand": brand_name} for brand_name in configured_brands]
 		frappe.cache().set_value(cache_key, result, expires_in_sec=300)
 		return result
 

From fade0818c4b4a4beac04f9a61d4936910a0d60f6 Mon Sep 17 00:00:00 2001
From: MohamedAliSmk <mohamedalismk@cgmail.com>
Date: Wed, 11 Mar 2026 14:04:19 +0200
Subject: [PATCH 5/8] Implement cache invalidation for POS Profile updates

- Add logic to invalidate cached POS filters after updating the POS Profile to ensure immediate reflection of changes in the POS UI.
- Log errors during cache invalidation to prevent blocking the update process.
---
 pos_next/api/pos_profile.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pos_next/api/pos_profile.py b/pos_next/api/pos_profile.py
index e45e6612..c357ef9b 100644
--- a/pos_next/api/pos_profile.py
+++ b/pos_next/api/pos_profile.py
@@ -638,6 +638,18 @@ def update_pos_profile(*args, **parameters):
 				pos_profile.append("custom_brands_table", {"brand": brand_name})
 		
 	pos_profile.save()
+
+	# Invalidate cached POS filters so changes are reflected immediately in POS UI
+	try:
+		cache = frappe.cache()
+		# Brands cache (used by pos_next.api.items.get_brands)
+		cache.delete_value(f"pos_brands:{pos_profile.name}")
+		# Item groups cache (used by pos_next.api.items.get_item_groups)
+		cache.delete_value(f"pos_item_groups:{pos_profile.name}")
+	except Exception:
+		# Cache invalidation issues should not block updating the POS Profile
+		frappe.log_error(frappe.get_traceback(), "POS Profile Cache Invalidation Error")
+
 	return pos_profile
 	
 @frappe.whitelist()

From 35673ba85bc40e1cf44bee7f175adc075d8c355d Mon Sep 17 00:00:00 2001
From: MohamedAliSmk <mohamedalismk@cgmail.com>
Date: Thu, 12 Mar 2026 10:54:47 +0200
Subject: [PATCH 6/8] add custom field as export customization

---
 pos_next/pos_next/custom/pos_profile.json | 130 ++++++++++++++--------
 1 file changed, 85 insertions(+), 45 deletions(-)

diff --git a/pos_next/pos_next/custom/pos_profile.json b/pos_next/pos_next/custom/pos_profile.json
index 5fde5905..2306f351 100644
--- a/pos_next/pos_next/custom/pos_profile.json
+++ b/pos_next/pos_next/custom/pos_profile.json
@@ -1,5 +1,69 @@
 {
  "custom_fields": [
+  {
+   "_assign": null,
+   "_comments": null,
+   "_liked_by": null,
+   "_user_tags": null,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "collapsible_depends_on": null,
+   "columns": 0,
+   "creation": "2026-03-12 11:52:12.728191",
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "docstatus": 0,
+   "dt": "POS Profile",
+   "fetch_from": null,
+   "fetch_if_empty": 0,
+   "fieldname": "custom_brands_table",
+   "fieldtype": "Table",
+   "hidden": 0,
+   "hide_border": 0,
+   "hide_days": 0,
+   "hide_seconds": 0,
+   "idx": 29,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_preview": 0,
+   "in_standard_filter": 0,
+   "insert_after": "item_groups",
+   "is_system_generated": 0,
+   "is_virtual": 0,
+   "label": "Brands",
+   "length": 0,
+   "link_filters": null,
+   "mandatory_depends_on": null,
+   "modified": "2026-03-12 11:52:44.526024",
+   "modified_by": "Administrator",
+   "module": null,
+   "name": "POS Profile-custom_brands",
+   "no_copy": 0,
+   "non_negative": 0,
+   "options": "POS Brands Detail",
+   "owner": "Administrator",
+   "permlevel": 0,
+   "placeholder": null,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": null,
+   "read_only": 0,
+   "read_only_depends_on": null,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "show_dashboard": 0,
+   "sort_options": 0,
+   "translatable": 0,
+   "unique": 0,
+   "width": null
+  },
   {
    "_assign": null,
    "_comments": null,
@@ -25,7 +89,7 @@
    "hide_border": 0,
    "hide_days": 0,
    "hide_seconds": 0,
-   "idx": 21,
+   "idx": 22,
    "ignore_user_permissions": 0,
    "ignore_xss_filter": 0,
    "in_global_search": 0,
@@ -89,14 +153,14 @@
    "hide_border": 0,
    "hide_days": 0,
    "hide_seconds": 0,
-   "idx": 0,
+   "idx": 56,
    "ignore_user_permissions": 0,
    "ignore_xss_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
    "in_preview": 0,
    "in_standard_filter": 0,
-   "insert_after": "posa_default_sales_order",
+   "insert_after": "project",
    "is_system_generated": 0,
    "is_virtual": 0,
    "label": "Block Sale Beyond Available Qty",
@@ -153,7 +217,7 @@
    "hide_border": 0,
    "hide_days": 0,
    "hide_seconds": 0,
-   "idx": 20,
+   "idx": 21,
    "ignore_user_permissions": 0,
    "ignore_xss_filter": 0,
    "in_global_search": 0,
@@ -200,15 +264,15 @@
    "creation": "2013-05-24 12:15:51",
    "custom": 0,
    "docstatus": 0,
-   "group": "Opening & Closing",
+   "group": "Invoices",
    "hidden": 0,
-   "idx": 4,
+   "idx": 1,
    "is_child_table": 0,
-   "link_doctype": "POS Closing Entry",
+   "link_doctype": "Sales Invoice",
    "link_fieldname": "pos_profile",
-   "modified": "2026-02-11 16:45:38.715377",
+   "modified": "2026-03-11 02:27:02.627253",
    "modified_by": "Administrator",
-   "name": "k0r557dckr",
+   "name": "5u26gjs8oq",
    "owner": "Administrator",
    "parent": "POS Profile",
    "parent_doctype": null,
@@ -222,13 +286,13 @@
    "docstatus": 0,
    "group": "Opening & Closing",
    "hidden": 0,
-   "idx": 3,
+   "idx": 4,
    "is_child_table": 0,
-   "link_doctype": "POS Opening Entry",
+   "link_doctype": "POS Closing Entry",
    "link_fieldname": "pos_profile",
-   "modified": "2026-02-11 16:45:38.715377",
+   "modified": "2026-03-11 02:27:02.627253",
    "modified_by": "Administrator",
-   "name": "k0rn4g1na8",
+   "name": "5u26kj6upu",
    "owner": "Administrator",
    "parent": "POS Profile",
    "parent_doctype": null,
@@ -240,15 +304,15 @@
    "creation": "2013-05-24 12:15:51",
    "custom": 0,
    "docstatus": 0,
-   "group": "Invoices",
+   "group": "Opening & Closing",
    "hidden": 0,
-   "idx": 1,
+   "idx": 3,
    "is_child_table": 0,
-   "link_doctype": "Sales Invoice",
+   "link_doctype": "POS Opening Entry",
    "link_fieldname": "pos_profile",
-   "modified": "2026-02-11 16:45:38.715377",
+   "modified": "2026-03-11 02:27:02.627253",
    "modified_by": "Administrator",
-   "name": "k0rtu0jsn6",
+   "name": "5u2kcto5lv",
    "owner": "Administrator",
    "parent": "POS Profile",
    "parent_doctype": null,
@@ -266,9 +330,9 @@
    "is_child_table": 0,
    "link_doctype": "POS Invoice",
    "link_fieldname": "pos_profile",
-   "modified": "2026-02-11 16:45:38.715377",
+   "modified": "2026-03-11 02:27:02.627253",
    "modified_by": "Administrator",
-   "name": "k0rvqet6nt",
+   "name": "5u2uvdimqn",
    "owner": "Administrator",
    "parent": "POS Profile",
    "parent_doctype": null,
@@ -277,30 +341,6 @@
    "table_fieldname": null
   }
  ],
- "property_setters": [
-  {
-   "_assign": null,
-   "_comments": null,
-   "_liked_by": null,
-   "_user_tags": null,
-   "creation": "2026-02-19 15:25:11.078968",
-   "default_value": null,
-   "doc_type": "POS Profile",
-   "docstatus": 0,
-   "doctype_or_field": "DocType",
-   "field_name": null,
-   "idx": 0,
-   "is_system_generated": 0,
-   "modified": "2026-02-19 15:25:11.078968",
-   "modified_by": "Administrator",
-   "module": null,
-   "name": "POS Profile-main-field_order",
-   "owner": "Administrator",
-   "property": "field_order",
-   "property_type": "Data",
-   "row_name": null,
-   "value": "[\"company\", \"customer\", \"country\", \"disabled\", \"column_break_9\", \"warehouse\", \"campaign\", \"company_address\", \"section_break_15\", \"applicable_for_users\", \"section_break_11\", \"payments\", \"section_break_14\", \"hide_images\", \"hide_unavailable_items\", \"auto_add_item_to_cart\", \"validate_stock_on_save\", \"print_receipt_on_order_complete\", \"column_break_16\", \"update_stock\", \"posa_cash_mode_of_payment\", \"posa_allow_delete\", \"ignore_pricing_rule\", \"allow_rate_change\", \"allow_discount_change\", \"disable_grand_total_to_default_mop\", \"allow_partial_payment\", \"section_break_23\", \"item_groups\", \"column_break_25\", \"customer_groups\", \"section_break_16\", \"print_format\", \"letter_head\", \"column_break0\", \"tc_name\", \"select_print_heading\", \"section_break_19\", \"selling_price_list\", \"currency\", \"write_off_account\", \"write_off_cost_center\", \"write_off_limit\", \"account_for_change_amount\", \"disable_rounded_total\", \"column_break_23\", \"income_account\", \"expense_account\", \"taxes_and_charges\", \"tax_category\", \"apply_discount_on\", \"accounting_dimensions_section\", \"cost_center\", \"dimension_col_break\", \"project\", \"posa_block_sale_beyond_available_qty\"]"
-  }
- ],
+ "property_setters": [],
  "sync_on_migrate": 1
 }
\ No newline at end of file

From c715c2d49ead84c5e85c99ad63123892d9252fdf Mon Sep 17 00:00:00 2001
From: MohamedAliSmk <mohamedalismk@cgmail.com>
Date: Thu, 12 Mar 2026 11:19:05 +0200
Subject: [PATCH 7/8] Update get_brands function to handle empty configured
 brands

- Modify logic to return all active brands as filter options when no brands are configured in the POS Profile, ensuring the item query remains unrestricted.
- Enhance clarity in comments regarding brand filtering behavior.
---
 pos_next/api/items.py | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/pos_next/api/items.py b/pos_next/api/items.py
index bb082f0d..7b8fd5d6 100644
--- a/pos_next/api/items.py
+++ b/pos_next/api/items.py
@@ -1818,15 +1818,18 @@ def get_brands(pos_profile):
 			.run(pluck="brand")
 		)
 
-		# When no brands are configured in the POS Profile, we intentionally
-		# return an empty list instead of falling back to the first N brands
-		# in the system. This keeps the behaviour consistent with the
-		# "allowed brands" logic in `_build_item_base_conditions`, which
-		# interprets an empty configured set as "no brand restriction" on
-		# items, and avoids confusing brand tabs that don't match the
-		# underlying item filter.
 		if not configured_brands:
-			result = []
+			# No brands configured on the POS Profile → show all active brands
+			# as filter options, while the actual item query remains
+			# unrestricted by brand (since `_get_allowed_profile_brands`
+			# will also see an empty list and skip brand conditions).
+			Brand = DocType("Brand")
+			result = (
+				frappe.qb.from_(Brand)
+				.select(Brand.name.as_("brand"))
+				.orderby(Brand.name)
+				.run(as_dict=True)
+			)
 		else:
 			result = [{"brand": brand_name} for brand_name in configured_brands]
 

From 0ef45b2cff149215b3a06e65cf64be5270c4a7ab Mon Sep 17 00:00:00 2001
From: MohamedAliSmk <mohamedalismk@cgmail.com>
Date: Thu, 12 Mar 2026 11:51:52 +0200
Subject: [PATCH 8/8] Enhance offline item search functionality by adding brand
 filtering

- Remove unused brand references in item search store state.
- Introduce a new method for searching cached items by brand in the offline worker, utilizing a brand index for efficient lookups.
- Update the database schema to include a brand index for improved offline search performance.
- Modify the API to support brand-based filtering in item queries, ensuring consistent behavior across the application.
---
 POS/src/stores/itemSearch.js          | 17 ++++----
 POS/src/utils/offline/db.js           |  3 +-
 POS/src/utils/offline/workerClient.js |  5 +++
 POS/src/workers/offline.worker.js     | 55 ++++++++++++++++++++++++
 pos_next/api/items.py                 | 61 +++++++++++++++++++--------
 5 files changed, 113 insertions(+), 28 deletions(-)

diff --git a/POS/src/stores/itemSearch.js b/POS/src/stores/itemSearch.js
index 964eb452..07c99ca7 100644
--- a/POS/src/stores/itemSearch.js
+++ b/POS/src/stores/itemSearch.js
@@ -1167,7 +1167,6 @@ export const useItemSearchStore = defineStore("itemSearch", () => {
 					pos_profile: posProfile.value,
 					search_term: "",
 					item_group: null,
-					brand: undefined,
 					start: start,
 					limit: pageSize,
 					show_variants_as_items: getShowVariantsFlag(),
@@ -1266,7 +1265,6 @@ export const useItemSearchStore = defineStore("itemSearch", () => {
 					pos_profile: posProfile.value,
 					search_term: "",
 					item_group: null,
-						brand: undefined,
 					start: currentOffset.value,
 					limit: itemsPerPage.value,
 					show_variants_as_items: getShowVariantsFlag(),
@@ -1860,7 +1858,6 @@ export const useItemSearchStore = defineStore("itemSearch", () => {
 				const countPromise = call("pos_next.api.items.get_items_count", {
 					pos_profile: posProfile.value,
 					item_group: group || undefined,
-					brand: undefined,
 					show_variants_as_items: getShowVariantsFlag(),
 				}).catch(err => {
 					log.warn("Could not fetch item count:", err.message)
@@ -1878,7 +1875,6 @@ export const useItemSearchStore = defineStore("itemSearch", () => {
 						pos_profile: posProfile.value,
 						search_term: "",
 						item_group: null,
-						brand: undefined,
 						start: 0,
 						limit: pageSize,
 						show_variants_as_items: getShowVariantsFlag(),
@@ -1971,10 +1967,14 @@ export const useItemSearchStore = defineStore("itemSearch", () => {
 			const offline = isOffline()
 
 			if (offline) {
-				const cached = await offlineWorker.searchCachedItems("", 5000, 0)
-				const filtered = brand
-					? (cached || []).filter(item => (item.brand || '') === brand)
-					: (cached || [])
+				let filtered = []
+				if (brand) {
+					// Use IndexedDB brand index via worker for efficient offline filtering
+					filtered = await offlineWorker.searchCachedItemsByBrand(brand, 5000, 0)
+				} else {
+					filtered = await offlineWorker.searchCachedItems("", 5000, 0)
+				}
+
 				const pageItems = filtered.slice(0, pageSize)
 
 				replaceAllItems(pageItems)
@@ -2004,7 +2004,6 @@ export const useItemSearchStore = defineStore("itemSearch", () => {
 					pos_profile: posProfile.value,
 					search_term: "",
 					item_group: null,
-					brand: undefined,
 					start: 0,
 					limit: pageSize,
 					show_variants_as_items: getShowVariantsFlag(),
diff --git a/POS/src/utils/offline/db.js b/POS/src/utils/offline/db.js
index d71021f6..4d93a835 100644
--- a/POS/src/utils/offline/db.js
+++ b/POS/src/utils/offline/db.js
@@ -44,7 +44,8 @@ const CURRENT_SCHEMA = {
 
 	// Items cache with searchable fields
 	// variant_of index allows querying variants by their template item
-	items: "&item_code, item_name, item_group, variant_of, has_variants, *barcodes",
+	// brand index allows efficient brand-based filtering in offline mode
+	items: "&item_code, item_name, item_group, variant_of, has_variants, brand, *barcodes",
 
 	// Customers cache
 	customers: "&name, customer_name, mobile_no, email_id",
diff --git a/POS/src/utils/offline/workerClient.js b/POS/src/utils/offline/workerClient.js
index 4ecae59b..e269ec6e 100644
--- a/POS/src/utils/offline/workerClient.js
+++ b/POS/src/utils/offline/workerClient.js
@@ -347,6 +347,7 @@ class OfflineWorkerClient {
 			case "GET_INVOICES":
 			case "SEARCH_ITEMS":
 			case "SEARCH_ITEMS_BY_GROUP":
+			case "SEARCH_ITEMS_BY_BRAND":
 			case "SEARCH_CUSTOMERS":
 			case "GET_PAYMENT_METHODS":
 			case "GET_CACHED_OFFERS":
@@ -413,6 +414,10 @@ class OfflineWorkerClient {
 		return this.sendMessage("SEARCH_ITEMS_BY_GROUP", { itemGroups, limit, offset })
 	}
 
+	async searchCachedItemsByBrand(brand, limit = 50, offset = 0) {
+		return this.sendMessage("SEARCH_ITEMS_BY_BRAND", { brand, limit, offset })
+	}
+
 	async countCachedItemsByGroup(itemGroups = []) {
 		return this.sendMessage("COUNT_ITEMS_BY_GROUP", { itemGroups })
 	}
diff --git a/POS/src/workers/offline.worker.js b/POS/src/workers/offline.worker.js
index 0f7a7a29..01febfec 100644
--- a/POS/src/workers/offline.worker.js
+++ b/POS/src/workers/offline.worker.js
@@ -668,6 +668,58 @@ async function searchCachedItemsByGroup(itemGroups = [], limit = 50, offset = 0)
 	}
 }
 
+/**
+ * Search cached items filtered by brand.
+ * Uses the brand index for efficient lookup.
+ *
+ * @param {string} brand - Brand name to filter by
+ * @param {number} limit - Max results
+ * @param {number} offset - Offset for pagination
+ * @returns {Promise<Array>} Matching items
+ */
+async function searchCachedItemsByBrand(brand, limit = 50, offset = 0) {
+	const startTime = performance.now()
+
+	if (!brand) {
+		// No brand filter → fall back to generic search
+		return searchCachedItems("", limit, offset)
+	}
+
+	const cacheKey = `brand:${brand}:${limit}:${offset}`
+	const cached = getCachedQuery(cacheKey)
+	if (cached) {
+		log.debug("Cache hit for brand search", { brand })
+		return cached
+	}
+
+	try {
+		const db = await initDB()
+
+		// Use brand index for lookup, then sort and paginate in memory
+		let results = await db.table("items")
+			.where("brand")
+			.equals(brand)
+			.filter(item => shouldShowItem(item))
+			.toArray()
+
+		// Stable ordering by item_name for consistent UI
+		results.sort((a, b) => (a.item_name || "").localeCompare(b.item_name || ""))
+
+		const paginated = results.slice(offset, offset + limit)
+
+		const duration = Math.round(performance.now() - startTime)
+		recordMetric('searchCachedItemsByBrand', duration, false)
+		log.debug(`Brand search: ${paginated.length} items for "${brand}" in ${duration}ms`)
+
+		cacheQueryResult(cacheKey, paginated)
+		return paginated
+	} catch (error) {
+		recordMetric('searchCachedItemsByBrand', performance.now() - startTime, true)
+		log.error("Error searching cached items by brand", error)
+		return []
+	}
+}
+
 /**
  * Count cached items filtered by item groups.
  * Uses the item_group index for efficient counting.
@@ -1633,6 +1685,9 @@ self.onmessage = async (event) => {
 			case "CACHE_CUSTOMERS":
 				result = await cacheCustomersFromServer(payload.customers)
 				break
+			case "SEARCH_ITEMS_BY_BRAND":
+				result = await searchCachedItemsByBrand(payload.brand, payload.limit, payload.offset || 0)
+				break
 
 			case "DELETE_CUSTOMERS":
 				result = await deleteCustomers(payload.customerNames)
diff --git a/pos_next/api/items.py b/pos_next/api/items.py
index 7b8fd5d6..ed189cbd 100644
--- a/pos_next/api/items.py
+++ b/pos_next/api/items.py
@@ -694,15 +694,48 @@ def _get_item_group_with_descendants(item_group):
 	)
 
 	return [item_group] + list(descendants)
-def _get_allowed_profile_brands(pos_profile):
-	"""Get brand names configured in POS Profile brands child table."""
-	brands = frappe.get_all(
-		"POS Brands Detail",
-		filters={"parent": pos_profile},
-		fields=["brand"],
-		pluck="brand"
+
+
+def _get_pos_profile_configured_brands(pos_profile):
+	"""Get distinct brand names configured on the POS Profile (child table only).
+
+	This is the single source of truth for profile-specific brand configuration and is
+	used by both:
+
+	- `_get_allowed_profile_brands` (to restrict item queries)
+	- `get_brands` (to build the filter list shown in the UI)
+
+	The function is cached per profile to avoid repeated DB hits across calls.
+	"""
+	cache_key = f"pos_profile_brands_raw:{pos_profile}"
+	cached = frappe.cache().get_value(cache_key)
+	if cached is not None:
+		return cached
+
+	POSBrandsDetail = DocType("POS Brands Detail")
+	configured = (
+		frappe.qb.from_(POSBrandsDetail)
+		.select(POSBrandsDetail.brand)
+		.distinct()
+		.where(POSBrandsDetail.parent == pos_profile)
+		.orderby(POSBrandsDetail.brand)
+		.run(pluck="brand")
 	)
-	return brands
+
+	# Store even empty list so we only ever hit the DB once per profile per cache TTL
+	frappe.cache().set_value(cache_key, configured, expires_in_sec=300)
+	return configured or []
+
+
+def _get_allowed_profile_brands(pos_profile):
+	"""Return list of brands that should be enforced in item queries for this profile.
+
+	Behaviour:
+	- If the POS Profile has brands configured in the child table, return that list.
+	- If no brands are configured, return an empty list so that item queries remain
+	  unrestricted by brand (see `get_brands` for UI fallback behaviour).
+	"""
+	return _get_pos_profile_configured_brands(pos_profile)
 
 def _build_item_base_conditions(
 	pos_profile_doc,
@@ -1807,16 +1840,8 @@ def get_brands(pos_profile):
 		return cached
 
 	try:
-		POSBrandsDetail = DocType("POS Brands Detail")
-
-		configured_brands = (
-			frappe.qb.from_(POSBrandsDetail)
-			.select(POSBrandsDetail.brand)
-			.distinct()
-			.where(POSBrandsDetail.parent == pos_profile)
-			.orderby(POSBrandsDetail.brand)
-			.run(pluck="brand")
-		)
+		# Reuse shared helper so profile brand configuration has a single source of truth
+		configured_brands = _get_pos_profile_configured_brands(pos_profile)
 
 		if not configured_brands:
 			# No brands configured on the POS Profile → show all active brands