From 840d0aabb1e4c3f20c125b2d3f259b84533114a4 Mon Sep 17 00:00:00 2001
From: piratefinn <toyou1995@gmail.com>
Date: Wed, 15 Nov 2017 13:46:34 +0000
Subject: [PATCH] currencyPipe fixed

---
 .../dashboard-customer.component.html         | 20 +++++++++----------
 .../shared/leaderboard-result.component.html  |  2 +-
 src/app/shared/payroll-result.component.html  |  2 +-
 .../shared/transaction-result.component.html  |  2 +-
 .../snippets/org-snippet-bar.component.html   |  4 ++--
 src/app/widgets/graph-widget.component.html   |  2 +-
 src/app/widgets/graph-widget.component.ts     |  2 +-
 7 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/app/dashboard/dashboard-customer.component.html b/src/app/dashboard/dashboard-customer.component.html
index 7b963f6..6a7c209 100644
--- a/src/app/dashboard/dashboard-customer.component.html
+++ b/src/app/dashboard/dashboard-customer.component.html
@@ -21,11 +21,11 @@
         <ul>
         <li>
           <div class="text-muted">My Total Spend</div>
-          <strong>{{ basicStats.user_sum | currency:'GBP':true:'1.2-2' }}</strong>
+          <strong>{{ basicStats.user_sum | currency:'GBP':'symbol':'1.2-2' }}</strong>
         </li>
         <li>
           <div class="text-muted">Value to Local Economy</div>
-          <strong>{{ basicStats.user_sum * 2.3 | currency:'GBP':true:'1.2-2' }}</strong>
+          <strong>{{ basicStats.user_sum * 2.3 | currency:'GBP':'symbol':'1.2-2' }}</strong>
         </li>
       </ul>
     </div>
@@ -34,7 +34,7 @@
     <div class="col-sm-6 col-lg-3">
       <div class="card card-inverse card-primary">
         <div class="card-block">
-          <div class="h4 mb-0">{{ basicStats.today_sum | currency:'GBP':true:'1.2-2' }}</div>
+          <div class="h4 mb-0">{{ basicStats.today_sum | currency:'GBP':'symbol':'1.2-2' }}</div>
           <div>Total Today</div>
           <!-- <div class="progress progress-white progress-xs mt-3">
             <div class="progress-bar" role="progressbar" style="width: 100%" attr.aria-valuenow="100" aria-valuemin="0" aria-valuemax="100"></div>
@@ -46,7 +46,7 @@
     <div class="col-sm-6 col-lg-3">
       <div class="card card-inverse card-primary">
         <div class="card-block">
-          <div class="h4 mb-0">{{ basicStats.today_sum / (basicStats.today_count ? basicStats.today_count : 1) | currency:'GBP':true:'1.2-2' }}</div>
+          <div class="h4 mb-0">{{ basicStats.today_sum / (basicStats.today_count ? basicStats.today_count : 1) | currency:'GBP':'symbol':'1.2-2' }}</div>
           <div>Avg. Spend Today</div>
           <!-- <div class="progress progress-white progress-xs mt-3">
             <div class="progress-bar" role="progressbar" style="width: 100%" attr.aria-valuenow="100" aria-valuemin="0" aria-valuemax="100"></div>
@@ -58,7 +58,7 @@
     <div class="col-sm-6 col-lg-3">
       <div class="card card-inverse card-primary">
         <div class="card-block">
-          <div class="h4 mb-0">{{ basicStats.week_sum | currency:'GBP':true:'1.2-2' }}</div>
+          <div class="h4 mb-0">{{ basicStats.week_sum | currency:'GBP':'symbol':'1.2-2' }}</div>
           <div>Last Week Total</div>
           <!-- <div class="progress progress-white progress-xs mt-3">
             <div class="progress-bar" role="progressbar" style="width: 100%" attr.aria-valuenow="100" aria-valuemin="0" aria-valuemax="100"></div>
@@ -70,7 +70,7 @@
     <div class="col-sm-6 col-lg-3">
       <div class="card card-inverse card-primary">
         <div class="card-block">
