diff --git a/karma.conf.js b/karma.conf.js
index 056b4e9..02b3582 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -7,6 +7,7 @@ module.exports = function (config) {
frameworks: ['jasmine', '@angular-devkit/build-angular'],
plugins: [
require('karma-jasmine'),
+ require("readable-stream");
require('karma-chrome-launcher'),
require('karma-jasmine-html-reporter'),
require('karma-coverage-istanbul-reporter'),
@@ -16,10 +17,10 @@ module.exports = function (config) {
clearContext: false // leave Jasmine Spec Runner output visible in browser
},
files: [
-
+
],
preprocessors: {
-
+
},
mime: {
'text/x-typescript': ['ts','tsx']
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 5dac1a3..36f8a7f 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -46,7 +46,6 @@ import { SuppliersComponent } from './dashboard/suppliers.component';
import { MoreStuffComponent } from './dashboard/more-graphs-and-tables.component';
-
@NgModule({
imports: [
BrowserModule,
@@ -73,6 +72,7 @@ import { MoreStuffComponent } from './dashboard/more-graphs-and-tables.component
MoreStuffComponent,
P404Component,
P500Component,
+
],
providers: [
AuthGuard,
diff --git a/src/app/dashboard/dashboard-customer.component.html b/src/app/dashboard/dashboard-customer.component.html
index c18993a..7f7abc9 100644
--- a/src/app/dashboard/dashboard-customer.component.html
+++ b/src/app/dashboard/dashboard-customer.component.html
@@ -179,5 +179,44 @@
+
+
+
+
+
+
Spend by company and industrial sector
+
+
+
+
+
+
+
+
+ -
+
+
+
{{ category.category || 'N/A' }}
+
+
+
Bought
+
{{ category.value || 'N/A' }}
+
+
+ - totalCategoryLimit && disableCategoryButton == false" class="divider text-center">
+
+
+
+
+
+
+
diff --git a/src/app/dashboard/dashboard-customer.component.ts b/src/app/dashboard/dashboard-customer.component.ts
index caf631f..0295a7e 100644
--- a/src/app/dashboard/dashboard-customer.component.ts
+++ b/src/app/dashboard/dashboard-customer.component.ts
@@ -101,6 +101,8 @@ export class DashboardCustomerComponent implements OnInit {
public barChartDataCategory:any[]=[];
public barChartLabelsCategory:string[] = [];
+
+
weekPurchaseList = {
first: 0,
second: 0,
diff --git a/src/app/dashboard/transaction-log.component.ts b/src/app/dashboard/transaction-log.component.ts
index 50a33b1..fcd290c 100644
--- a/src/app/dashboard/transaction-log.component.ts
+++ b/src/app/dashboard/transaction-log.component.ts
@@ -87,6 +87,7 @@ export class TransactionLogComponent implements OnInit {
);
}
+
recurringTransactionDetails(clicked, template: TemplateRef) {
this.clickedRecur = clicked;
this.updatedTime = moment(this.clickedRecur.display_time, 'llll').format('YYYY-MM-DD[T]HH:mm');
diff --git a/src/app/layouts/full-layout.component.html b/src/app/layouts/full-layout.component.html
index c4369e8..26a4ed9 100644
--- a/src/app/layouts/full-layout.component.html
+++ b/src/app/layouts/full-layout.component.html
@@ -103,21 +103,21 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/src/app/panels/bubble-panel.html b/src/app/panels/bubble-panel.component.html
similarity index 100%
rename from src/app/panels/bubble-panel.html
rename to src/app/panels/bubble-panel.component.html
diff --git a/src/app/panels/bubble-panel.ts b/src/app/panels/bubble-panel.component.ts
similarity index 100%
rename from src/app/panels/bubble-panel.ts
rename to src/app/panels/bubble-panel.component.ts
diff --git a/src/app/providers/api-service.ts b/src/app/providers/api-service.ts
index 61508c1..c89bbe0 100644
--- a/src/app/providers/api-service.ts
+++ b/src/app/providers/api-service.ts
@@ -133,6 +133,27 @@ export class ApiService {
);
}
+ // LCC data
+ public externalTransactions() {
+ const key = this.sessionKey;
+ return this.http.post(
+ this.apiUrl + '/v1/organisation/external/transactions',
+ {
+ session_key : key,
+ }
+ );
+ }
+
+ public externalSuppliers() {
+ const key = this.sessionKey;
+ return this.http.post(
+ this.apiUrl + '/organisation/external/suppliers',
+ {
+ session_key : key,
+ }
+ );
+ }
+
// Searches organisations used for transaction submission
public search(data) {