version stable envoyer carte 08 10 2017

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

@@ -110,7 +110,7 @@
           <div class="row">
             <div class="col-md-12" id="footer-2">
               <button class="btn btn-light-green waves-light" [disabled]="email.errors || validationBirthday() || carteEnvoieOK" (click)="regiPar()">Creer nouveau parrain & envoyer carte</button>
-              <button class="btn btn-cyan" (click)="goToOpComm()">Retour</button>
+              <button class="btn btn-cyan" [disabled]="carteEnvoieEncours" (click)="goToOpComm()">Retour</button>
             </div>
           </div>
           <div class="row">
@@ -190,7 +190,7 @@
           </div>
         </div>
         <div class="card-footer" style="margin-top:5%">
-          <div *ngIf="carteEnvoieEncours && !carteExitDeja">
+          <div *ngIf="carteEnvoieEncours">
             <div class="row">
               <div class="col-md-12" id="footer-1">
                 <svg class="spinner" width="40px" height="40px" viewBox="0 0 66 66" xmlns="http://www.w3.org/2000/svg">
@@ -205,7 +205,7 @@
           <div class="row">
             <div class="col-md-12" id="footer-2">
               <button class="btn btn-light-green waves-light" [disabled]="(parSelect === '') || (birthdayTemp !== parrain.birthday) || carteExitDeja || carteEnvoieOK" (click)="envoyerCartePar()">Envoyer Carte {{parSelect}}</button>
-              <button class="btn btn-cyan" (click)="goToOpComm()">Retour</button>
+              <button class="btn btn-cyan" [disabled]="carteEnvoieEncours" (click)="goToOpComm()">Retour</button>
             </div>
           </div>
           <div class="row">

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

@@ -241,7 +241,7 @@ export class EnvoyerCarteComponent implements OnInit, OnDestroy {
      let secondaryApp = null;
      secondaryApp = firebase.initializeApp(config, 'Secondary');*/
 
-    this.carteEnvoieEncours = true;
+
 
     let parrainTemp = new Parrain();
     this.carteEnvoieOK = false;
@@ -304,6 +304,7 @@ export class EnvoyerCarteComponent implements OnInit, OnDestroy {
           if (elementParTemp.uid !== '') {
             this.getIdParrain(elementParTemp.uid);
             this.creerCartePar();
+            this.carteEnvoieEncours = true;
             this.carteEnvoieOK = true;
             setTimeout(() => {
                 this.carteEnvoieEncours = false;
@@ -458,6 +459,7 @@ export class EnvoyerCarteComponent implements OnInit, OnDestroy {
         if (this.carteExitDeja === false) {
           console.log('cestBon !!');
           this.creerCartePar();
+          this.carteEnvoieEncours = true;
           this.carteEnvoieOK = true;
           setTimeout(() => {
               this.carteEnvoieEncours = false;
@@ -528,7 +530,7 @@ export class EnvoyerCarteComponent implements OnInit, OnDestroy {
   }
 
   envoyerCartePar(){
-    this.carteEnvoieEncours = true;
+
     this.carteExist(this.cartePar.parrainCarte.uid);
 
     // this.goToOpComm();