diff --git a/00-backend/datasource/database.sqlite b/00-backend/datasource/database.sqlite index 9aadb75..60fc467 100644 Binary files a/00-backend/datasource/database.sqlite and b/00-backend/datasource/database.sqlite differ diff --git a/01-frontend/public/locales/de/translation.json b/01-frontend/public/locales/de/translation.json index 0fd276d..54eaff4 100644 --- a/01-frontend/public/locales/de/translation.json +++ b/01-frontend/public/locales/de/translation.json @@ -104,6 +104,7 @@ "actualPrice": "Endpreis in €", "stock": "Bestand", "price100": "Preis in ct", + "price100€": "Preis in €", "discount100": "Rabatt in %", "deleteProduct": "Produkt löschen", "description": "Beschreibung", diff --git a/01-frontend/public/locales/en/translation.json b/01-frontend/public/locales/en/translation.json index b233b50..aa10b5d 100644 --- a/01-frontend/public/locales/en/translation.json +++ b/01-frontend/public/locales/en/translation.json @@ -104,6 +104,7 @@ "actualPrice": "Price in €", "stock": "Stock", "price100": "Price in ct", + "price100€": "Price in €", "discount100": "Discount in %", "deleteProduct": "Delete Product", "description": "Description", diff --git a/01-frontend/src/helper/adminpanel/AccountsInfo.tsx b/01-frontend/src/helper/adminpanel/AccountsInfo.tsx index bc28330..7fcb374 100644 --- a/01-frontend/src/helper/adminpanel/AccountsInfo.tsx +++ b/01-frontend/src/helper/adminpanel/AccountsInfo.tsx @@ -17,15 +17,7 @@ export default function AccountsInfo() { //TODO: implement console.log("CustomerEdit", account); } - -/* - for testing purposes - for (let i = 0; i < 100; i++) { - _rows.push(_rows[5]); - } -* */ - //TODO: get per REST const [rows, setRows] = useState([]); const [selectedRows, setSelectedRows] = useState>(new Set()); @@ -33,7 +25,7 @@ export default function AccountsInfo() { const { data } = useQuery({ queryKey: ["fetchAccounts", loginData], - queryFn: () => fetchAccounts(loginData? loginData : {email: "", password: "", session: "", customerId: -1}), + queryFn: () => fetchAccounts(loginData? loginData : {email: "", password: "", session: "", customerId: -1, isAdmin: false}), retry: 3, retryDelay: 1000, }); @@ -123,7 +115,6 @@ export default function AccountsInfo() { showToolbar processRowUpdate={(updatedRow) => { setRows(rows.map(row => row.id === updatedRow.id ? updatedRow : row)); - //TODO: make REST callback return updatedRow; }} /> diff --git a/01-frontend/src/helper/adminpanel/ItemsInfo.tsx b/01-frontend/src/helper/adminpanel/ItemsInfo.tsx index 0a45d42..a3571cd 100644 --- a/01-frontend/src/helper/adminpanel/ItemsInfo.tsx +++ b/01-frontend/src/helper/adminpanel/ItemsInfo.tsx @@ -119,7 +119,7 @@ export default function ItemsInfo() { }, { field: 'price100', - headerName: t('price100'), + headerName: t('price100€'), width: 100, editable: true, type: 'number',