{
localStorage.setItem('lastTransaction', JSON.stringify(transaction));
diff --git a/src/pages/Transactions.js b/src/pages/Transactions.js
index a57ad12..39ffb28 100644
--- a/src/pages/Transactions.js
+++ b/src/pages/Transactions.js
@@ -18,7 +18,7 @@ import ButtonWithReplica from "../components/ButtonWithReplica";
dayjs.extend(utc);
dayjs.extend(timezone);
-export default function Transactions({ shop, shopId, propsShopId, sendParam, deviceType, paymentUrl }) {
+export default function Transactions({ shop, shopId, propsShopId, sendParam, deviceType, paymentUrl, setModal }) {
const { shopIdentifier, tableId } = useParams();
if (sendParam) sendParam({ shopIdentifier, tableId });
@@ -26,13 +26,13 @@ export default function Transactions({ shop, shopId, propsShopId, sendParam, dev
const [isPaymentLoading, setIsPaymentLoading] = useState(false);
const [isPaymentOpen, setIsPaymentOpen] = useState(false);
const [searchTerm, setSearchTerm] = useState('');
-const [matchedItems, setMatchedItems] = useState([]);
+ const [matchedItems, setMatchedItems] = useState([]);
const [loading, setLoading] = useState(false);
-useEffect(() => {
- setMatchedItems(searchAndAggregateItems(transactions, searchTerm));
-}, [searchTerm, transactions]);
+ useEffect(() => {
+ setMatchedItems(searchAndAggregateItems(transactions, searchTerm));
+ }, [searchTerm, transactions]);
useEffect(() => {
@@ -40,9 +40,13 @@ useEffect(() => {
try {
setLoading(true);
let response = await getTransactionsFromCafe(shopId || propsShopId, 5, false);
-
+
setLoading(false);
if (response) setTransactions(response);
+
+
+ // response = await getMyTransactions(shopId || propsShopId, 5);
+ // setMyTransactions(response);
} catch (error) {
console.error("Error fetching transactions:", error);
}
@@ -62,38 +66,38 @@ useEffect(() => {
return grandTotal + calculateTotalPrice(transaction.DetailedTransactions);
}, 0);
};
-const searchAndAggregateItems = (transactions, searchTerm) => {
- if (!searchTerm.trim()) return [];
+ const searchAndAggregateItems = (transactions, searchTerm) => {
+ if (!searchTerm.trim()) return [];
- const normalizedTerm = searchTerm.trim().toLowerCase();
- const aggregatedItems = new Map();
+ const normalizedTerm = searchTerm.trim().toLowerCase();
+ const aggregatedItems = new Map();
- transactions.forEach(transaction => {
- transaction.DetailedTransactions.forEach(detail => {
- const itemName = detail.Item.name;
- const itemNameLower = itemName.toLowerCase();
+ transactions.forEach(transaction => {
+ transaction.DetailedTransactions.forEach(detail => {
+ const itemName = detail.Item.name;
+ const itemNameLower = itemName.toLowerCase();
- if (itemNameLower.includes(normalizedTerm)) {
- const key = detail.itemId;
+ if (itemNameLower.includes(normalizedTerm)) {
+ const key = detail.itemId;
- if (!aggregatedItems.has(key)) {
- aggregatedItems.set(key, {
- itemId: detail.itemId,
- name: itemName,
- totalQty: 0,
- totalPrice: 0,
- });
+ if (!aggregatedItems.has(key)) {
+ aggregatedItems.set(key, {
+ itemId: detail.itemId,
+ name: itemName,
+ totalQty: 0,
+ totalPrice: 0,
+ });
+ }
+
+ const current = aggregatedItems.get(key);
+ current.totalQty += detail.qty;
+ current.totalPrice += detail.qty * (detail.promoPrice || detail.price);
}
-
- const current = aggregatedItems.get(key);
- current.totalQty += detail.qty;
- current.totalPrice += detail.qty * (detail.promoPrice || detail.price);
- }
+ });
});
- });
- return Array.from(aggregatedItems.values());
-};
+ return Array.from(aggregatedItems.values());
+ };
const handleConfirm = async (transactionId) => {
@@ -103,7 +107,7 @@ const searchAndAggregateItems = (transactions, searchTerm) => {
if (result) {
setTransactions(prev =>
prev.map(t =>
- t.transactionId === transactionId ? { ...t, confirmed: 1 } : t
+ t.transactionId === transactionId ? result : t
)
);
}
@@ -148,35 +152,35 @@ const searchAndAggregateItems = (transactions, searchTerm) => {
setSearchTerm(e.target.value)}
- style={{ border:'0px',height: '42px',borderRadius: '15px', margin: '7px auto 10px', width: '88%', paddingLeft: '8px' }}
-/>
+ type="text"
+ placeholder="Cari nama item..."
+ value={searchTerm}
+ onChange={(e) => setSearchTerm(e.target.value)}
+ style={{ border: '0px', height: '42px', borderRadius: '15px', margin: '7px auto 10px', width: '88%', paddingLeft: '8px' }}
+ />
{/* Existing Transactions List (keep all your JSX below unchanged) */}
-{matchedItems.length > 0 && matchedItems.map(item => (
-
-
- -
- {item.name} x {item.totalQty}
-
-
-
- Total:
- Rp {item.totalPrice}
-
-
-))}
+ {matchedItems.length > 0 && matchedItems.map(item => (
+
+
+ -
+ {item.name} x {item.totalQty}
+
+
+
+ Total:
+ Rp {item.totalPrice}
+
+
+ ))}
{transactions &&
transactions.map((transaction) => (
{
{transaction.confirmed === 1 ? (
- ) : transaction.confirmed === -1 || transaction.confirmed === -2 ? (
+ ) : transaction.confirmed === -1 && !transaction.is_paid || transaction.confirmed === -2 && !transaction.is_paid ? (
- ) : transaction.confirmed === 2 ? (
+ ) : transaction.confirmed === 2 && !transaction.is_paid ? (
- ) : transaction.confirmed === 3 ? (
+ ) : transaction.confirmed === 3 || transaction.is_paid ? (