version stable final 10 10 2017

src/app/components/home/home.component.html

@@ -292,19 +292,6 @@
 
   <hr>
 
-  <!--Call to action-->
-  <div class="call-to-action">
-    <ul>
-      <li>
-        <h5>Register for free</h5>
-      </li>
-      <li><a href="" class="btn btn-danger waves-light" mdbRippleRadius>Sign up!</a></li>
-    </ul>
-  </div>
-  <!--/.Call to action-->
-
-  <hr>
-
   <!--Social buttons-->
   <div class="text-center mb-3">
 

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

@@ -80,9 +80,9 @@
                 </div>
               </div>
               <div class="col-md-2" id="subCard2Part2">
-                <button class="btn btn-outline-primary btn-rounded" [disabled]="(op.validationXJC === 'En Cours') || (op.validationXJC === 'rejeté') || (op.validationXJC === 'bloqué')" (click)="goToEnCart(op.uid)">Envoyer</button>
-                <button class="btn btn-outline-default btn-rounded" [disabled]="(op.validationXJC === 'En Cours') || (op.validationXJC === 'rejeté') || (op.validationXJC === 'bloqué')" (click)="goToScanCart(op.uid)">Scanner</button>
-                <button class="btn btn-outline-info btn-rounded" [disabled]="(op.validationXJC === 'En Cours') || (op.validationXJC === 'rejeté') || (op.validationXJC === 'bloqué')" (click)="goToDebiterCart(op.uid)">Débiter</button>
+                <button class="btn btn-outline-primary btn-rounded" [disabled]="(op.validationXJC === 'En Cours') || (op.validationXJC === 'Rejeté') || (op.status === 'Bloqué') || (op.status === 'Inactive')" (click)="goToEnCart(op.uid)">Envoyer</button>
+                <button class="btn btn-outline-default btn-rounded" [disabled]="(op.validationXJC === 'En Cours') || (op.validationXJC === 'Rejeté') || (op.status === 'Bloqué') || (op.status === 'Inactive')" (click)="goToScanCart(op.uid)">Scanner</button>
+                <button class="btn btn-outline-info btn-rounded" [disabled]="(op.validationXJC === 'En Cours') || (op.validationXJC === 'Rejeté')" (click)="goToDebiterCart(op.uid)">Débiter</button>
               </div>
             </div>
           </div>