Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
K
kohinos-tav
  • Overview
    • Overview
    • Details
    • Activity
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 0
    • Issues 0
    • List
    • Board
    • Labels
    • Milestones
  • Merge Requests 1
    • Merge Requests 1
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • agplv3
  • kohinos-tav
  • Merge Requests
  • !70

Merged
Opened Mar 07, 2024 by Damien Moulard@DamienM 
  • Report abuse
Report abuse

create new method to distribute TAV allowance, based on household

Edited Mar 14, 2024 by Damien Moulard
  • Discussion 5
  • Commits 8
  • Changes 26
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Damien Moulard @DamienM

    added 20 commits

    • ee167589...55fe59bb - 18 commits from branch ssa-gironde
    • 265e0af4 - Merge branch 'ssa-gironde' into 5735-allowance-based-on-household
    • 45fbd986 - WIP: create new method to distribute TAV allowance, based on household

    Compare with previous version

    Mar 12, 2024

    added 20 commits

    • ee167589...55fe59bb - 18 commits from branch ssa-gironde
    • 265e0af4 - Merge branch 'ssa-gironde' into 5735-allowance-based-on-household
    • 45fbd986 - WIP: create new method to distribute TAV allowance, based on household

    Compare with previous version

    added 20 commits <ul><li>ee167589...55fe59bb - 18 commits from branch <code>ssa-gironde</code></li><li>265e0af4 - Merge branch &#39;ssa-gironde&#39; into 5735-allowance-based-on-household</li><li>45fbd986 - WIP: create new method to distribute TAV allowance, based on household</li></ul> [Compare with previous version](https://gl.cooperatic.fr/cooperatic/kohinos-tav/merge_requests/70/diffs?diff_id=2852&start_sha=ee1675893b303afac15f194b599ef1905205a93d)
    Toggle commit list
  • Damien Moulard @DamienM

    added 1 commit

    • 4ce2d41f - add new cotisation and allocation amounts to adherent, add fields to adherent…

    Compare with previous version

    Mar 13, 2024

    added 1 commit

    • 4ce2d41f - add new cotisation and allocation amounts to adherent, add fields to adherent…

    Compare with previous version

    added 1 commit <ul><li>4ce2d41f - add new cotisation and allocation amounts to adherent, add fields to adherent…</li></ul> [Compare with previous version](https://gl.cooperatic.fr/cooperatic/kohinos-tav/merge_requests/70/diffs?diff_id=2855&start_sha=45fbd986fcd72fc2b1b440881a76d1eeebe082bf)
    Toggle commit list
  • Damien Moulard @DamienM

    added 1 commit

    • d621a4fd - allowance based on household

    Compare with previous version

    Mar 14, 2024

    added 1 commit

    • d621a4fd - allowance based on household

    Compare with previous version

    added 1 commit <ul><li>d621a4fd - allowance based on household</li></ul> [Compare with previous version](https://gl.cooperatic.fr/cooperatic/kohinos-tav/merge_requests/70/diffs?diff_id=2857&start_sha=4ce2d41f9f3d32b205b4c55ac53ba173daf4ecfd)
    Toggle commit list
  • Damien Moulard @DamienM

    added 1 commit

    • c203aeb3 - quick fix

    Compare with previous version

    Mar 14, 2024

    added 1 commit

    • c203aeb3 - quick fix

    Compare with previous version

    added 1 commit <ul><li>c203aeb3 - quick fix</li></ul> [Compare with previous version](https://gl.cooperatic.fr/cooperatic/kohinos-tav/merge_requests/70/diffs?diff_id=2858&start_sha=d621a4fdb1b8371f67f737057dfdcdfb86b3a127)
    Toggle commit list
  • Damien Moulard @DamienM

    added 12 commits

    • c203aeb3...3a401fc8 - 11 commits from branch ssa-gironde
    • e26663ec - merge conflicts

    Compare with previous version

    Mar 14, 2024

    added 12 commits

    • c203aeb3...3a401fc8 - 11 commits from branch ssa-gironde
    • e26663ec - merge conflicts

    Compare with previous version

    added 12 commits <ul><li>c203aeb3...3a401fc8 - 11 commits from branch <code>ssa-gironde</code></li><li>e26663ec - merge conflicts</li></ul> [Compare with previous version](https://gl.cooperatic.fr/cooperatic/kohinos-tav/merge_requests/70/diffs?diff_id=2859&start_sha=c203aeb3e3abd7444a93c4d088f4ada72a16403d)
    Toggle commit list
  • Damien Moulard @DamienM

    unmarked as a Work In Progress

    Mar 14, 2024

    unmarked as a Work In Progress

    unmarked as a **Work In Progress**
    Toggle commit list
  • Yvon Kerdoncuff
    @Yvon started a discussion Mar 15, 2024
    Last updated by Damien Moulard Mar 18, 2024
    • Yvon Kerdoncuff @Yvon commented Mar 15, 2024
      Master

      Sur mon instance j'ai impersonné l'utilisateur yvon@chnik.fr en tant qu'adhérent après avoir renseigné son montant de cotisation à 26 €. Le montant à cotiser qui apparaît sur l'écran n'est pas le bon.

      image

      Sur mon instance j'ai impersonné l'utilisateur yvon@chnik.fr en tant qu'adhérent après avoir renseigné son montant de cotisation à 26 €. Le montant à cotiser qui apparaît sur l'écran n'est pas le bon. ![image](/uploads/67b47004e7a15f363b8c57261547a593/image.png)
    • Yvon Kerdoncuff @Yvon commented Mar 15, 2024
      Master

      Par contre le montant est correct lorsque j'essaie d'effectuer la cotisation via le comptoir.

      image

      Par contre le montant est correct lorsque j'essaie d'effectuer la cotisation via le comptoir. ![image](/uploads/fce4287de8d7a23090b42e7badd3cccb/image.png)
    • Damien Moulard @DamienM commented Mar 18, 2024
      Master

      Ha oui c'est parce que je ne me suis pas du tout occupé du paiement via CB, et ce montant fait partie du processus de paiement CB. Je peux éventuellement le changer ici oui, ça sera à faire dans tous les cas.

      Ha oui c'est parce que je ne me suis pas du tout occupé du paiement via CB, et ce montant fait partie du processus de paiement CB. Je peux éventuellement le changer ici oui, ça sera à faire dans tous les cas.
    • Damien Moulard @DamienM commented Mar 18, 2024
      Master

      fait

      fait
    Please register or sign in to reply
  • Yvon Kerdoncuff
    @Yvon started a discussion on the diff Mar 15, 2024
    Resolved by Yvon Kerdoncuff Mar 15, 2024
    src/Controller/UserComptoirController.php
    225 $this->addFlash(
    226 'error',
    227 $this->translator->trans("Opération impossible : le profil de l'habitant.e est incomplet, veuillez le compléter dans l'interface d'administration.")
    228 );
    228 229
    229 $cotisationAmount = $profile->getMontant(); // Amount in € paid by the user
    230 $flux->setMontant($cotisationAmount);
    231
    232 $this->em->persist($flux);
    233 $this->operationUtils->executeOperations($flux);
    230 return $this->redirectToRoute('index');
    231 }
    232
    233 if (is_null($destinataire->getAllocationAmount())) {
    234 $this->tavCotisationUtils->calculateAllowanceAccordingToHousehold($destinataire);
    235 $this->em->persist($destinataire);
    • Yvon Kerdoncuff @Yvon commented Mar 15, 2024
      Master
      Le persist ici est a priori inutile mais je vois qu'il pourrait être utile si la tracking policy de doctrine était changée sur le projet : https://stackoverflow.com/questions/7262934/knowing-when-to-call-persist ; plus pour info et pour voir si on partage bien ce qui se passe. Ok pour moi de laisser comme ça.
    Please register or sign in to reply
  • Damien Moulard @DamienM

    added 1 commit

    • fa204e43 - adherent pay its cotisation: use right amount for household based allowance

    Compare with previous version

    Mar 18, 2024

    added 1 commit

    • fa204e43 - adherent pay its cotisation: use right amount for household based allowance

    Compare with previous version

    added 1 commit <ul><li>fa204e43 - adherent pay its cotisation: use right amount for household based allowance</li></ul> [Compare with previous version](https://gl.cooperatic.fr/cooperatic/kohinos-tav/merge_requests/70/diffs?diff_id=2860&start_sha=e26663ec37dd9d95170b0b85fd10308f119ecd63)
    Toggle commit list
  • Yvon Kerdoncuff @Yvon

    merged

    Mar 18, 2024

    merged

    merged
    Toggle commit list
  • Yvon Kerdoncuff @Yvon

    mentioned in commit 1527feab

    Mar 18, 2024

    mentioned in commit 1527feab

    mentioned in commit 1527feab4024cbcac90d77a6951dbdf564295a91
    Toggle commit list
  • Write
  • Preview
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
Reference: agplv3/kohinos-tav!70
×

Revert this merge request

This will create a new commit in order to revert the existing changes.

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

Cherry-pick this merge request

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