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

dev #29

Merged
JoeKung merged 30 commits from dev into main 2026-03-09 09:58:45 +01:00
Conversation 0 Commits 30 Files Changed 93 +8 -4
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 811e0f441b - Show all commits

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 +

7
frontend/src/app/features/checkout/checkout.component.html
View File

@@ -331,11 +331,14 @@
<div class="total-row"> <div class="total-row">
<span>{{ "CHECKOUT.SETUP_FEE" | translate }}</span> <span>{{ "CHECKOUT.SETUP_FEE" | translate }}</span>
<span>{{ <span>{{
(session.baseSetupCostChf ?? session.session.setupCostChf) session.baseSetupCostChf ?? session.session.setupCostChf
| currency: "CHF" | currency: "CHF"
}}</span> }}</span>
</div> </div>
<div class="total-row" *ngIf="(session.nozzleChangeCostChf || 0) > 0"> <div
class="total-row"
*ngIf="(session.nozzleChangeCostChf || 0) > 0"
>
<span>Cambio Ugello</span> <span>Cambio Ugello</span>
<span>{{ session.nozzleChangeCostChf | currency: "CHF" }}</span> <span>{{ session.nozzleChangeCostChf | currency: "CHF" }}</span>
</div> </div>