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
  • !92

Merged
Opened May 03, 2024 by Damien Moulard@DamienM 
  • Report abuse
Report abuse

6178 mark ccas transactions

  • Discussion 5
  • Commits 3
  • Changes 5
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Damien Moulard @DamienM

    added 1 commit

    • 8dd2a2a4 - ccas: mark refund transaction as ccas if base transaction is ccas

    Compare with previous version

    May 03, 2024

    added 1 commit

    • 8dd2a2a4 - ccas: mark refund transaction as ccas if base transaction is ccas

    Compare with previous version

    added 1 commit <ul><li>8dd2a2a4 - ccas: mark refund transaction as ccas if base transaction is ccas</li></ul> [Compare with previous version](https://gl.cooperatic.fr/cooperatic/kohinos-tav/merge_requests/92/diffs?diff_id=2995&start_sha=5ec6fb598445bb5c9221e21041fe00ebbfd3696c)
    Toggle commit list
  • Yvon Kerdoncuff
    @Yvon started a discussion on the diff May 06, 2024
    Resolved by Damien Moulard May 07, 2024
    src/Entity/Adherent.php
    144 144 */
    145 145 private $allocationAmount;
    146 146
    147 /**
    148 * @ORM\Column(type="boolean", options={"default": false})
    149 */
    150 private $ccasAccepted;
    151
    152 /**
    153 * @ORM\Column(type="boolean", options={"default": false})
    154 */
    155 private $ccasEligible = false;
    156
    157 /**
    158 * @ORM\Column(type="string", length=36, nullable=true, unique=true)
    • Yvon Kerdoncuff @Yvon commented May 06, 2024
      Master

      Je ne sais pas pourquoi tu as senti le besoin d'ajouter "= false" sur tous ces nouveaux champs, mais ça n'est pas compatible avec le "unique=true" de anonymousToken car avoir la valeur false deux fois n'est pas admis par cette contrainte.

      Exemple à la tentative de création d'un deuxième adhérent :

      image

      Edited May 06, 2024 by Yvon Kerdoncuff
      Je ne sais pas pourquoi tu as senti le besoin d'ajouter "= false" sur tous ces nouveaux champs, mais ça n'est pas compatible avec le "unique=true" de anonymousToken car avoir la valeur false deux fois n'est pas admis par cette contrainte. Exemple à la tentative de création d'un deuxième adhérent : ![image](/uploads/b163e671bbc062435c1259885b4952e9/image.png)
    • Damien Moulard @DamienM commented May 07, 2024
      Master

      mince ! je voulais mettre false par défaut à tous les booléens que j'ai rajouté et je suis allé trop vite

      mince ! je voulais mettre false par défaut à tous les booléens que j'ai rajouté et je suis allé trop vite
    • Damien Moulard @DamienM commented May 07, 2024
      Master

      corrigé

      corrigé
    Please register or sign in to reply
  • Yvon Kerdoncuff
    @Yvon started a discussion on an old version of the diff May 06, 2024
    Resolved by Damien Moulard May 07, 2024
    src/Entity/Transaction.php
    31 31 const TYPE_TRANSACTION_PRESTATAIRE_ADHERENT = 'prestataire_adherent';
    32 32 const TYPE_TRANSACTION_PRESTATAIRE_PRESTATAIRE = 'prestataire_prestataire';
    33 33
    34 /**
    35 * A transaction is marked as CCAS if both parties are CCAS complient.
    • Yvon Kerdoncuff @Yvon commented May 06, 2024
      Master

      compliant

      compliant
    • Damien Moulard @DamienM commented May 07, 2024
      Master

      corrigé

      corrigé
    • Damien Moulard @DamienM

      changed this line in version 5 of the diff

      May 07, 2024

      changed this line in version 5 of the diff

      changed this line in [version 5 of the diff](https://gl.cooperatic.fr/cooperatic/kohinos-tav/merge_requests/92/diffs?diff_id=3011&start_sha=8dd2a2a4a838a7ff97703585201c3ae289aa3d21#49505d57dccfb75d3fd0da1ccfbf1f41e2c06f51_35_35)
      Toggle commit list
    Please register or sign in to reply
  • Damien Moulard @DamienM

    added 1 commit

    • 9a862467 - quick fix

    Compare with previous version

    May 07, 2024

    added 1 commit

    • 9a862467 - quick fix

    Compare with previous version

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

    resolved all discussions

    May 07, 2024

    resolved all discussions

    resolved all discussions
    Toggle commit list
  • Damien Moulard @DamienM

    merged

    May 07, 2024

    merged

    merged
    Toggle commit list
  • Damien Moulard @DamienM

    mentioned in commit 58c040b6

    May 07, 2024

    mentioned in commit 58c040b6

    mentioned in commit 58c040b605e36b6d6cbd17389de034853409bde4
    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!92
×

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.