Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

globodeoro < master #167

Merged
merged 3 commits into from
Jun 18, 2023
Merged

globodeoro < master #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a83e335
Update build.yml
belluccifranco Jun 2, 2023
db74b2f
- In remitos component, changes the position of transportista info on…
facundososalopez Jun 15, 2023
1f51653
Merge pull request #166 from open-commercial/hotfix20230615
belluccifranco Jun 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:

jobs:
build-analyze-deploy:
name: Build, analyze, dockerize and deploy
name: Build, analyze, dockerize, and publish
runs-on: ubuntu-latest
steps:
- name: Git checkout
Expand Down
2 changes: 1 addition & 1 deletion src/app/components/remitos/remitos.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ <h1 class="h3 m-0 flex-fill text-truncate"><fa-icon [icon]="['fas', 'file-export
</span>
</div>
<div class="px-2 flex-fill">
<div class="d-flex flex-row flex-wrap">
<div class="d-flex flex-column flex-md-row flex-md-wrap">
<span class="me-2"><span class="fw-bold">Usuario:&nbsp;</span><span class="fst-italic">{{ item.nombreUsuario }}</span></span>
<span class="me-2"><span class="fw-bold">Cliente:&nbsp;</span><span class="fst-italic">{{ item.nombreFiscalCliente }}</span></span>
<span class="me-2"><span class="fw-bold">Transportista:&nbsp;</span><span class="fst-italic">{{ item.nombreTransportista }}</span></span>
Expand Down
6 changes: 3 additions & 3 deletions src/app/feature-modules/gastos/components/ver-gasto/ver-gasto.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="app-ver-gasto my-3">
<div class="app-ver-gasto">
<div *ngIf="gasto">
<div class="d-flex flex-column flex-md-row align-items-md-center">
<h1 class="h3 flex-fill text-truncate">
<div class="d-flex flex-row align-items-center my-3">
<h1 class="h3 m-0 flex-fill text-truncate">
<a class="btn fake-cursor" placement="right" ngbPopover="Volver atras" triggers="mouseenter:mouseleave"
(click)="volverAtras()">
<fa-icon [icon]="['fas', 'chevron-left']" [size]="'lg'"></fa-icon>
Expand Down
4 changes: 2 additions & 2 deletions src/app/feature-modules/gastos/components/ver-gasto/ver-gasto.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export class VerGastoComponent implements OnInit {
this.hasRoleToSee = this.authService.userHasAnyOfTheseRoles(this.allowedRolesToSee);
if (!this.hasRoleToSee) {
this.mensajeService.msg('No tiene permisos para ver el gasto.', MensajeModalType.ERROR)
.then(() => this.volverAtras());
.then(() => this.volverAtras(), () => { return; });
return;
}
const id = Number(this.route.snapshot.paramMap.get('id'));
Expand All @@ -40,7 +40,7 @@ export class VerGastoComponent implements OnInit {
.subscribe({
next: gasto => this.gasto = gasto,
error: err => {
this.mensajeService.msg(err.error, MensajeModalType.ERROR);
this.mensajeService.msg(err.error, MensajeModalType.ERROR).then(() => { return; }, () => { return; });
this.volverAtras();
}
})
Expand Down