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

thierry
Tmadkaud 7 years ago
commit e407bebc4a

@ -20,7 +20,7 @@
</div> </div>
</div> </div>
<div class="col-md-6 card subCard2"> <div class="col-md-6 card subCard2">
<div class="card-block no-margin"> <div class="card-block row no-margin">
<div class="col-md-12" id="subCard2Part1"> <div class="col-md-12" id="subCard2Part1">
<div id="opTitle"> <div id="opTitle">
<label>Operation Commerciale: {{opComm?.name}}</label> <label>Operation Commerciale: {{opComm?.name}}</label>
@ -82,14 +82,14 @@
</div> </div>
</div> </div>
</div>--> </div>-->
<div class="col-md-6 card subCard2issu"> <div class="col-md-6 card subCard2">
<div class="row"> <div class="card-block no-margin">
<div class="col-md-12 col-sm-12"> <div class="col-md-12 col-sm-12">
<label>ID de la carte: {{crt.uid}}</label> <label>ID de la carte: {{crt.uid}}</label>
<label>Avantage Cumule: {{crt.avantageCumule === ''? '0' : crt.avantageCumule}} €</label> <label>Avantage Cumule: {{crt.avantageCumule === ''? '0' : crt.avantageCumule}} €</label>
<label>Avantage Recuperer: {{crt.avantageRecuperer === ''? '0' : crt.avantageRecuperer}} €</label> <label>Avantage Recuperer: {{crt.avantageRecuperer === ''? '0' : crt.avantageRecuperer}} €</label>
</div> </div>
<div class="btn-block d-flex flex-row"> <div class="btn-block d-flex flex-lg-row flex-md-column flex-sm-row">
<button class="btn btn-outline-primary btn-rounded" (click)="hideme[i] = !hideme[i]">{{show ? 'Cacher Détails' : 'Détails'}}</button> <button class="btn btn-outline-primary btn-rounded" (click)="hideme[i] = !hideme[i]">{{show ? 'Cacher Détails' : 'Détails'}}</button>
</div> </div>
</div> </div>

@ -50,7 +50,7 @@
</div> </div>
</div> </div>
</div>--> </div>-->
<div class="col-md-12 card subCard2"> <div class="col-md-6 card subCard2">
<label>ID de la carte: {{crt.uid}}</label> <label>ID de la carte: {{crt.uid}}</label>
<label>Avantage cumule: {{crt.avantageCumule === ''? '0' : crt.avantageCumule}} €</label> <label>Avantage cumule: {{crt.avantageCumule === ''? '0' : crt.avantageCumule}} €</label>
<label>Avantage recuperer: {{crt.avantageRecuperer === ''? '0' : crt.avantageRecuperer}} €</label> <label>Avantage recuperer: {{crt.avantageRecuperer === ''? '0' : crt.avantageRecuperer}} €</label>

Loading…
Cancel
Save