#1 fill all 'TODO' vat placeholder with value

alfio-event · Jul 8, 2019 · 31b343c · 31b343c
1 parent a0c24d6
commit 31b343c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/src/app/additional-service/additional-service.component.html b/src/app/additional-service/additional-service.component.html
@@ -15,7 +15,7 @@ <h3>{{additionalService.title[translate.currentLang]}}</h3>
             <ng-container *ngIf="!additionalService.hasDiscount">{{additionalService.formattedFinalPrice}} {{event.currency}}</ng-container>
             {{' '}}
             <span *ngIf="additionalService.vatApplies">
-                <fa-icon [icon]="['fa', 'info-circle']" class="text-info" ngbTooltip="{{(additionalService.vatIncluded ? 'show-event.incVat' : 'show-event.excVat') | translate:{'0':additionalService.vatPercentage, '1': 'TODO'} }}"></fa-icon>
+                <fa-icon [icon]="['fa', 'info-circle']" class="text-info" ngbTooltip="{{(additionalService.vatIncluded ? 'show-event.incVat' : 'show-event.excVat') | translate:{'0':additionalService.vatPercentage, '1': ('common.vat' | translate)} }}"></fa-icon>
             </span>
         </span>
     </div>

diff --git a/src/app/event-display/event-display.component.html b/src/app/event-display/event-display.component.html
@@ -112,7 +112,7 @@ <h3>{{category.name}}</h3>
                             <ng-container *ngIf="category.hasDiscount"><del>{{category.formattedFinalPrice}}</del>{{' '}}<mark>{{category.formattedDiscountedPrice}}</mark> {{event.currency}}</ng-container>
                             <ng-container *ngIf="!category.hasDiscount">{{category.formattedFinalPrice}} {{event.currency}}</ng-container>
                             {{' '}}
-                            <fa-icon [icon]="['fa', 'info-circle']" class="text-info" ngbTooltip="{{(event.vatIncluded ? 'show-event.incVat' : 'show-event.excVat') | translate:{'0': event.vat, '1': 'TODO'} }}"></fa-icon>
+                            <fa-icon [icon]="['fa', 'info-circle']" class="text-info" ngbTooltip="{{(event.vatIncluded ? 'show-event.incVat' : 'show-event.excVat') | translate:{'0': event.vat, '1': ('common.vat' | translate)} }}"></fa-icon>
                           </span>
                         </div>
                         <div class="col-sm-2">

diff --git a/src/app/reservation/invoice-form/invoice-form.component.html b/src/app/reservation/invoice-form/invoice-form.component.html
@@ -97,7 +97,7 @@ <h2 translate="reservation-page.invoice-details"></h2>
   <div class="row" *ngIf="invoiceBusiness">
     <div [ngClass]="{'col-md-12': !vatNumberStrictlyRequired, 'col-md-6': vatNumberStrictlyRequired}">
         <div class="form-group">
-            <label for="vatNr">{{'invoice.vat' |translate: {'0': 'TODO'} }}</label>
+            <label for="vatNr">{{'invoice.vat' |translate: {'0': ('common.vat' | translate)} }}</label>
             <div class="input-group">
                 <div class="input-group-prepend" *ngIf="form.value.vatCountryCode"><span class="input-group-text">{{form.value.vatCountryCode}}</span></div>
                 <input id="vatNr" type="text" formControlName="vatNr" class="form-control" appInvalidFeedback>
@@ -108,7 +108,7 @@ <h2 translate="reservation-page.invoice-details"></h2>
         <div class="form-group">
             <div class="form-check checkbox-in-form-group">
                 <input class="form-check-input" type="checkbox" formControlName="skipVatNr" [value]="true" id="skip-vat-nr" appInvalidFeedback>
-                <label class="form-check-label radio-inline" for="skip-vat-nr">{{' '}}{{'reservation-page.skipVatNr' | translate: {'0': 'TODO'} }}</label>
+                <label class="form-check-label radio-inline" for="skip-vat-nr">{{' '}}{{'reservation-page.skipVatNr' | translate: {'0': ('common.vat' | translate)} }}</label>
             </div>
         </div>
     </div>

diff --git a/src/app/reservation/summary-table/summary-table.component.html b/src/app/reservation/summary-table/summary-table.component.html
@@ -17,19 +17,19 @@
   </tbody>
   <tfoot>
       <tr *ngIf="!reservationInfo.orderSummary.free && reservationInfo.orderSummary.displayVat && !event.vatIncluded">
-          <td colspan="3">{{'reservation-page.vat'|translate:{'0': event.vat, '1': 'TODO'} }}</td>
+          <td colspan="3">{{'reservation-page.vat'|translate:{'0': event.vat, '1': ('common.vat' | translate)} }}</td>
           <td class="text-right">{{reservationInfo.orderSummary.totalVAT}} {{event.currency}}</td>
       </tr>
       <tr>
         <th colspan="3" translate="reservation-page.total"></th>
         <td class="text-right"><strong>{{reservationInfo.orderSummary.totalPrice}} {{event.currency}}</strong></td>
       </tr>
       <tr *ngIf="!reservationInfo.orderSummary.free && reservationInfo.orderSummary.displayVat && event.vatIncluded">
-          <td colspan="3">{{'reservation-page.vat-included'|translate: {'0': event.vat, '1': 'TODO'} }}</td>
+          <td colspan="3">{{'reservation-page.vat-included'|translate: {'0': event.vat, '1': ('common.vat' | translate)} }}</td>
           <td class="text-right">{{reservationInfo.orderSummary.totalVAT}} {{event.currency}}</td>
       </tr>
       <tr *ngIf="!reservationInfo.orderSummary.free && !reservationInfo.orderSummary.displayVat">
-          <td colspan="4">{{'invoice.vat-voided'|translate: {'0': 'TODO'} }}</td>
+          <td colspan="4">{{'invoice.vat-voided'|translate: {'0': ('common.vat' | translate)} }}</td>
       </tr>
   </tfoot>
 </table>