JoeKung/print-calculator
1
1
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feat/calculator-options' into feat/calculator-options
All checks were successful
PR Checks / prettier-autofix (pull_request) Successful in 14s
Details
PR Checks / security-sast (pull_request) Successful in 28s
Details
PR Checks / test-backend (pull_request) Successful in 26s
Details
PR Checks / test-frontend (pull_request) Successful in 1m7s
Details

Browse Source 
# Conflicts:
#	frontend/src/app/features/checkout/checkout.component.html
This commit is contained in:
Joe Küng
2026-03-05 21:46:23 +01:00
parent 7a699d2adf 811e0f441b
commit 042c254691
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
frontend/src/app/features/calculator/services/quote-estimator.service.ts
View File

@@ -384,8 +384,9 @@ export class QuoteEstimatorService {
); );
const grandTotal = Number(sessionData?.grandTotalChf); const grandTotal = Number(sessionData?.grandTotalChf);
const effectiveSetupCost = const effectiveSetupCost = Number(
Number(sessionData?.setupCostChf ?? session?.setupCostChf ?? 0); sessionData?.setupCostChf ?? session?.setupCostChf ?? 0,
);
const fallbackTotal = const fallbackTotal =
Number(sessionData?.itemsTotalChf || 0) + Number(sessionData?.itemsTotalChf || 0) +
effectiveSetupCost + effectiveSetupCost +