Merge tag 'v1.7.6' into 1.8

maestrano · Nov 20, 2018 · 96a5783 · 96a5783
2 parents e8a4fb7 + 4754040
commit 96a5783
Show file tree

Hide file tree

Showing 12 changed files with 631 additions and 589 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,5 +1,10 @@
 # Impac! Frontend Changelog
 
+### v1.8.4
+- Applies v1.7.6
+
+-------------------------------------------------------------
+
 ### v1.8.3
 - Adapt Trends calculations to latest frontend
 
@@ -50,6 +55,12 @@
 
 -------------------------------------------------------------
 
+### v1.7.6
+
+- Applies v1.6.11
+
+-------------------------------------------------------------
+
 ### v1.7.5 | 2018 - Week 20
 
 - [IMPAC-855] CF: Fix Payroll costs series legend image
@@ -77,6 +88,12 @@
 
 -------------------------------------------------------------
 
+### v1.6.11 | 2018
+
+- [KAPPASUP-61] Improve messaging on live balance widget
+
+-------------------------------------------------------------
+
 ### v1.6.10 | 2018 - Week 15
 
 #### Adds

diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "impac-angular",
   "description": "Impac! Front-End Library",
-  "version": "1.8.3",
+  "version": "1.8.4",
   "license": "Copyright 2017 Maestrano Pty Ltd",
   "repository": {
     "type": "git",

diff --git a/dist/impac-angular.css b/dist/impac-angular.css
diff --git a/dist/impac-angular.js b/dist/impac-angular.js
diff --git a/dist/impac-angular.less b/dist/impac-angular.less
@@ -3285,42 +3285,6 @@ chart-threshold {
   }
 }
 
-.analytics .widget-item .content .table-layout {
-
-  table {
-    width: 100%;
-    max-width: 100%;
-
-    th,
-    td:not(.nested-table) {
-      color: @mediumblue;
-      border-bottom: solid 1px @lightgray;
-      padding: 5px 0;
-
-      &:not(:first-child) {
-        text-align: right;
-      }
-    }
-
-    th[ng-click] {
-      cursor: pointer;
-    }
-  }
-
-  #table-layout {
-    & > thead tr:first-child {
-      .font(12px,500,@impac-widget-text-color-medium);
-      text-transform: uppercase;
-      border-bottom: 2px solid @lightgray;
-      padding: 5px 0;
-    }
-
-    .nested-table {
-      i.fa { padding-right: 5px; }
-    }
-  }
-}
-
 .analytics .widget-item .content.accounts-accounting-values {
   // Nothing particular yet for this template...
 }
@@ -3579,6 +3543,12 @@ chart-threshold {
     .center-bold(0px);
   }
 
+  .come-back-later {
+    text-align: center;
+    font-size: 11px;
+    opacity: 0.8;
+  }
+
   .negative2 {
     font-size: 14px;
   }
@@ -4156,6 +4126,42 @@ chart-threshold {
     }
   }
 }
+.analytics .widget-item .content .table-layout {
+
+  table {
+    width: 100%;
+    max-width: 100%;
+
+    th,
+    td:not(.nested-table) {
+      color: @mediumblue;
+      border-bottom: solid 1px @lightgray;
+      padding: 5px 0;
+
+      &:not(:first-child) {
+        text-align: right;
+      }
+    }
+
+    th[ng-click] {
+      cursor: pointer;
+    }
+  }
+
+  #table-layout {
+    & > thead tr:first-child {
+      .font(12px,500,@impac-widget-text-color-medium);
+      text-transform: uppercase;
+      border-bottom: 2px solid @lightgray;
+      padding: 5px 0;
+    }
+
+    .nested-table {
+      i.fa { padding-right: 5px; }
+    }
+  }
+}
+
 .analytics .widget-item .content .settings.select-account {
   padding: 0px 5px;
 }
@@ -4638,40 +4644,6 @@ chart-threshold {
     }
   }
 }
-.analytics .widget-item .content.accounts-cash-projection {
-  .tall-widget();
-
-  .cash-projection-chart {
-    height: ~"calc(@{impac-big-widget-size} - 50px)";
-  }
-
-  .highcharts-legend-item {
-    rect.highcharts-point {
-      display: none;
-    }
-
-    span {
-      width: 110px;
-      text-align: center;
-      img {
-        text-align: center;
-        width: 55px;
-        height: 25px;
-      }
-    }
-  }
-
-  .dates-picker {
-    display: inline-block;
-    float: right;
-    font-size: 12px;
-  }
-
-  transactions-list {
-    font-size: 12px;
-  }
-}
-
 .analytics .widget-item .content.accounts-cash-balance {
   .tall-widget();
 
@@ -4733,6 +4705,40 @@ chart-threshold {
   }
 }
 
