From 8a5f7cdbab74aa19c975d31c032758e4c9a7d02c Mon Sep 17 00:00:00 2001
From: harrishragavan <harrishragavan1552005@gmail.com>
Date: Wed, 11 Mar 2026 16:13:26 +0530
Subject: [PATCH 1/2] feat: add POS Shift History dialog with filters and CSV
 export

---
 POS/components.d.ts                           |   1 +
 POS/src/components/sale/InvoiceCart.vue       |  29 +
 .../components/sale/InvoiceHistoryDialog.vue  | 273 ++++++----
 .../components/sale/ShiftHistoryDialog.vue    | 382 +++++++++++++
 POS/src/pages/POSSale.vue                     |  35 ++
 pos_next/api/invoices.py                      |  76 +--
 pos_next/api/shifts.py                        |  56 ++
 .../pos_next/workspace/posnext/posnext.json   | 510 +++++++++---------
 8 files changed, 960 insertions(+), 402 deletions(-)
 create mode 100644 POS/src/components/sale/ShiftHistoryDialog.vue

diff --git a/POS/components.d.ts b/POS/components.d.ts
index 1f2e8b35..34185d02 100644
--- a/POS/components.d.ts
+++ b/POS/components.d.ts
@@ -50,6 +50,7 @@ declare module 'vue' {
     SessionLockScreen: typeof import('./src/components/common/SessionLockScreen.vue')['default']
     SettingsSection: typeof import('./src/components/settings/SettingsSection.vue')['default']
     ShiftClosingDialog: typeof import('./src/components/ShiftClosingDialog.vue')['default']
+    ShiftHistoryDialog: typeof import('./src/components/sale/ShiftHistoryDialog.vue')['default']
     ShiftOpeningDialog: typeof import('./src/components/ShiftOpeningDialog.vue')['default']
     StatusBadge: typeof import('./src/components/common/StatusBadge.vue')['default']
     Toast: typeof import('./src/components/common/Toast.vue')['default']
diff --git a/POS/src/components/sale/InvoiceCart.vue b/POS/src/components/sale/InvoiceCart.vue
index d9183515..90d60b9a 100644
--- a/POS/src/components/sale/InvoiceCart.vue
+++ b/POS/src/components/sale/InvoiceCart.vue
@@ -737,6 +737,35 @@
 							__("Create Customer")
 						}}</span>
 					</button>
+
+					<!-- Shift History -->
+					<button
+						type="button"
+						@click="$emit('show-shift-history')"
+						class="flex flex-col items-center justify-center p-3 sm:p-4 bg-white border border-gray-200 rounded-lg hover:border-indigo-300 hover:bg-indigo-50 active:bg-indigo-100 transition-colors shadow-sm hover:shadow touch-manipulation group"
+						:title="__('View shift history')"
+					>
+						<div
+							class="w-9 h-9 sm:w-10 sm:h-10 bg-indigo-50 rounded-full flex items-center justify-center mb-2 group-hover:bg-indigo-100 transition-colors"
+						>
+							<svg
+								class="w-5 h-5 text-indigo-600"
+								fill="none"
+								stroke="currentColor"
+								viewBox="0 0 24 24"
+							>
+								<path
+									stroke-linecap="round"
+									stroke-linejoin="round"
+									stroke-width="2"
+									d="M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2m-6 9l2 2 4-4"
+								/>
+							</svg>
+						</div>
+						<span class="text-[11px] sm:text-xs font-semibold text-gray-700">{{
+							__("Shift History")
+						}}</span>
+					</button>
 				</div>
 			</div>
 
diff --git a/POS/src/components/sale/InvoiceHistoryDialog.vue b/POS/src/components/sale/InvoiceHistoryDialog.vue
index ae196da3..41b9d268 100644
--- a/POS/src/components/sale/InvoiceHistoryDialog.vue
+++ b/POS/src/components/sale/InvoiceHistoryDialog.vue
@@ -12,9 +12,10 @@
 							v-model="searchTerm"
 							type="text"
 							:placeholder="__('Search by invoice number or customer...')"
-							@input="searchInvoices"
+							@input="onSearchInput"
 						>
 							<template #prefix>
+								<!-- Search icon -->
 								<svg class="h-4 w-4 text-gray-400" fill="none" stroke="currentColor" viewBox="0 0 24 24">
 									<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z"/>
 								</svg>
@@ -24,32 +25,80 @@
 					<Button
 						variant="subtle"
 						@click="loadInvoices"
-						:loading="invoicesResource.loading"
+						:loading="invoicesResource.loading && !isLoadingMore"
 						:title="__('Refresh')"
 					>
+						<!-- RotateCcw icon -->
 						<svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-							<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 4v5h.582m15.356 2A8.001 8.001 0 004.582 9m0 0H9m11 11v-5h-.581m0 0a8.003 8.003 0 01-15.357-2m15.357 2H15"/>
+							<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 10h10a8 8 0 018 8v2M3 10l6 6m-6-6l6-6"/>
 						</svg>
 					</Button>
 				</div>
 
-				<!-- Invoices List -->
-				<div v-if="invoicesResource.loading" class="text-center py-8">
-					<div class="animate-spin rounded-full h-8 w-8 border-b-2 border-blue-500 mx-auto"></div>
-					<p class="mt-3 text-xs text-gray-500">{{ __('Loading invoices...') }}</p>
+				<!-- Error State -->
+				<div
+					v-if="invoicesResource.error && !invoicesResource.loading"
+					class="flex items-center gap-3 rounded-lg border border-red-200 bg-red-50 px-4 py-3 text-sm text-red-700"
+				>
+					<!-- AlertCircle icon -->
+					<svg class="h-4 w-4 flex-shrink-0" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+						<circle cx="12" cy="12" r="10"/><line x1="12" y1="8" x2="12" y2="12"/><line x1="12" y1="16" x2="12.01" y2="16"/>
+					</svg>
+					<span>{{ __('Failed to load invoices. Please try again.') }}</span>
+					<Button variant="subtle" size="sm" @click="loadInvoices" class="ml-auto">
+						{{ __('Retry') }}
+					</Button>
 				</div>
 
-				<div v-else-if="filteredInvoices.length === 0" class="text-center py-8">
-					<svg class="mx-auto h-12 w-12 text-gray-400" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-						<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 12h6m-6 4h6m2 5H7a2 2 0 01-2-2V5a2 2 0 012-2h5.586a1 1 0 01.707.293l5.414 5.414a1 1 0 01.293.707V19a2 2 0 01-2 2z"/>
+				<!-- Skeleton Loaders (initial load only) -->
+				<div v-else-if="invoicesResource.loading && !isLoadingMore" class="flex flex-col gap-2">
+					<div
+						v-for="n in 5"
+						:key="n"
+						class="rounded-lg border border-gray-100 bg-white p-3 animate-pulse"
+					>
+						<div class="flex items-start justify-between gap-3">
+							<div class="flex-1 space-y-2">
+								<div class="flex items-center gap-2">
+									<div class="h-4 w-28 rounded bg-gray-200"></div>
+									<div class="h-4 w-14 rounded-full bg-gray-100"></div>
+								</div>
+								<div class="h-3 w-36 rounded bg-gray-100"></div>
+								<div class="h-3 w-24 rounded bg-gray-100"></div>
+							</div>
+							<div class="flex flex-col items-end gap-2">
+								<div class="h-5 w-20 rounded bg-gray-200"></div>
+								<div class="flex gap-1">
+									<div class="h-7 w-7 rounded bg-gray-100"></div>
+									<div class="h-7 w-7 rounded bg-gray-100"></div>
+									<div class="h-7 w-7 rounded bg-gray-100"></div>
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
+
+				<!-- Empty State -->
+				<div v-else-if="isEmpty" class="flex flex-col items-center justify-center py-12 text-center">
+					<!-- FileSearch icon -->
+					<svg class="mx-auto h-14 w-14 text-gray-300" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+						<path stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M9 12h6m-6 4h6m2 5H7a2 2 0 01-2-2V5a2 2 0 012-2h5.586a1 1 0 01.707.293l5.414 5.414a1 1 0 01.293.707V19a2 2 0 01-2 2z"/>
+						<circle cx="11" cy="11" r="0" stroke-width="0"/><path stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M21 21l-3-3"/>
 					</svg>
-					<p class="mt-2 text-sm text-gray-500">{{ __('No invoices found') }}</p>
+					<p class="mt-3 text-sm font-semibold text-gray-500">{{ __('No invoices found') }}</p>
+					<p class="mt-1 text-xs text-gray-400">
+						{{ __('Try adjusting your search or refresh the list.') }}
+					</p>
+					<Button variant="subtle" class="mt-4" @click="loadInvoices">
+						{{ __('Refresh') }}
+					</Button>
 				</div>
 
+				<!-- Invoices List -->
 				<div v-else class="flex flex-col gap-2 max-h-96 overflow-y-auto pe-2">
 					<div
-						v-for="invoice in filteredInvoices"
-						:key="invoice.name"
+						v-for="(invoice, index) in invoices"
+						:key="invoice.name + invoice.posting_date"
 						class="bg-white border border-gray-200 rounded-lg p-3 hover:shadow-md transition-all"
 					>
 						<div class="flex items-start justify-between gap-3">
@@ -59,14 +108,14 @@
 									<h4 class="text-sm font-semibold text-gray-900">
 										{{ invoice.name }}
 									</h4>
-									<!-- Show Return badge (red) if it's a return invoice -->
+									<!-- Return badge -->
 									<span
 										v-if="invoice.is_return"
 										class="text-xs px-2 py-0.5 rounded-full font-medium bg-red-100 text-red-800"
 									>
 										{{ __('Return') }}
 									</span>
-									<!-- Otherwise show regular status badge -->
+									<!-- Status badge -->
 									<span
 										v-else
 										:class="[
@@ -87,35 +136,44 @@
 									{{ formatCurrency(invoice.grand_total) }}
 								</p>
 								<div class="flex items-center gap-1 mt-2">
-									<button
+									<Button
+										variant="ghost"
+										theme="blue"
+										size="sm"
 										@click="viewInvoice(invoice)"
-										class="p-1.5 hover:bg-blue-50 rounded transition-colors"
 										:title="__('View Details')"
 									>
+										<!-- Eye icon -->
 										<svg class="w-4 h-4 text-blue-600" fill="none" stroke="currentColor" viewBox="0 0 24 24">
 											<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 12a3 3 0 11-6 0 3 3 0 016 0z"/>
 											<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M2.458 12C3.732 7.943 7.523 5 12 5c4.478 0 8.268 2.943 9.542 7-1.274 4.057-5.064 7-9.542 7-4.477 0-8.268-2.943-9.542-7z"/>
 										</svg>
-									</button>
-									<button
+									</Button>
+									<Button
+										variant="ghost"
+										theme="green"
+										size="sm"
 										@click="printInvoice(invoice)"
-										class="p-1.5 hover:bg-green-50 rounded transition-colors"
 										:title="__('Print')"
 									>
+										<!-- Printer icon -->
 										<svg class="w-4 h-4 text-green-600" fill="none" stroke="currentColor" viewBox="0 0 24 24">
 											<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M17 17h2a2 2 0 002-2v-4a2 2 0 00-2-2H5a2 2 0 00-2 2v4a2 2 0 002 2h2m2 4h6a2 2 0 002-2v-4a2 2 0 00-2-2H9a2 2 0 00-2 2v4a2 2 0 002 2zm8-12V5a2 2 0 00-2-2H9a2 2 0 00-2 2v4h10z"/>
 										</svg>
-									</button>
-									<button
+									</Button>
+									<Button
 										v-if="canCreateReturn(invoice)"
+										variant="ghost"
+										theme="orange"
+										size="sm"
 										@click="openReturnModal(invoice)"
-										class="p-1.5 hover:bg-orange-50 rounded transition-colors"
 										:title="__('Create Return')"
 									>
