Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Show Service plan cost when selecting a service plan (if not free) #2959

Merged
merged 9 commits into from
Nov 9, 2018
Merged

Show Service plan cost when selecting a service plan (if not free) #2959

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
053fd35
At cost to service plan selection
Sep 6, 2018
c2749f8
Hide if plan is free
Sep 6, 2018
02a01f8
Updated in response to review
Sep 7, 2018
df2f403
Support other currency locales
Sep 24, 2018
9bc80f7
A further tweak
Sep 24, 2018
537de60
Merge remote-tracking branch 'origin/v2-master' into add-dashboard-url
richard-cox Nov 8, 2018
78e5e72
Two tweaks
richard-cox Nov 8, 2018
635915d
Simplyify cost code & tweak format of `Costs` collection
richard-cox Nov 8, 2018
70cc63d
Changes following review
richard-cox Nov 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Hide if plan is free
  • Loading branch information
Irfan Habib committed Sep 6, 2018
commit c2749f80f38216b301b441475befeb8996a5ac37
8 changes: 5 additions & 3 deletions ...p/shared/components/add-service-instance/select-plan-step/select-plan-step.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,11 @@
<span *ngIf="(getPlanAccessibility(selPlan.entity) | async) !== 'ok'"> ({{ getAccessibilityMessage(selPlan.entity) | async }})</span>
</app-metadata-item>
<app-metadata-item label="Free"> {{ isFree(selPlan) | titlecase}} </app-metadata-item>
<div *ngFor="let cost of selPlan.extra.costs">
<app-metadata-item label="Cost per {{ cost.unit | titlecase }}"> {{ getCostCurrency(cost, true) }}{{ getCostValue(cost) }} </app-metadata-item>
</div>
<ng-container *ngIf="!isFree(selPlan)">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will always be false as isFree is a string - need to use *ngIf="!selPlan.entity.entity.free">

<div *ngFor="let cost of selPlan.extra.costs">
<app-metadata-item label="Cost per {{ cost.unit | titlecase }}"> {{ getCostCurrency(cost, true) }}{{ getCostValue(cost) }} </app-metadata-item>
</div>
</ng-container>
<app-metadata-item label="Additional Information" *ngIf="hasAdditionalInfo(selPlan)">
<ul>
<li *ngFor="let bulletPoint of selPlan.extra.bullets">{{bulletPoint}}</li>
Expand Down