Merge pull request #190 from wantero/master

29 - EU, ENQUANTO CUSSA FACILITADOR PRECISO INFORMAR QUE UMA DOAÇÃO FOI CANCELADA PARA QUE ESSA INFORMAÇÃO SEJA RASTREÁVEL.
SharebookBR · Feb 5, 2019 · dc20291 · dc20291
2 parents 1b82ec2 + 21770dd
commit dc20291
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 11 deletions.
diff --git a/src/app/components/account/account.component.html b/src/app/components/account/account.component.html
@@ -173,6 +173,22 @@ <h1 class="text-center display-4">Editar Perfil</h1>
           </div>
         </div>      
 
+        <div class="form-group col-md-6 offset-md-3 mb-2">
+          <label class="col-form-label" for="state">Estado</label>
+          <div class="input-group">
+            <input formControlName="state" type="text" class="form-control">
+            <div class="input-group-addon append">
+              <i class="fa fa-map-marker"></i>
+            </div>
+          </div>
+
+          <div *ngIf="formGroup['controls'].Address['controls'].state.touched && !formGroup['controls'].Address['controls'].state.valid">
+            <small class="form-text text-danger" *ngIf="formGroup['controls'].Address['controls'].state.hasError('required')">
+              Estado obrigatório.
+            </small>
+          </div>
+        </div>              
+
         <div class="form-group col-md-6 offset-md-3 mb-2">
             <label class="col-form-label" for="country">País</label>
             <div class="input-group">

diff --git a/src/app/components/account/account.component.ts b/src/app/components/account/account.component.ts
@@ -101,7 +101,6 @@ export class AccountComponent implements OnInit {
         this.address = address;
         this.address.country = 'Brasil';
         this.formGroup['controls'].Address['controls'].street.setValue(this.address.street);
-        this.formGroup['controls'].Address['controls'].complement.setValue(this.address.complement);
         this.formGroup['controls'].Address['controls'].neighborhood.setValue(this.address.neighborhood);
         this.formGroup['controls'].Address['controls'].city.setValue(this.address.city);
         this.formGroup['controls'].Address['controls'].state.setValue(this.address.state);

diff --git a/src/app/components/book/list/list.component.ts b/src/app/components/book/list/list.component.ts
@@ -95,7 +95,7 @@ export class ListComponent implements OnInit {
       myBookDonationStatus.push({value: BookDonationStatus[key], title: BookDonationStatus[key]});
     });
 
-    const btnDelete = '<span class="btn btn-danger btn-sm" data-toggle="tooltip" title="Eliminar Livro">' +
+    const btnCancelDonation = '<span class="btn btn-danger btn-sm" data-toggle="tooltip" title="Cancelar Doação">' +
                       ' <i class="fa fa-trash"></i> </span>&nbsp;';
     const btnEdit   = '<span class="btn btn-info btn-sm" data-toggle="tooltip" title="Editar Livro">' +
                       ' <i class="fa fa-edit"></i> </span>&nbsp;';
@@ -163,8 +163,8 @@ export class ListComponent implements OnInit {
             title: btnEdit
           },
           {
-            name: 'delete',
-            title: btnDelete
+            name: 'CancelDonation',
+            title: btnCancelDonation
           },
           {
             name: 'donate',
@@ -180,18 +180,18 @@ export class ListComponent implements OnInit {
   }
 
   onCustom(event) {
-    if (event.action === 'delete') {
-      // chamada do modal de confirmação antes de efetuar a ação do delete
+    if (event.action === 'CancelDonation') {
+      // chamada do modal de confirmação antes de efetuar a ação do btnCancelDonation
       if (event.data.donated) {
         alert('Livro já doado!');
       } else {
-        this.confirmationDialogService.confirm('Atenção!', 'Confirma a exclusão do Livro?')
+        this.confirmationDialogService.confirm('Atenção!', 'Confirma o cancelamento da doação?')
           .then((confirmed) => {
             if (confirmed) {
-              this._scBook.delete(event.data.id).subscribe(resp => {
+              this._scBook.cancelDonation(event.data.id).subscribe(resp => {
                 if (resp['success']) {
-                  this.books.remove(event.data);
-                  this._scAlert.success('Registro removido com sucesso.');
+                  this._scAlert.success('Doação cancelada com sucesso.');
+                  this.reloadData();
                 }
               });
             }

diff --git a/src/app/core/models/BookDonationStatus.ts b/src/app/core/models/BookDonationStatus.ts
@@ -3,5 +3,6 @@ export enum BookDonationStatus {
   WAITING_APPROVAL = 'Aguardando aprovação',
   AVAILABLE = 'Disponível',
   INVISIBLE = 'Invisível',
-  DONATED = 'Doado'
+  DONATED = 'Doado',
+  CANCELED = 'Cancelado'
 }
diff --git a/src/app/core/services/book/book.service.ts b/src/app/core/services/book/book.service.ts
@@ -47,6 +47,10 @@ export class BookService {
     return this._http.delete(`${this.config.apiEndpoint}/book/${bookId}`);
   }
 
+  public cancelDonation(bookId: number) {
+    return this._http.post<any>(`${this.config.apiEndpoint}/book/cancel/${bookId}`, null);
+  }
+
   public getFreightOptions() {
     return this._http.get<any>(`${this.config.apiEndpoint}/book/freightOptions`).pipe(
       map(response => {