fix: ensure clean state on logout and login

- Fix ShiftOpeningDialog to trigger initDialog on mount when already open using immediate watcher
- Add resetAllDialogs method to clear all dialog states on logout
- Fix PaymentDialog to use dynamic makeParams and guard against null posProfile
- Add customer clearing to useInvoice clearCart function
- Clear cart and dialogs on both logout and login page mount
- Add backend validation for pos_profile parameter in get_payment_methods
- Ensure router navigation to login page on logout

Author: Ahmed Osama

POS/src/components/ShiftOpeningDialog.vue

@@ -235,13 +235,19 @@ const paymentMethods = computed(() => {
 })
 
 // Watch dialog open state
-watch(open, (isOpen) => {
-  if (isOpen) {
-    initDialog()
-  } else {
-    resetDialog()
-  }
-})
+// Use { immediate: true } to ensure initDialog runs even when
+// the component mounts with open already true (e.g., after logout with dialog open)
+watch(
+	open,
+	(isOpen) => {
+		if (isOpen) {
+			initDialog()
+		} else {
+			resetDialog()
+		}
+	},
+	{ immediate: true }
+)
 
 watch(showClosingDialog, (isOpen) => {
 	closingExistingShift.value = isOpen
@@ -252,13 +258,24 @@ watch(showClosingDialog, (isOpen) => {
 
 async function initDialog() {
   step.value = 1
-  profilesResource.fetch()
+  selectedProfile.value = null
+  existingShift.value = null
+  openingBalances.value = {}
+  dialogDataResource.reset()
 
-  // Check if user already has an open shift
-  const checkResult = await checkOpeningShift.fetch()
-  if (checkResult) {
-    existingShift.value = checkResult
-    step.value = 3
+  try {
+    // Await profile fetch to ensure data is loaded before proceeding
+    await profilesResource.fetch()
+
+    // Check if user already has an open shift
+    const checkResult = await checkOpeningShift.fetch()
+    if (checkResult) {
+      existingShift.value = checkResult
+      step.value = 3
+    }
+  } catch (error) {
+    console.error("Error initializing shift dialog:", error)
+    // Error will be displayed via profilesResource.error in the UI
   }
 }
 
@@ -267,6 +284,9 @@ function resetDialog() {
   selectedProfile.value = null
   openingBalances.value = {}
   existingShift.value = null
+  profilesResource.reset()
+  dialogDataResource.reset()
+  createShiftResource.reset()
 }
 
 function selectPosProfile(profile) {

POS/src/components/sale/PaymentDialog.vue

@@ -240,8 +240,10 @@ const paymentEntries = ref([])
 
 const paymentMethodsResource = createResource({
 	url: "pos_next.api.pos_profile.get_payment_methods",
-	params: {
-		pos_profile: props.posProfile,
+	makeParams() {
+		return {
+			pos_profile: props.posProfile,
+		}
 	},
 	auto: false,
 	onSuccess(data) {
@@ -256,6 +258,12 @@ const paymentMethodsResource = createResource({
 
 // Load payment methods - from cache if offline, from server if online
 async function loadPaymentMethods() {
+	// Guard: Don't load if posProfile is not set
+	if (!props.posProfile) {
+		console.warn("PaymentDialog: Cannot load payment methods - posProfile is not set")
+		return
+	}
+
 	if (props.isOffline) {
 		// Load from cache when offline
 		const cached = await getCachedPaymentMethods(props.posProfile)
@@ -268,7 +276,12 @@ async function loadPaymentMethods() {
 		}
 	} else {
 		// Load from server when online
-		paymentMethodsResource.reload()
+		// Use fetch() instead of reload() for proper initialization
+		try {
+			await paymentMethodsResource.fetch()
+		} catch (error) {
+			console.error("Error loading payment methods:", error)
+		}
 	}
 }
 

POS/src/composables/useInvoice.js

@@ -629,6 +629,7 @@ export function useInvoice() {
 
 	async function clearCart() {
 		invoiceItems.value = []
+		customer.value = null
 		payments.value = []
 		additionalDiscount.value = 0
 		couponCode.value = null

POS/src/pages/Login.vue

@@ -96,13 +96,19 @@
 </template>
 
 <script setup>
-import { reactive, watch, ref } from "vue"
+import { reactive, watch, ref, onMounted } from "vue"
 import { useRouter } from "vue-router"
 import { session } from "../data/session"
 import ShiftOpeningDialog from "../components/ShiftOpeningDialog.vue"
 import { FeatherIcon } from "frappe-ui"
+import { useShift } from "../composables/useShift"
+import { usePOSCartStore } from "@/stores/posCart"
+import { usePOSUIStore } from "@/stores/posUI"
 
 const router = useRouter()
+const { shiftState } = useShift()
+const cartStore = usePOSCartStore()
+const uiStore = usePOSUIStore()
 
 const loginForm = reactive({
 	email: "",
@@ -112,6 +118,33 @@ const loginForm = reactive({
 const showShiftDialog = ref(false)
 const showPassword = ref(false)
 
+// Reset state when login page mounts
+onMounted(() => {
+	// Clear login form
+	loginForm.email = ""
+	loginForm.password = ""
+	showPassword.value = false
+	showShiftDialog.value = false
+
+	// Clear any login errors
+	if (session.login.error) {
+		session.login.reset()
+	}
+
+	// Clear cart and UI state to ensure clean slate
+	cartStore.clearCart()
+	uiStore.resetAllDialogs()
+
+	// Clear any stale shift state
+	shiftState.value = {
+		pos_opening_shift: null,
+		pos_profile: null,
+		company: null,
+		isOpen: false,
+	}
+	localStorage.removeItem("pos_shift_data")
+})
+
 function submit() {
 	if (!loginForm.email || !loginForm.password) {
 		return

POS/src/pages/POSSale.vue

@@ -904,6 +904,8 @@ function handleShiftClosed() {
 	// Check if logout should happen after closing shift
 	if (logoutAfterClose.value) {
 		logoutAfterClose.value = false
+		// Clear all dialog states to prevent stale state on next login
+		uiStore.resetAllDialogs()
 		session.logout.submit()
 	} else {
 		setTimeout(() => {
@@ -1279,7 +1281,10 @@ function getCurrentUser() {
 
 function confirmLogout() {
 	logoutAfterClose.value = false
-	uiStore.showLogoutDialog = false
+	// Clear cart to prevent stale items on next login
+	cartStore.clearCart()
+	// Clear all dialog states to prevent stale state on next login
+	uiStore.resetAllDialogs()
 	session.logout.submit()
 }
 

POS/src/stores/posUI.js

@@ -127,6 +127,28 @@ export const usePOSUIStore = defineStore('posUI', () => {
 		}
 	}
 
+	function resetAllDialogs() {
+		// Close all dialogs on logout to prevent stale state
+		showPaymentDialog.value = false
+		showCustomerDialog.value = false
+		showSuccessDialog.value = false
+		showOpenShiftDialog.value = false
+		showCloseShiftDialog.value = false
+		showDraftDialog.value = false
+		showReturnDialog.value = false
+		showCouponDialog.value = false
+		showOffersDialog.value = false
+		showBatchSerialDialog.value = false
+		showHistoryDialog.value = false
+		showOfflineInvoicesDialog.value = false
+		showCreateCustomerDialog.value = false
+		showClearCartDialog.value = false
+		showLogoutDialog.value = false
+		showItemSelectionDialog.value = false
+		showErrorDialog.value = false
+		clearError()
+	}
+
 	return {
 		// State
 		isLoading,
@@ -177,5 +199,6 @@ export const usePOSUIStore = defineStore('posUI', () => {
 		setResizing,
 		updateLayoutBounds,
 		clampLeftPanelWidth,
+		resetAllDialogs,
 	}
 })

pos_next/api/pos_profile.py

@@ -59,6 +59,10 @@ def get_pos_profile_data(pos_profile):
 def get_payment_methods(pos_profile):
 	"""Get available payment methods from POS Profile"""
 	try:
+		# Validate pos_profile parameter
+		if not pos_profile:
+			frappe.throw(_("POS Profile is required"))
+
 		payment_methods = frappe.get_list(
 			"POS Payment Method",
 			filters={"parent": pos_profile},