+										<!-- RotateCcw icon -->
 										<svg class="w-4 h-4 text-orange-600" fill="none" stroke="currentColor" viewBox="0 0 24 24">
 											<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 10h10a8 8 0 018 8v2M3 10l6 6m-6-6l6-6"/>
 										</svg>
-									</button>
+									</Button>
 								</div>
 							</div>
 						</div>
@@ -123,8 +181,12 @@
 				</div>
 
 				<!-- Load More -->
-				<div v-if="hasMore && !invoicesResource.loading" class="text-center">
-					<Button variant="subtle" @click="loadMore">
+				<div v-if="hasMore && !isEmpty && !invoicesResource.error" class="text-center">
+					<Button
+						variant="subtle"
+						@click="loadMore"
+						:loading="isLoadingMore"
+					>
 						{{ __('Load More') }}
 					</Button>
 				</div>
@@ -174,123 +236,89 @@ function formatCurrency(amount) {
 
 const emit = defineEmits(["update:modelValue", "create-return", "view-invoice", "print-invoice", "return-created"])
 
+// ─── State ────────────────────────────────────────────────────────────────────
 const show = ref(props.modelValue)
 const invoices = ref([])
 const searchTerm = ref("")
-const page = ref(0)
-const pageSize = 20
+const offset = ref(0)
+const LIMIT = 20
 const hasMore = ref(true)
+const isLoadingMore = ref(false)
 
 // Return dialog state
 const showReturnDialog = ref(false)
 const selectedInvoiceForReturn = ref(null)
 
-// Track if we're loading more (appending) vs fresh load (replacing)
-const isLoadingMore = ref(false)
+// ─── Computed ─────────────────────────────────────────────────────────────────
+const isEmpty = computed(
+	() => !invoicesResource.loading && !invoicesResource.error && invoices.value.length === 0
+)
+
+// ─── Debounce utility (no lodash needed) ─────────────────────────────────────
+let _debounceTimer = null
+function debounce(fn, delay) {
+	return (...args) => {
+		clearTimeout(_debounceTimer)
+		_debounceTimer = setTimeout(() => fn(...args), delay)
+	}
+}
 
-// Create resource for loading invoices
+// ─── Resource ─────────────────────────────────────────────────────────────────
 const invoicesResource = createResource({
-	url: "frappe.client.get_list",
+	url: "pos_next.api.invoices.get_invoices",
 	makeParams() {
 		return {
-			doctype: "Sales Invoice",
-			filters: {
-				is_pos: 1,
-				...(props.posProfile && { pos_profile: props.posProfile }),
-			},
-			fields: [
-				"name",
-				"customer",
-				"customer_name",
-				"posting_date",
-				"posting_time",
-				"grand_total",
-				"status",
-				"docstatus",
-				"is_return",
-			],
-			order_by: "modified desc",
-			start: page.value * pageSize,
-			page_length: pageSize,
+			pos_profile: props.posProfile,
+			search: searchTerm.value || null,
+			limit: LIMIT,
+			offset: offset.value,
 		}
 	},
 	auto: false,
 	onSuccess(data) {
 		if (data && Array.isArray(data)) {
-			const newInvoices = data.map((inv) => ({
-				...inv,
-				items_count: 0,
-			}))
+			const newInvoices = data.map((inv) => ({ ...inv }))
 
 			if (isLoadingMore.value) {
-				// Append to existing list
-				invoices.value = [...invoices.value, ...newInvoices]
+				// Append, deduplicating by name
+				const existingNames = new Set(invoices.value.map((i) => i.name))
+				const unique = newInvoices.filter((i) => !existingNames.has(i.name))
+				invoices.value = [...invoices.value, ...unique]
 			} else {
-				// Replace the list
 				invoices.value = newInvoices
 			}
 
-			// Check if there are more results
-			hasMore.value = data.length === pageSize
-			isLoadingMore.value = false
+			hasMore.value = data.length === LIMIT
 		}
+		isLoadingMore.value = false
 	},
 	onError(error) {
 		console.error("Error loading invoices:", error)
-		showError(__("Failed to load invoices"))
 		isLoadingMore.value = false
 	},
 })
 
-watch(
-	() => props.modelValue,
-	(val) => {
-		show.value = val
-		if (val && props.posProfile) {
-			invoicesResource.reload()
-		}
-	},
-)
-
-watch(show, (val) => {
-	emit("update:modelValue", val)
-})
-
-// Clear selected invoice when return dialog closes
-watch(showReturnDialog, (val) => {
-	if (!val) {
-		selectedInvoiceForReturn.value = null
-	}
-})
-
-const filteredInvoices = computed(() => {
-	if (!searchTerm.value) return invoices.value
-
-	const term = searchTerm.value.toLowerCase()
-	return invoices.value.filter(
-		(inv) =>
-			inv.name.toLowerCase().includes(term) ||
-			inv.customer_name?.toLowerCase().includes(term),
-	)
-})
-
+// ─── Actions ─────────────────────────────────────────────────────────────────
 function loadInvoices() {
-	if (props.posProfile) {
-		// Reset to first page for fresh load
-		page.value = 0
-		isLoadingMore.value = false
-		invoicesResource.reload()
-	}
+	if (!props.posProfile) return
+	offset.value = 0
+	isLoadingMore.value = false
+	invoicesResource.reload()
 }
 
 function loadMore() {
-	page.value++
+	if (!props.posProfile || !hasMore.value) return
+	offset.value += LIMIT
 	isLoadingMore.value = true
 	invoicesResource.reload()
 }
 
-function searchInvoices() {
-	// Debounced search - already filtered by computed property
+const _debouncedSearch = debounce(() => {
+	loadInvoices()
+}, 300)
+
+function onSearchInput() {
+	_debouncedSearch()
 }
 
 function viewInvoice(invoice) {
@@ -302,11 +330,7 @@ function printInvoice(invoice) {
 }
 
 function canCreateReturn(invoice) {
-	// Can create return if:
-	// 1. Invoice is submitted (docstatus === 1)
-	// 2. Not already a return invoice
-	// 3. Status is not "Credit Note Issued" (already has a return)
-	return invoice.docstatus === 1 && !invoice.is_return && invoice.status !== 'Credit Note Issued'
+	return invoice.docstatus === 1 && !invoice.is_return && invoice.status !== "Credit Note Issued"
 }
 
 function openReturnModal(invoice) {
@@ -315,9 +339,7 @@ function openReturnModal(invoice) {
 }
 
 function handleReturnCreated(returnInvoice) {
-	// Refresh the invoice list to show updated statuses
-	invoicesResource.reload()
-	// Emit the event to parent
+	loadInvoices()
 	emit("return-created", returnInvoice)
 }
 
@@ -332,4 +354,33 @@ function formatDateTime(date, time) {
 	}
 	return dateStr
 }
+
+// ─── Watchers ─────────────────────────────────────────────────────────────────
+watch(
+	() => props.modelValue,
+	(val) => {
+		show.value = val
+		if (val && props.posProfile) {
+			loadInvoices()
+		}
+	},
+)
+
+watch(show, (val) => {
+	emit("update:modelValue", val)
+	// Dialog cleanup: reset state when dialog closes
+	if (!val) {
+		searchTerm.value = ""
+		offset.value = 0
+		invoices.value = []
+		hasMore.value = true
+	}
+})
+
+// Clear selected invoice when return dialog closes
+watch(showReturnDialog, (val) => {
+	if (!val) {
+		selectedInvoiceForReturn.value = null
+	}
+})
 </script>
diff --git a/POS/src/components/sale/ShiftHistoryDialog.vue b/POS/src/components/sale/ShiftHistoryDialog.vue
new file mode 100644
index 00000000..0d95a8be
--- /dev/null
+++ b/POS/src/components/sale/ShiftHistoryDialog.vue
@@ -0,0 +1,382 @@
+<template>
+	<Dialog
+		v-model="show"
+		:options="{ title: __('POS Shift History'), size: '7xl' }"
+	>
+		<template #body-content>
+			<div class="flex flex-col gap-6">
+				<!-- Quick Summary Cards -->
+				<div class="grid grid-cols-1 sm:grid-cols-3 gap-4">
+					<div class="bg-blue-50 border border-blue-100 rounded-xl p-4 flex flex-col justify-between shadow-sm">
+						<span class="text-xs font-semibold text-blue-600 uppercase tracking-wider">{{ __('Total Sales') }}</span>
+						<span class="text-2xl font-bold text-blue-900 mt-1">{{ formatCurrency(totalGrandTotal) }}</span>
+					</div>
+					<div class="bg-indigo-50 border border-indigo-100 rounded-xl p-4 flex flex-col justify-between shadow-sm">
+						<span class="text-xs font-semibold text-indigo-600 uppercase tracking-wider">{{ __('Total Shifts') }}</span>
+						<span class="text-2xl font-bold text-indigo-900 mt-1">{{ shifts.length }}</span>
+					</div>
+					<div :class="['rounded-xl p-4 flex flex-col justify-between shadow-sm border', totalCashDiff >= 0 ? 'bg-emerald-50 border-emerald-100' : 'bg-rose-50 border-rose-100']">
+						<span :class="['text-xs font-semibold uppercase tracking-wider', totalCashDiff >= 0 ? 'text-emerald-600' : 'text-rose-600']">{{ __('Net Cash Diff') }}</span>
+						<span :class="['text-2xl font-bold mt-1', totalCashDiff >= 0 ? 'text-emerald-900' : 'text-rose-900']">{{ formatCurrency(totalCashDiff) }}</span>
+					</div>
+				</div>
+
+				<!-- Filters Section -->
+				<div class="flex flex-col sm:flex-row items-end gap-3 bg-gray-50/50 p-4 rounded-xl border border-gray-100">
+					<div class="w-full sm:w-56">
+						<label class="block text-[10px] font-bold text-gray-400 uppercase mb-1 ml-1">{{ __('POS Profile') }}</label>
+						<select
+							v-model="filters.pos_profile"
+							@change="loadShifts"
+							class="w-full h-10 px-3 bg-white border border-gray-200 rounded-lg text-sm font-medium focus:ring-2 focus:ring-blue-500 focus:border-blue-500 outline-none transition-all cursor-pointer shadow-sm"
+						>
+							<option value="">{{ __('All Profiles') }}</option>
+							<option v-for="profile in posProfiles" :key="profile.name" :value="profile.name">
+								{{ profile.name }}
+							</option>
+						</select>
+					</div>
+					<div class="w-full sm:w-44">
+						<label class="block text-[10px] font-bold text-gray-400 uppercase mb-1 ml-1">{{ __('From Date') }}</label>
+						<Input
+							type="date"
+							v-model="filters.from_date"
+							class="shadow-sm"
+							@change="loadShifts"
+						/>
+					</div>
+					<div class="w-full sm:w-44">
+						<label class="block text-[10px] font-bold text-gray-400 uppercase mb-1 ml-1">{{ __('To Date') }}</label>
+						<Input
+							type="date"
+							v-model="filters.to_date"
+							class="shadow-sm"
+							@change="loadShifts"
+						/>
+					</div>
+					<div class="flex-1"></div>
+					<div class="flex items-center gap-2">
+						<Button
+							variant="subtle"
+							theme="gray"
+							class="shadow-sm font-bold"
+							@click="setQuickFilter('7days')"
+						>
+							{{ __('7D') }}
+						</Button>
+						<Button
+							variant="subtle"
+							theme="gray"
+							class="shadow-sm font-bold"
+							@click="setQuickFilter('1month')"
+						>
+							{{ __('1M') }}
+						</Button>
+						<Button
+							variant="solid"
+							theme="blue"
+							class="shadow-md"
+							@click="loadShifts"
+							:loading="shiftsResource.loading"
+						>
+							<template #icon>
+								<svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+									<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 4v5h.582m15.356 2A8.001 8.001 0 004.582 9m0 0H9m11 11v-5h-.581m0 0a8.003 8.003 0 01-15.357-2m15.357 2H15"/>
+								</svg>
+							</template>
+							{{ __('Refresh') }}
+						</Button>
+						<Button
+							variant="subtle"
+							theme="gray"
+							class="shadow-sm border border-gray-100"
+							@click="exportToCSV"
+							:disabled="shifts.length === 0"
+						>
+							<template #icon>
+								<svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+									<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 16v1a3 3 0 003 3h10a3 3 0 003-3v-1m-4-4l-4 4m0 0l-4-4m4 4V4"/>
+								</svg>
+							</template>
+						</Button>
+					</div>
+				</div>
+
+				<!-- Shifts Table -->
+				<div class="bg-white border border-gray-200 rounded-xl shadow-sm overflow-hidden">
+					<div v-if="shiftsResource.loading" class="flex flex-col items-center justify-center py-20">
+						<div class="animate-spin rounded-full h-10 w-10 border-b-2 border-blue-600"></div>
+						<p class="mt-4 text-sm font-semibold text-gray-500 tracking-wide uppercase">{{ __('Loading your history...') }}</p>
+					</div>
+
+					<div v-else-if="shifts.length === 0" class="flex flex-col items-center justify-center py-20 opacity-50">
+						<svg class="h-16 w-16 text-gray-300" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+							<path stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M12 8v4l3 3m6-3a9 9 0 11-18 0 9 9 0 0118 0z"/>
+						</svg>
+						<p class="mt-4 text-sm font-semibold text-gray-500 uppercase tracking-widest">{{ __('No shifts found for this range') }}</p>
+					</div>
+
+					<div v-else class="overflow-x-auto max-h-[50vh]">
+						<table class="w-full text-left text-sm whitespace-nowrap border-collapse">
+							<thead class="bg-gray-50 border-b border-gray-100 top-0 sticky z-10">
+								<tr>
+									<th class="px-5 py-3 text-[10px] font-bold text-gray-500 uppercase tracking-widest">{{ __('Shift Date') }}</th>
+									<th class="px-5 py-3 text-[10px] font-bold text-gray-500 uppercase tracking-widest">{{ __('POS Profile') }}</th>
+									<th class="px-5 py-3 text-[10px] font-bold text-gray-500 uppercase tracking-widest">{{ __('Cashier') }}</th>
+									<th class="px-5 py-3 text-[10px] font-bold text-gray-500 uppercase tracking-widest text-center">{{ __('Times (Open - Close)') }}</th>
+									<th class="px-5 py-3 text-[10px] font-bold text-gray-500 uppercase tracking-widest text-right">{{ __('Opening') }}</th>
+									<th class="px-5 py-3 text-[10px] font-bold text-gray-500 uppercase tracking-widest text-right">{{ __('Closing') }}</th>
+									<th class="px-5 py-3 text-[10px] font-bold text-gray-500 uppercase tracking-widest text-right">{{ __('Sales') }}</th>
+									<th class="px-5 py-3 text-[10px] font-bold text-gray-500 uppercase tracking-widest text-right">{{ __('Cash Diff') }}</th>
+								</tr>
+							</thead>
+							<tbody class="divide-y divide-gray-50 bg-white">
+								<tr 
+									v-for="shift in shifts" 
+									:key="shift.opening_shift_name" 
+									@click="viewShift(shift)"
+									class="hover:bg-blue-50/50 cursor-pointer transition-all duration-200 group relative"
+								>
+									<td class="px-5 py-4 font-semibold text-gray-900 group-hover:text-blue-700">
+										{{ formatDate(shift.date) }}
+									</td>
+									<td class="px-5 py-4">
+										<span class="px-2 py-1 bg-gray-100 text-gray-700 text-[11px] font-semibold rounded-md uppercase tracking-wide">
+											{{ shift.pos_profile }}
+										</span>
+									</td>
+									<td class="px-5 py-4 text-gray-500 tabular-nums">
+										{{ shift.cashier }}
+									</td>
+									<td class="px-5 py-4 text-center">
+										<div class="flex items-center justify-center gap-2">
+											<span class="text-[11px] font-semibold text-emerald-600 bg-emerald-50 px-1.5 py-0.5 rounded">{{ formatTime(shift.open_time) }}</span>
+											<svg class="w-3 h-3 text-gray-300" fill="currentColor" viewBox="0 0 20 20"><path fill-rule="evenodd" d="M10.293 3.293a1 1 0 011.414 0l6 6a1 1 0 010 1.414l-6 6a1 1 0 01-1.414-1.414L14.586 11H3a1 1 0 110-2h11.586l-4.293-4.293a1 1 0 010-1.414z" clip-rule="evenodd"/></svg>
+											<span v-if="shift.close_time" class="text-[11px] font-semibold text-amber-600 bg-amber-50 px-1.5 py-0.5 rounded">{{ formatTime(shift.close_time) }}</span>
+											<span v-else class="text-[11px] font-semibold text-green-600 bg-green-50 px-1.5 py-0.5 rounded italic uppercase tracking-tighter">{{ __('Running') }}</span>
+										</div>
+									</td>
+									<td class="px-5 py-4 text-right tabular-nums font-medium text-gray-600">{{ formatCurrency(shift.opening_amount) }}</td>
+									<td class="px-5 py-4 text-right tabular-nums font-medium text-gray-600">{{ formatCurrency(shift.closing_amount) }}</td>
+									<td class="px-5 py-4 text-right tabular-nums font-bold text-gray-900">{{ formatCurrency(shift.sales_total) }}</td>
+									<td class="px-5 py-4 text-right">
+										<span :class="['inline-flex items-center gap-1 font-bold tabular-nums', getCashDiffColor(shift.difference)]">
+											<svg v-if="shift.difference > 0" class="w-3 h-3" fill="currentColor" viewBox="0 0 20 20"><path fill-rule="evenodd" d="M14.707 12.707a1 1 0 01-1.414 0L10 9.414l-3.293 3.293a1 1 0 01-1.414-1.414l4-4a1 1 0 011.414 0l4 4a1 1 0 010 1.414z" clip-rule="evenodd"/></svg>
+											<svg v-else-if="shift.difference < 0" class="w-3 h-3" fill="currentColor" viewBox="0 0 20 20"><path fill-rule="evenodd" d="M5.293 7.293a1 1 0 011.414 0L10 10.586l3.293-3.293a1 1 0 111.414 1.414l-4 4a1 1 0 01-1.414 0l-4-4a1 1 0 010-1.414z" clip-rule="evenodd"/></svg>
+											{{ formatCurrency(shift.difference) }}
+										</span>
+									</td>
+								</tr>
+							</tbody>
+						</table>
+					</div>
+				</div>
+			</div>
+		</template>
+		<template #actions>
+			<Button variant="subtle" @click="show = false" class="font-bold uppercase tracking-widest text-xs px-6">
+				{{ __('Close History') }}
+			</Button>
+		</template>
+	</Dialog>
+</template>
+
+<script setup>
+import { useToast } from "@/composables/useToast"
+import { DEFAULT_CURRENCY, DEFAULT_LOCALE, formatCurrency as formatCurrencyUtil } from "@/utils/currency"
+import { Button, Dialog, Input, createResource } from "frappe-ui"
+import { ref, watch, reactive, onMounted, computed } from "vue"
+
+const { showError } = useToast()
+
+const props = defineProps({
+	modelValue: Boolean,
+	posProfile: String,
+	currency: {
+		type: String,
+		default: DEFAULT_CURRENCY,
+	},
+})
+
+const emit = defineEmits(["update:modelValue"])
+
+const show = ref(props.modelValue)
+const shifts = ref([])
+const posProfiles = ref([])
+
+const filters = reactive({
+	pos_profile: props.posProfile,
+	from_date: "",
+	to_date: "",
+})
+
+// Computed totals
+const totalGrandTotal = computed(() => {
+	return shifts.value.reduce((sum, s) => sum + Number.parseFloat(s.sales_total || 0), 0)
+})
+
+const totalCashDiff = computed(() => {
+	return shifts.value.reduce((sum, s) => sum + Number.parseFloat(s.difference || 0), 0)
+})
+
+// Initialize filters and load profiles
+onMounted(() => {
+	const today = new Date()
+	const startOfMonth = new Date(today.getFullYear(), today.getMonth(), 1)
+	
+	filters.from_date = startOfMonth.toISOString().split('T')[0]
+	filters.to_date = today.toISOString().split('T')[0]
+
+	loadProfiles()
+	if (show.value) {
+		loadShifts()
+	}
+})
+
+async function loadProfiles() {
+	try {
+		const res = await fetch("/api/method/frappe.client.get_list", {
+			method: "POST",
+			headers: { "Content-Type": "application/json" },
+			body: JSON.stringify({
+				doctype: "POS Profile",
+				filters: { disabled: 0 },
+				fields: ["name"]
+			})
+		})
+		const data = await res.json()
+		posProfiles.value = data.message || []
+	} catch (e) {
+		console.error("Failed to load profiles", e)
+	}
+}
+
+function exportToCSV() {
+	if (shifts.value.length === 0) return
+
+	const headers = [
+		__('Date'), 
+		__('POS Profile'), 
+		__('Cashier'), 
+		__('Open Time'), 
+		__('Close Time'), 
+		__('Opening Amount'), 
+		__('Closing Amount'), 
+		__('Total Sales'), 
+		__('Cash Difference')
+	]
+
+	const rows = shifts.value.map(s => [
+		s.date,
+		s.pos_profile,
+		s.cashier,
+		s.open_time,
+		s.close_time || '-',
+		s.opening_amount,
+		s.closing_amount,
+		s.sales_total,
+		s.difference
+	])
+
+	let csvContent = "data:text/csv;charset=utf-8," 
+		+ headers.join(",") + "\n"
+		+ rows.map(e => e.join(",")).join("\n");
+
+	const encodedUri = encodeURI(csvContent);
+	const link = document.createElement("a");
+	link.setAttribute("href", encodedUri);
+	link.setAttribute("download", `POS_Shift_History_${filters.from_date}_to_${filters.to_date}.csv`);
+	document.body.appendChild(link);
+	link.click();
+	document.body.removeChild(link);
+}
+
+function viewShift(shift) {
+	const doctype = shift.closing_shift_name ? 'pos-closing-shift' : 'pos-opening-shift'
+	const name = shift.closing_shift_name || shift.opening_shift_name
+	window.open(`/app/${doctype}/${name}`, '_blank')
+}
+
+function formatCurrency(amount) {
+	return formatCurrencyUtil(Number.parseFloat(amount || 0), props.currency)
+}
+
+function formatDate(dateString) {
+	if (!dateString) return ""
+	return new Date(dateString).toLocaleDateString(DEFAULT_LOCALE, {
+		year: "numeric",
+		month: "short",
+		day: "2-digit"
+	})
+}
+
+function formatTime(dateTimeString) {
+	if (!dateTimeString) return "-"
+	return new Date(dateTimeString).toLocaleTimeString(DEFAULT_LOCALE, {
+		hour: "2-digit",
+		minute: "2-digit",
+		hour12: true
+	})
+}
+
+function getCashDiffColor(diff) {
+	if (!diff && diff !== 0) return 'text-gray-900'
+	if (diff > 0) return 'text-green-600'
+	if (diff < 0) return 'text-red-600'
+	return 'text-gray-900'
+}
+
+function setQuickFilter(type) {
+	const today = new Date()
+	filters.to_date = today.toISOString().split('T')[0]
+	
+	const from = new Date()
+	if (type === '7days') {
+		from.setDate(today.getDate() - 7)
+	} else if (type === '1month') {
+		from.setMonth(today.getMonth() - 1)
+	}
+	filters.from_date = from.toISOString().split('T')[0]
+	
+	loadShifts()
+}
+
+const shiftsResource = createResource({
+	url: "pos_next.api.shifts.get_shift_history",
+	makeParams() {
+		return {
+			filters: JSON.stringify(filters)
+		}
+	},
+	auto: false,
+	onSuccess(data) {
+		shifts.value = data || []
+	},
+	onError(error) {
+		console.error("Error loading shifts:", error)
+		showError(__("Failed to load shift history"))
+	},
+})
+
+watch(
+	() => props.modelValue,
+	(val) => {
+		show.value = val
+		if (val && props.posProfile) {
+			filters.pos_profile = props.posProfile
+			shiftsResource.reload()
+		}
+	},
+)
+
+watch(show, (val) => {
+	emit("update:modelValue", val)
+})
+
+function loadShifts() {
+	if (props.posProfile) {
+		shiftsResource.reload()
+	}
+}
+
+</script>
diff --git a/POS/src/pages/POSSale.vue b/POS/src/pages/POSSale.vue
index 20a7664b..83bf921f 100644
--- a/POS/src/pages/POSSale.vue
+++ b/POS/src/pages/POSSale.vue
@@ -97,6 +97,25 @@
 						</svg>
 						<span>{{ __("Invoice History") }}</span>
 					</button>
+					<button
+						@click="navigateToShiftHistory"
+						class="w-full text-start px-4 py-2.5 text-sm text-gray-700 hover:bg-indigo-50 flex items-center gap-3 transition-colors"
+					>
+						<svg
+							class="w-5 h-5 text-indigo-600"
+							fill="none"
+							stroke="currentColor"
+							viewBox="0 0 24 24"
+						>
+							<path
+								stroke-linecap="round"
+								stroke-linejoin="round"
+								stroke-width="2"
+								d="M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2m-6 9l2 2 4-4"
+							/>
+						</svg>
+						<span>{{ __("Shift History") }}</span>
+					</button>
 					<button
 						v-if="offlineStore.pendingInvoicesCount > 0"
 						@click="
@@ -371,6 +390,7 @@
 								@show-history="uiStore.showHistoryDialog = true"
 								@show-return="uiStore.showReturnDialog = true"
 								@close-shift="handleCloseShift()"
+								@show-shift-history="navigateToShiftHistory"
 							/>
 						</div>
 					</keep-alive>
@@ -583,6 +603,13 @@
 				@return-created="handleReturnCreated"
 			/>
 
+			<!-- Shift History Dialog -->
+			<ShiftHistoryDialog
+				v-model="showShiftHistoryDialog"
+				:pos-profile="shiftStore.profileName"
+				:currency="shiftStore.profileCurrency"
+			/>
+
 			<!-- Offline Invoices Dialog -->
 			<OfflineInvoicesDialog
 				v-model="uiStore.showOfflineInvoicesDialog"
@@ -981,6 +1008,7 @@ import CustomerDialog from "@/components/sale/CustomerDialog.vue";
 import DraftInvoicesDialog from "@/components/sale/DraftInvoicesDialog.vue";
 import InvoiceCart from "@/components/sale/InvoiceCart.vue";
 import InvoiceHistoryDialog from "@/components/sale/InvoiceHistoryDialog.vue";
+import ShiftHistoryDialog from "@/components/sale/ShiftHistoryDialog.vue";
 import ItemSelectionDialog from "@/components/sale/ItemSelectionDialog.vue";
 import ItemsSelector from "@/components/sale/ItemsSelector.vue";
 import OffersDialog from "@/components/sale/OffersDialog.vue";
@@ -1111,6 +1139,9 @@ const selectedInvoiceForView = ref(null);
 // Invoice history data (used by InvoiceManagement component)
 const invoiceHistoryData = ref([]);
 
+// Shift History dialog
+const showShiftHistoryDialog = ref(false);
+
 // Stock sync status
 const isStockSyncActive = ref(false);
 
@@ -2184,6 +2215,10 @@ function handleCloseShift() {
 	uiStore.showCloseShiftDialog = true;
 }
 
+function navigateToShiftHistory() {
+	showShiftHistoryDialog.value = true;
+}
+
 function formatCurrency(amount) {
 	return Number.parseFloat(amount || 0).toFixed(2);
 }
diff --git a/pos_next/api/invoices.py b/pos_next/api/invoices.py
index 1ce61982..dd7b647e 100644
--- a/pos_next/api/invoices.py
+++ b/pos_next/api/invoices.py
@@ -1476,31 +1476,60 @@ def get_invoice(invoice_name):
 
 
 @frappe.whitelist()
-def get_invoices(pos_profile, limit=100):
+def get_invoices(pos_profile, search=None, limit=20, offset=0, from_date=None, to_date=None):
 	"""
-	Get list of invoices for a POS Profile.
+	Get paginated, server-side filtered list of invoices for a POS Profile.
 
 	Args:
 		pos_profile: POS Profile name
-		limit: Maximum number of invoices to return (default 100)
+		search: Optional search term matched against invoice name or customer_name
+		limit: Page size (default 20)
+		offset: Number of records to skip for pagination (default 0)
+		from_date: Optional start date filter (YYYY-MM-DD)
+		to_date: Optional end date filter (YYYY-MM-DD)
 
 	Returns:
-		List of invoices with details
+		List of invoice dicts with basic fields (no per-invoice item loading)
 	"""
 	if not pos_profile:
 		frappe.throw(_("POS Profile is required"))
 
-	# Check if user has access to this POS Profile
+	# Permission check
 	has_access = frappe.db.exists(
 		"POS Profile User",
 		{"parent": pos_profile, "user": frappe.session.user}
 	)
-
 	if not has_access and not frappe.has_permission("Sales Invoice", "read"):
 		frappe.throw(_("You don't have access to this POS Profile"))
 
-	# Query for invoices
-	invoices = frappe.db.sql("""
+	limit = cint(limit) or 20
+	offset = cint(offset) or 0
+
+	# Build WHERE conditions and params
+	conditions = [
+		"pos_profile = %(pos_profile)s",
+		"docstatus = 1",
+		"is_pos = 1",
+	]
+	params = {"pos_profile": pos_profile, "limit": limit, "offset": offset}
+
+	if search:
+		conditions.append(
+			"(name LIKE %(search)s OR customer_name LIKE %(search)s OR customer LIKE %(search)s)"
+		)
+		params["search"] = f"%{cstr(search)}%"
+
+	if from_date:
+		conditions.append("posting_date >= %(from_date)s")
+		params["from_date"] = from_date
+
+	if to_date:
+		conditions.append("posting_date <= %(to_date)s")
+		params["to_date"] = to_date
+
+	where_clause = " AND ".join(conditions)
+
+	invoices = frappe.db.sql(f"""
 		SELECT
 			name,
 			customer,
@@ -1517,37 +1546,12 @@ def get_invoices(pos_profile, limit=100):
 		FROM
 			`tabSales Invoice`
 		WHERE
-			pos_profile = %(pos_profile)s
-			AND docstatus = 1
-			AND is_pos = 1
+			{where_clause}
 		ORDER BY
 			posting_date DESC,
 			posting_time DESC
-		LIMIT %(limit)s
-	""", {
-		"pos_profile": pos_profile,
-		"limit": limit
-	}, as_dict=True)
-
-	# Load items for each invoice for filtering purposes
-	for invoice in invoices:
-		items = frappe.db.sql("""
-			SELECT
-				item_code,
-				item_name,
-				qty,
-				rate,
-				amount
-			FROM
-				`tabSales Invoice Item`
-			WHERE
-				parent = %(invoice_name)s
-			ORDER BY
-				idx
-		""", {
-			"invoice_name": invoice.name
-		}, as_dict=True)
-		invoice.items = items
+		LIMIT %(limit)s OFFSET %(offset)s
+	""", params, as_dict=True)
 
 	return invoices
 
diff --git a/pos_next/api/shifts.py b/pos_next/api/shifts.py
index 50f72321..ae4f629b 100644
--- a/pos_next/api/shifts.py
+++ b/pos_next/api/shifts.py
@@ -182,3 +182,59 @@ def submit_closing_shift(closing_shift):
 	except Exception as e:
 		frappe.log_error(frappe.get_traceback(), "Submit Closing Shift Error")
 		frappe.throw(_("Error submitting closing shift: {0}").format(str(e)))
+
+@frappe.whitelist()
+def get_shift_history(filters=None):
+    if isinstance(filters, str):
+        filters = json.loads(filters)
+    
+    conditions = []
+    values = {}
+    
+    if filters:
+        if filters.get('pos_profile'):
+            conditions.append("os.pos_profile = %(pos_profile)s")
+            values['pos_profile'] = filters.get('pos_profile')
+            
+        if filters.get('from_date'):
+            conditions.append("os.posting_date >= %(from_date)s")
+            values['from_date'] = filters.get('from_date')
+            
+        if filters.get('to_date'):
+            conditions.append("os.posting_date <= %(to_date)s")
+            values['to_date'] = filters.get('to_date')
+            
+    where_clause = " AND ".join(conditions)
+    if where_clause:
+        where_clause = " WHERE " + where_clause
+        
+    query = f"""
+        SELECT 
+            os.name as opening_shift_name,
+            cs.name as closing_shift_name,
+            os.posting_date as date,
+            os.pos_profile,
+            os.user as cashier,
+            os.period_start_date as open_time,
+            cs.period_end_date as close_time,
+            (SELECT SUM(amount) FROM `tabPOS Opening Shift Detail` WHERE parent = os.name) as opening_amount,
+            (SELECT SUM(closing_amount) FROM `tabPOS Closing Shift Detail` WHERE parent = cs.name) as closing_amount,
+            cs.grand_total as sales_total,
+            (SELECT SUM(difference) FROM `tabPOS Closing Shift Detail` WHERE parent = cs.name) as difference
+        FROM `tabPOS Opening Shift` os
+        LEFT JOIN `tabPOS Closing Shift` cs ON cs.pos_opening_shift = os.name
+        {where_clause}
+        ORDER BY os.posting_date DESC, os.period_start_date DESC
+    """
+    
+    data = frappe.db.sql(query, values, as_dict=True)
+    
+    # Ensure safe flt values and maintain consistency
+    for row in data:
+        from frappe.utils import flt
+        row.opening_amount = flt(row.opening_amount)
+        row.closing_amount = flt(row.closing_amount)
+        row.sales_total = flt(row.sales_total)
+        row.difference = flt(row.difference)
+        
+    return data
diff --git a/pos_next/pos_next/workspace/posnext/posnext.json b/pos_next/pos_next/workspace/posnext/posnext.json
index f4000e2e..3b3aa110 100644
--- a/pos_next/pos_next/workspace/posnext/posnext.json
+++ b/pos_next/pos_next/workspace/posnext/posnext.json
@@ -1,257 +1,257 @@
 {
- "charts": [],
- "content": "[{\"id\":\"cDBfxZcI12\",\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Your Shortcuts</b></span>\",\"col\":12}},{\"id\":\"EuDVjJUKSQ\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Start POS\",\"col\":3}},{\"id\":\"uXQ4aBaRfk\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Item\",\"col\":3}},{\"id\":\"jEFYB2fX3t\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Pos Settings\",\"col\":3}},{\"id\":\"RoWvjX8Ocp\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Pos Profile\",\"col\":3}},{\"id\":\"p4KrSYzInK\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Pos Opening Shift\",\"col\":3}},{\"id\":\"VO-VLNdx_2\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Pos Closing Shift\",\"col\":3}},{\"id\":\"OYrA05uyCG\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Pos Offer\",\"col\":3}},{\"id\":\"FUd4_fFBgH\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Pos Coupon\",\"col\":3}},{\"id\":\"spacer1\",\"type\":\"spacer\",\"data\":{\"col\":12}},{\"id\":\"header2\",\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Reports &amp; Configuration</b></span>\",\"col\":12}},{\"id\":\"reports_card\",\"type\":\"card\",\"data\":{\"card_name\":\"Reports\",\"col\":4}},{\"id\":\"pos_card\",\"type\":\"card\",\"data\":{\"card_name\":\"POS\",\"col\":4}},{\"id\":\"config_card\",\"type\":\"card\",\"data\":{\"card_name\":\"Configuration\",\"col\":4}},{\"id\":\"shift_card\",\"type\":\"card\",\"data\":{\"card_name\":\"Shift Management\",\"col\":4}},{\"id\":\"offers_card\",\"type\":\"card\",\"data\":{\"card_name\":\"Offers & Coupons\",\"col\":4}},{\"id\":\"items_card\",\"type\":\"card\",\"data\":{\"card_name\":\"Items\",\"col\":4}}]",
- "creation": "2026-01-27 21:23:15.819052",
- "custom_blocks": [],
- "docstatus": 0,
- "doctype": "Workspace",
- "hide_custom": 0,
- "icon": "message",
- "idx": 0,
- "indicator_color": "green",
- "is_hidden": 0,
- "label": "POSNext",
- "links": [
-  {
-   "hidden": 0,
-   "is_query_report": 0,
-   "label": "Reports",
-   "link_count": 5,
-   "link_type": "DocType",
-   "onboard": 0,
-   "type": "Card Break"
-  },
-  {
-   "hidden": 0,
-   "is_query_report": 1,
-   "label": "Sales vs Shifts Report",
-   "link_count": 0,
-   "link_to": "Sales vs Shifts Report",
-   "link_type": "Report",
-   "onboard": 0,
-   "type": "Link"
-  },
-  {
-   "hidden": 0,
-   "is_query_report": 1,
-   "label": "Cashier Performance Report",
-   "link_count": 0,
-   "link_to": "Cashier Performance Report",
-   "link_type": "Report",
-   "onboard": 0,
-   "type": "Link"
-  },
-  {
-   "hidden": 0,
-   "is_query_report": 1,
-   "label": "Payments and Cash Control Report",
-   "link_count": 0,
-   "link_to": "Payments and Cash Control Report",
-   "link_type": "Report",
-   "onboard": 0,
-   "type": "Link"
-  },
-  {
-   "hidden": 0,
-   "is_query_report": 1,
-   "label": "Inventory Impact and Fast Movers Report",
-   "link_count": 0,
-   "link_to": "Inventory Impact and Fast Movers Report",
-   "link_type": "Report",
-   "onboard": 0,
-   "type": "Link"
-  },
-  {
-   "hidden": 0,
-   "is_query_report": 1,
-   "label": "Offline Sync and System Health Report",
-   "link_count": 0,
-   "link_to": "Offline Sync and System Health Report",
-   "link_type": "Report",
-   "onboard": 0,
-   "type": "Link"
-  },
-  {
-   "hidden": 0,
-   "is_query_report": 0,
-   "label": "Configuration",
-   "link_count": 2,
-   "link_type": "DocType",
-   "onboard": 0,
-   "type": "Card Break"
-  },
-  {
-   "hidden": 0,
-   "is_query_report": 0,
-   "label": "POS Settings",
-   "link_count": 0,
-   "link_to": "POS Settings",
-   "link_type": "DocType",
-   "onboard": 0,
-   "type": "Link"
-  },
-  {
-   "hidden": 0,
-   "is_query_report": 0,
-   "label": "POS Profile",
-   "link_count": 0,
-   "link_to": "POS Profile",
-   "link_type": "DocType",
-   "onboard": 0,
-   "type": "Link"
-  },
-  {
-   "hidden": 0,
-   "is_query_report": 0,
-   "label": "Shift Management",
-   "link_count": 2,
-   "link_type": "DocType",
-   "onboard": 0,
-   "type": "Card Break"
-  },
-  {
-   "hidden": 0,
-   "is_query_report": 0,
-   "label": "POS Opening Shift",
-   "link_count": 0,
-   "link_to": "POS Opening Shift",
-   "link_type": "DocType",
-   "onboard": 0,
-   "type": "Link"
-  },
-  {
-   "hidden": 0,
-   "is_query_report": 0,
-   "label": "POS Closing Shift",
-   "link_count": 0,
-   "link_to": "POS Closing Shift",
-   "link_type": "DocType",
-   "onboard": 0,
-   "type": "Link"
-  },
-  {
-   "hidden": 0,
-   "is_query_report": 0,
-   "label": "Offers & Coupons",
-   "link_count": 2,
-   "link_type": "DocType",
-   "onboard": 0,
-   "type": "Card Break"
-  },
-  {
-   "hidden": 0,
-   "is_query_report": 0,
-   "label": "POS Offer",
-   "link_count": 0,
-   "link_to": "POS Offer",
-   "link_type": "DocType",
-   "onboard": 0,
-   "type": "Link"
-  },
-  {
-   "hidden": 0,
-   "is_query_report": 0,
-   "label": "POS Coupon",
-   "link_count": 0,
-   "link_to": "POS Coupon",
-   "link_type": "DocType",
-   "onboard": 0,
-   "type": "Link"
-  },
-  {
-   "hidden": 0,
-   "is_query_report": 0,
-   "label": "Items",
-   "link_count": 1,
-   "link_type": "DocType",
-   "onboard": 0,
-   "type": "Card Break"
-  },
-  {
-   "hidden": 0,
-   "is_query_report": 0,
-   "label": "Item",
-   "link_count": 0,
-   "link_to": "Item",
-   "link_type": "DocType",
-   "onboard": 0,
-   "type": "Link"
-  }
- ],
- "modified": "2026-01-27 21:23:15.819052",
- "modified_by": "Administrator",
- "module": "POS Next",
- "name": "POSNext",
- "number_cards": [],
- "owner": "Administrator",
- "public": 1,
- "quick_lists": [],
- "roles": [],
- "sequence_id": 0.0,
- "shortcuts": [
-  {
-   "color": "Grey",
-   "doc_view": "",
-   "label": "Start POS",
-   "type": "URL",
-   "url": "/pos/"
-  },
-  {
-   "color": "Grey",
-   "doc_view": "List",
-   "label": "Item",
-   "link_to": "Item",
-   "stats_filter": "[]",
-   "type": "DocType"
-  },
-  {
-   "color": "Grey",
-   "doc_view": "List",
-   "label": "Pos Settings",
-   "link_to": "POS Settings",
-   "stats_filter": "[]",
-   "type": "DocType"
-  },
-  {
-   "color": "Grey",
-   "doc_view": "List",
-   "label": "Pos Profile",
-   "link_to": "POS Profile",
-   "stats_filter": "[]",
-   "type": "DocType"
-  },
-  {
-   "color": "Grey",
-   "doc_view": "List",
-   "label": "Pos Opening Shift",
-   "link_to": "POS Opening Shift",
-   "stats_filter": "[]",
-   "type": "DocType"
-  },
-  {
-   "color": "Grey",
-   "doc_view": "List",
-   "label": "Pos Closing Shift",
-   "link_to": "POS Closing Shift",
-   "stats_filter": "[]",
-   "type": "DocType"
-  },
-  {
-   "color": "Grey",
-   "doc_view": "List",
-   "label": "Pos Offer",
-   "link_to": "POS Offer",
-   "stats_filter": "[]",
-   "type": "DocType"
-  },
-  {
-   "color": "Grey",
-   "doc_view": "List",
-   "label": "Pos Coupon",
-   "link_to": "POS Coupon",
-   "stats_filter": "[]",
-   "type": "DocType"
-  }
- ],
- "title": "POSNext"
+    "charts": [],
+    "content": "[{\"id\":\"cDBfxZcI12\",\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Your Shortcuts</b></span>\",\"col\":12}},{\"id\":\"EuDVjJUKSQ\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Start POS\",\"col\":3}},{\"id\":\"uXQ4aBaRfk\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Item\",\"col\":3}},{\"id\":\"jEFYB2fX3t\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Pos Settings\",\"col\":3}},{\"id\":\"RoWvjX8Ocp\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Pos Profile\",\"col\":3}},{\"id\":\"p4KrSYzInK\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Pos Opening Shift\",\"col\":3}},{\"id\":\"VO-VLNdx_2\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Pos Closing Shift\",\"col\":3}},{\"id\":\"OYrA05uyCG\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Pos Offer\",\"col\":3}},{\"id\":\"FUd4_fFBgH\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Pos Coupon\",\"col\":3}},{\"id\":\"spacer1\",\"type\":\"spacer\",\"data\":{\"col\":12}},{\"id\":\"header2\",\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Reports &amp; Configuration</b></span>\",\"col\":12}},{\"id\":\"reports_card\",\"type\":\"card\",\"data\":{\"card_name\":\"Reports\",\"col\":4}},{\"id\":\"pos_card\",\"type\":\"card\",\"data\":{\"card_name\":\"POS\",\"col\":4}},{\"id\":\"config_card\",\"type\":\"card\",\"data\":{\"card_name\":\"Configuration\",\"col\":4}},{\"id\":\"shift_card\",\"type\":\"card\",\"data\":{\"card_name\":\"Shift Management\",\"col\":4}},{\"id\":\"offers_card\",\"type\":\"card\",\"data\":{\"card_name\":\"Offers & Coupons\",\"col\":4}},{\"id\":\"items_card\",\"type\":\"card\",\"data\":{\"card_name\":\"Items\",\"col\":4}}]",
+    "creation": "2026-01-27 21:23:15.819052",
+    "custom_blocks": [],
+    "docstatus": 0,
+    "doctype": "Workspace",
+    "hide_custom": 0,
+    "icon": "message",
+    "idx": 0,
+    "indicator_color": "green",
+    "is_hidden": 0,
+    "label": "POSNext",
+    "links": [
+        {
+            "hidden": 0,
+            "is_query_report": 0,
+            "label": "Reports",
+            "link_count": 5,
+            "link_type": "DocType",
+            "onboard": 0,
+            "type": "Card Break"
+        },
+        {
+            "hidden": 0,
+            "is_query_report": 1,
+            "label": "Sales vs Shifts Report",
+            "link_count": 0,
+            "link_to": "Sales vs Shifts Report",
+            "link_type": "Report",
+            "onboard": 0,
+            "type": "Link"
+        },
+        {
+            "hidden": 0,
+            "is_query_report": 1,
+            "label": "Cashier Performance Report",
+            "link_count": 0,
+            "link_to": "Cashier Performance Report",
+            "link_type": "Report",
+            "onboard": 0,
+            "type": "Link"
+        },
+        {
+            "hidden": 0,
+            "is_query_report": 1,
+            "label": "Payments and Cash Control Report",
+            "link_count": 0,
+            "link_to": "Payments and Cash Control Report",
+            "link_type": "Report",
+            "onboard": 0,
+            "type": "Link"
+        },
+        {
+            "hidden": 0,
+            "is_query_report": 1,
+            "label": "Inventory Impact and Fast Movers Report",
+            "link_count": 0,
+            "link_to": "Inventory Impact and Fast Movers Report",
+            "link_type": "Report",
+            "onboard": 0,
+            "type": "Link"
+        },
+        {
+            "hidden": 0,
+            "is_query_report": 1,
+            "label": "Offline Sync and System Health Report",
+            "link_count": 0,
+            "link_to": "Offline Sync and System Health Report",
+            "link_type": "Report",
+            "onboard": 0,
+            "type": "Link"
+        },
+        {
+            "hidden": 0,
+            "is_query_report": 0,
+            "label": "Configuration",
+            "link_count": 2,
+            "link_type": "DocType",
+            "onboard": 0,
+            "type": "Card Break"
+        },
+        {
+            "hidden": 0,
+            "is_query_report": 0,
+            "label": "POS Settings",
+            "link_count": 0,
+            "link_to": "POS Settings",
+            "link_type": "DocType",
+            "onboard": 0,
+            "type": "Link"
+        },
+        {
+            "hidden": 0,
+            "is_query_report": 0,
+            "label": "POS Profile",
+            "link_count": 0,
+            "link_to": "POS Profile",
+            "link_type": "DocType",
+            "onboard": 0,
+            "type": "Link"
+        },
+        {
+            "hidden": 0,
+            "is_query_report": 0,
+            "label": "Shift Management",
+            "link_count": 2,
+            "link_type": "DocType",
+            "onboard": 0,
+            "type": "Card Break"
+        },
+        {
+            "hidden": 0,
+            "is_query_report": 0,
+            "label": "POS Opening Shift",
+            "link_count": 0,
+            "link_to": "POS Opening Shift",
+            "link_type": "DocType",
+            "onboard": 0,
+            "type": "Link"
+        },
+        {
+            "hidden": 0,
+            "is_query_report": 0,
+            "label": "POS Closing Shift",
+            "link_count": 0,
+            "link_to": "POS Closing Shift",
+            "link_type": "DocType",
+            "onboard": 0,
+            "type": "Link"
+        },
+        {
+            "hidden": 0,
+            "is_query_report": 0,
+            "label": "Offers & Coupons",
+            "link_count": 2,
+            "link_type": "DocType",
+            "onboard": 0,
+            "type": "Card Break"
+        },
+        {
+            "hidden": 0,
+            "is_query_report": 0,
+            "label": "POS Offer",
+            "link_count": 0,
+            "link_to": "POS Offer",
+            "link_type": "DocType",
+            "onboard": 0,
+            "type": "Link"
+        },
+        {
+            "hidden": 0,
+            "is_query_report": 0,
+            "label": "POS Coupon",
+            "link_count": 0,
+            "link_to": "POS Coupon",
+            "link_type": "DocType",
+            "onboard": 0,
+            "type": "Link"
+        },
+        {
+            "hidden": 0,
+            "is_query_report": 0,
+            "label": "Items",
+            "link_count": 1,
+            "link_type": "DocType",
+            "onboard": 0,
+            "type": "Card Break"
+        },
+        {
+            "hidden": 0,
+            "is_query_report": 0,
+            "label": "Item",
+            "link_count": 0,
+            "link_to": "Item",
+            "link_type": "DocType",
+            "onboard": 0,
+            "type": "Link"
+        }
+    ],
+    "modified": "2026-01-27 21:23:15.819052",
+    "modified_by": "Administrator",
+    "module": "POS Next",
+    "name": "POSNext",
+    "number_cards": [],
+    "owner": "Administrator",
+    "public": 1,
+    "quick_lists": [],
+    "roles": [],
+    "sequence_id": 0.0,
+    "shortcuts": [
+        {
+            "color": "Grey",
+            "doc_view": "",
+            "label": "Start POS",
+            "type": "URL",
+            "url": "/pos/"
+        },
+        {
+            "color": "Grey",
+            "doc_view": "List",
+            "label": "Item",
+            "link_to": "Item",
+            "stats_filter": "[]",
+            "type": "DocType"
+        },
+        {
+            "color": "Grey",
+            "doc_view": "List",
+            "label": "Pos Settings",
+            "link_to": "POS Settings",
+            "stats_filter": "[]",
+            "type": "DocType"
+        },
+        {
+            "color": "Grey",
+            "doc_view": "List",
+            "label": "Pos Profile",
+            "link_to": "POS Profile",
+            "stats_filter": "[]",
+            "type": "DocType"
+        },
+        {
+            "color": "Grey",
+            "doc_view": "List",
+            "label": "Pos Opening Shift",
+            "link_to": "POS Opening Shift",
+            "stats_filter": "[]",
+            "type": "DocType"
+        },
+        {
+            "color": "Grey",
+            "doc_view": "List",
+            "label": "Pos Closing Shift",
+            "link_to": "POS Closing Shift",
+            "stats_filter": "[]",
+            "type": "DocType"
+        },
+        {
+            "color": "Grey",
+            "doc_view": "List",
+            "label": "Pos Offer",
+            "link_to": "POS Offer",
+            "stats_filter": "[]",
+            "type": "DocType"
+        },
+        {
+            "color": "Grey",
+            "doc_view": "List",
+            "label": "Pos Coupon",
+            "link_to": "POS Coupon",
+            "stats_filter": "[]",
+            "type": "DocType"
+        }
+    ],
+    "title": "POSNext"
 }
\ No newline at end of file

From d039038ae9b910e14757a98923dff268d69f00a5 Mon Sep 17 00:00:00 2001
From: harrishragavan <harrishragavan1552005@gmail.com>
Date: Thu, 12 Mar 2026 21:27:48 +0530
Subject: [PATCH 2/2] fix(POS): improve shift history security and query
 performance

---
 POS/src/components/sale/InvoiceCart.vue       |   1 +
 .../components/sale/InvoiceHistoryDialog.vue  |  12 +-
 .../components/sale/ShiftHistoryDialog.vue    | 327 +++++++++++++-----
 pos_next/api/shifts.py                        | 185 +++++++---
 4 files changed, 373 insertions(+), 152 deletions(-)

diff --git a/POS/src/components/sale/InvoiceCart.vue b/POS/src/components/sale/InvoiceCart.vue
index 90d60b9a..03827c89 100644
--- a/POS/src/components/sale/InvoiceCart.vue
+++ b/POS/src/components/sale/InvoiceCart.vue
@@ -1392,6 +1392,7 @@ const emit = defineEmits([
 	"show-history", // () - Show invoice history
 	"show-return", // () - Open return invoice dialog
 	"close-shift", // () - Close current shift
+	"show-shift-history", // () - Open shift history dialog
 	// "create-sales-order", // () - Create Sales Order // Removed as per instruction
 ]);
 
diff --git a/POS/src/components/sale/InvoiceHistoryDialog.vue b/POS/src/components/sale/InvoiceHistoryDialog.vue
index 41b9d268..ca034a28 100644
--- a/POS/src/components/sale/InvoiceHistoryDialog.vue
+++ b/POS/src/components/sale/InvoiceHistoryDialog.vue
@@ -215,7 +215,7 @@ import { useToast } from "@/composables/useToast"
 import { DEFAULT_CURRENCY, DEFAULT_LOCALE, formatCurrency as formatCurrencyUtil } from "@/utils/currency"
 import { getInvoiceStatusColor } from "@/utils/invoice"
 import { Button, Dialog, Input, createResource } from "frappe-ui"
-import { computed, ref, watch } from "vue"
+import { computed, ref, watch, onUnmounted } from "vue"
 import ReturnInvoiceDialog from "./ReturnInvoiceDialog.vue"
 
 const { showError } = useToast()
@@ -256,6 +256,13 @@ const isEmpty = computed(
 
 // ─── Debounce utility (no lodash needed) ─────────────────────────────────────
 let _debounceTimer = null
+
+// MEDIUM (fix #8): clear pending debounce timer when dialog unmounts to prevent
+// the callback from calling loadInvoices() on a stale/destroyed component.
+onUnmounted(() => {
+	clearTimeout(_debounceTimer)
+})
+
 function debounce(fn, delay) {
 	return (...args) => {
 		clearTimeout(_debounceTimer)
@@ -294,6 +301,9 @@ const invoicesResource = createResource({
 	},
 	onError(error) {
 		console.error("Error loading invoices:", error)
+		// FIX #10: show a toast so the user gets immediate feedback on failure
+		// (the template also shows an inline error state with a Retry button)
+		showError(__("Failed to load invoices. Please try again."))
 		isLoadingMore.value = false
 	},
 })
diff --git a/POS/src/components/sale/ShiftHistoryDialog.vue b/POS/src/components/sale/ShiftHistoryDialog.vue
index 0d95a8be..1c284e6b 100644
--- a/POS/src/components/sale/ShiftHistoryDialog.vue
+++ b/POS/src/components/sale/ShiftHistoryDialog.vue
@@ -5,37 +5,24 @@
 	>
 		<template #body-content>
 			<div class="flex flex-col gap-6">
-				<!-- Quick Summary Cards -->
+				<!-- Quick Summary Cards — totals come from the server (#11 fix) -->
 				<div class="grid grid-cols-1 sm:grid-cols-3 gap-4">
 					<div class="bg-blue-50 border border-blue-100 rounded-xl p-4 flex flex-col justify-between shadow-sm">
 						<span class="text-xs font-semibold text-blue-600 uppercase tracking-wider">{{ __('Total Sales') }}</span>
-						<span class="text-2xl font-bold text-blue-900 mt-1">{{ formatCurrency(totalGrandTotal) }}</span>
+						<span class="text-2xl font-bold text-blue-900 mt-1">{{ formatCurrency(serverTotals.total_sales) }}</span>
 					</div>
 					<div class="bg-indigo-50 border border-indigo-100 rounded-xl p-4 flex flex-col justify-between shadow-sm">
 						<span class="text-xs font-semibold text-indigo-600 uppercase tracking-wider">{{ __('Total Shifts') }}</span>
-						<span class="text-2xl font-bold text-indigo-900 mt-1">{{ shifts.length }}</span>
+						<span class="text-2xl font-bold text-indigo-900 mt-1">{{ serverTotals.total_shifts }}</span>
 					</div>
-					<div :class="['rounded-xl p-4 flex flex-col justify-between shadow-sm border', totalCashDiff >= 0 ? 'bg-emerald-50 border-emerald-100' : 'bg-rose-50 border-rose-100']">
-						<span :class="['text-xs font-semibold uppercase tracking-wider', totalCashDiff >= 0 ? 'text-emerald-600' : 'text-rose-600']">{{ __('Net Cash Diff') }}</span>
-						<span :class="['text-2xl font-bold mt-1', totalCashDiff >= 0 ? 'text-emerald-900' : 'text-rose-900']">{{ formatCurrency(totalCashDiff) }}</span>
+					<div :class="['rounded-xl p-4 flex flex-col justify-between shadow-sm border', serverTotals.total_cash_diff >= 0 ? 'bg-emerald-50 border-emerald-100' : 'bg-rose-50 border-rose-100']">
+						<span :class="['text-xs font-semibold uppercase tracking-wider', serverTotals.total_cash_diff >= 0 ? 'text-emerald-600' : 'text-rose-600']">{{ __('Net Cash Diff') }}</span>
+						<span :class="['text-2xl font-bold mt-1', serverTotals.total_cash_diff >= 0 ? 'text-emerald-900' : 'text-rose-900']">{{ formatCurrency(serverTotals.total_cash_diff) }}</span>
 					</div>
 				</div>
 
 				<!-- Filters Section -->
 				<div class="flex flex-col sm:flex-row items-end gap-3 bg-gray-50/50 p-4 rounded-xl border border-gray-100">
-					<div class="w-full sm:w-56">
-						<label class="block text-[10px] font-bold text-gray-400 uppercase mb-1 ml-1">{{ __('POS Profile') }}</label>
-						<select
-							v-model="filters.pos_profile"
-							@change="loadShifts"
-							class="w-full h-10 px-3 bg-white border border-gray-200 rounded-lg text-sm font-medium focus:ring-2 focus:ring-blue-500 focus:border-blue-500 outline-none transition-all cursor-pointer shadow-sm"
-						>
-							<option value="">{{ __('All Profiles') }}</option>
-							<option v-for="profile in posProfiles" :key="profile.name" :value="profile.name">
-								{{ profile.name }}
-							</option>
-						</select>
-					</div>
 					<div class="w-full sm:w-44">
 						<label class="block text-[10px] font-bold text-gray-400 uppercase mb-1 ml-1">{{ __('From Date') }}</label>
 						<Input
@@ -128,14 +115,14 @@
 									<th class="px-5 py-3 text-[10px] font-bold text-gray-500 uppercase tracking-widest text-right">{{ __('Closing') }}</th>
 									<th class="px-5 py-3 text-[10px] font-bold text-gray-500 uppercase tracking-widest text-right">{{ __('Sales') }}</th>
 									<th class="px-5 py-3 text-[10px] font-bold text-gray-500 uppercase tracking-widest text-right">{{ __('Cash Diff') }}</th>
+									<th class="px-5 py-3 text-[10px] font-bold text-gray-500 uppercase tracking-widest text-right">{{ __('Actions') }}</th>
 								</tr>
 							</thead>
 							<tbody class="divide-y divide-gray-50 bg-white">
 								<tr 
 									v-for="shift in shifts" 
 									:key="shift.opening_shift_name" 
-									@click="viewShift(shift)"
-									class="hover:bg-blue-50/50 cursor-pointer transition-all duration-200 group relative"
+									class="hover:bg-blue-50/50 transition-all duration-200 group relative"
 								>
 									<td class="px-5 py-4 font-semibold text-gray-900 group-hover:text-blue-700">
 										{{ formatDate(shift.date) }}
@@ -166,11 +153,79 @@
 											{{ formatCurrency(shift.difference) }}
 										</span>
 									</td>
+									<!-- FIX #17: actions column — user can open either Opening or Closing shift -->
+									<td class="px-3 py-4 text-right">
+										<div class="flex items-center justify-end gap-1">
+											<button
+												@click.stop="openShiftDoc(shift, 'opening')"
+												class="text-[10px] font-semibold px-2 py-1 rounded bg-blue-50 text-blue-700 hover:bg-blue-100 transition-colors"
+												:title="__('View Opening Shift')"
+											>
+												{{ __('Open') }}
+											</button>
+											<button
+												v-if="shift.closing_shift_name"
+												@click.stop="openShiftDoc(shift, 'closing')"
+												class="text-[10px] font-semibold px-2 py-1 rounded bg-amber-50 text-amber-700 hover:bg-amber-100 transition-colors"
+												:title="__('View Closing Shift')"
+											>
+												{{ __('Close') }}
+											</button>
+										</div>
+									</td>
 								</tr>
 							</tbody>
 						</table>
 					</div>
 				</div>
+
+				<!-- Pagination bar (shown when there is more than one page) -->
+				<div
+					v-if="totalPages > 1"
+					class="flex items-center justify-between px-4 py-3 border-t border-gray-100 bg-gray-50/60 rounded-b-xl"
+				>
+					<span class="text-[11px] font-medium text-gray-500 select-none">
+						{{ __('Showing') }}
+						{{ (currentPage - 1) * PAGE_SIZE + 1 }}&ndash;{{ Math.min(currentPage * PAGE_SIZE, serverTotals.total_shifts) }}
+						{{ __('of') }} {{ serverTotals.total_shifts }} {{ __('shifts') }}
+					</span>
+
+					<div class="flex items-center gap-1">
+						<button
+							@click="goToPage(currentPage - 1)"
+							:disabled="currentPage === 1 || shiftsResource.loading"
+							class="w-8 h-8 flex items-center justify-center rounded-lg border border-gray-200 text-gray-500 hover:bg-white hover:border-blue-300 hover:text-blue-600 disabled:opacity-30 disabled:cursor-not-allowed transition-colors"
+						>
+							<svg class="w-3.5 h-3.5" fill="currentColor" viewBox="0 0 20 20"><path fill-rule="evenodd" d="M12.707 5.293a1 1 0 010 1.414L9.414 10l3.293 3.293a1 1 0 01-1.414 1.414l-4-4a1 1 0 010-1.414l4-4a1 1 0 011.414 0z" clip-rule="evenodd"/></svg>
+						</button>
+
+						<template v-for="page in visiblePages" :key="page">
+							<span
+								v-if="typeof page === 'string'"
+								class="w-8 h-8 flex items-center justify-center text-gray-400 text-xs select-none"
+							>&hellip;</span>
+							<button
+								v-else
+								@click="goToPage(page)"
+								:disabled="shiftsResource.loading"
+								:class="[
+									'w-8 h-8 flex items-center justify-center rounded-lg border text-xs font-semibold transition-colors',
+									page === currentPage
+										? 'bg-blue-600 border-blue-600 text-white shadow-sm'
+										: 'border-gray-200 text-gray-600 hover:bg-white hover:border-blue-300 hover:text-blue-600 disabled:opacity-50',
+								]"
+							>{{ page }}</button>
+						</template>
+
+						<button
+							@click="goToPage(currentPage + 1)"
+							:disabled="currentPage === totalPages || shiftsResource.loading"
+							class="w-8 h-8 flex items-center justify-center rounded-lg border border-gray-200 text-gray-500 hover:bg-white hover:border-blue-300 hover:text-blue-600 disabled:opacity-30 disabled:cursor-not-allowed transition-colors"
+						>
+							<svg class="w-3.5 h-3.5" fill="currentColor" viewBox="0 0 20 20"><path fill-rule="evenodd" d="M7.293 14.707a1 1 0 010-1.414L10.586 10 7.293 6.707a1 1 0 011.414-1.414l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414 0z" clip-rule="evenodd"/></svg>
+						</button>
+					</div>
+				</div>
 			</div>
 		</template>
 		<template #actions>
@@ -191,7 +246,6 @@ const { showError } = useToast()
 
 const props = defineProps({
 	modelValue: Boolean,
-	posProfile: String,
 	currency: {
 		type: String,
 		default: DEFAULT_CURRENCY,
@@ -202,99 +256,157 @@ const emit = defineEmits(["update:modelValue"])
 
 const show = ref(props.modelValue)
 const shifts = ref([])
-const posProfiles = ref([])
 
-const filters = reactive({
-	pos_profile: props.posProfile,
-	from_date: "",
-	to_date: "",
+// Pagination
+const PAGE_SIZE   = 5
+const currentPage = ref(1)
+
+const totalPages = computed(() => {
+	const total = serverTotals.value.total_shifts
+	return total > 0 ? Math.ceil(total / PAGE_SIZE) : 1
+})
+
+// Visible page numbers for the paginator (always shows at most 5 buttons)
+const visiblePages = computed(() => {
+	const total = totalPages.value
+	const cur   = currentPage.value
+	if (total <= 7) return Array.from({ length: total }, (_, i) => i + 1)
+
+	const pages = new Set([1, total])
+	for (let i = Math.max(1, cur - 1); i <= Math.min(total, cur + 1); i++) pages.add(i)
+	if (cur - 2 > 2)     pages.add('..l')
+	if (cur + 2 < total) pages.add('..r')
+	return [...pages].sort((a, b) =>
+		typeof a === 'number' && typeof b === 'number' ? a - b
+		: typeof a === 'number' ? -1 : 1
+	)
 })
 
-// Computed totals
-const totalGrandTotal = computed(() => {
-	return shifts.value.reduce((sum, s) => sum + Number.parseFloat(s.sales_total || 0), 0)
+// FIX #11: server-side aggregate totals (avoid client-side computation over
+// a LIMIT-truncated page). Initialised to zeros; updated on each successful load.
+const serverTotals = ref({
+	total_sales: 0,
+	total_cash_diff: 0,
+	total_shifts: 0,
 })
 
-const totalCashDiff = computed(() => {
-	return shifts.value.reduce((sum, s) => sum + Number.parseFloat(s.difference || 0), 0)
+// Initialize date filters once on mount; profile + shift loading is deferred
+// to the show-watcher so it only fires when the dialog is actually opened.
+const filters = reactive({
+	from_date: "",
+	to_date: "",
 })
 
-// Initialize filters and load profiles
 onMounted(() => {
 	const today = new Date()
 	const startOfMonth = new Date(today.getFullYear(), today.getMonth(), 1)
-	
+
 	filters.from_date = startOfMonth.toISOString().split('T')[0]
 	filters.to_date = today.toISOString().split('T')[0]
-
-	loadProfiles()
-	if (show.value) {
-		loadShifts()
-	}
 })
 
-async function loadProfiles() {
-	try {
-		const res = await fetch("/api/method/frappe.client.get_list", {
-			method: "POST",
-			headers: { "Content-Type": "application/json" },
-			body: JSON.stringify({
-				doctype: "POS Profile",
-				filters: { disabled: 0 },
-				fields: ["name"]
-			})
-		})
-		const data = await res.json()
-		posProfiles.value = data.message || []
-	} catch (e) {
-		console.error("Failed to load profiles", e)
+
+/**
+ * Safely encode a single CSV field per RFC 4180 + OWASP formula-injection rules.
+ *
+ * Rules applied in order:
+ *  1. Coerce to string; null/undefined → empty string.
+ *  2. OWASP formula-injection guard: if the value starts with one of the
+ *     dangerous leading characters (=, +, -, @, TAB, CR) that spreadsheet
+ *     apps treat as formula starters, prepend a single TAB character.
+ *     This breaks the formula trigger while keeping the cell readable.
+ *  3. RFC 4180 quoting: always wrap the field in double-quotes and escape
+ *     any embedded double-quote by doubling it ("").
+ *
+ * @param {*} value - Raw cell value.
+ * @returns {string} - RFC 4180 quoted cell string.
+ */
+function csvEscape(value) {
+	const FORMULA_PREFIX = /^[=+\-@\t\r]/
+	let str = (value == null || value === undefined) ? '' : String(value)
+
+	// Strip bare \r or \r\n inside values; keep \n (will be inside quotes, safe in RFC 4180)
+	str = str.replace(/\r\n?/g, '\n')
+
+	// OWASP: neutralise formula-injection trigger characters at start of cell
+	if (FORMULA_PREFIX.test(str)) {
+		str = '\t' + str
 	}
+
+	// RFC 4180: always quote, escape internal double-quotes by doubling
+	return '"' + str.replace(/"/g, '""') + '"'
 }
 
+/**
+ * Download shift history as a properly encoded CSV file.
+ *
+ * Uses Blob + URL.createObjectURL (best practice):
+ *  - No 2 MB data-URI size cap.
+ *  - Binary-safe: UTF-8 BOM ensures Excel opens with correct encoding
+ *    without requiring a manual import wizard.
+ *  - CRLF line endings (\r\n) per RFC 4180 — required by Excel on Windows.
+ *  - Memory is released immediately via revokeObjectURL after the click.
+ */
 function exportToCSV() {
-	if (shifts.value.length === 0) return
+	if (!shifts.value.length) return
 
 	const headers = [
-		__('Date'), 
-		__('POS Profile'), 
-		__('Cashier'), 
-		__('Open Time'), 
-		__('Close Time'), 
-		__('Opening Amount'), 
-		__('Closing Amount'), 
-		__('Total Sales'), 
-		__('Cash Difference')
+		__('Date'),
+		__('POS Profile'),
+		__('Cashier'),
+		__('Open Time'),
+		__('Close Time'),
+		__('Opening Amount'),
+		__('Closing Amount'),
+		__('Total Sales'),
+		__('Cash Difference'),
 	]
 
+	// Build rows — format display values for readability in the spreadsheet
 	const rows = shifts.value.map(s => [
-		s.date,
-		s.pos_profile,
-		s.cashier,
-		s.open_time,
-		s.close_time || '-',
-		s.opening_amount,
-		s.closing_amount,
-		s.sales_total,
-		s.difference
+		s.date || '',
+		s.pos_profile || '',
+		s.cashier || '',
+		s.open_time  ? formatTime(s.open_time)  : '',
+		s.close_time ? formatTime(s.close_time) : '',
+		s.opening_amount ?? 0,
+		s.closing_amount ?? 0,
+		s.sales_total    ?? 0,
+		s.difference     ?? 0,
 	])
 
-	let csvContent = "data:text/csv;charset=utf-8," 
-		+ headers.join(",") + "\n"
-		+ rows.map(e => e.join(",")).join("\n");
-
-	const encodedUri = encodeURI(csvContent);
-	const link = document.createElement("a");
-	link.setAttribute("href", encodedUri);
-	link.setAttribute("download", `POS_Shift_History_${filters.from_date}_to_${filters.to_date}.csv`);
-	document.body.appendChild(link);
-	link.click();
-	document.body.removeChild(link);
+	// RFC 4180: CRLF between records; header row first
+	const CRLF = '\r\n'
+	const csvLines = [
+		headers.map(csvEscape).join(','),
+		...rows.map(row => row.map(csvEscape).join(',')),
+	].join(CRLF)
+
+	// UTF-8 BOM (EF BB BF) — tells Excel this is UTF-8, preventing mojibake
+	const BOM = '\uFEFF'
+	const blob = new Blob([BOM + csvLines], { type: 'text/csv;charset=utf-8;' })
+
+	// Create a temporary object URL, trigger download, then revoke immediately
+	const url = URL.createObjectURL(blob)
+	const link = document.createElement('a')
+	link.href = url
+	link.download = `POS_Shift_History_${filters.from_date}_to_${filters.to_date}.csv`
+	link.style.display = 'none'
+	document.body.appendChild(link)
+	link.click()
+	document.body.removeChild(link)
+	// Release the object URL from memory — must happen after the click
+	URL.revokeObjectURL(url)
 }
 
-function viewShift(shift) {
-	const doctype = shift.closing_shift_name ? 'pos-closing-shift' : 'pos-opening-shift'
-	const name = shift.closing_shift_name || shift.opening_shift_name
-	window.open(`/app/${doctype}/${name}`, '_blank')
+// FIX #17: replaced the old viewShift() that always opened the closing shift
+// (if it existed) with openShiftDoc() that lets the user pick explicitly.
+function openShiftDoc(shift, type) {
+	if (type === 'closing' && shift.closing_shift_name) {
+		window.open(`/app/pos-closing-shift/${shift.closing_shift_name}`, '_blank')
+	} else {
+		window.open(`/app/pos-opening-shift/${shift.opening_shift_name}`, '_blank')
+	}
 }
 
 function formatCurrency(amount) {
@@ -345,12 +457,28 @@ const shiftsResource = createResource({
 	url: "pos_next.api.shifts.get_shift_history",
 	makeParams() {
 		return {
-			filters: JSON.stringify(filters)
+			filters: JSON.stringify(filters),
+			limit:  PAGE_SIZE,
+			offset: (currentPage.value - 1) * PAGE_SIZE,
 		}
 	},
 	auto: false,
-	onSuccess(data) {
-		shifts.value = data || []
+	onSuccess(response) {
+		if (response && typeof response === 'object' && !Array.isArray(response) && response.rows) {
+			shifts.value = response.rows || []
+			serverTotals.value = {
+				total_sales:     response.totals?.total_sales     ?? 0,
+				total_cash_diff: response.totals?.total_cash_diff ?? 0,
+				total_shifts:    response.totals?.total_shifts    ?? shifts.value.length,
+			}
+		} else {
+			shifts.value = response || []
+			serverTotals.value = {
+				total_sales:     shifts.value.reduce((s, r) => s + (r.sales_total || 0), 0),
+				total_cash_diff: shifts.value.reduce((s, r) => s + (r.difference  || 0), 0),
+				total_shifts:    shifts.value.length,
+			}
+		}
 	},
 	onError(error) {
 		console.error("Error loading shifts:", error)
@@ -358,12 +486,19 @@ const shiftsResource = createResource({
 	},
 })
 
+// Navigate to a specific page (1-indexed)
+function goToPage(page) {
+	const p = Number(page)
+	if (!Number.isInteger(p) || p < 1 || p > totalPages.value) return
+	currentPage.value = p
+	shiftsResource.reload()
+}
+
 watch(
 	() => props.modelValue,
 	(val) => {
 		show.value = val
-		if (val && props.posProfile) {
-			filters.pos_profile = props.posProfile
+		if (val) {
 			shiftsResource.reload()
 		}
 	},
@@ -373,10 +508,10 @@ watch(show, (val) => {
 	emit("update:modelValue", val)
 })
 
+// loadShifts always returns to page 1 (filter changed)
 function loadShifts() {
-	if (props.posProfile) {
-		shiftsResource.reload()
-	}
+	currentPage.value = 1
+	shiftsResource.reload()
 }
 
 </script>
diff --git a/pos_next/api/shifts.py b/pos_next/api/shifts.py
index ae4f629b..a452d700 100644
--- a/pos_next/api/shifts.py
+++ b/pos_next/api/shifts.py
@@ -6,7 +6,7 @@
 import json
 import frappe
 from frappe import _
-from frappe.utils import nowdate, nowtime, get_datetime
+from frappe.utils import nowdate, nowtime, get_datetime, flt, cint
 from pos_next.api.utilities import get_wallet_payment_modes
 
 
@@ -183,58 +183,133 @@ def submit_closing_shift(closing_shift):
 		frappe.log_error(frappe.get_traceback(), "Submit Closing Shift Error")
 		frappe.throw(_("Error submitting closing shift: {0}").format(str(e)))
 
+
 @frappe.whitelist()
-def get_shift_history(filters=None):
-    if isinstance(filters, str):
-        filters = json.loads(filters)
-    
-    conditions = []
-    values = {}
-    
-    if filters:
-        if filters.get('pos_profile'):
-            conditions.append("os.pos_profile = %(pos_profile)s")
-            values['pos_profile'] = filters.get('pos_profile')
-            
-        if filters.get('from_date'):
-            conditions.append("os.posting_date >= %(from_date)s")
-            values['from_date'] = filters.get('from_date')
-            
-        if filters.get('to_date'):
-            conditions.append("os.posting_date <= %(to_date)s")
-            values['to_date'] = filters.get('to_date')
-            
-    where_clause = " AND ".join(conditions)
-    if where_clause:
-        where_clause = " WHERE " + where_clause
-        
-    query = f"""
-        SELECT 
-            os.name as opening_shift_name,
-            cs.name as closing_shift_name,
-            os.posting_date as date,
-            os.pos_profile,
-            os.user as cashier,
-            os.period_start_date as open_time,
-            cs.period_end_date as close_time,
-            (SELECT SUM(amount) FROM `tabPOS Opening Shift Detail` WHERE parent = os.name) as opening_amount,
-            (SELECT SUM(closing_amount) FROM `tabPOS Closing Shift Detail` WHERE parent = cs.name) as closing_amount,
-            cs.grand_total as sales_total,
-            (SELECT SUM(difference) FROM `tabPOS Closing Shift Detail` WHERE parent = cs.name) as difference
-        FROM `tabPOS Opening Shift` os
-        LEFT JOIN `tabPOS Closing Shift` cs ON cs.pos_opening_shift = os.name
-        {where_clause}
-        ORDER BY os.posting_date DESC, os.period_start_date DESC
-    """
-    
-    data = frappe.db.sql(query, values, as_dict=True)
-    
-    # Ensure safe flt values and maintain consistency
-    for row in data:
-        from frappe.utils import flt
-        row.opening_amount = flt(row.opening_amount)
-        row.closing_amount = flt(row.closing_amount)
-        row.sales_total = flt(row.sales_total)
-        row.difference = flt(row.difference)
-        
-    return data
+def get_shift_history(filters=None, limit=25, offset=0):
+	"""Return paginated shift history for the current session user only.
+
+	Args:
+		filters: JSON string or dict with optional from_date / to_date.
+		limit:   Page size (default 25, max 100).
+		offset:  Number of records to skip (0-based, for page navigation).
+
+	Returns:
+		{
+		  "rows":   [...],          # Current page rows
+		  "totals": {               # Aggregates across ALL matching rows (no page cap)
+		      "total_shifts":   int,
+		      "total_sales":    float,
+		      "total_cash_diff": float,
+		  }
+		}
+
+	Security: The session user restriction is always enforced server-side.
+	Clients cannot override it by passing filters.
+	"""
+	if not frappe.has_permission("POS Opening Shift", "read"):
+		frappe.throw(_("Insufficient permissions to view shift history"))
+
+	if isinstance(filters, str):
+		filters = json.loads(filters)
+
+	# Clamp page size: minimum 1, maximum 100
+	page_size   = max(1, min(cint(limit) or 25, 100))
+	page_offset = max(0, cint(offset) or 0)
+
+	# Mandatory WHERE conditions — user is always enforced server-side
+	conditions = [
+		"os.docstatus = 1",
+		"os.user = %(session_user)s",
+	]
+	values = {
+		"session_user": frappe.session.user,
+		"limit":        page_size,
+		"offset":       page_offset,
+	}
+
+	if filters:
+		if filters.get("from_date"):
+			conditions.append("os.posting_date >= %(from_date)s")
+			values["from_date"] = filters["from_date"]
+
+		if filters.get("to_date"):
+			conditions.append("os.posting_date <= %(to_date)s")
+			values["to_date"] = filters["to_date"]
+
+	where_clause = "WHERE " + " AND ".join(conditions)
+
+	# ── Rows query (paginated) ────────────────────────────────────────────────
+	# Pre-aggregated LEFT JOINs replace 3 correlated subqueries per row.
+	rows_query = f"""
+		SELECT
+			os.name            AS opening_shift_name,
+			cs.name            AS closing_shift_name,
+			os.posting_date    AS date,
+			os.pos_profile,
+			os.user            AS cashier,
+			os.period_start_date AS open_time,
+			cs.period_end_date   AS close_time,
+			COALESCE(osd.opening_amount, 0) AS opening_amount,
+			COALESCE(csd.closing_amount, 0) AS closing_amount,
+			COALESCE(cs.grand_total,     0) AS sales_total,
+			COALESCE(csd.difference,     0) AS difference
+		FROM `tabPOS Opening Shift` os
+		LEFT JOIN `tabPOS Closing Shift` cs
+			ON cs.pos_opening_shift = os.name
+		LEFT JOIN (
+			SELECT parent, SUM(amount) AS opening_amount
+			FROM `tabPOS Opening Shift Detail`
+			GROUP BY parent
+		) osd ON osd.parent = os.name
+		LEFT JOIN (
+			SELECT
+				parent,
+				SUM(closing_amount) AS closing_amount,
+				SUM(difference)     AS difference
+			FROM `tabPOS Closing Shift Detail`
+			GROUP BY parent
+		) csd ON csd.parent = cs.name
+		{where_clause}
+		ORDER BY os.posting_date DESC, os.period_start_date DESC
+		LIMIT %(limit)s OFFSET %(offset)s
+	"""
+
+	data = frappe.db.sql(rows_query, values, as_dict=True)
+
+	for row in data:
+		row.opening_amount = flt(row.opening_amount)
+		row.closing_amount = flt(row.closing_amount)
+		row.sales_total    = flt(row.sales_total)
+		row.difference     = flt(row.difference)
+
+	# ── Totals query (no LIMIT) ───────────────────────────────────────────────
+	# Runs across the full filter set so summary cards are always accurate
+	# regardless of which page the user is viewing.
+	totals_query = f"""
+		SELECT
+			COUNT(*)                              AS total_shifts,
+			COALESCE(SUM(cs.grand_total),    0)   AS total_sales,
+			COALESCE(SUM(csd_t.difference),  0)   AS total_cash_diff
+		FROM `tabPOS Opening Shift` os
+		LEFT JOIN `tabPOS Closing Shift` cs
+			ON cs.pos_opening_shift = os.name
+		LEFT JOIN (
+			SELECT parent, SUM(difference) AS difference
+			FROM `tabPOS Closing Shift Detail`
+			GROUP BY parent
+		) csd_t ON csd_t.parent = cs.name
+		{where_clause}
+	"""
+	# Exclude pagination keys from totals query values
+	totals_values = {k: v for k, v in values.items() if k not in ("limit", "offset")}
+	totals_row = frappe.db.sql(totals_query, totals_values, as_dict=True)
+	totals = totals_row[0] if totals_row else {}
+
+	return {
+		"rows": data,
+		"totals": {
+			"total_shifts":    int(totals.get("total_shifts",    len(data))),
+			"total_sales":     flt(totals.get("total_sales",     0)),
+			"total_cash_diff": flt(totals.get("total_cash_diff", 0)),
+		},
+	}