-          <div class="h4 mb-0">{{ basicStats.week_sum / (basicStats.week_count ? basicStats.week_count : 1) | currency:'GBP':true:'1.2-2' }}</div>
+          <div class="h4 mb-0">{{ basicStats.week_sum / (basicStats.week_count ? basicStats.week_count : 1) | currency:'GBP':'symbol':'1.2-2' }}</div>
           <div>Last Week Avg. Spend</div>
           <!-- <div class="progress progress-white progress-xs mt-3">
             <div class="progress-bar" role="progressbar" style="width: 100%" attr.aria-valuenow="100" aria-valuemin="0" aria-valuemax="100"></div>
@@ -82,7 +82,7 @@
     <div class="col-sm-6 col-lg-3">
       <div class="card card-inverse card-primary">
         <div class="card-block">
-          <div class="h4 mb-0">{{ basicStats.month_sum | currency:'GBP':true:'1.2-2' }}</div>
+          <div class="h4 mb-0">{{ basicStats.month_sum | currency:'GBP':'symbol':'1.2-2' }}</div>
           <div>Last Month Total</div>
           <!-- <div class="progress progress-white progress-xs mt-3">
             <div class="progress-bar" role="progressbar" style="width: 100%" attr.aria-valuenow="100" aria-valuemin="0" aria-valuemax="100"></div>
@@ -94,7 +94,7 @@
     <div class="col-sm-6 col-lg-3">
       <div class="card card-inverse card-primary">
         <div class="card-block">
-          <div class="h4 mb-0">{{ basicStats.month_sum / (basicStats.month_count ? basicStats.month_count : 1) | currency:'GBP':true:'1.2-2' }}</div>
+          <div class="h4 mb-0">{{ basicStats.month_sum / (basicStats.month_count ? basicStats.month_count : 1) | currency:'GBP':'symbol':'1.2-2' }}</div>
           <div>Last Month Avg. Spend</div>
           <!-- <div class="progress progress-white progress-xs mt-3">
             <div class="progress-bar" role="progressbar" style="width: 100%" attr.aria-valuenow="100" aria-valuemin="0" aria-valuemax="100"></div>
@@ -106,7 +106,7 @@
     <div class="col-sm-6 col-lg-3">
       <div class="card card-inverse card-primary">
         <div class="card-block">
-          <div class="h4 mb-0">{{ basicStats.user_sum | currency:'GBP':true:'1.2-2' }}</div>
+          <div class="h4 mb-0">{{ basicStats.user_sum | currency:'GBP':'symbol':'1.2-2' }}</div>
           <div>User Total</div>
           <!-- <div class="progress progress-white progress-xs mt-3">
             <div class="progress-bar" role="progressbar" style="width: 100%" attr.aria-valuenow="100" aria-valuemin="0" aria-valuemax="100"></div>
@@ -118,7 +118,7 @@
     <div class="col-sm-6 col-lg-3">
       <div class="card card-inverse card-primary">
         <div class="card-block">
-          <div class="h4 mb-0">{{ basicStats.user_sum / (basicStats.user_count ? basicStats.user_count : 1) | currency:'GBP':true:'1.2-2' }}</div>
+          <div class="h4 mb-0">{{ basicStats.user_sum / (basicStats.user_count ? basicStats.user_count : 1) | currency:'GBP':'symbol':'1.2-2' }}</div>
           <div>User Avg. Spend</div>
           <!-- <div class="progress progress-white progress-xs mt-3">
             <div class="progress-bar" role="progressbar" style="width: 100%" attr.aria-valuenow="100" aria-valuemin="0" aria-valuemax="100"></div>
diff --git a/src/app/shared/leaderboard-result.component.html b/src/app/shared/leaderboard-result.component.html
index 76e4d3c..f941935 100644
--- a/src/app/shared/leaderboard-result.component.html
+++ b/src/app/shared/leaderboard-result.component.html
@@ -1,3 +1,3 @@
 <td>{{ leaderboard.position }}</td>
 <td class="text-truncate">{{ leaderboard.display_name }}</td>
