From 512b18ca85209fad5f7fee11690e31f43a31aabc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lara=20Mi=C3=B1ones=20Rodr=C3=ADguez?= Date: Thu, 27 Nov 2025 15:46:40 +0100 Subject: [PATCH 1/7] ADD error message to revenue sharing + env variable for disabling quotes --- .../provider-revenue-sharing.component.html | 23 ++++++-- .../provider-revenue-sharing.component.ts | 53 +++++++++++++------ src/app/shared/card/card.component.html | 2 +- src/app/shared/card/card.component.ts | 1 + src/app/shared/header/header.component.html | 2 +- src/app/shared/header/header.component.ts | 1 + src/environments/environment.development.ts | 1 + src/environments/environment.production.ts | 1 + src/environments/environment.ts | 1 + 9 files changed, 63 insertions(+), 22 deletions(-) diff --git a/src/app/pages/user-profile/profile-sections/provider-revenue-sharing/provider-revenue-sharing.component.html b/src/app/pages/user-profile/profile-sections/provider-revenue-sharing/provider-revenue-sharing.component.html index 24a2e434..f832104a 100644 --- a/src/app/pages/user-profile/profile-sections/provider-revenue-sharing/provider-revenue-sharing.component.html +++ b/src/app/pages/user-profile/profile-sections/provider-revenue-sharing/provider-revenue-sharing.component.html @@ -1,14 +1,14 @@
+

Provider revenue sharing

