From 2bc3dc97267b4797eaa66ae28038fcfefc0d043f Mon Sep 17 00:00:00 2001
From: wantero <wantero@dlctec.com.br>
Date: Thu, 21 Mar 2019 15:51:06 -0300
Subject: [PATCH 1/2] Melhoria no aviso de frete.

---
 .../book/details/details.component.html           | 15 +++++++++------
 .../components/book/details/details.component.ts  |  1 +
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/app/components/book/details/details.component.html b/src/app/components/book/details/details.component.html
index 7414d3ce..cc26d5ee 100644
--- a/src/app/components/book/details/details.component.html
+++ b/src/app/components/book/details/details.component.html
@@ -20,21 +20,24 @@ <h1 class="text-center display-4">{{pageTitle}}</h1>
         />
       </div>
       <div class="col">
-        <p><b>Título do livro:</b><br/>{{bookInfo.title}}</p>
+        <p><b>Título:</b><br/>{{bookInfo.title}}</p>
         <p><b>Autor:</b><br/>{{bookInfo.author}}</p>
         <p><b>Categoria:</b><br/>{{bookInfo.category?.name}}</p>
-        <p><b>Quando será anunciado o ganhador desse livro?</b><br/>{{chooseDateInfo}}</p>
-        <p><b>Doador paga o frete?</b><br/>{{freightName}}<b *ngIf="!!freightAlert"> ({{freightAlertMessage}})</b></p>
-        <p><b>Local de Origem</b><br/>{{bookInfo.user.address.city}} - {{bookInfo.user.address.state}}</p>
         <p *ngIf="!!bookInfo.synopsis" style="white-space: pre-wrap;"><b>Sinópse:</b><br/>{{bookInfo.synopsis}}</p>
-
+        <p><b>Quando será anunciado o ganhador desse livro?</b><br/>{{chooseDateInfo}}</p>        
+        <p><b>Local de Origem</b><br/>{{bookInfo.user.address.city}} - {{bookInfo.user.address.state}}</p>        
+        <p><b>Frete grátis?</b><br/>{{!freightAlert ? 'Sim' : 'Não'}}</p>
+        <div class="custom-control custom-checkbox" *ngIf="available && userProfile && !requested && !!freightAlert">
+          <input type="checkbox" class="custom-control-input" id="checkFreight" [(ngModel)]="isCheckedFreight">
+          <label class="custom-control-label" for="checkFreight">Estou ciente que o frete não é grátis. Caso seja escolhido, me comprometo a reembolsar o doador.</label>
+        </div>          
         <div class="form-group col-md-8">
           <div class="modal-footer">
             <span class="badge badge-success mr-auto" *ngIf="requested">Você já solicitou. Aguarde e boa sorte!</span>
 
             <span class="badge badge-danger mr-auto" *ngIf="!requested && !available">Não disponível.</span>
             
-            <input type="button" *ngIf="available && userProfile && !requested" class="btn btn-primary" value="Tenho interesse" style="padding-left: 50px; padding-right: 50px" (click)="onRequestBook()">
+            <input type="button" *ngIf="available && userProfile && !requested" class="btn btn-primary" value="Tenho interesse" style="padding-left: 50px; padding-right: 50px" (click)="onRequestBook()" [disabled]="!!freightAlert && !isCheckedFreight">
             
             <input type="button" *ngIf="available && !userProfile" class="btn btn-primary" value="Faça login para solicitar o livro" style="padding-left: 50px; padding-right: 50px" (click)="onLoginBook()">
               <a [routerLink]="['/home']" class="btn btn-link" id="cancelButton">Cancelar</a>
