diff --git a/package.json b/package.json index 5c30e14..833756d 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "groovebrew-mockup", "version": "0.1.0", "private": true, - "homepage": "https://kedaimaster.com", + "homepage": "https://dev.kedaimaster.com", "dependencies": { "@emotion/react": "^11.13.3", "@emotion/styled": "^11.13.0", diff --git a/src/config.js b/src/config.js index 967c5ce..6cf67cc 100644 --- a/src/config.js +++ b/src/config.js @@ -1,5 +1,5 @@ // src/config.js -const API_BASE_URL = 'https://api.kedaimaster.com'; +const API_BASE_URL = 'https://dev.api.kedaimaster.com'; export default API_BASE_URL; diff --git a/src/pages/Dashboard.js b/src/pages/Dashboard.js index 09fd846..567de89 100644 --- a/src/pages/Dashboard.js +++ b/src/pages/Dashboard.js @@ -191,7 +191,7 @@ const LinktreePage = ({ user, setModal }) => { // 1. Optionally combine all report items from cafes of the selected tenant let allSelectedSubItems = null; if (user.roleId == 1) - allSelectedSubItems = selectedSubItems?.flatMap(cafe => cafe.report?.items || selectedItems.report?.items || []); + allSelectedSubItems = selectedSubItems?.flatMap(cafe => cafe.report?.items || selectedItems.report?.itemSales || []); // 2. Retrieve the specific cafe's report items if needed const filteredItems = selectedSubItems?.find(cafe => cafe.cafeId == selectedSubItemId) || { report: { items: [] } }; @@ -202,13 +202,13 @@ const LinktreePage = ({ user, setModal }) => { if (user.roleId == 1 || user.roleId == 0 && selectedItemId == 0) segments = (selectedItemId != 0 && selectedItemId != -1 && selectedSubItemId == 0 ? allSelectedSubItems : selectedItemId != 0 && selectedItemId != -1 ? filteredItems.report?.items || [] : items?.items || []).map((item, index) => ({ percentage: item.percentage || (items?.totalIncome / item?.totalIncome || items?.totalIncome / item?.report?.totalIncome) * 100, - value: item.username || item.name, + value: item.username || item.itemName || item.name, color: (colors && colors[index]) || "#cccccc", // Safe check for colors array })) || []; // Ensure segments is an empty array if no items are availabled // Function to combine items of all cafes for the selected tenant console.log(selectedItems) - console.log(selectedItemId) + console.log(segments) // Check if items and items.items are defined before proceeding const allMaterials = (items?.items || []).flatMap(item => item.report?.materialsPurchased || []); @@ -326,7 +326,7 @@ const sortedMaterials = allMaterials.sort((a, b) => new Date(a.date) - new Date( 1 -205 -24 -27 -69 -23 -89 7 -20 31 -17 172 5 198 17 22 59 22 83 0z"/> -
keuntungan
+Tagihan
{items?.totalIncome * 0.02}
@@ -788,7 +788,7 @@ const sortedMaterials = allMaterials.sort((a, b) => new Date(a.date) - new Date( >