display fixes in customer dashboard

synergatika · Nov 1, 2022 · 7c90b45 · 7c90b45
1 parent dd754d2
commit 7c90b45
Show file tree

Hide file tree

Showing 7 changed files with 58 additions and 53 deletions.
diff --git a/src/app/auth/terms/synergy_terms.component.html b/src/app/auth/terms/synergy_terms.component.html
@@ -1,36 +1,4 @@
-<div class="col-xl-12">
-    <div class="col-xl-12">
-        <!-- <h1 mat-dialog-title>Favorite Animal</h1>
-            <h2 mat-dialog-title>Install Angular</h2> -->
-        <!-- <mat-dialog-content> -->
-        <h2><strong>Terms and Conditions</strong></h2>
-        <p>Welcome to Synergy Web App!</p>
-        <p>These terms and conditions outline the rules and regulations for the use of Synergy's Website,
-            located at app.synergatika.gr.</p>
-        <p>By accessing this website we assume you accept these terms and conditions. Do not continue to use
-            Synergy Web App if you do not agree to take all of the terms and conditions stated on this page.
-        </p>
-        <p>The following terminology applies to these Terms and Conditions, Privacy Statement and Disclaimer
-            Notice and all Agreements: "Client", "You" and "Your" refers to you, the person log on this
-            website and compliant to the Company’s terms and conditions. "The Company", "Ourselves", "We",
-            "Our" and "Us", refers to our Company. "Party", "Parties", or "Us", refers to both the Client
-            and ourselves. All terms refer to the offer, acceptance and consideration of payment necessary
-            to undertake the process of our assistance to the Client in the most appropriate manner for the
-            express purpose of meeting the Client’s needs in respect of provision of the Company’s stated
-            services, in accordance with and subject to, prevailing law of Netherlands. Any use of the above
-            terminology or other words in the singular, plural, capitalization and/or he/she or they, are
-            taken as interchangeable and therefore as referring to same.</p>
-        <h3><strong>Cookies</strong></h3>
-        <p>We employ the use of cookies. By accessing Synergy Web App, you agreed to use cookies in
-            agreement with the Synergy's Privacy Policy.</p>
-        <p>Most interactive websites use cookies to let us retrieve the user’s details for each visit.
-            Cookies are used by our website to enable the functionality of certain areas to make it easier
-            for people visiting our website. Some of our affiliate/advertising partners may also use
-            cookies.</p>
-        <!-- </mat-dialog-content> -->
-        <!-- <mat-dialog-actions>
-                <button mat-button mat-dialog-close>Cancel</button>
-                <button mat-button [mat-dialog-close]="true" cdkFocusInitial>Agree</button>
-            </mat-dialog-actions> -->
+<div class="terms-container" *ngIf="content">
+    <div class="col-xl-12" [innerHTML]="content">
     </div>
-</div>
+</div>
diff --git a/src/app/auth/terms/synergy_terms.component.ts b/src/app/auth/terms/synergy_terms.component.ts
@@ -1,27 +1,47 @@
-import { Component, OnInit, OnDestroy } from '@angular/core';
+import { Component, OnInit, OnDestroy, ChangeDetectorRef } from '@angular/core';
+import { Subject } from 'rxjs';
 import { MatDialog } from '@angular/material/dialog';
