eduardo
/
datasurvey
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #145 from Quantum-P3/feature/US-47 

Feature/us 47
This commit is contained in:
Eduardo Quiros 2021-08-18 05:09:49 +00:00 committed by GitHub
parent 4cb626aab7 28c984a7d0
commit 03eec6d7c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 41 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/resources/i18n/messages.properties
View File

@ -68,7 +68,7 @@ email.deleteColaborator.text2=Saludos,
email.receipt.title=Comprobante de pago email.receipt.title=Comprobante de pago
email.receipt.user={0} email.receipt.user={0}
email.receipt.fecha={0} email.receipt.fecha=Fecha de pago: {0}
email.receipt.plantilla={0} email.receipt.plantilla={0}
email.receipt.precio=${0} email.receipt.precio=${0}

57
src/main/resources/templates/mail/facturaPayPalEmail.html
View File

@ -135,11 +135,9 @@
<div class="page-content container"> <div class="page-content container">
<div class="container px-0"> <div class="container px-0">
<div class="row mt-4"> <div class="row mt-4">
<div class="col-12 col-lg-10 offset-lg-1"> <div>
<!-- .row --> <!-- .row -->
<hr class="row brc-default-l1 mx-n1 mb-4" />
<div class="row"> <div class="row">
<div class="col-sm-6"> <div class="col-sm-6">
<div> <div>
@ -153,31 +151,56 @@
<!-- /.col --> <!-- /.col -->
<div class="text-95 col-sm-6 align-self-start d-sm-flex justify-content-end"> <div class="text-95 col-sm-6 align-self-start d-sm-flex justify-content-end">
<hr class="d-sm-none" />
<div class="text-grey-m2"> <div class="text-grey-m2">
<div class="my-2"> <div class="my-2">
<i class="fa fa-circle text-blue-m2 text-xs mr-1"></i> <i class="text-blue-m2 text-xs mr-1"></i>
<span class="text-600 text-90" th:text="#{email.receipt.fecha(${factura.getFecha()}, 'dd-MM-yyyy HH:mm' )}" <span class="text-600 text-90" th:text="#{email.receipt.fecha(${factura.getFecha()}, 'dd-MM-yyyy HH:mm' )}"
>Fecha:</span >Fecha:</span
> >
</div> </div>
</div> </div>
</div> </div>
<hr class="d-sm-none" />
<!-- /.col --> <!-- /.col -->
</div> </div>
<div class="mt-4"> <div class="container">
<div class="row text-600 text-white bgc-default-tp1 py-25"> <div class="row">
<div class="col-9 col-sm-5">Plantilla</div> <div class="col-lg-10 mt-5 mb-5">
<div class="d-none d-sm-block col-4 col-sm-2">Cantidad</div> <table class="table table-bordered" style="width: 100%">
<div class="d-none d-sm-block col-sm-2">Precio</div> <thead>
</div> <tr class="text-uppercase font-weight-bold text-blue">
<th>Plantilla</th>
<th>Cantidad</th>
<th>Precio</th>
</tr>
</thead>
<div class="text-95 text-secondary-d3"> <tbody style="text-align: center">
<div class="row mb-2 mb-sm-0 py-25"> <tr class="text-95 text-secondary-d3">
<div class="col-9 col-sm-5" th:text="#{email.receipt.plantilla(${factura.getNombrePlantilla()})}"></div> <td th:text="#{email.receipt.plantilla(${factura.getNombrePlantilla()})}"></td>
<div class="d-none d-sm-block col-2">1</div> <td>1</td>
<div class="d-none d-sm-block col-2 text-95" th:text="#{email.receipt.precio(${factura.getCosto()})}"></div> <td th:text="#{email.receipt.precio(${factura.getCosto()})}"></td>
</tr>
</tbody>
</table>
<hr />
<!-- <div class="row text-600 text-white bgc-default-tp1 d-flex flex-row" >
<div class="col-9 col-sm-5">Plantilla</div>
<div class="d-none d-sm-block col-4 col-sm-2">Cantidad</div>
<div class="d-none d-sm-block col-sm-2">Precio</div>
</div>
<div class="text-95 text-secondary-d3">
<div class="row mb-2 mb-sm-0 py-25">
<div class="col-9 col-sm-5" th:text="#{email.receipt.plantilla(${factura.getNombrePlantilla()})}"></div>
<div class="d-none d-sm-block col-2">1</div>
<div class="d-none d-sm-block col-2 text-95" th:text="#{email.receipt.precio(${factura.getCosto()})}"></div>
</div>
</div>-->
</div> </div>
</div> </div>
</div> </div>
@ -185,7 +208,7 @@
<div class="row mt-3"> <div class="row mt-3">
<div class="col-12 col-sm-5 text-grey text-90 order-first order-sm-last"> <div class="col-12 col-sm-5 text-grey text-90 order-first order-sm-last">
<div class="row my-2 align-items-center bgc-primary-l3 p-2"> <div class="row my-2 align-items-center bgc-primary-l3 p-2">
<div class="col-7 text-right">Monto total</div> <div class="col-7 text-600 text-110 text-blue text-right">Monto total:</div>
<div class="col-5"> <div class="col-5">
<span class="text-150 text-success-d3 opacity-2" th:text="#{email.receipt.precio(${factura.getCosto()})}"></span> <span class="text-150 text-success-d3 opacity-2" th:text="#{email.receipt.precio(${factura.getCosto()})}"></span>
</div> </div>