ok

2025-02-15 12:21:47 +07:00
parent a7f350464c
commit 422398c65e
9 changed files with 241 additions and 186 deletions
--- a/src/pages/Cart.js
+++ b/src/pages/Cart.js
@@ -13,10 +13,19 @@ import {

 import { getItemsByCafeId } from "../helpers/cartHelpers.js";

+
+import { useNavigationHelpers } from "../helpers/navigationHelpers";
+
+
 export default function Invoice({ shopId, table, sendParam, deviceType, socket }) {
  const { shopIdentifier, tableCode } = useParams();
+  
  sendParam({ shopIdentifier, tableCode });

+  const {
+    goToShop
+  } = useNavigationHelpers(shopIdentifier, table.tableCode);
+
  const [cartItems, setCartItems] = useState([]);
  const [totalPrice, setTotalPrice] = useState(0);
  const [isPaymentLoading, setIsPaymentLoading] = useState(false); // State for payment button loading animation
@@ -144,7 +153,7 @@ export default function Invoice({ shopId, table, sendParam, deviceType, socket }
    console.log(localStorage.getItem('cart'))
    console.log(cartItems)

-    if(localStorage.getItem('cart') == "[]") return;
+    if (localStorage.getItem('cart') == "[]") return;

    // Parse the local storage cart
    const localStorageCart = JSON.parse(localStorage.getItem('cart'));
@@ -154,8 +163,8 @@ export default function Invoice({ shopId, table, sendParam, deviceType, socket }

    // Filter out items from cartItems that do not exist in the local storage cart
    const updatedCartItems = cartItems.map(itemType => ({
-        ...itemType,
-        itemList: itemType.itemList.filter(item => localStorageItemIds.has(item.itemId))
+      ...itemType,
+      itemList: itemType.itemList.filter(item => localStorageItemIds.has(item.itemId))
    }));

    setCartItems(updatedCartItems);
@@ -189,39 +198,39 @@ export default function Invoice({ shopId, table, sendParam, deviceType, socket }
    setEmail(event.target.value);
  };
  return (
-    <div className={styles.Invoice} style={{height: (getItemsByCafeId(shopId).length > 0 ? '': '100vh'), minHeight: (getItemsByCafeId(shopId).length > 0 ? 'calc(100vh - 210px)': '') }}>
-      
-      <div style={{ marginTop: "50px" }}></div>
-      <h2 className={styles["Invoice-title"]}>Keranjang</h2>
-      {getItemsByCafeId(shopId) < 1 ?
-      <div style={{height: '75vh', display:'flex', justifyContent: 'center', flexDirection: 'column', alignContent: 'center', alignItems: 'center'}}>
-        <div style={{width: '50%'}}>
-      <svg
-      viewBox="0 0 32 32"
-      style={{ fill: "#8F8787" }}
-    >
-      <path d="M9.79175 24.75C8.09591 24.75 6.72383 26.1375 6.72383 27.8333C6.72383 29.5292 8.09591 30.9167 9.79175 30.9167C11.4876 30.9167 12.8751 29.5292 12.8751 27.8333C12.8751 26.1375 11.4876 24.75 9.79175 24.75ZM0.541748 0.0833435V3.16668H3.62508L9.17508 14.8679L7.09383 18.645C6.84717 19.0767 6.70842 19.5854 6.70842 20.125C6.70842 21.8208 8.09591 23.2083 9.79175 23.2083H28.2917V20.125H10.4392C10.2234 20.125 10.0538 19.9554 10.0538 19.7396L10.1001 19.5546L11.4876 17.0417H22.973C24.1292 17.0417 25.1467 16.4096 25.6709 15.4538L31.1901 5.44834C31.3134 5.23251 31.3751 4.97043 31.3751 4.70834C31.3751 3.86043 30.6813 3.16668 29.8334 3.16668H7.03217L5.583 0.0833435H0.541748ZM25.2084 24.75C23.5126 24.75 22.1405 26.1375 22.1405 27.8333C22.1405 29.5292 23.5126 30.9167 25.2084 30.9167C26.9042 30.9167 28.2917 29.5292 28.2917 27.8333C28.2917 26.1375 26.9042 24.75 25.2084 24.75Z" />
-    </svg>
-    </div>
-    <h1 style={{fontSize: '120%', color :'#8F8787' }}>Tidak ada item di keranjang</h1>
-    </div>
-      :
-      <>
-      <div className={styles.RoundedRectangle}>
-        {cartItems.map((itemType) => (
-          <ItemLister
-            shopId={shopId}
-            forInvoice={true}
-            key={itemType.id}
-            typeName={itemType.typeName}
-            itemList={itemType.itemList}
-          />
-        ))}
+    <div className={styles.Invoice} style={{ height: (getItemsByCafeId(shopId).length > 0 ? '' : '100vh'), minHeight: (getItemsByCafeId(shopId).length > 0 ? '100vh' : '') }}>

-{table.tableNo != null && (
-        <div className={styles.OrderTypeContainer}>
-            <span htmlFor="orderType">Diantar ke {table.tableNo}</span>
-          {/* <select
+      <div onClick={goToShop} style={{ marginLeft: '22px', marginTop: '49px', marginRight: '10px', display: 'flex', flexWrap: 'nowrap', alignItems: 'center', fontSize: '25px' }} ><svg xmlns="http://www.w3.org/2000/svg" width="30" height="30" viewBox="0 0 512 512"><path d="M48,256c0,114.87,93.13,208,208,208s208-93.13,208-208S370.87,48,256,48,48,141.13,48,256Zm212.65-91.36a16,16,0,0,1,.09,22.63L208.42,240H342a16,16,0,0,1,0,32H208.42l52.32,52.73A16,16,0,1,1,238,347.27l-79.39-80a16,16,0,0,1,0-22.54l79.39-80A16,16,0,0,1,260.65,164.64Z" /></svg>Keranjang</div>
+
+      {getItemsByCafeId(shopId) < 1 ?
+        <div style={{ height: '75vh', display: 'flex', justifyContent: 'center', flexDirection: 'column', alignContent: 'center', alignItems: 'center' }}>
+          <div style={{ width: '50%' }}>
+            <svg
+              viewBox="0 0 32 32"
+              style={{ fill: "#8F8787" }}
+            >
+              <path d="M9.79175 24.75C8.09591 24.75 6.72383 26.1375 6.72383 27.8333C6.72383 29.5292 8.09591 30.9167 9.79175 30.9167C11.4876 30.9167 12.8751 29.5292 12.8751 27.8333C12.8751 26.1375 11.4876 24.75 9.79175 24.75ZM0.541748 0.0833435V3.16668H3.62508L9.17508 14.8679L7.09383 18.645C6.84717 19.0767 6.70842 19.5854 6.70842 20.125C6.70842 21.8208 8.09591 23.2083 9.79175 23.2083H28.2917V20.125H10.4392C10.2234 20.125 10.0538 19.9554 10.0538 19.7396L10.1001 19.5546L11.4876 17.0417H22.973C24.1292 17.0417 25.1467 16.4096 25.6709 15.4538L31.1901 5.44834C31.3134 5.23251 31.3751 4.97043 31.3751 4.70834C31.3751 3.86043 30.6813 3.16668 29.8334 3.16668H7.03217L5.583 0.0833435H0.541748ZM25.2084 24.75C23.5126 24.75 22.1405 26.1375 22.1405 27.8333C22.1405 29.5292 23.5126 30.9167 25.2084 30.9167C26.9042 30.9167 28.2917 29.5292 28.2917 27.8333C28.2917 26.1375 26.9042 24.75 25.2084 24.75Z" />
+            </svg>
+          </div>
+          <h1 style={{ fontSize: '120%', color: '#8F8787' }}>Tidak ada item di keranjang</h1>
+        </div>
+        :
+        <>
+          <div className={styles.RoundedRectangle}>
+            {cartItems.map((itemType) => (
+              <ItemLister
+                shopId={shopId}
+                forInvoice={true}
+                key={itemType.id}
+                typeName={itemType.typeName}
+                itemList={itemType.itemList}
+              />
+            ))}
+
+            {table.tableNo != null && (
+              <div className={styles.OrderTypeContainer}>
+                <span htmlFor="orderType">Diantar ke {table.tableNo}</span>
+                {/* <select
            id="orderType"
            value={orderType}
            onChange={handleOrderTypeChange}
@@ -232,66 +241,67 @@ export default function Invoice({ shopId, table, sendParam, deviceType, socket }
            <option value="pickup">Pickup</option>
            {table == null && <option value="serve">Serve</option>}
          </select> */}
-        </div>
-          )}
-        {orderType === "serve" && table.length < 1 && (
-          <div className={styles.OrderTypeContainer}>
-            <span htmlFor="orderType">Serve to:</span>
-            <input
-              type="text"
-              placeholder="Table Number"
-              value={tableNumber}
-              onChange={handleTableNumberChange}
-              className={styles.TableNumberInput}
-            />
-          </div>
-        )}
-
-        <div className={styles.NoteContainer}>
-          <span>Catatan :</span>
-          <span></span>
-        </div>
-
-        <div className={styles.NoteContainer}>
-          <textarea
-            ref={textareaRef}
-            className={styles.NoteInput}
-            placeholder="Tambahkan catatan..."
-          />
-        </div>
-      </div>
-      <div className={styles.PaymentOption}>
-        <div className={styles.TotalContainer}>
-          <span>Pembayaran</span>
-          <span>
-            <select
-            style={{borderRadius: '6px', fontSize: '20px'}}
-            id="orderMethod"
-            value={orderMethod}
-            onChange={handleOrderMethodChange}
-          >
-            <option value="cash">&nbsp;Tunai</option>
-            <option value="cashless">&nbsp;Non Tunai&nbsp;</option>
-          </select>
-          </span>
-        </div>
-        <div style={{display: 'flex', paddingLeft: '25px', paddingRight: '25px'}}>
-          <button className={styles.PayButton} onClick={() => handlePay(orderMethod == 'cash' ? true : false)}>
-            {isPaymentLoading ? (
-              <ColorRing height="50" width="50" color="white" />
-            ) : (
-              <div>
-                <span>Pesan</span>
-                
-                <span>Rp{totalPrice}</span>
              </div>
            )}
-          </button>
-        </div>
-      </div>
-      <div className={styles.PaymentOptionMargin}></div>
-      </>
-}
+            {orderType === "serve" && table.length < 1 && (
+              <div className={styles.OrderTypeContainer}>
+                <span htmlFor="orderType">Serve to:</span>
+                <input
+                  type="text"
+                  placeholder="Table Number"
+                  value={tableNumber}
+                  onChange={handleTableNumberChange}
+                  className={styles.TableNumberInput}
+                />
+              </div>
+            )}
+
+            <div className={styles.NoteContainer}>
+              <span>Catatan :</span>
+              <span></span>
+            </div>
+
+            <div className={styles.NoteContainer}>
+              <textarea
+                ref={textareaRef}
+                className={styles.NoteInput}
+                placeholder="Tambahkan catatan..."
+              />
+            </div>
+          </div>
+          <div className={styles.PaymentOption}>
+            <div className={styles.TotalContainer}>
+              <span>Pembayaran</span>
+              <span>
+                <select
+                  style={{ borderRadius: '6px', fontSize: '20px' }}
+                  id="orderMethod"
+                  value={orderMethod}
+                  onChange={handleOrderMethodChange}
+                >
+                  <option value="cash">&nbsp;Tunai</option>
+                  <option value="cashless">&nbsp;Non Tunai&nbsp;</option>
+                </select>
+              </span>
+            </div>
+            <div style={{ display: 'flex', paddingLeft: '25px', paddingRight: '25px' }}>
+              <button className={styles.PayButton} onClick={() => handlePay(orderMethod == 'cash' ? true : false)}>
+                {isPaymentLoading ? (
+                  <ColorRing height="50" width="50" color="white" />
+                ) : (
+                  <div>
+                    <span>Pesan</span>
+
+                    <span>Rp{totalPrice}</span>
+                  </div>
+                )}
+              </button>
+            </div>
+            <div onClick={goToShop} style={{ textAlign: 'center', marginBottom: '20px' }}>Kembali</div>
+          </div>
+          <div className={styles.PaymentOptionMargin}></div>
+        </>
+      }
    </div>
  );
 }