From 3e5d795153f6fca7c3c146b6761f71a111922d40 Mon Sep 17 00:00:00 2001
From: insvrgent <zaditgans671555@gmail.com>
Date: Thu, 6 Feb 2025 10:32:18 +0700
Subject: [PATCH] ok

---
 src/helpers/transactionHelpers.js | 18 +++++++++----
 src/pages/LinktreePage.module.css |  3 ++-
 src/pages/Reports.js              | 43 ++++++++++++++++++++++++++++++-
 3 files changed, 57 insertions(+), 7 deletions(-)

diff --git a/src/helpers/transactionHelpers.js b/src/helpers/transactionHelpers.js
index fcb6121..c63bcfc 100644
--- a/src/helpers/transactionHelpers.js
+++ b/src/helpers/transactionHelpers.js
@@ -402,14 +402,22 @@ export const getReports = async (cafeId, filter) => {
   );
   return response.json();
 };
-export const getAnalytics = async (filter) => {
-  const response = await fetch(
-    API_BASE_URL + "/transaction/get-analytics" +  "?type=" + filter,
-    getHeaders('POST')
-  );
+
+export const getAnalytics = async (filter, selectedCafeId) => {
+  // Start the URL with the filter type query
+  let url = API_BASE_URL + "/transaction/get-analytics" + "?type=" + filter;
+
+  // Only add selectedCafeId to the query string if it's not null
+  if (selectedCafeId !== null) {
+    url += "&cafeId=" + selectedCafeId;
+  }
+
+  // Fetch with the updated URL
+  const response = await fetch(url, getHeaders('POST'));
   return response.json();
 };
 
+
 export const getIncome = async (cafeId) => {
   const response = await fetch(
     `${API_BASE_URL}/transaction/get-income/${cafeId}`,
diff --git a/src/pages/LinktreePage.module.css b/src/pages/LinktreePage.module.css
index 77db6eb..f90c4c9 100644
--- a/src/pages/LinktreePage.module.css
+++ b/src/pages/LinktreePage.module.css
@@ -266,9 +266,10 @@
   border: 1px solid #ccc;
   margin-top: 5px;
   margin-bottom: 15px;
-  text-transform: lowercase;
+  text-transform: none; /* Remove lowercase transformation */
 }
 
+
 .usernameInputError {
   width: 250px;
   height: 55px;
diff --git a/src/pages/Reports.js b/src/pages/Reports.js
index 3613dd4..bed2ff1 100644
--- a/src/pages/Reports.js
+++ b/src/pages/Reports.js
@@ -127,9 +127,12 @@ const App = ({ forCafe = true, cafeId = -1,
     try {
       setLoading(true);
       // Fetch the analytics data with the selected filter
-      const analyticsData = (selectedCafeId !== '' && selectedCafeId !== 0)
+      let analyticsData = null;
+      if(user.roleId == 1)
+        analyticsData = (selectedCafeId !== '' && selectedCafeId !== 0)
         ? await getReports(selectedCafeId, filter)
         : await getAnalytics(filter);
+      else analyticsData = await getAnalytics(filter, selectedCafeId);
 
       console.log(analyticsData);
       if (analyticsData) setAnalytics(analyticsData);
@@ -657,6 +660,44 @@ const App = ({ forCafe = true, cafeId = -1,
           }
         </div>
       }
+      {!forCafe && selectedCafeId == -1 && user.roleId == 1 && 
+        <div style={{
+          textAlign: "center",
+        }}>
+          <div
+            style={{
+              display: "flex",
+              flexWrap: "wrap",
+              justifyContent: "center",
+              padding: "20px",
+            }}
+          >
+
+              <RoundedRectangle
+                title={"Masukkan nama bisnis"}
+                width="calc(100% - 10px)"
+              >
+                <input
+                  value={itemName}
+                  onChange={(e) => setItemName(e.target.value)}
+                  style={{
+                    width: '70%',
+                    fontSize: '25px',
+                    borderRadius: '7px',
+                    border: '1px solid black'
+                  }}
+                />
+              </RoundedRectangle>
+
+            
+            <RoundedRectangle
+              title={"Buat Bisnis"}
+              width="calc(100% - 10px)"
+              onClick={handleClick}
+            />
+          </div>
+        </div>
+      }
       {user?.roleId == 1 &&
         <>
           <div className={`${styles.couponContainer}`}>