@if (loading) { -
+
Loading...
-} @else { -

Provider revenue sharing

+} @else { @if(subscription){
@@ -114,4 +114,19 @@

+ +

+ } \ No newline at end of file diff --git a/src/app/pages/user-profile/profile-sections/provider-revenue-sharing/provider-revenue-sharing.component.ts b/src/app/pages/user-profile/profile-sections/provider-revenue-sharing/provider-revenue-sharing.component.ts index ea77200f..fc6a5627 100644 --- a/src/app/pages/user-profile/profile-sections/provider-revenue-sharing/provider-revenue-sharing.component.ts +++ b/src/app/pages/user-profile/profile-sections/provider-revenue-sharing/provider-revenue-sharing.component.ts @@ -22,6 +22,8 @@ export class ProviderRevenueSharingComponent implements OnInit { revenueSummary:any; referral:any; support:any; + errorMessage: any = ''; + showError:boolean=false; partyId:any=''; @@ -33,25 +35,44 @@ export class ProviderRevenueSharingComponent implements OnInit { async ngOnInit() { + this.loading=true; this.initPartyInfo(); - let info = await this.revenueService.getRevenue(this.partyId); - console.log('------') - console.log(info) - for(let i=0; i (this.showError = false), 3000); } initPartyInfo(){ diff --git a/src/app/shared/card/card.component.html b/src/app/shared/card/card.component.html index 5412b371..b86e1329 100644 --- a/src/app/shared/card/card.component.html +++ b/src/app/shared/card/card.component.html @@ -91,7 +91,7 @@ class="flex align-items-bottom text-white cursor-pointer bg-green-700 hover:bg-green-900 focus:ring-4 focus:outline-none focus:ring-green-300 font-medium rounded-lg text-sm px-5 py-2.5 text-center dark:bg-green-600 dark:hover:bg-green-700 dark:focus:ring-green-800"> {{ 'CARD._add_cart' | translate }} - } @else if(providerThemeName=='DOME'){ + } @else if(quotesEnabled){ - @if(providerThemeName=='DOME'){ + @if(quotesEnabled){
    • diff --git a/src/app/shared/header/header.component.ts b/src/app/shared/header/header.component.ts index db97b068..1f7cc769 100644 --- a/src/app/shared/header/header.component.ts +++ b/src/app/shared/header/header.component.ts @@ -62,6 +62,7 @@ export class HeaderComponent implements OnInit, AfterViewInit, DoCheck, OnDestro this.themeToggleLightIcon = themeToggleLightIcon; } providerThemeName = environment.providerThemeName; + quotesEnabled = environment.QUOTES_ENABLED; qrWindow: Window | null = null; statePair:string catalogs: any[] | undefined = []; diff --git a/src/environments/environment.development.ts b/src/environments/environment.development.ts index 62cad292..914ce452 100644 --- a/src/environments/environment.development.ts +++ b/src/environments/environment.development.ts @@ -80,6 +80,7 @@ export const environment = { addAttachmentToQuote: '/addAttachmentToQuote', deleteQuote: '/quote' }, + QUOTES_ENABLED: true, analytics: '', feedbackCampaign: false, feedbackCampaignExpiration: 0 diff --git a/src/environments/environment.production.ts b/src/environments/environment.production.ts index f88fa8db..0d5c6674 100644 --- a/src/environments/environment.production.ts +++ b/src/environments/environment.production.ts @@ -80,6 +80,7 @@ export const environment = { addAttachmentToQuote: '/addAttachmentToQuote', deleteQuote: '/quote' }, + QUOTES_ENABLED: true, analytics: '', feedbackCampaign: false, feedbackCampaignExpiration: 0 diff --git a/src/environments/environment.ts b/src/environments/environment.ts index eb083d1b..59de786c 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -80,6 +80,7 @@ export const environment = { addAttachmentToQuote: '/addAttachmentToQuote', deleteQuote: '/quote' }, + QUOTES_ENABLED: true, analytics: '', feedbackCampaign: false, feedbackCampaignExpiration: 0 From 9b89aa731e358ec42a61a087aebe62f06f14076b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lara=20Mi=C3=B1ones=20Rodr=C3=ADguez?= Date: Thu, 27 Nov 2025 15:47:20 +0100 Subject: [PATCH 2/7] FIX init service --- src/app/services/app-init.service.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/app/services/app-init.service.ts b/src/app/services/app-init.service.ts index 5bfe5c53..d8f3d93f 100644 --- a/src/app/services/app-init.service.ts +++ b/src/app/services/app-init.service.ts @@ -24,7 +24,7 @@ export class AppInitService { environment.SEARCH_ENABLED = config.searchEnabled; environment.DOME_TRUST_LINK = config.domeTrust; environment.DOME_ABOUT_LINK = config.domeAbout; - environment.PURCHASE_ENABLED = config.purchaseEnabled; + environment.PURCHASE_ENABLED = config.purchaseEnabled ?? false; environment.DOME_REGISTER_LINK = config.domeRegister; environment.DOME_PUBLISH_LINK = config.domePublish; environment.KB_ONBOARDING_GUIDELINES_URL = config.domeOnboardingGuidelines; @@ -35,7 +35,8 @@ export class AppInitService { environment.analytics = config.analytics ?? 'https://analytics.dome-marketplace-sbx.org/', environment.feedbackCampaign = config.feedbackCampaign ?? false, environment.feedbackCampaignExpiration = config.feedbackCampaign ?? moment().add(1, 'week').unix() - environment.providerThemeName = config.theme ?? 'default'; + environment.providerThemeName = 'DOME'; + environment.QUOTES_ENABLED = config.quotesEnabled ?? true resolve(config); }), error: (error) => { From 2a1197db10d916d669739620e771aeac3d66c47a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lara=20Mi=C3=B1ones=20Rodr=C3=ADguez?= Date: Thu, 27 Nov 2025 15:54:56 +0100 Subject: [PATCH 3/7] FIX disable quote on prod details --- src/app/pages/product-details/product-details.component.html | 4 ++-- src/app/pages/product-details/product-details.component.ts | 1 + src/app/services/app-init.service.ts | 2 +- src/app/shared/card/card.component.html | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/app/pages/product-details/product-details.component.html b/src/app/pages/product-details/product-details.component.html index de748cb4..707d19b3 100644 --- a/src/app/pages/product-details/product-details.component.html +++ b/src/app/pages/product-details/product-details.component.html @@ -165,7 +165,7 @@ {{ 'CARD._add_cart' | translate }} - } @else if(providerThemeName=='DOME') { + } @else if(quotesEnabled) { - } @else if(providerThemeName=='DOME') { + } @else if(quotesEnabled) {
    - } - - @if(billing){ -
    - -

    Billing History

    - -
    - @for(child of billing?.items; track child){ -
    - {{ child?.label }}: - @for(state of child?.items; track state){ -
    - - {{state?.label}}: - @if(state?.link != null){ - - {{state?.text}} - - } @else { - {{state?.text}} - } - -
    - } - -
    - } -
    - + @for (section of report; track section) { +
    + +
    - } - - @if(revenue){ -
    -

    Revenue Volume Monitoring

    -
    - @for(child of revenue?.items; track child){ -
    - {{ child?.label }}: {{child?.text}} -
    - } -
    -
    - } - - @if(revenueSummary){ -
    -

    Revenue Summary

    -
    -

    - {{ revenueSummary?.text }} -

    -
    -
    - } - - - @if(referral){ -
    -

    Referral Program Area

    -
    - @for(child of referral?.items; track child){ -
    - {{ child?.label }}: {{child?.text}} -
    - } -
    -
    - } - - @if(support){ -
    -

    Support Contact

    -
    - @for(child of support?.items; track child){ -
    - {{ child?.label }}: - @if(child?.link != null){ - - {{child?.text}} - - } @else { - {{child?.text}} - } -
    - } -
    -
    - } + } + }
    diff --git a/src/app/pages/user-profile/profile-sections/provider-revenue-sharing/provider-revenue-sharing.component.ts b/src/app/pages/user-profile/profile-sections/provider-revenue-sharing/provider-revenue-sharing.component.ts index fc6a5627..e193eb8c 100644 --- a/src/app/pages/user-profile/profile-sections/provider-revenue-sharing/provider-revenue-sharing.component.ts +++ b/src/app/pages/user-profile/profile-sections/provider-revenue-sharing/provider-revenue-sharing.component.ts @@ -3,17 +3,19 @@ import { CommonModule } from '@angular/common'; import { TranslateModule } from '@ngx-translate/core'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; import {LocalStorageService} from "src/app/services/local-storage.service"; -import { LoginInfo } from 'src/app/models/interfaces'; +import { LoginInfo, Report } from 'src/app/models/interfaces'; import { RevenueSharingService } from 'src/app/services/revenue-sharing.service' +import { RevenueReportComponent } from 'src/app/shared/revenue-report/revenue-report.component' import * as moment from 'moment'; @Component({ selector: 'provider-revenue-sharing', standalone: true, - imports: [TranslateModule, FontAwesomeModule, CommonModule], + imports: [TranslateModule, FontAwesomeModule, CommonModule, RevenueReportComponent], templateUrl: './provider-revenue-sharing.component.html', styleUrl: './provider-revenue-sharing.component.css' }) + export class ProviderRevenueSharingComponent implements OnInit { loading: boolean = false; subscription:any; @@ -24,8 +26,11 @@ export class ProviderRevenueSharingComponent implements OnInit { support:any; errorMessage: any = ''; showError:boolean=false; + partyId:any=''; + report: Report[]=[]; + constructor( private localStorage: LocalStorageService, @@ -42,21 +47,7 @@ export class ProviderRevenueSharingComponent implements OnInit { this.loading=false; console.log('------') console.log(info) - for(let i=0; i +

    {{ node.label }}:

    + +
    + + + @if(node.text) { + + @if(node.link) { + + {{ node.text }} + + } @else { + {{ node.text }} + } + + } + + + @if(node.items?.length > 0) { + @for (child of node.items; track child) { + + } + } +
    +
    + \ No newline at end of file diff --git a/src/app/shared/revenue-report/revenue-report.component.spec.ts b/src/app/shared/revenue-report/revenue-report.component.spec.ts new file mode 100644 index 00000000..2d473ea3 --- /dev/null +++ b/src/app/shared/revenue-report/revenue-report.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { RevenueReportComponent } from './revenue-report.component'; + +describe('RevenueReportComponent', () => { + let component: RevenueReportComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [RevenueReportComponent] + }) + .compileComponents(); + + fixture = TestBed.createComponent(RevenueReportComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/shared/revenue-report/revenue-report.component.ts b/src/app/shared/revenue-report/revenue-report.component.ts new file mode 100644 index 00000000..b10f3a7a --- /dev/null +++ b/src/app/shared/revenue-report/revenue-report.component.ts @@ -0,0 +1,13 @@ +import { Component, Input } from '@angular/core'; +import {Report} from 'src/app/models/interfaces' + +@Component({ + selector: 'app-revenue-report', + standalone: true, + imports: [], + templateUrl: './revenue-report.component.html', + styleUrl: './revenue-report.component.css' +}) +export class RevenueReportComponent { + @Input() node!: any; +} From bfa61fda71d37ad70044afe19187f6b2f6393f29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lara=20Mi=C3=B1ones=20Rodr=C3=ADguez?= Date: Fri, 28 Nov 2025 12:08:28 +0100 Subject: [PATCH 6/7] FIX top margin on info boxes --- src/app/shared/revenue-report/revenue-report.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/shared/revenue-report/revenue-report.component.html b/src/app/shared/revenue-report/revenue-report.component.html index 15a3ceb1..97e6eb34 100644 --- a/src/app/shared/revenue-report/revenue-report.component.html +++ b/src/app/shared/revenue-report/revenue-report.component.html @@ -1,4 +1,4 @@ -
    +

    {{ node.label }}:

    From a6923fb895f9d4b0083a1ba1c736f05d3768cadb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lara=20Mi=C3=B1ones=20Rodr=C3=ADguez?= Date: Fri, 28 Nov 2025 12:17:52 +0100 Subject: [PATCH 7/7] FIX place label and text on same line --- .../revenue-report.component.html | 29 ++++++++++++------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/src/app/shared/revenue-report/revenue-report.component.html b/src/app/shared/revenue-report/revenue-report.component.html index 97e6eb34..f1b52932 100644 --- a/src/app/shared/revenue-report/revenue-report.component.html +++ b/src/app/shared/revenue-report/revenue-report.component.html @@ -1,15 +1,19 @@
    -

    {{ node.label }}:

    + + +
    +

    + {{ node.label }}: +

    -
    - - + @if(node.text) { @if(node.link) { - + {{ node.text }} } @else { @@ -17,13 +21,16 @@

    {{ node.label }}: } } +

    - - @if(node.items?.length > 0) { + + @if(node.items?.length > 0) { +
    @for (child of node.items; track child) { } - } -
    +
    + } +
    \ No newline at end of file