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

thierry
Viiciouss 7 years ago
commit 4a181077b9

@ -90,7 +90,7 @@
<label>Avantages Recuperés: {{crt.avantageRecuperer === ''? '0' : crt.avantageRecuperer}} €</label>
</div>
<div class="btn-block d-flex flex-lg-row flex-md-column flex-sm-row" id="subCard2Part2">
<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" tooltip="Historique des scans et retours effectués sur cette carte de parrainage" placement="top" (click)="hideme[i] = !hideme[i]"><i class="fa fa-info-circle mr-1"></i>{{show ? 'Cacher Détails' : 'Détails'}}</button>
</div>
</div>
</div>

@ -110,9 +110,11 @@
.container {
padding-top: 20%;
}
.mainCard {
margin-bottom: 20%;
padding-bottom: 40%;
}
#nouvelleOp {
margin-bottom: 20%;
}

@ -40,7 +40,7 @@
</div>
</div>
<div class="btn-block d-flex flex-lg-row flex-md-column flex-sm-row" id="subCard2Part2">
<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" tooltip="Historique des scans et retours effectués sur cette carte de parrainage" placement="top" (click)="hideme[i] = !hideme[i]"><i class="fa fa-info-circle mr-1"></i>{{show ? 'Cacher Détails' : 'Détails'}}</button>
<!--<button class="btn btn-outline-info btn-rounded" (click)="sectionToImage(op.carteTemplate.downloadURL, commercant.image.downloadURL)">screenShot</button>-->
</div>
</div>

@ -104,9 +104,11 @@
.container {
padding-top: 20%;
}
.mainCard {
margin-bottom: 20%;
padding-bottom: 40%;
}
#nouvelleOp {
margin-bottom: 20%;
}

@ -58,7 +58,7 @@
<label>Avantages recuperés: {{crt.avantageRecuperer === ''? '0' : crt.avantageRecuperer}} €</label>
</div>
<div class="btn-block d-flex flex-lg-row flex-md-column flex-sm-row" id="subCard2Part2">
<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" tooltip="Historique des scans et retours effectués sur cette carte de parrainage" placement="top" (click)="hideme[i] = !hideme[i]"><i class="fa fa-info-circle mr-1"></i>{{show ? 'Cacher Détails' : 'Détails'}}</button>
<!--<button class="btn btn-outline-info btn-rounded" (click)="sectionToImage(op.carteTemplate.downloadURL, commercant.image.downloadURL)">screenShot</button>-->
</div>
</div>

@ -108,7 +108,7 @@
padding-top: 20%;
}
.mainCard {
margin-bottom: 20%;
padding-bottom: 40%;
}
#nouvelleOp {
margin-bottom: 20%;

@ -22,7 +22,7 @@
</div>
<div class="text-center" style="margin-top:5%">
<button type="submit" class="btn btn-dark-green" [disabled]="mail.errors || pass.errors" (click)="login()">Se connecter<i class="fa fa-paper-plane-o ml-1"></i></button>
<button type="submit" class="btn btn-dark-green" [disabled]="mail.errors || pass.errors" (click)="login()"><i class="fa fa-sign-in" aria-hidden="true"></i>Se connecter</button>
<!--<button class="btn btn-cyan" (click)="loadHomeComponent()">Back</button>-->
</div>
<div class="text-center" style="margin-top:5%">

@ -1,6 +1,6 @@
<navbar SideClass="navbar navbar-expand-lg navbar-dark fixed-top scrolling-navbar indigo">
<logo>
<a class="logo navbar-brand waves-light" mdbRippleRadius><strong>Parraine Tes Amis</strong></a>
<a class="logo navbar-brand waves-light" ripple-radius><strong>Parraine Tes Amis</strong></a>
</logo>
<links>
<ul class="navbar-nav mr-auto">
@ -15,10 +15,10 @@
-->
<ul class="navbar-nav nav-flex-icons">
<li class="nav-item dropdown" dropdown>
<a dropdownToggle mdbRippleRadius type="button" class="nav-link dropdown-toggle waves-light" mdbRippleRadius>
<a dropdownToggle ripple-radius type="button" class="nav-link dropdown-toggle waves-light" ripple-radius>
{{this.admin.email}}<span class="caret"></span></a>
<div *dropdownMenu class="dropdown-menu dropdown dropdown-primary" role="menu">
<a class="dropdown-item waves-light" mdbRippleRadius (click)="logout()">Se déconnecter</a>
<a class="dropdown-item waves-light" ripple-radius (click)="logout()"><i class="fa fa-sign-out indigo-text mr-1"></i>Se déconnecter</a>
</div>
</li>
</ul>