diff --git a/src/app/components/book/details/details.component.ts b/src/app/components/book/details/details.component.ts
index e9b7c792..fa9585f7 100644
--- a/src/app/components/book/details/details.component.ts
+++ b/src/app/components/book/details/details.component.ts
@@ -37,6 +37,7 @@ export class DetailsComponent implements OnInit {
   freightAlertMessage: string;
   daysToChoose: number;
   chooseDateInfo: string;
+  isCheckedFreight: boolean;
 
   constructor(
     private _scBook: BookService,

From 0a52818454d80c9d34ad74a60e3431fc4c03cc57 Mon Sep 17 00:00:00 2001
From: wantero <wantero@dlctec.com.br>
Date: Thu, 21 Mar 2019 16:15:12 -0300
Subject: [PATCH 2/2] =?UTF-8?q?Ajuste=20da=20PR=20p/=20ficar=20mais=20expl?=
 =?UTF-8?q?icativa=20a=20vari=C3=A1vel?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../book/details/details.component.html           |  6 +++---
 .../components/book/details/details.component.ts  | 15 +++++----------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/app/components/book/details/details.component.html b/src/app/components/book/details/details.component.html
index cc26d5ee..a76a25cc 100644
--- a/src/app/components/book/details/details.component.html
+++ b/src/app/components/book/details/details.component.html
@@ -26,8 +26,8 @@ <h1 class="text-center display-4">{{pageTitle}}</h1>
         <p *ngIf="!!bookInfo.synopsis" style="white-space: pre-wrap;"><b>Sinópse:</b><br/>{{bookInfo.synopsis}}</p>
         <p><b>Quando será anunciado o ganhador desse livro?</b><br/>{{chooseDateInfo}}</p>        
         <p><b>Local de Origem</b><br/>{{bookInfo.user.address.city}} - {{bookInfo.user.address.state}}</p>        
-        <p><b>Frete grátis?</b><br/>{{!freightAlert ? 'Sim' : 'Não'}}</p>
-        <div class="custom-control custom-checkbox" *ngIf="available && userProfile && !requested && !!freightAlert">
+        <p><b>Frete grátis?</b><br/>{{isFreeFreight ? 'Sim' : 'Não'}}</p>
+        <div class="custom-control custom-checkbox" *ngIf="available && userProfile && !requested && !isFreeFreight ">
           <input type="checkbox" class="custom-control-input" id="checkFreight" [(ngModel)]="isCheckedFreight">
           <label class="custom-control-label" for="checkFreight">Estou ciente que o frete não é grátis. Caso seja escolhido, me comprometo a reembolsar o doador.</label>
         </div>          
@@ -37,7 +37,7 @@ <h1 class="text-center display-4">{{pageTitle}}</h1>
 
             <span class="badge badge-danger mr-auto" *ngIf="!requested && !available">Não disponível.</span>
             
-            <input type="button" *ngIf="available && userProfile && !requested" class="btn btn-primary" value="Tenho interesse" style="padding-left: 50px; padding-right: 50px" (click)="onRequestBook()" [disabled]="!!freightAlert && !isCheckedFreight">
+            <input type="button" *ngIf="available && userProfile && !requested" class="btn btn-primary" value="Tenho interesse" style="padding-left: 50px; padding-right: 50px" (click)="onRequestBook()" [disabled]="!isFreeFreight && !isCheckedFreight">
             
             <input type="button" *ngIf="available && !userProfile" class="btn btn-primary" value="Faça login para solicitar o livro" style="padding-left: 50px; padding-right: 50px" (click)="onLoginBook()">
               <a [routerLink]="['/home']" class="btn btn-link" id="cancelButton">Cancelar</a>
diff --git a/src/app/components/book/details/details.component.ts b/src/app/components/book/details/details.component.ts
index fa9585f7..9f339d87 100644
--- a/src/app/components/book/details/details.component.ts
+++ b/src/app/components/book/details/details.component.ts
@@ -33,8 +33,7 @@ export class DetailsComponent implements OnInit {
   bookInfo: Book = new Book();
   categoryName: string;
   freightName: string;
-  freightAlert: boolean;
-  freightAlertMessage: string;
+  isFreeFreight: boolean;
   daysToChoose: number;
   chooseDateInfo: string;
   isCheckedFreight: boolean;
@@ -94,26 +93,22 @@ export class DetailsComponent implements OnInit {
             switch (x.freightOption.toString()) {
               case 'City': {
                 if (this.bookInfo.user.address.city !== this.myUser.address.city) {
-                  this.freightAlert = true;
-                  this.freightAlertMessage = 'O doador paga o frete somente para a cidade de origem';
+                  this.isFreeFreight = false;
                 }
                 break;
               }
               case 'State': {
                 if (this.bookInfo.user.address.state !== this.myUser.address.state) {
-                  this.freightAlert = true;
-                  this.freightAlertMessage = 'O doador paga o frete somente para o estado de origem';
+                  this.isFreeFreight = false;
                 }
                 break;
               }
               case 'WithoutFreight': {
-                this.freightAlert = true;
-                this.freightAlertMessage = 'O doador NÃO paga pelo frete';
+                this.isFreeFreight = false;
                 break;
               }
               default: {
-                this.freightAlert = false;
-                this.freightAlertMessage = '';
+                this.isFreeFreight = true;
               }
             }
           }