+import { StaticContentService  } from '../../core/services/static_content.service';
 
 @Component({
-    selector: 'app-terms',
-    templateUrl: './synergy_terms.component.html',
+  selector: 'app-terms',
+  templateUrl: './synergy_terms.component.html',
 })
 export class TermsComponent implements OnInit, OnDestroy {
 
+  private unsubscribe: Subject<any>;
+  content: any;
+
 	/**
 	 * Component Constructor
 	 *
 	 * @param dialog: MatDialog
 	 */
-    constructor(
-        public dialog: MatDialog,
-    ) {
-    }
+  constructor(
+    public dialog: MatDialog,
+    private cdr: ChangeDetectorRef,
+    private StaticContentService : StaticContentService ,
+  ) {
+  }
+
+  ngOnInit() {
+    this.unsubscribe = new Subject();
+    this.content = null;
+    this.fetchContent('126');
+  }
+
+  fetchContent(page_id) {
+    this.StaticContentService.getWPContent(page_id).subscribe((data) => {
+      this.content = data.content.rendered;
+      console.log(this.content);
+    });
+  }
 
-    ngOnInit() {
-    }
+  ngOnDestroy() {
+    this.unsubscribe.next();
+    this.unsubscribe.complete();
+  }
 
-    ngOnDestroy() {
 
-    }
 
-}
+}
diff --git a/src/app/core/config/i18n/el.ts b/src/app/core/config/i18n/el.ts
@@ -58,7 +58,7 @@ export const locale = {
     AUTH: {
       MESSAGES: {
         WELCOME_TITLE: 'Καλώς ήρθες',
-        WELCOME_SUBTITLE: 'Έλα στην παρέα του synergatika.gr για να στηρίξεις τα συνεργατικά καταστήματα και να κερδίσεις εκπτώσεις και προσφορές!',
+        WELCOME_SUBTITLE: 'Έλα στην παρέα του synergatika.gr για να μας γνωρίσεις και να μας στηρίξεις!',
         HAVE_ACCOUNT: 'Έχεις ήδη Λογαριασμό;',
         NOT_HAVE_ACCOUNT: 'Ακόμα δεν έχεις Λογαριασμό;',
         ALREADY_VALIDATED: 'Έχεις ήδη επαληθεύσει το email σου;',
@@ -754,10 +754,15 @@ export const locale = {
       PUBLISH_CONFIRM_B: 'Μέτα τη δημοσίευση δεν θα είναι διαθέσιμη η επεξεργασία της',
       DRAFT: 'πρόχειρο',
       CANCEL: 'Ακύρωση',
-
+      NOT_REDEEMABLE :{
+        DESC: 'Η καμπάνια δεν είναι εξαργυρώσιμη. Ευχαριστούμε για την προσφορά σας!',
+        DONATED: 'ΔΩΡΕΑ'
+      },
+      UNPAID_TITLE:"Στοιχεία πληρωμής",
+      UNPAID_MSSG:"Η πληρωμή σου στην καμπάνια δεν έχει επιβεβαιωθεί. Αν δεν έχεις κάνει την πληρωμή κάνε την άμεσα. Αν πληρώσεις τραπεζικά, χρησιμοποιήσε την ταυτότητα πληρωμής στην αιτιολογία της κατάθεσης.",
       SUPPORT_PERIOD: 'Περίοδος Υποστήριξης',
       SUPPORT_PERIOD_SUB: 'Αυτή είναι η περίοδος που μπορείτε να προπληρώσετε τα προϊόντα που επιθυμείτε',
-      REDEEM_PERIOD: 'Περίοδος εξαργύρωσης',
+      REDEEM_PERIOD: 'Περίοδος Εξαργύρωσης',
       REDEEM_PERIOD_SUB: 'Αυτή είναι η περίοδος που μπορείτε να εξαργυρώσετε τα προϊόντα για τα οποία έχετε προπληρώσει',
       PRICE: 'Τιμή',
       PRICE_PER_ITEM: 'Τιμή ανα ποσότητα',
@@ -867,6 +872,7 @@ export const locale = {
         QR_CODE: 'Ο QR Κωδικός σου',
         WALLET_TITLE: 'Το πορτοφόλι μου',
         WALLET_SUBTITLE: 'σε όλο το δίκτυο',
+        WALLET_DESC:'Εδώ βλέπεις τους πόντους σου και τις καμπάνιες που συμμετέχεις.'
       },
       WIZARD: {
         NEXT_STEP: 'Επόμενο Βήμα',

diff --git a/src/app/core/services/static_content.service.ts b/src/app/core/services/static_content.service.ts
@@ -54,6 +54,10 @@ export class StaticContentService {//extends IStaticContentService {
     })
   }
 
+  getWPContent(pageId): Observable<any> {
+    return this.http.get<any>(environment.staticUrl + "/pages/" + pageId);
+  }
+
   // return new Promise<boolean>((resolve) => {
   //   // this.http.get(`${environment.apiUrl}/content`).subscribe((response) => {
   //   //  this.content$ = response['data'];

diff --git a/src/app/member-menu/member-dashboard/member-dashboard.component.html b/src/app/member-menu/member-dashboard/member-dashboard.component.html
@@ -17,7 +17,10 @@
       <mat-card class="dashboard-card wallet-card">
 
         <mat-card-header class="wallet-card-header">
-          <mat-card-title>{{'MEMBER.DASHBOARD.WALLET_TITLE' | translate}}</mat-card-title>
+          <mat-card-title>
+            <h3>{{'MEMBER.DASHBOARD.WALLET_TITLE' | translate}}</h3>
+            <span>{{'MEMBER.DASHBOARD.WALLET_DESC' | translate}}</span>
+          </mat-card-title>
 
           <!--begin::QR Code-->
           <sng-qr_code-card></sng-qr_code-card>

diff --git a/src/app/member-menu/member-dashboard/member-dashboard.component.scss b/src/app/member-menu/member-dashboard/member-dashboard.component.scss
@@ -28,6 +28,10 @@
   &-header {
     border-bottom: 2px solid #eee;
     margin-bottom: 10px;
+    span{
+      font-size: 15px;
+      color:#707070;
+    }
   }
 
   &-icon {

diff --git a/src/index.html b/src/index.html
@@ -3,7 +3,7 @@
 
 <head>
   <meta charset="utf-8">
-  <title>Synergy Wallet</title>
+  <title>App -Synergatika.gr | Εμπορική Κοινότητα Συνεργατικών </title>
   <base href="/">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link rel="icon" type="image/x-icon" href="assets/media/images/favicon.png">
@@ -23,4 +23,4 @@
   if (global === undefined) {
     var global = window;
   }
-</script>
+</script>