@ -1,12 +1,12 @@
<!--Navbar-->
<navbar SideClass="navbar navbar-expand-lg navbar-dark fixed-top scrolling-navbar indigo">
<logo>
<a class="logo navbar-brand waves-light" mdbRippleRadius><strong>Parraine Tes Amis</strong></a>
<a class="logo navbar-brand waves-light" ripple-radius><strong>Parraine Tes Amis</strong></a>
</logo>
<links>
<ul class="navbar-nav mr-auto">
<li class="nav-item active waves-light" [class.active]="opCommercialLink.classList.contains('active')"> <a class="nav-link waves-light" #opCommercialLink routerLink="/opCommercial" routerLinkActive="active">Opérations commerciales</a></li>
<li class="nav-item active waves-light" [class.active]="historiqueCarteLink.classList.contains('active')"> <a class="nav-link waves-light" #historiqueCarteLink routerLink="/historiqueCarte" routerLinkActive="active">Historique des cartes de parrainages</a></li>
<li class="nav-item active waves-effect waves-light" [class.active]="opCommercialLink.classList.contains('active')"> <a class="nav-link waves-light" #opCommercialLink routerLink="/opCommercial" routerLinkActive="active">Opérations commerciales</a></li>
<li class="nav-item active waves-effect waves-light" [class.active]="historiqueCarteLink.classList.contains('active')"> <a class="nav-link waves-light" #historiqueCarteLink routerLink="/historiqueCarte" routerLinkActive="active">Historique des cartes de parrainages</a></li>
</ul>
@ -17,18 +17,18 @@
<ul class="navbar-nav nav-flex-icons">
<li class="nav-item avatar">
<ul class="navbar-nav mr-auto">
<li class="nav-item waves-light" mdbRippleRadius>
<li class="nav-item waves-light" ripple-radius>
<a class="nav-link dropdown-toggle waves-effect waves-light" id="navbarDropdownMenuLink-5" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><img src="{{avatarCommercant}}" class="circle-avatar img-fluid rounded-circle"></a>
</li>
</ul>
</li>
<li class="nav-item dropdown" dropdown>
<a dropdownToggle mdbRippleRadius type="button" class="nav-link dropdown-toggle waves-light" mdbRippleRadius>
<a dropdownToggle ripple-radius type="button" class="nav-link dropdown-toggle waves-light" ripple-radius>
{{nameCommercant}}<span class="caret"></span></a>
<div *dropdownMenu class="dropdown-menu dropdown dropdown-primary" role="menu">
<a class="dropdown-item waves-light" [routerLink]="['/profil']">Profil</a>
<a class="dropdown-item waves-light" [routerLink]="['/profil']"><i class="fa fa-user-circle-o indigo-text mr-1" aria-hidden="true"></i>Profil</a>
<div class="divider dropdown-divider"></div>
<a class="dropdown-item waves-light" mdbRippleRadius (click)="logout()">Se déconnecter</a>
<a class="dropdown-item waves-light" ripple-radius (click)="logout()"><i class="fa fa-sign-out indigo-text mr-1" aria-hidden="true"></i>Se déconnecter</a>
</div>
</li>
</ul>

