PenaSide/adminFront
3
0
Fork 0
Code Issues 2 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into 'main'

Browse Source 
Dev

See merge request frontend/admin!26
This commit is contained in:
Mikhail 2023-07-05 15:43:09 +00:00
commit 6474d5088b
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/pages/dashboard/Content/DiscountManagement/DiscountDataGrid.tsx
View File

@ -112,16 +112,18 @@ export default function DiscountDataGrid() {
useDiscounts({ onNewDiscounts: setDiscounts }); useDiscounts({ onNewDiscounts: setDiscounts });
const rowBackDicounts: GridRowsProp = realDiscounts.filter(e => e.Layer > 0).map(discount => ({ const rowBackDicounts: GridRowsProp = realDiscounts.filter(e => e.Layer > 0).map(discount => {
console.log(discount.Condition[layerValue[discount.Layer] as keyof typeof discount.Condition])
return({
id: discount.ID, id: discount.ID,
name: discount.Name, name: discount.Name,
description: discount.Description, description: discount.Description,
conditionType: layerTranslate[discount.Layer], conditionType: layerTranslate[discount.Layer],
factor: formatDiscountFactor(discount.Target.Factor), factor: formatDiscountFactor(discount.Target.Factor),
value: layerValue[discount.Layer], value: discount.Condition[layerValue[discount.Layer] as keyof typeof discount.Condition],
active: discount.Deprecated ? "🚫" : "✅", active: discount.Deprecated ? "🚫" : "✅",
deleted: discount.Audit.Deleted, deleted: discount.Audit.Deleted,
})); })});
return ( return (
<Box sx={{ width: "100%", marginTop: "55px", p: "16px", maxWidth: "1000px" }}> <Box sx={{ width: "100%", marginTop: "55px", p: "16px", maxWidth: "1000px" }}>

2
src/pages/dashboard/Content/DiscountManagement/EditDiscountDialog.tsx
View File

@ -38,7 +38,7 @@ export default function EditDiscountDialog() {
setDiscountNameField(discount.Name); setDiscountNameField(discount.Name);
setDiscountDescriptionField(discount.Description); setDiscountDescriptionField(discount.Description);
setPrivilegeIdField(discount.Condition.Product); setPrivilegeIdField(discount.Condition.Product);
setDiscountFactorField(discount.Target.Factor.toString()); setDiscountFactorField(((1 - discount.Target.Factor) * 100).toFixed(2));
setPurchasesAmountField(discount.Condition.PurchasesAmount.toString()); setPurchasesAmountField(discount.Condition.PurchasesAmount.toString());
setCartPurchasesAmountField(discount.Condition.CartPurchasesAmount.toString()); setCartPurchasesAmountField(discount.Condition.CartPurchasesAmount.toString());
setDiscountMinValueField(discount.Condition.PriceFrom.toString()); setDiscountMinValueField(discount.Condition.PriceFrom.toString());