matt/inventory
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Start fixing points

Browse Source
This commit is contained in:
Matt
2025-09-25 21:27:28 -04:00
parent 4ea3a4aec3
commit d3e3cba087
4 changed files with 134 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
inventory-server/dashboard/acot-server/routes/discounts.js
View File

@@ -48,13 +48,13 @@ const BUCKET_CASE = (() => {
return `CASE\n ${parts.join('\n ')}\n END`; return `CASE\n ${parts.join('\n ')}\n END`;
})(); })();
const DEFAULT_POINT_DOLLAR_VALUE = 0.005; // 1000 points = $5 const DEFAULT_POINT_DOLLAR_VALUE = 0.005; // 1000 points = $5, so 200 points = $1
const DEFAULTS = { const DEFAULTS = {
merchantFeePercent: 2.9, merchantFeePercent: 2.9,
fixedCostPerOrder: 1.5, fixedCostPerOrder: 1.5,
pointsPerDollar: 0, pointsPerDollar: 0,
pointsRedemptionRate: 0, pointsRedemptionRate: 0, // Will be calculated from actual data
pointDollarValue: DEFAULT_POINT_DOLLAR_VALUE, pointDollarValue: DEFAULT_POINT_DOLLAR_VALUE,
}; };
@@ -265,8 +265,8 @@ router.post('/simulate', async (req, res) => {
${BUCKET_CASE} AS bucket_key ${BUCKET_CASE} AS bucket_key
FROM _order o FROM _order o
${promoJoin} ${promoJoin}
WHERE o.summary_total > 0 WHERE o.summary_shipping > 0
AND o.summary_subtotal > 0 AND o.summary_total > 0
AND o.order_status NOT IN (15) AND o.order_status NOT IN (15)
AND o.ship_method_selected <> 'holdit' AND o.ship_method_selected <> 'holdit'
AND o.ship_country = ? AND o.ship_country = ?
@@ -302,7 +302,7 @@ router.post('/simulate', async (req, res) => {
GROUP BY order_id GROUP BY order_id
) AS c ON c.order_id = f.order_id ) AS c ON c.order_id = f.order_id
LEFT JOIN ( LEFT JOIN (
SELECT order_id, SUM(discount_amount_points) AS points_redeemed SELECT order_id, SUM(discount_amount) AS points_redeemed
FROM order_discounts FROM order_discounts
WHERE discount_type = 20 AND discount_active = 1 WHERE discount_type = 20 AND discount_active = 1
GROUP BY order_id GROUP BY order_id
@@ -366,11 +366,54 @@ router.post('/simulate', async (req, res) => {
? totals.pointsAwarded / totals.subtotal ? totals.pointsAwarded / totals.subtotal
: 0; : 0;
const redemptionRate = config.points.redemptionRate != null // Calculate redemption rate with extended lookback to account for redemption lag
? config.points.redemptionRate let calculatedRedemptionRate = 0;
: totals.pointsAwarded > 0 if (config.points.redemptionRate != null) {
? Math.min(1, totals.pointsRedeemed / totals.pointsAwarded) calculatedRedemptionRate = config.points.redemptionRate;
: 0; } else if (totals.pointsAwarded > 0) {
// Use a 12-month lookback to capture more realistic redemption patterns
const extendedStartDt = startDt.minus({ months: 12 });
const extendedRedemptionQuery = `
SELECT SUM(od.discount_amount) as extended_redemptions
FROM order_discounts od
JOIN _order o ON od.order_id = o.order_id
WHERE od.discount_type = 20 AND od.discount_active = 1
AND o.order_status NOT IN (15)
AND o.ship_country = ?
AND o.date_placed BETWEEN ? AND ?
AND o.order_cid IN (
SELECT DISTINCT order_cid
FROM _order
WHERE date_placed BETWEEN ? AND ?
AND order_status NOT IN (15)
AND summary_points > 0
)
`;
try {
const [extendedRows] = await connection.execute(extendedRedemptionQuery, [
shipCountry,
formatDateForSql(extendedStartDt),
formatDateForSql(endDt),
formatDateForSql(startDt),
formatDateForSql(endDt)
]);
const extendedRedemptions = Number(extendedRows[0]?.extended_redemptions || 0);
// Convert dollar redemptions to points using the correct conversion rate (200 points = $1)
const extendedRedemptionsInPoints = extendedRedemptions * 200;
if (extendedRedemptionsInPoints > 0) {
calculatedRedemptionRate = Math.min(1, extendedRedemptionsInPoints / totals.pointsAwarded);
} else {
throw new Error('Unable to calculate redemption rate: no redemption data found in extended lookback period');
}
} catch (error) {
console.error('Failed to calculate redemption rate:', error);
throw error; // Let it fail instead of using fallback
}
}
const redemptionRate = calculatedRedemptionRate;
const pointDollarValue = config.points.pointDollarValue || DEFAULT_POINT_DOLLAR_VALUE; const pointDollarValue = config.points.pointDollarValue || DEFAULT_POINT_DOLLAR_VALUE;

90
inventory/src/components/discount-simulator/ConfigPanel.tsx
View File

@@ -11,7 +11,7 @@ import { ScrollArea } from "@/components/ui/scroll-area";
import { DiscountPromoOption, DiscountPromoType, ShippingPromoType, ShippingTierConfig, DiscountSimulationResponse } from "@/types/discount-simulator"; import { DiscountPromoOption, DiscountPromoType, ShippingPromoType, ShippingTierConfig, DiscountSimulationResponse } from "@/types/discount-simulator";
import { Separator } from "@/components/ui/separator"; import { Separator } from "@/components/ui/separator";
import { Badge } from "@/components/ui/badge"; import { Badge } from "@/components/ui/badge";
import { formatCurrency, formatNumber } from "@/utils/productUtils"; import { formatNumber } from "@/utils/productUtils";
import { PlusIcon, X } from "lucide-react"; import { PlusIcon, X } from "lucide-react";
import { Skeleton } from "@/components/ui/skeleton"; import { Skeleton } from "@/components/ui/skeleton";
@@ -44,21 +44,13 @@ interface ConfigPanelProps {
pointsPerDollar: number; pointsPerDollar: number;
redemptionRate: number; redemptionRate: number;
pointDollarValue: number; pointDollarValue: number;
onPointsChange: (update: { onPointDollarValueChange: (value: number) => void;
pointsPerDollar?: number;
redemptionRate?: number;
pointDollarValue?: number;
}) => void;
onConfigInputChange: () => void; onConfigInputChange: () => void;
onResetConfig: () => void; onResetConfig: () => void;
onRunSimulation: () => void; onRunSimulation: () => void;
isRunning: boolean; isRunning: boolean;
recommendedPoints?: { recommendedPointDollarValue?: number;
pointsPerDollar: number; onApplyRecommendedPointDollarValue?: () => void;
redemptionRate: number;
pointDollarValue: number;
};
onApplyRecommendedPoints?: () => void;
result?: DiscountSimulationResponse; result?: DiscountSimulationResponse;
} }
@@ -116,14 +108,14 @@ export function ConfigPanel({
pointsPerDollar, pointsPerDollar,
redemptionRate, redemptionRate,
pointDollarValue, pointDollarValue,
onPointsChange, onPointDollarValueChange,
onConfigInputChange, onConfigInputChange,
onResetConfig, onResetConfig,
promoLoading = false, promoLoading = false,
onRunSimulation, onRunSimulation,
isRunning, isRunning,
recommendedPoints, recommendedPointDollarValue,
onApplyRecommendedPoints, onApplyRecommendedPointDollarValue,
result result
}: ConfigPanelProps) { }: ConfigPanelProps) {
const promoOptions = useMemo(() => { const promoOptions = useMemo(() => {
@@ -213,10 +205,8 @@ export function ConfigPanel({
onShippingTiersChange(tiers); onShippingTiersChange(tiers);
}; };
const recommendedDiffers = recommendedPoints const recommendedDiffers = typeof recommendedPointDollarValue === 'number'
? recommendedPoints.pointsPerDollar !== pointsPerDollar || ? recommendedPointDollarValue !== pointDollarValue
recommendedPoints.redemptionRate !== redemptionRate ||
recommendedPoints.pointDollarValue !== pointDollarValue
: false; : false;
const fieldClass = "flex flex-col gap-1.5"; const fieldClass = "flex flex-col gap-1.5";
@@ -230,6 +220,7 @@ export function ConfigPanel({
const compactWideNumberClass = "h-8 px-2 text-sm"; const compactWideNumberClass = "h-8 px-2 text-sm";
const showProductAdjustments = productPromo.type !== "none"; const showProductAdjustments = productPromo.type !== "none";
const showShippingAdjustments = shippingPromo.type !== "none"; const showShippingAdjustments = shippingPromo.type !== "none";
const promoSelectValue = selectedPromoId != null ? selectedPromoId.toString() : "__all__";
const handleFieldBlur = useCallback(() => { const handleFieldBlur = useCallback(() => {
setTimeout(onRunSimulation, 0); setTimeout(onRunSimulation, 0);
@@ -252,14 +243,14 @@ export function ConfigPanel({
<div className={fieldClass}> <div className={fieldClass}>
<Label className={labelClass}>Promo code</Label> <Label className={labelClass}>Promo code</Label>
<Select <Select
value={selectedPromoId !== undefined ? selectedPromoId.toString() : undefined} value={promoSelectValue}
onValueChange={(value) => { onValueChange={(value) => {
if (value === '__all__') { if (value === '__all__') {
onPromoChange(undefined); onPromoChange(undefined);
return; return;
} }
const parsed = Number(value); const parsed = Number(value);
onPromoChange(Number.isNaN(parsed) ? undefined : parsed); onPromoChange(Number.isNaN(parsed) ? undefined : parsed);
}} }}
> >
<SelectTrigger className={`${compactTriggerClass} w-full`}> <SelectTrigger className={`${compactTriggerClass} w-full`}>
@@ -297,15 +288,6 @@ export function ConfigPanel({
<Badge variant="secondary" className="text-xs"> <Badge variant="secondary" className="text-xs">
{formatPercent(result.totals.productDiscountRate)} avg discount {formatPercent(result.totals.productDiscountRate)} avg discount
</Badge> </Badge>
<Badge variant="secondary" className="text-xs">
{result.totals.pointsPerDollar.toFixed(4)} pts/$
</Badge>
<Badge variant="secondary" className="text-xs">
{formatPercent(result.totals.redemptionRate)} redeemed
</Badge>
<Badge variant="secondary" className="text-xs">
{formatCurrency(result.totals.pointDollarValue, 4)} pt value
</Badge>
</div> </div>
)} )}
</section> </section>
@@ -568,34 +550,14 @@ export function ConfigPanel({
<section className={sectionClass}> <section className={sectionClass}>
<span className={sectionTitleClass}>Rewards points</span> <span className={sectionTitleClass}>Rewards points</span>
<div className={fieldRowClass}> <div className={fieldRowClass}>
<div className={fieldRowHorizontalClass}> <div className="grid gap-3 sm:grid-cols-2">
<div className={fieldClass}> <div className="flex flex-col gap-1.5">
<Label className={labelClass}>Points per $</Label> <span className={labelClass}>Points per $</span>
<Input <span className="text-sm font-medium">{Number.isFinite(pointsPerDollar) ? pointsPerDollar.toFixed(4) : '—'}</span>
className={compactNumberClass}
type="number"
step="0.0001"
value={pointsPerDollar}
onChange={(event) => {
onConfigInputChange();
onPointsChange({ pointsPerDollar: parseNumber(event.target.value, pointsPerDollar) });
}}
onBlur={handleFieldBlur}
/>
</div> </div>
<div className={fieldClass}> <div className="flex flex-col gap-1.5">
<Label className={labelClass}>Redemption rate (%)</Label> <span className={labelClass}>Redemption rate (%)</span>
<Input <span className="text-sm font-medium">{formatPercent(redemptionRate)}</span>
className={compactNumberClass}
type="number"
step="0.01"
value={redemptionRate * 100}
onChange={(event) => {
onConfigInputChange();
onPointsChange({ redemptionRate: parseNumber(event.target.value, redemptionRate * 100) / 100 });
}}
onBlur={handleFieldBlur}
/>
</div> </div>
</div> </div>
<div className={fieldClass}> <div className={fieldClass}>
@@ -607,15 +569,15 @@ export function ConfigPanel({
value={pointDollarValue} value={pointDollarValue}
onChange={(event) => { onChange={(event) => {
onConfigInputChange(); onConfigInputChange();
onPointsChange({ pointDollarValue: parseNumber(event.target.value, pointDollarValue) }); onPointDollarValueChange(parseNumber(event.target.value, pointDollarValue));
}} }}
onBlur={handleFieldBlur} onBlur={handleFieldBlur}
/> />
</div> </div>
{recommendedPoints && ( {typeof recommendedPointDollarValue === 'number' && (
<div className="flex flex-col gap-1 text-xs text-muted-foreground"> <div className="flex flex-col gap-1 text-xs text-muted-foreground">
{recommendedDiffers && onApplyRecommendedPoints && ( {recommendedDiffers && onApplyRecommendedPointDollarValue && (
<Button variant="outline" size="sm" onClick={onApplyRecommendedPoints}> <Button variant="outline" size="sm" onClick={onApplyRecommendedPointDollarValue}>
Use recommended Use recommended
</Button> </Button>
)} )}

118
inventory/src/pages/DiscountSimulator.tsx
View File

@@ -57,12 +57,8 @@ export function DiscountSimulator() {
const [shippingTiers, setShippingTiers] = useState<ShippingTierConfig[]>([]); const [shippingTiers, setShippingTiers] = useState<ShippingTierConfig[]>([]);
const [merchantFeePercent, setMerchantFeePercent] = useState(DEFAULT_MERCHANT_FEE); const [merchantFeePercent, setMerchantFeePercent] = useState(DEFAULT_MERCHANT_FEE);
const [fixedCostPerOrder, setFixedCostPerOrder] = useState(DEFAULT_FIXED_COST); const [fixedCostPerOrder, setFixedCostPerOrder] = useState(DEFAULT_FIXED_COST);
const [pointsConfig, setPointsConfig] = useState({ const [pointDollarValue, setPointDollarValue] = useState(DEFAULT_POINT_VALUE);
pointsPerDollar: 0, const [pointDollarTouched, setPointDollarTouched] = useState(false);
redemptionRate: 0,
pointDollarValue: DEFAULT_POINT_VALUE,
});
const [pointsTouched, setPointsTouched] = useState(false);
const [simulationResult, setSimulationResult] = useState<DiscountSimulationResponse | undefined>(undefined); const [simulationResult, setSimulationResult] = useState<DiscountSimulationResponse | undefined>(undefined);
const [isSimulating, setIsSimulating] = useState(false); const [isSimulating, setIsSimulating] = useState(false);
const [hasLoadedConfig, setHasLoadedConfig] = useState(false); const [hasLoadedConfig, setHasLoadedConfig] = useState(false);
@@ -134,6 +130,12 @@ export function DiscountSimulator() {
const createPayload = useCallback((): DiscountSimulationRequest => { const createPayload = useCallback((): DiscountSimulationRequest => {
const { from, to } = ensureDateRange(dateRange); const { from, to } = ensureDateRange(dateRange);
const payloadPointsConfig = {
pointsPerDollar: null,
redemptionRate: null,
pointDollarValue,
};
return { return {
dateRange: { dateRange: {
start: startOfDay(from).toISOString(), start: startOfDay(from).toISOString(),
@@ -153,11 +155,7 @@ export function DiscountSimulator() {
}), }),
merchantFeePercent, merchantFeePercent,
fixedCostPerOrder, fixedCostPerOrder,
pointsConfig: { pointsConfig: payloadPointsConfig,
pointsPerDollar: pointsConfig.pointsPerDollar,
redemptionRate: pointsConfig.redemptionRate,
pointDollarValue: pointsConfig.pointDollarValue,
},
}; };
}, [ }, [
dateRange, dateRange,
@@ -168,7 +166,7 @@ export function DiscountSimulator() {
shippingTiers, shippingTiers,
merchantFeePercent, merchantFeePercent,
fixedCostPerOrder, fixedCostPerOrder,
pointsConfig, pointDollarValue,
]); ]);
const simulationMutation = useMutation< const simulationMutation = useMutation<
@@ -193,25 +191,14 @@ export function DiscountSimulator() {
setSimulationResult(data); setSimulationResult(data);
if (!pointsTouched) { if (!pointDollarTouched && typeof data.totals.pointDollarValue === 'number') {
skipAutoRunRef.current = true; const incomingValue = data.totals.pointDollarValue;
setPointsConfig((prev) => { if (pointDollarValue !== incomingValue) {
if ( skipAutoRunRef.current = true;
prev.pointsPerDollar === data.totals.pointsPerDollar && setPointDollarValue(incomingValue);
prev.redemptionRate === data.totals.redemptionRate && } else {
prev.pointDollarValue === data.totals.pointDollarValue skipAutoRunRef.current = false;
) { }
skipAutoRunRef.current = false;
return prev;
}
return {
...prev,
pointsPerDollar: data.totals.pointsPerDollar,
redemptionRate: data.totals.redemptionRate,
pointDollarValue: data.totals.pointDollarValue,
};
});
} }
}, },
onError: (error) => { onError: (error) => {
@@ -259,7 +246,12 @@ export function DiscountSimulator() {
shippingTiers?: ShippingTierConfig[]; shippingTiers?: ShippingTierConfig[];
merchantFeePercent?: number; merchantFeePercent?: number;
fixedCostPerOrder?: number; fixedCostPerOrder?: number;
pointsConfig?: typeof pointsConfig; pointsConfig?: {
pointsPerDollar?: number | null;
redemptionRate?: number | null;
pointDollarValue?: number | null;
};
pointDollarValue?: number;
}; };
skipAutoRunRef.current = true; skipAutoRunRef.current = true;
@@ -300,9 +292,14 @@ export function DiscountSimulator() {
setFixedCostPerOrder(parsed.fixedCostPerOrder); setFixedCostPerOrder(parsed.fixedCostPerOrder);
} }
if (parsed.pointsConfig) { if (parsed.pointsConfig && typeof parsed.pointsConfig.pointDollarValue === 'number') {
setPointsConfig(parsed.pointsConfig); setPointDollarValue(parsed.pointsConfig.pointDollarValue);
setPointsTouched(true); setPointDollarTouched(true);
}
if (typeof parsed.pointDollarValue === 'number') {
setPointDollarValue(parsed.pointDollarValue);
setPointDollarTouched(true);
} }
setLoadedFromStorage(true); setLoadedFromStorage(true);
@@ -331,9 +328,9 @@ export function DiscountSimulator() {
shippingTiers, shippingTiers,
merchantFeePercent, merchantFeePercent,
fixedCostPerOrder, fixedCostPerOrder,
pointsConfig, pointDollarValue,
}); });
}, [dateRange, selectedPromoId, productPromo, shippingPromo, shippingTiers, merchantFeePercent, fixedCostPerOrder, pointsConfig]); }, [dateRange, selectedPromoId, productPromo, shippingPromo, shippingTiers, merchantFeePercent, fixedCostPerOrder, pointDollarValue]);
useEffect(() => { useEffect(() => {
if (!hasLoadedConfig) { if (!hasLoadedConfig) {
@@ -379,26 +376,19 @@ export function DiscountSimulator() {
return () => window.clearTimeout(timeoutId); return () => window.clearTimeout(timeoutId);
}, [loadedFromStorage, runSimulation]); }, [loadedFromStorage, runSimulation]);
const recommendedPoints = simulationResult?.totals const currentPointsPerDollar = simulationResult?.totals?.pointsPerDollar ?? 0;
? { const currentRedemptionRate = simulationResult?.totals?.redemptionRate ?? 0;
pointsPerDollar: simulationResult.totals.pointsPerDollar, const recommendedPointDollarValue = simulationResult?.totals?.pointDollarValue;
redemptionRate: simulationResult.totals.redemptionRate,
pointDollarValue: simulationResult.totals.pointDollarValue,
}
: undefined;
const handlePointsChange = (update: Partial<typeof pointsConfig>) => { const handlePointDollarValueChange = (value: number) => {
setPointsTouched(true); setPointDollarTouched(true);
setPointsConfig((prev) => ({ setPointDollarValue(value);
...prev,
...update,
}));
}; };
const handleApplyRecommendedPoints = () => { const handleApplyRecommendedPointValue = () => {
if (recommendedPoints) { if (typeof recommendedPointDollarValue === 'number') {
setPointsConfig(recommendedPoints); setPointDollarValue(recommendedPointDollarValue);
setPointsTouched(true); setPointDollarTouched(true);
} }
}; };
@@ -413,12 +403,8 @@ export function DiscountSimulator() {
setShippingTiers([]); setShippingTiers([]);
setMerchantFeePercent(DEFAULT_MERCHANT_FEE); setMerchantFeePercent(DEFAULT_MERCHANT_FEE);
setFixedCostPerOrder(DEFAULT_FIXED_COST); setFixedCostPerOrder(DEFAULT_FIXED_COST);
setPointsConfig({ setPointDollarValue(DEFAULT_POINT_VALUE);
pointsPerDollar: 0, setPointDollarTouched(false);
redemptionRate: 0,
pointDollarValue: DEFAULT_POINT_VALUE,
});
setPointsTouched(false);
setSimulationResult(undefined); setSimulationResult(undefined);
if (typeof window !== 'undefined') { if (typeof window !== 'undefined') {
@@ -463,16 +449,16 @@ export function DiscountSimulator() {
onMerchantFeeChange={setMerchantFeePercent} onMerchantFeeChange={setMerchantFeePercent}
fixedCostPerOrder={fixedCostPerOrder} fixedCostPerOrder={fixedCostPerOrder}
onFixedCostChange={setFixedCostPerOrder} onFixedCostChange={setFixedCostPerOrder}
pointsPerDollar={pointsConfig.pointsPerDollar} pointsPerDollar={currentPointsPerDollar}
redemptionRate={pointsConfig.redemptionRate} redemptionRate={currentRedemptionRate}
pointDollarValue={pointsConfig.pointDollarValue} pointDollarValue={pointDollarValue}
onPointsChange={handlePointsChange} onPointDollarValueChange={handlePointDollarValueChange}
onConfigInputChange={handleConfigInputChange} onConfigInputChange={handleConfigInputChange}
onResetConfig={resetConfig} onResetConfig={resetConfig}
onRunSimulation={() => runSimulation()} onRunSimulation={() => runSimulation()}
isRunning={isSimulating} isRunning={isSimulating}
recommendedPoints={recommendedPoints} recommendedPointDollarValue={recommendedPointDollarValue}
onApplyRecommendedPoints={handleApplyRecommendedPoints} onApplyRecommendedPointDollarValue={handleApplyRecommendedPointValue}
result={simulationResult} result={simulationResult}
/> />
</div> </div>

6
inventory/src/types/discount-simulator.ts
View File

@@ -90,8 +90,8 @@ export interface DiscountSimulationRequest {
merchantFeePercent: number; merchantFeePercent: number;
fixedCostPerOrder: number; fixedCostPerOrder: number;
pointsConfig: { pointsConfig: {
pointsPerDollar: number; pointsPerDollar: number | null;
redemptionRate: number; redemptionRate: number | null;
pointDollarValue: number; pointDollarValue: number | null;
}; };
} }