@ -1,11 +1,11 @@
<!--Navbar-->
<navbar SideClass="navbar navbar-expand-lg navbar-dark fixed-top scrolling-navbar indigo">
<logo>
<a class="logo navbar-brand waves-light" mdbRippleRadius><strong>Parraine Tes Amis</strong></a>
<a class="logo navbar-brand waves-light" ripple-radius><strong>Parraine Tes Amis</strong></a>
</logo>
<links>
<ul class="navbar-nav mr-auto">
<li class="nav-item active waves-light" [class.active]="carteParrainLink.classList.contains('active')"> <a class="nav-link waves-light" #carteParrainLink routerLink="/carteParrainageComponent" routerLinkActive="active">Liste des cartes de parrainage</a></li>
<li class="nav-item active waves-light waves-effect" [class.active]="carteParrainLink.classList.contains('active')"> <a class="nav-link waves-light" #carteParrainLink routerLink="/carteParrainageComponent" routerLinkActive="active">Liste des cartes de parrainage</a></li>
<!--<li class="nav-item active waves-light" [class.active]="historiqueCarteLink.classList.contains('active')"> <a class="nav-link waves-light" #historiqueCarteLink routerLink="/historiqueCarte" routerLinkActive="active">Historique des cartes de parrainages</a></li>-->
</ul>
@ -17,18 +17,18 @@
<ul class="navbar-nav nav-flex-icons">
<li class="nav-item avatar">
<ul class="navbar-nav mr-auto">
<li class="nav-item waves-light" mdbRippleRadius>
<li class="nav-item waves-light waves-effect" ripple-radius>
<a class="nav-link dropdown-toggle waves-effect waves-light" id="navbarDropdownMenuLink-5" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><img src="{{avatarParrain}}" class="img-fluid rounded-circle z-depth-0 hoverZoomLink"></a>
</li>
</ul>
</li>
<li class="nav-item dropdown" dropdown>
<a dropdownToggle mdbRippleRadius type="button" class="nav-link dropdown-toggle waves-light" mdbRippleRadius>
<a dropdownToggle ripple-radius type="button" class="nav-link dropdown-toggle waves-light" ripple-radius>
{{nameParrain}}<span class="caret"></span></a>
<div *dropdownMenu class="dropdown-menu dropdown dropdown-primary" role="menu">
<a class="dropdown-item waves-light" [routerLink]="['/profil']">Profil</a>
<a class="dropdown-item waves-light" [routerLink]="['/profil']"><i class="fa fa-user-circle-o indigo-text mr-1"></i>Profil</a>
<div class="divider dropdown-divider"></div>
<a class="dropdown-item waves-light" mdbRippleRadius (click)="logout()">Se déconnecter</a>
<a class="dropdown-item waves-light" ripple-radius (click)="logout()"><i class="fa fa-sign-out indigo-text mr-1"></i>Se déconnecter</a>
</div>
</li>
</ul>

@ -62,7 +62,7 @@
données, y compris notre Utilisation des cookies.
</label>
<div class="text-center" style="margin-top:5%">
<button class="btn btn-light-green waves-light" [disabled]="codeTemp !== cartePar.parrainCarte.secretCode" (click)="debiterCarte()">Débiter Carte</button>
<button class="btn btn-light-green waves-light" [disabled]="codeTemp !== cartePar.parrainCarte.secretCode" (click)="debiterCarte()"><i class="fa fa-pie-chart ml-1"></i>Débiter Carte</button>
<button class="btn btn-cyan" (click)="goToOpComm()">Back</button>
</div>

@ -107,7 +107,7 @@
</div>
<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-light-green waves-light" [disabled]="email.errors || validationBirthday() || carteEnvoieOK" (click)="regiPar()"><i class="fa fa-user-plus" aria-hidden="true"></i>Creer nouveau parrain & envoyer carte</button>
<button class="btn btn-cyan" [disabled]="carteEnvoieEncours" (click)="goToOpComm()">Retour</button>
</div>
</div>
@ -206,7 +206,7 @@
</div>
<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-light-green waves-light" [disabled]="(parSelect === '') || (birthdayTemp !== parrain.birthday) || carteExitDeja || carteEnvoieOK" (click)="envoyerCartePar()"><i class="fa fa-send-o" aria-hidden="true"></i>Envoyer Carte {{parSelect}}</button>
<button class="btn btn-cyan" [disabled]="carteEnvoieEncours" (click)="goToOpComm()">Retour</button>
</div>
</div>