-<td>{{ listType.includes('total') ? (leaderboard.value | currency:'GBP':true:'1.2-2') : (leaderboard.value | number:'1.0-0') }}</td>
+<td>{{ listType.includes('total') ? (leaderboard.value | currency:'GBP':'symbol':'1.2-2') : (leaderboard.value | number:'1.0-0') }}</td>
diff --git a/src/app/shared/payroll-result.component.html b/src/app/shared/payroll-result.component.html
index 6d891c6..2022309 100644
--- a/src/app/shared/payroll-result.component.html
+++ b/src/app/shared/payroll-result.component.html
@@ -1,3 +1,3 @@
 <td>{{payrollDate}}</td>
-<td>{{payroll.gross_payroll | currency:'GBP':true:'1.2-2' }}</td>
+<td>{{payroll.gross_payroll | currency:'GBP':'symbol':'1.2-2' }}</td>
 <td>{{payroll.employee_amount}}</td>
diff --git a/src/app/shared/transaction-result.component.html b/src/app/shared/transaction-result.component.html
index 5736bdf..8218cb7 100644
--- a/src/app/shared/transaction-result.component.html
+++ b/src/app/shared/transaction-result.component.html
@@ -1,3 +1,3 @@
 <td>{{transaction.seller}}</td>
-<td>{{transaction.value | currency:'GBP':true:'1.2-2' }}</td>
+<td>{{transaction.value | currency:'GBP':'symbol':'1.2-2' }}</td>
 <td>{{transactionDate}}</td>
diff --git a/src/app/snippets/org-snippet-bar.component.html b/src/app/snippets/org-snippet-bar.component.html
index e1e76ef..db5bfb6 100644
--- a/src/app/snippets/org-snippet-bar.component.html
+++ b/src/app/snippets/org-snippet-bar.component.html
@@ -7,7 +7,7 @@
       </li>
       <li class="hidden-sm-down">
         <div class="text-muted">Money Spent This Month</div>
-        <strong>{{ thisMonthPurchasesTotal | currency:'GBP':true:'1.2-2'}}</strong>
+        <strong>{{ thisMonthPurchasesTotal | currency:'GBP':'symbol':'1.2-2'}}</strong>
       </li>
       <li class="hidden-sm-down">
         <div class="text-muted">Customers Today</div>
@@ -15,7 +15,7 @@
       </li>
       <li class="hidden-sm-down">
         <div class="text-muted">Average Transaction Today</div>
-        <strong>{{ ( todaySalesTotal / todaySalesCount ) || 0 | currency:'GBP':true:'1.2-2'}}</strong>
+        <strong>{{ ( todaySalesTotal / todaySalesCount ) || 0 | currency:'GBP':'symbol':'1.2-2'}}</strong>
       </li>
     </ul>
   </div>
diff --git a/src/app/widgets/graph-widget.component.html b/src/app/widgets/graph-widget.component.html
index b94d92e..eee8be8 100644
--- a/src/app/widgets/graph-widget.component.html
+++ b/src/app/widgets/graph-widget.component.html
@@ -4,7 +4,7 @@
       <i [ngClass]="graphIcon"></i>
     </button>
     <h4 *ngIf="dataType == availableDataTypes.number" class="mb-0">{{ graphSum }}</h4>
-    <h4 *ngIf="dataType == availableDataTypes.currency" class="mb-0">{{ graphSum | currency:'GBP':true:'1.2-2' }}</h4>
+    <h4 *ngIf="dataType == availableDataTypes.currency" class="mb-0">{{ graphSum | currency:'GBP':'symbol':'1.2-2' }}</h4>
     <p>{{ graphTitle }}</p>
   </div>
   <div class="chart-wrapper px-3" style="height:70px;">
diff --git a/src/app/widgets/graph-widget.component.ts b/src/app/widgets/graph-widget.component.ts
index 1339db9..3d99096 100644
--- a/src/app/widgets/graph-widget.component.ts
+++ b/src/app/widgets/graph-widget.component.ts
@@ -137,7 +137,7 @@ export class GraphWidget implements OnInit {
   private tooltipLabelCallback(tooltipItem: any, data: any) {
     const value = tooltipItem.yLabel;
     if ( this.dataType === DataType.currency ) {
-      return this.currencyPipe.transform(value, 'GBP', true, '1.2-2');
+      return this.currencyPipe.transform(value, 'GBP', 'symbol', '1.2-2');
     }
     return value || '0';
   }