Skip to content

feat(booking): add list selection for web scanner and camera checkout for mobile #2788

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Open
Pallavikumarimdb wants to merge 3 commits into
base: main
Choose a base branch
from
Open

feat(booking): add list selection for web scanner and camera checkout for mobile #2788

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d01d3f4
feat(booking): add list selection for web scanner and camera checkout…
Pallavikumarimdb Jul 31, 2026
7ee9572
revert(auth): accidental dev login bypass changes
Pallavikumarimdb Jul 31, 2026
3cb56aa
feat(mobile): align kit scan eligibility and conditional navigation f…
Pallavikumarimdb Aug 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
95 changes: 63 additions & 32 deletions apps/companion/app/(tabs)/bookings/[id].tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1372,42 +1372,73 @@ export default function BookingDetailScreen() {
after the booking has gone ONGOING (canPartialCheckout, not
canCheckout) so the user can keep taking the rest. */}
{canPartialCheckout && (
<TouchableOpacity
style={[
styles.actionButtonOutline,
selectMode === "checkout" && styles.actionButtonOutlineActive,
]}
onPress={() => {
setSelectMode(selectMode === "checkout" ? null : "checkout");
setSelectedAssetIds(new Set());
}}
accessibilityLabel={
selectMode === "checkout"
? "Cancel selection"
: "Select assets to check out"
}
accessibilityRole="button"
>
<Ionicons
name={
selectMode === "checkout" ? "close" : "checkbox-outline"
}
size={18}
color={
selectMode === "checkout"
? colors.error
: colors.buttonSecondaryText
<>
<TouchableOpacity
style={styles.actionButtonOutline}
onPress={() =>
router.push(
`/(tabs)/scanner?bookingId=${
booking.id
}&bookingName=${encodeURIComponent(
booking.name
)}&bookingAction=checkout`
)
}
/>
<Text
accessibilityLabel="Scan assets to check out"
accessibilityRole="button"
>
<Ionicons
name="scan"
size={18}
color={colors.buttonSecondaryText}
/>
<Text style={styles.actionButtonOutlineText}>
Scan to Check Out
</Text>
</TouchableOpacity>

<TouchableOpacity
style={[
styles.actionButtonOutlineText,
selectMode === "checkout" && { color: colors.error },
styles.actionButtonOutline,
selectMode === "checkout" &&
styles.actionButtonOutlineActive,
]}
onPress={() => {
setSelectMode(
selectMode === "checkout" ? null : "checkout"
);
setSelectedAssetIds(new Set());
}}
accessibilityLabel={
selectMode === "checkout"
? "Cancel selection"
: "Select assets to check out"
}
accessibilityRole="button"
>
{selectMode === "checkout" ? "Cancel" : "Select to Check Out"}
</Text>
</TouchableOpacity>
<Ionicons
name={
selectMode === "checkout" ? "close" : "checkbox-outline"
}
size={18}
color={
selectMode === "checkout"
? colors.error
: colors.buttonSecondaryText
}
/>
<Text
style={[
styles.actionButtonOutlineText,
selectMode === "checkout" && { color: colors.error },
]}
>
{selectMode === "checkout"
? "Cancel"
: "Select to Check Out"}
</Text>
</TouchableOpacity>
</>
)}

{/* Book-by-model: a RESERVED booking with unfulfilled reservations
Expand Down
175 changes: 147 additions & 28 deletions apps/companion/app/(tabs)/scanner.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,7 @@ function ScannerContent() {
// all the add-mode scan capture / blockers / list rendering apply to both.
const isBookingAddMode =
isBookingMode && (bookingAction === "add" || bookingAction === "fulfil");
const isBookingCheckoutMode = isBookingMode && bookingAction === "checkout";
Comment thread
coderabbitai[bot] marked this conversation as resolved.

// Filter scanner actions based on the user's role in the current org
const availableActions = useMemo(
Expand Down Expand Up @@ -1272,30 +1273,59 @@ function ScannerContent() {
return;
}

if (bookingCtx.checkedInAssetIds.has(asset.id)) {
flashFrame("error");
Haptics.notificationAsync(Haptics.NotificationFeedbackType.Warning);
setScanResult({
type: "error",
title: "Already Checked In",
message: `"${asset.title}" has already been checked in for this booking.`,
});
finalizeScan();
return;
}
if (isBookingCheckoutMode) {
if (asset.status === "CHECKED_OUT") {
flashFrame("error");
Haptics.notificationAsync(
Haptics.NotificationFeedbackType.Warning
);
setScanResult({
type: "error",
title: "Already Checked Out",
message: `"${asset.title}" is already checked out.`,
});
finalizeScan();
return;
}
if (asset.status === "IN_CUSTODY") {
flashFrame("error");
Haptics.notificationAsync(Haptics.NotificationFeedbackType.Error);
setScanResult({
type: "error",
title: "In Custody",
message: `"${asset.title}" is currently in custody.`,
});
finalizeScan();
return;
}
} else {
if (bookingCtx.checkedInAssetIds.has(asset.id)) {
flashFrame("error");
Haptics.notificationAsync(
Haptics.NotificationFeedbackType.Warning
);
setScanResult({
type: "error",
title: "Already Checked In",
message: `"${asset.title}" has already been checked in for this booking.`,
});
finalizeScan();
return;
}

if (asset.status !== "CHECKED_OUT") {
flashFrame("error");
Haptics.notificationAsync(Haptics.NotificationFeedbackType.Error);
setScanResult({
type: "error",
title: "Not Checked Out",
message: `"${asset.title}" is ${asset.status
.replace(/_/g, " ")
.toLowerCase()}, not checked out.`,
});
finalizeScan();
return;
if (asset.status !== "CHECKED_OUT") {
flashFrame("error");
Haptics.notificationAsync(Haptics.NotificationFeedbackType.Error);
setScanResult({
type: "error",
title: "Not Checked Out",
message: `"${asset.title}" is ${asset.status
.replace(/_/g, " ")
.toLowerCase()}, not checked out.`,
});
finalizeScan();
return;
}
}

setBookingCheckinItems((prev) => [newItem, ...prev]);
Expand All @@ -1305,9 +1335,9 @@ function ScannerContent() {
setScanResult({
type: "success",
title: asset.title,
message: `Added to check-in (${
bookingCheckinItems.length + 1
} items)`,
message: isBookingCheckoutMode
? `Added to check-out (${bookingCheckinItems.length + 1} items)`
: `Added to check-in (${bookingCheckinItems.length + 1} items)`,
});

setTimeout(() => setScanResult(null), 1200);
Expand Down Expand Up @@ -2000,6 +2030,76 @@ function ScannerContent() {
);
};

const handleBookingCheckout = () => {
if (!bookingId || !currentOrg || bookingCheckinItems.length === 0) return;

const count = bookingCheckinItems.length;
Alert.alert(
"Check Out Assets",
`Check out ${count} ${count === 1 ? "asset" : "assets"} for "${
bookingName || "this booking"
}"?`,
[
{ text: "Cancel", style: "cancel" },
{
text: "Check Out",
onPress: async () => {
setIsBookingSubmitting(true);
const assetIds = bookingCheckinItems.map((i) => i.targetId);
const timeZone = (() => {
try {
return (
Intl.DateTimeFormat().resolvedOptions().timeZone || "UTC"
);
} catch {
return "UTC";
}
})();

const { data: result, error } = await api.partialCheckoutBooking(
currentOrg.id,
bookingId,
assetIds,
timeZone
);
setIsBookingSubmitting(false);

if (error) {
Alert.alert("Error", error);
return;
}

Haptics.notificationAsync(Haptics.NotificationFeedbackType.Success);
playScanSound();
const msg = result?.isComplete
? `All assets checked out! "${
bookingName || "Booking"
}" is now ongoing.`
: `${
result?.checkedOutCount ?? bookingCheckinItems.length
} checked out, ${result?.remainingCount ?? "some"} remaining.`;
Alert.alert("Checked Out", msg, [
{
text: "OK",
onPress: () => {
setBookingCheckinItems([]);
lastScanRef.current = "";
markBookingDirty(bookingId);
InteractionManager.runAfterInteractions(() => {
pushIntoTab(
"/(tabs)/bookings",
`/(tabs)/bookings/${bookingId}`
);
});
},
},
]);
},
},
]
);
};
Comment thread
coderabbitai[bot] marked this conversation as resolved.

// ── Permission states ───────────────────────────────

if (!permission) {
Expand Down Expand Up @@ -2126,10 +2226,15 @@ function ScannerContent() {
? "Fulfil & Check Out"
: isBookingAddMode
? "Add to Booking"
: isBookingCheckoutMode
? "Booking Check-Out"
: "Booking Check-In"}
</Text>
<Text style={styles.bookingModeName} numberOfLines={1}>
{bookingName || "Scan assets to check in"}
{bookingName ||
(isBookingCheckoutMode
? "Scan assets to check out"
: "Scan assets to check in")}
</Text>
{isBookingFulfilMode &&
bookingCtx &&
Expand Down Expand Up @@ -2222,6 +2327,8 @@ function ScannerContent() {
? "Scan the reserved units to assign"
: isBookingAddMode
? "Scan assets or kits to add"
: isBookingCheckoutMode
? "Scan assets to check out"
: "Scan assets to check in"
: instructionMap[action]}
</Text>
Expand Down Expand Up @@ -2383,7 +2490,7 @@ function ScannerContent() {
/>
)}

{/* ── Booking Drawer (check-in / scan-to-add) ── */}
{/* ── Booking Drawer (check-in / check-out / scan-to-add) ── */}
{showBookingDrawer && (
<BatchDrawer
items={bookingCheckinItems}
Expand All @@ -2393,6 +2500,10 @@ function ScannerContent() {
? `${bookingCheckinItems.length} unit${
bookingCheckinItems.length > 1 ? "s" : ""
} scanned`
: isBookingCheckoutMode
? `${bookingCheckinItems.length} asset${
bookingCheckinItems.length > 1 ? "s" : ""
} to check out`
: `${bookingCheckinItems.length} asset${
bookingCheckinItems.length > 1 ? "s" : ""
} to check in`
Expand All @@ -2412,6 +2523,10 @@ function ScannerContent() {
} more to assign`
: isBookingAddMode
? "Add to Booking"
: isBookingCheckoutMode
? `Check Out ${bookingCheckinItems.length} ${
bookingCheckinItems.length === 1 ? "Asset" : "Assets"
}`
: `Check In ${bookingCheckinItems.length} ${
bookingCheckinItems.length === 1 ? "Asset" : "Assets"
}`
Expand All @@ -2421,6 +2536,8 @@ function ScannerContent() {
? "log-out-outline"
: isBookingAddMode
? "add-circle-outline"
: isBookingCheckoutMode
? "log-out-outline"
: "log-in-outline"
}
isSubmitting={isBookingSubmitting}
Expand All @@ -2431,6 +2548,8 @@ function ScannerContent() {
? handleBookingFulfil
: isBookingAddMode
? handleBookingAdd
: isBookingCheckoutMode
? handleBookingCheckout
: handleBookingCheckin
}
showStatus={isBookingAddMode}
Expand Down
Loading