@ -15,7 +15,8 @@
<h4 class="mb-5 mt-1 font-bold wow fadeInDown text-center" style="padding-top: 5%;">Operations commerciales ({{(opCommData | async)?.length}})</h4>
<div class="topButtons col-md-12" style="padding-top: 2%;">
<div class="btnCreerOp">
<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" tooltip="Création d'une nouvelle opération commerciale" placement="top" id="nouvelleOp" (click)="goToCreaOpCom()"><i class="fa fa-plus-circle ml-1 mr-3"></i>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>
@ -80,9 +81,9 @@
</div>
</div>
<div class="btn-block d-flex flex-lg-row flex-md-column flex-sm-row" id="subCard2Part2">
<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>
<button class="btn btn-outline-primary btn-rounded" tooltip="Envoyer une nouvelle carte de parrainage à un parrain affilié ou un nouveau parrain" placement="top" [disabled]="(op.validationXJC === 'En Cours') || (op.validationXJC === 'Rejeté') || (op.status === 'Bloqué') || (op.status === 'Inactive')" (click)="goToEnCart(op.uid)"><i class="fa fa-send-o" aria-hidden="true"></i>Envoyer</button>
<button class="btn btn-outline-default btn-rounded" tooltip="Scanner la carte de parrainage d'un filleul" placement="top" [disabled]="(op.validationXJC === 'En Cours') || (op.validationXJC === 'Rejeté') || (op.status === 'Bloqué') || (op.status === 'Inactive')" (click)="goToScanCart(op.uid)"><i class="fa fa-shopping-basket ml-1"></i>Scanner</button>
<button class="btn btn-outline-info btn-rounded" tooltip="Débiter la carte de parrainage d'un parrain affilié" placement="top" [disabled]="(op.validationXJC === 'En Cours') || (op.validationXJC === 'Rejeté')" (click)="goToDebiterCart(op.uid)"><i class="fa fa-pie-chart ml-1"></i>Débiter</button>
</div>
</div>
</div>

@ -116,7 +116,7 @@
</label>
<div class="text-center" style="margin-top:5%">
<button class="btn btn-light-green waves-light" [disabled]="filleulSelect === '' || ParrainCarteSelect === '' || cartePar.status === 'Inactive'" (click)="scanCarteFil()">Scanner Carte de {{filleulSelect}}</button>
<button class="btn btn-light-green waves-light" [disabled]="filleulSelect === '' || ParrainCarteSelect === '' || cartePar.status === 'Inactive'" (click)="scanCarteFil()"><i class="fa fa-shopping-basket ml-1"></i>Scanner Carte de {{filleulSelect}}</button>
<button class="btn btn-cyan" (click)="goToOpComm()">Retour</button>
</div>
</div>

@ -25,7 +25,7 @@
-->
<div class="flex-column flex-center">
<button class="btn btn-deep-orange" style="margin-top: 2%;" (click)="resetPass()">Réinitialiser mot de passe</button>
<button class="btn btn-deep-orange mb-4 mt-2" (click)="resetPass()"><i class="fa fa-lock" aria-hidden="true"></i>Réinitialiser mot de passe</button>
<div *ngIf="resetPassEmail" class="alert alert-success">
Un <strong>email pour réinitiliser votre mot de passe</strong> vient de vous être envoyé à <strong><i>{{localUser.email}}</i></strong>.
</div>
@ -77,7 +77,7 @@
</div>
<div class="btn-block">
<button class="btn btn-green btn-rounded waves-light" [disabled]="(newPassword != '') && (newPassword != ConfirmPassword)" (click)="modifyProfile()">Modifier Profil</button>
<button class="btn btn-green btn-rounded waves-light" [disabled]="(newPassword != '') && (newPassword != ConfirmPassword)" (click)="modifyProfile()"><i class="fa fa-save" aria-hidden="true"></i>Modifier Profil</button>
<button class="btn btn-default btn-rounded waves-light" (click)="goToProfil()">Retour</button>
</div>
</div>
@ -122,7 +122,7 @@
<div class="flex-column flex-center">
<button class="btn btn-deep-orange" style="margin-top: 2%;" (click)="resetPass()">Réinitialiser mot de passe</button>
<button class="btn btn-deep-orange mb-4 mt-2"(click)="resetPass()"><i class="fa fa-lock" aria-hidden="true"></i>Réinitialiser mot de passe</button>
<div *ngIf="resetPassEmail" class="alert alert-success">
Un <strong>email pour réinitiliser votre mot de passe</strong> vient de vous être envoyé à <strong><i>{{localUser.email}}</i></strong>.
</div>
@ -149,7 +149,7 @@
</div>
</div>
<div class="btn-block">
<button class="btn btn-green btn-rounded waves-light" [disabled]="(newPassword != '') && (newPassword != ConfirmPassword)" (click)="modifyProfile()">Modifier Profil</button>
<button class="btn btn-green btn-rounded waves-light" [disabled]="(newPassword != '') && (newPassword != ConfirmPassword)" (click)="modifyProfile()"><i class="fa fa-save" aria-hidden="true"></i>Modifier Profil</button>
<button class="btn btn-default btn-rounded waves-light" (click)="goToProfil()">Retour</button>
</div>
</div>