+.analytics .widget-item .content.accounts-cash-projection {
+  .tall-widget();
+
+  .cash-projection-chart {
+    height: ~"calc(@{impac-big-widget-size} - 50px)";
+  }
+
+  .highcharts-legend-item {
+    rect.highcharts-point {
+      display: none;
+    }
+
+    span {
+      width: 110px;
+      text-align: center;
+      img {
+        text-align: center;
+        width: 55px;
+        height: 25px;
+      }
+    }
+  }
+
+  .dates-picker {
+    display: inline-block;
+    float: right;
+    font-size: 12px;
+  }
+
+  transactions-list {
+    font-size: 12px;
+  }
+}
+
 .analytics .widget-item .content.accounts-invoices-list {
   // component specific styles
   // -------------------------

diff --git a/dist/impac-angular.min.css b/dist/impac-angular.min.css
diff --git a/dist/impac-angular.min.js b/dist/impac-angular.min.js
diff --git a/dist/locales/en-AU.json b/dist/locales/en-AU.json
@@ -75,7 +75,7 @@
   "impac.data_not_found_config.title":            "Data not found",
   "impac.data_not_found_config.live_b_title":       "Xero not found",
   "impac.data_not_found_config.main_message":     "You don't seem to have any data to display on this widget...",
-  "impac.data_not_found_config.live_b_message":   "Xero has to be added to display data on this widget...",
+  "impac.data_not_found_config.live_b_message":   "Xero has to be connected to display data on this widget...",
   "impac.data_not_found_config.link_message":     "Add an app",
   "impac.data_not_found_config.see_example":      "See an example",
   "impac.data_not_found_config.demo_data":        "Demo data",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "impac-angular",
-  "version": "1.8.3",
+  "version": "1.8.4",
   "author": {
     "name": "Xaun Lopez",
     "email": "[email protected]"

diff --git a/src/components/widgets/accounts-live-balance/accounts-live-balance.less b/src/components/widgets/accounts-live-balance/accounts-live-balance.less
@@ -31,6 +31,12 @@
     .center-bold(0px);
   }
 
+  .come-back-later {
+    text-align: center;
+    font-size: 11px;
+    opacity: 0.8;
+  }
+
   .negative2 {
     font-size: 14px;
   }

diff --git a/src/components/widgets/accounts-live-balance/accounts-live-balance.tmpl.html b/src/components/widgets/accounts-live-balance/accounts-live-balance.tmpl.html
@@ -20,13 +20,13 @@ <h3>{{widget.selectedAccount.name}}</h3>
       <div class="currency currency-centered">{{getCurrency()}}</div>
       <hr>
       <div class="headers legend">
-        <div class="price positive2">
-          {{getStatementBalance().column_7 ? (getStatementBalance().column_7 | mnoCurrency : getCurrency() : false) : 'Statement Not Available' }}
+        <div ng-class="(getStatementBalance().column_7 === 'not_ready') ? 'come-back-later' : 'price positive2'">
+          {{getStatementBalance().column_7 === 'not_ready' ? "We're preparing your data...please come back later" : (getStatementBalance().column_7 | mnoCurrency : getCurrency() : false) }}
         </div>
         <div class="statement-title"> Statement Balance </div>
         <div class="spacer"></div>
         <div class="price negative2">
-          {{getTotal().column_5 ? (getTotal().column_5 | mnoCurrency : getCurrency() : false) : 'N/A' }}
+          {{getTotal().column_5 ? (getTotal().column_5 | mnoCurrency : getCurrency() : false) : '0.00' }}
         </div>
         <div class="balance-title"> Balance in Xero </div>
       </div>

diff --git a/src/locales/en-AU.json b/src/locales/en-AU.json
@@ -75,7 +75,7 @@
   "impac.data_not_found_config.title":            "Data not found",
   "impac.data_not_found_config.live_b_title":       "Xero not found",
   "impac.data_not_found_config.main_message":     "You don't seem to have any data to display on this widget...",
-  "impac.data_not_found_config.live_b_message":   "Xero has to be added to display data on this widget...",
+  "impac.data_not_found_config.live_b_message":   "Xero has to be connected to display data on this widget...",
   "impac.data_not_found_config.link_message":     "Add an app",
   "impac.data_not_found_config.see_example":      "See an example",
   "impac.data_not_found_config.demo_data":        "Demo data",