Merge branch 'thierry' of ssh://git.marbelium.com:10023/Viiciouss/XJC into anis

src/app/components/admin/demande-op-commercial/demande-op-commercial.component.html

@@ -3,14 +3,14 @@
 <div class="container">
 
   <div class="col-md-12" id="demandes">
-    <h4 class="mb-5 mt-1 font-bold wow fadeInDown text-center" style="padding-top: 5%;">Nouvelles demandes d'opérations</h4>
+    <h4 class="mb-5 mt-1 font-bold wow fadeInDown text-center" style="padding-top: 5%;">Demande d'opération commerciale</h4>
     <div class="list-group wow fadeInLeftBig">
       <div class="card mainCard" *ngFor="let op of opCommDataEnCours | async">
         <div class="row no-margin" id="testt">
           <div class="col-md-6 mb-1 subCard1" id="subCard1">
             <img src="{{op.carteTemplate.downloadURL}}" id="image1" class="mx-auto d-block flex-center card-img-overlay" alt="Responsive image">
             <div class="view">
-              <div class="mask pattern-3">
+              <div class="mask pattern-6">
                 <div class="row firstRow">
                   <div class="col-md-6 flex-center card-block cardPart1"><p class="white-text info-text font-bold">{{commercant.commercialName}}</p></div>
                   <div class="col-md-6 flex-center card-block card-image mb-1 cardPart2 image2" [ngStyle]="{ 'background-image': 'url(' + commercant.image.downloadURL + ')'}">

src/app/components/admin/liste-op-commercial/liste-op-commercial.component.html

@@ -25,7 +25,7 @@
           <div class="col-md-6 mb-1 subCard1" id="subCard1">
             <img src="{{op.carteTemplate.downloadURL}}" id="image1" class="mx-auto d-block flex-center card-img-overlay" alt="Responsive image">
             <div class="view">
-              <div class="mask pattern-3">
+              <div class="mask pattern-6">
                 <div class="row no-margin firstRow">
                   <div class="col-md-6 flex-center card-block cardPart1"><p class="white-text info-text font-bold">{{commercant.commercialName}}</p></div>
                   <div class="col-md-6 flex-center card-block card-image mb-1 cardPart2 image2" [ngStyle]="{ 'background-image': 'url(' + commercant.image.downloadURL + ')'}">
@@ -94,7 +94,7 @@
           <div class="col-md-6 mb-1 subCard1" id="subCard1">
             <img src="{{op.carteTemplate.downloadURL}}" id="image1" class="mx-auto d-block flex-center card-img-overlay" alt="Responsive image">
             <div class="view">
-              <div class="mask pattern-3">
+              <div class="mask pattern-6">
                 <div class="row no-margin firstRow">
                   <div class="col-md-6 flex-center card-block cardPart1"><p class="white-text info-text font-bold">{{commercant.commercialName}}</p></div>
                   <div class="col-md-6 flex-center card-block card-image mb-1 cardPart2 image2" [ngStyle]="{ 'background-image': 'url(' + commercant.image.downloadURL + ')'}">

src/app/components/opCommercial/envoyer-carte/envoyer-carte.component.html

@@ -75,7 +75,7 @@
       <div class="col-md-12 subCard1 card" id="subCard1">
         <img src="{{cartePar.carteTemplate.downloadURL}}" id="image1" crossorigin="anonymous" class="img-fluid mx-auto d-block flex-center card-img-overlay" alt="Responsive image">
         <div class="view">
-          <div class="mask pattern-3">
+          <div class="mask pattern-6">
             <div class="row firstRow">
               <div class="col-md-6 flex-center card-block cardPart1"><p class="white-text info-text font-bold">{{commercant.commercialName}}</p></div>
               <div class="col-md-6 flex-center card-block card-image mb-1 cardPart2 image2" [ngStyle]="{ 'background-image': 'url(' + commercant.image.downloadURL + ')'}">
@@ -148,7 +148,7 @@
       <div class="col-md-12 subCard1 card" id="subCard1">
         <img src="{{cartePar.carteTemplate.downloadURL}}" id="image1" crossorigin="anonymous" class="img-fluid mx-auto d-block flex-center card-img-overlay" alt="Responsive image">
         <div class="view">
-          <div class="mask pattern-3">
+          <div class="mask pattern-6">
             <div class="row firstRow">
               <div class="col-md-6 flex-center card-block cardPart1"><p class="white-text info-text font-bold">{{commercant.commercialName}}</p></div>
               <div class="col-md-6 flex-center card-block card-image mb-1 cardPart2 image2" [ngStyle]="{ 'background-image': 'url(' + commercant.image.downloadURL + ')'}">

src/app/components/opCommercial/op-commercial/op-commercial.component.html

@@ -12,9 +12,9 @@
 -->
   <app-nav-commercant></app-nav-commercant>
 
-  <h4 class="mb-5 mt-1 font-bold wow fadeInDown text-center" style="padding-top: 5%;">Liste de vos operations commerciales</h4>
+  <h4 class="mb-5 mt-1 font-bold wow fadeInDown text-center" style="padding-top: 5%;">Operations commerciales</h4>
   <div class="btn-block flex-center align-middle" style="padding-top: 2%;">
-    <button class="btn btn-primary btn-rounded waves-light" id="nouvelleOp" (click)="goToCreaOpCom()">Nouvelle opération Commerciale</button>
+    <button class="btn btn-primary btn-rounded waves-light" id="nouvelleOp" (click)="goToCreaOpCom()">Nouvelle opération commerciale</button>
     <!--<button class="btn btn-primary btn-rounded waves-light" (click)="goToCarteEnvoyer()">Historique carte envoyer</button>-->
     <!--<button class="btn btn-default btn-rounded waves-light" (click)="goToProfil()">Profil</button>-->
   </div>
@@ -25,7 +25,7 @@
         <div class="col-md-6 mb-1 subCard1" id="subCard1">
           <img src="{{op.carteTemplate.downloadURL}}" id="image1" class="img-fluid mx-auto d-block flex-center card-img-overlay" alt="Responsive image">
           <div class="view">
-            <div class="mask pattern-3">
+            <div class="mask pattern-6">
               <div class="row no-margin firstRow">
                 <div class="col-md-6 flex-center card-block cardPart1"><p class="white-text info-text font-bold">{{commercant.commercialName}}</p></div>
                 <div class="col-md-6 flex-center card-block card-image mb-1 cardPart2 image2" [ngStyle]="{ 'background-image': 'url(' + commercant.image.downloadURL + ')'}">
@@ -43,11 +43,11 @@
           <div class="card-block row no-margin">
             <div class="col-md-8 col-sm-6" id="subCard2Part1">
               <div id="opTitle">
-                <label>Operation Commerciale: {{op.name}}</label>
+                <label>Operation Commerciale : {{op.name}}</label>
               </div>
               <div id="opAvantages">
-                <label>Avantage parrain: {{op.avantageParrain}}</label>
-                <label>Avantage filleul: {{op.avantageFilleul}}</label>
+                <label>Avantage parrain : {{op.avantageParrain}} €</label>
+                <label>Avantage filleul : {{op.avantageFilleul}} €</label>
               </div>
               <div id="opLogs">
                 <label>Carte(s) envoyée(s): {{op.nbEnvoie}}</label>