@ -50,7 +50,7 @@
</div>-->
<div class="btn-block">
<button class="btn btn-orange btn-rounded waves-light" (click)="goToEditProfile()">Editer profil</button>
<button class="btn btn-orange btn-rounded waves-light" (click)="goToEditProfile()"><i class="fa fa-pencil-square-o" aria-hidden="true"></i>Editer profil</button>
<button class="btn btn-default btn-rounded waves-light" (click)="goToCarte()">Retour</button>
</div>
@ -118,7 +118,7 @@
<!--<p><i class="fa fa-quote-left"></i> Lorem ipsum dolor sit amet, consectetur adipisicing elit. Eos, adipisci</p>-->
<div class="btn-block">
<button class="btn btn-orange btn-rounded waves-light" (click)="goToEditProfile()">Editer votre profil</button>
<button class="btn btn-orange btn-rounded waves-light" (click)="goToEditProfile()"><i class="fa fa-pencil-square-o" aria-hidden="true"></i>Editer votre profil</button>
<button class="btn btn-default btn-rounded waves-light" (click)="goToOpCom()">Retour</button>
</div>

@ -90,7 +90,7 @@
données, y compris notre Utilisation des cookies.
</label>
<div class="text-center" style="margin-top:5%">
<button class="btn btn-deep-orange" [disabled]="filePar || (validationBirthdayP) || email.errors || password.errors || (parrain.password != ConfirmPasswordParrain) || parrain.familyname == '' || parrain.firstname == '' || parrain.sex == '' || test" (click)="register()">S'inscrire</button>
<button class="btn btn-deep-orange" [disabled]="filePar || (validationBirthdayP) || email.errors || password.errors || (parrain.password != ConfirmPasswordParrain) || parrain.familyname == '' || parrain.firstname == '' || parrain.sex == '' || test" (click)="register()"><i class="fa fa-user-plus" aria-hidden="true"></i>S'inscrire</button>
<!--<button class="btn btn-deep-orange" [disabled]="filePar || !birthday.touched || validationBirthdayParrain() || (birthday.touched && validationBirthdayParrain()) || email.errors || password.errors || (parrain.password != ConfirmPasswordParrain) || parrain.familyname == '' || parrain.firstname == '' || parrain.sex == '' || test" (click)="register()">S'inscrire</button>-->
<div *ngIf="echecRegisterPar" class="alert alert-danger">
Erreur: Un compte avec cet <strong>email</strong> existe déjà.
@ -157,7 +157,7 @@
données, y compris notre Utilisation des cookies.
</label>
<div class="text-center" style="margin-top:5%">
<button class="btn btn-deep-orange" [disabled]="fileCom || email.errors || password.errors || siret.errors || commercant.raisonSociale == '' || commercant.commercialName == '' || (commercant.password != ConfirmPasswordCommercant) || test" (click)="register()">S'inscrire</button>
<button class="btn btn-deep-orange" [disabled]="fileCom || email.errors || password.errors || siret.errors || commercant.raisonSociale == '' || commercant.commercialName == '' || (commercant.password != ConfirmPasswordCommercant) || test" (click)="register()"><i class="fa fa-user-plus" aria-hidden="true"></i>S'inscrire</button>
<!--<button class="btn btn-cyan" (click)="loadHomeComponent()">Back</button>-->
<div *ngIf="echecRegisterCom" class="alert alert-danger">
Erreur: Un compte avec cet <strong>email</strong> existe déjà.

@ -2,7 +2,7 @@
<html lang="en" class="full-height">
<head>
<meta charset="utf-8">
<title>Angular Bootstrap MD - Free</title>
<title>ParraineTesAmis</title>
<base href="/">
<meta name="viewport" content="width=device-width, initial-scale=1">

Loading…
Cancel
Save