• This project
    • Loading...
  • Sign in

Marta Miranda / boletin_api

Logo codes
Go to a project
Toggle navigation
  • Projects
  • Groups
  • Snippets
  • Help
Toggle navigation pinning
  • Project
  • Activity
  • Repository
  • Pipelines
  • Graphs
  • Issues 0
  • Merge Requests 0
  • Wiki
  • Network
  • Create a new issue
  • Builds
  • Commits
Merged
Merge Request !65 opened 2023-10-02 13:06:17 UTC by Enzo Yair@Ecardenez

feature/#51_quiero_visualizar_monto_a_pagar

Edited 2023-10-03 15:05:54 UTC
Request to merge feature/#51_quiero_visualizar_monto_a_pagar into develop
×

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch origin
git checkout -b feature/#51_quiero_visualizar_monto_a_pagar origin/feature/#51_quiero_visualizar_monto_a_pagar

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git checkout develop
git merge --no-ff feature/#51_quiero_visualizar_monto_a_pagar

Step 4. Push the result of the merge to GitLab

git push origin develop

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines

Merged by Martín Miranda 2023-10-03 15:05:54 UTC

The changes were merged into develop. The source branch has been removed.

  • Discussion 3
  • Commits 3
  • Changes 9
  • Enzo Yair
    @Ecardenez 2023-10-02 13:40:09 UTC

    Added 1 commit:

    • bba16158 - se agrego orden en la vista de Comprobante
  • Avatar
    Martín Miranda
    @debianitram started a discussion on an outdated diff 2023-10-03 01:26:05 UTC
    Toggle discussion
    project/apps/edicto/precio.py
    es_publico = organismo.es_publico if organismo else False
    sellos = edicto.cantidad_sellos
    palabras = edicto.cantidad_palabras
    copias = edicto.cantidad_copias
    publicar = edicto.dias_publicar
    precio_valores = {
    'precio': precio.precio,
    'precio_ejemplar': precio.precio_ejemplar,
    'precio_dia': precio.precio_dia
    }
    result_palabra = (sellos + palabras) * precio_valores['precio']
    result_ejemplar = (copias * precio_valores['precio_ejemplar']) + (publicar * precio_valores['precio_dia'])
    subtotal = result_ejemplar + result_palabra
    if es_publico:
    • Martín Miranda
      @debianitram commented 2023-10-03 01:26:05 UTC
      Developer

      reemplaza por if organismo.es_publico:

  • Avatar
    Martín Miranda
    @debianitram started a discussion on an outdated diff 2023-10-03 01:26:21 UTC
    Toggle discussion
    project/apps/edicto/precio.py
    if organismo:
    resultado = result_ejemplar + result_palabra / 2
    else:
    resultado = result_ejemplar + result_palabra
    precio_resultado = ComprobantePago(edicto=edicto, resultado=resultado)
    precio_resultado.save()
    return precio_resultado
    from .models import ComprobantePago
    def calculadora(edicto, precio):
    try:
    descuento = 50
    organismo = edicto.creado_por.organismo
    es_publico = organismo.es_publico if organismo else False
    • Martín Miranda
      @debianitram commented 2023-10-03 01:26:21 UTC
      Developer

      no tiene sentido esto.

  • Enzo Yair
    @Ecardenez 2023-10-03 11:30:03 UTC

    Added 1 commit:

    • e6a9b6b3 - correcion de funcion
  • F21cea19bfa66dae7471e4e3269bc9aa?s=80&d=identicon
    Enzo Yair
    @Ecardenez started a discussion on the diff 2023-10-03 11:59:12 UTC
    Toggle discussion
    project/apps/edicto/admin.py
     
    # Register your models here.
     
    admin.site.register(Precio)
     
    admin.site.register(Precio)
     
    • Enzo Yair
      @Ecardenez commented 2023-10-03 11:59:12 UTC
      Master

      por favor, ignorar. Estuve probando codigo para otro modulo

  • Martín Miranda
    @debianitram 2023-10-03 15:05:54 UTC

    Status changed to merged

  • Martín Miranda
    @debianitram 2023-10-03 15:05:54 UTC

    mentioned in commit daf3b95a

  • Please register or login to post a comment
Enzo Yair
Assignee
Enzo Yair @Ecardenez
Assign to
None
Milestone
None
Assign milestone
2
2 participants
Reference: mvmiranda/boletin_api!65
×

Revert this merge request

Cancel
A new branch will be created in your fork and a new merge request will be started.
×

Cherry-pick this merge request

Cancel
A new branch will be created in your fork and a new merge request will be started.