• 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
Closed
Merge Request !12 opened 2023-07-12 12:30:17 UTC by Enzo Yair@Ecardenez

Feature/#10 crear formularios

Edited 2023-07-14 12:03:15 UTC
Request to merge feature/#10_crear_formularios 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/#10_crear_formularios origin/feature/#10_crear_formularios

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/#10_crear_formularios

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

Closed by Enzo Yair 2023-07-14 12:03:14 UTC

The changes were not merged into develop.

  • Discussion 2
  • Commits 3
  • Changes 21
  • 250441d17e88f1d443435d97d59b6a76?s=80&d=identicon
    Marta Miranda
    @mvmiranda started a discussion on the diff 2023-07-12 12:36:10 UTC
    Toggle discussion
    project/apps/edicto/constants.py 0 → 100644
    from django.utils.translation import gettext_lazy as _
    INICIADO = 'iniciado'
    PENDIENTE_DE_PAGO = 'pendiente_de_pago'
    PUBLICADO = 'publicado'
    RECHAZADO = 'rechazado'
    STATUS_CHOICE = [
    (INICIADO, _('iniciado')),
    (PENDIENTE_DE_PAGO, _('pendiente_de_pago')),
    (PUBLICADO, _('publicado')),
    (RECHAZADO, _('rechazado')),
    ]
    • Marta Miranda
      @mvmiranda commented 2023-07-12 12:36:10 UTC
      Master

      Falta un estado el Aprobado, que es el que ya pago, pero que todavia no fue publicado

  • 250441d17e88f1d443435d97d59b6a76?s=80&d=identicon
    Marta Miranda
    @mvmiranda started a discussion on the diff 2023-07-12 12:46:31 UTC
    Toggle discussion
    project/apps/edicto/migrations/0001_initial.py 0 → 100644
    'verbose_name_plural': 'Edictos',
    },
    ),
    migrations.CreateModel(
    name='ComprobantePago',
    fields=[
    ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
    ('resultado', models.FloatField()),
    ('numero_comprobante', models.CharField(max_length=300)),
    ('fecha_pago', models.DateTimeField()),
    ('edicto', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='edicto.edicto')),
    ],
    options={
    'verbose_name': 'ComprobantePago',
    'verbose_name_plural': 'ComprobantesPagos',
    },
    • Marta Miranda
      @mvmiranda commented 2023-07-12 12:46:31 UTC
      Master

      En Edicto, falta la fecha_creacion_edicto

  • Enzo Yair
    @Ecardenez 2023-07-13 11:55:51 UTC

    Added 1 commit:

    • 4c08902d - cambios_en_serializer_y_models
  • Enzo Yair
    @Ecardenez 2023-07-14 12:03:15 UTC

    Status changed to closed

  • Please register or login to post a comment
Enzo Yair
Assignee
Enzo Yair @Ecardenez
Assign to
None
Milestone
None
Assign milestone
1
1 participant
Reference: mvmiranda/boletin_api!12