Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
T
third-party
  • 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 2
    • Merge Requests 2
  • 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
  • cooperatic-foodcoops
  • third-party
  • Merge Requests
  • !193

Merged
Opened Jul 07, 2022 by Damien Moulard@DamienM 
  • Report abuse
Report abuse

REC: unmerge orders

  • Discussion 7
  • Commits 4
  • Pipelines 4
  • Changes 4
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Damien Moulard @DamienM

    added 1 commit

    • 72e3be1b - fix modal

    Compare with previous version

    Jul 07, 2022

    added 1 commit

    • 72e3be1b - fix modal

    Compare with previous version

    added 1 commit <ul><li>72e3be1b - fix modal</li></ul> [Compare with previous version](https://gl.cooperatic.fr/cooperatic-foodcoops/third-party/merge_requests/193/diffs?diff_id=1738&start_sha=45b3fc2a8bef0decb2b49eaa1e6d9847b31f0c93)
    Toggle commit list
  • Damien Moulard @DamienM

    added 1 commit

    • 8caed586 - fix modal

    Compare with previous version

    Jul 07, 2022

    added 1 commit

    • 8caed586 - fix modal

    Compare with previous version

    added 1 commit <ul><li>8caed586 - fix modal</li></ul> [Compare with previous version](https://gl.cooperatic.fr/cooperatic-foodcoops/third-party/merge_requests/193/diffs?diff_id=1739&start_sha=72e3be1b0476e9b74bb32f4ac1799eb342fb33b9)
    Toggle commit list
  • François C.
    @fracolo started a discussion on an old version of the diff Jul 07, 2022
    Last updated by Damien Moulard Jul 08, 2022
    reception/static/js/reception_index.js
    314 };
    315
    316 dbc.put(doc).then(() => {})
    317 .catch((err) => {
    318 error = {
    319 msg: 'Erreur dans la creation de la commande dans couchdb',
    320 ctx: 'create_order_doc',
    321 details: err
    322 };
    323 report_JS_error(error, 'reception');
    324 console.log(error);
    325 });
    326 }
    327 })
    328 .catch(function (err) {
    329 console.log(err);
    • François C. @fracolo commented Jul 07, 2022
      Master

      Possible de remonter l'erreur sur le serveur, comme au-dessus ?

      Possible de remonter l'erreur sur le serveur, comme au-dessus ?
    • Damien Moulard @DamienM commented Jul 08, 2022
      Developer

      Ha oui, effectivement j'ai oublié ça

      Ha oui, effectivement j'ai oublié ça
    • Damien Moulard @DamienM

      changed this line in version 4 of the diff

      Jul 08, 2022

      changed this line in version 4 of the diff

      changed this line in [version 4 of the diff](https://gl.cooperatic.fr/cooperatic-foodcoops/third-party/merge_requests/193/diffs?diff_id=1741&start_sha=8caed586f6c1e35916dbb0999234137c4e1c1e46#8a8c55d13960bffeacaf01c5eaac97e8ac2809f8_329_329)
      Toggle commit list
    • Damien Moulard @DamienM commented Jul 08, 2022
      Developer

      Fait

      Fait
    Please register or sign in to reply
  • François C.
    @fracolo started a discussion on an old version of the diff Jul 07, 2022
    Last updated by Damien Moulard Jul 08, 2022
    reception/static/js/reception_index.js
    325 });
    326 }
    327 })
    328 .catch(function (err) {
    329 console.log(err);
    330 });
    331 }
    332
    333 order_groups.groups.splice(group_index, 1);
    334 dbc.put(order_groups, (err, result) => {
    335 if (!err) {
    336 order_groups._rev = result.rev;
    337 display_orders_table();
    338 display_grouped_orders();
    339 } else {
    340 console.log(err);
    • François C. @fracolo commented Jul 07, 2022
      Master

      Possible de remonter l'erreur sur le serveur, comme plus haut ?

      Possible de remonter l'erreur sur le serveur, comme plus haut ?
    • Damien Moulard @DamienM commented Jul 08, 2022
      Developer

      Fait

      Fait
    • Damien Moulard @DamienM

      changed this line in version 4 of the diff

      Jul 08, 2022

      changed this line in version 4 of the diff

      changed this line in [version 4 of the diff](https://gl.cooperatic.fr/cooperatic-foodcoops/third-party/merge_requests/193/diffs?diff_id=1741&start_sha=8caed586f6c1e35916dbb0999234137c4e1c1e46#8a8c55d13960bffeacaf01c5eaac97e8ac2809f8_340_346)
      Toggle commit list
    Please register or sign in to reply
  • François C.
    @fracolo started a discussion on an old version of the diff Jul 07, 2022
    Last updated by Damien Moulard Jul 08, 2022
    reception/static/js/reception_index.js
    604 679 console.log(err);
    605 680 }
    606 681 });
    682 } else {
    683 console.log(err);
    • François C. @fracolo commented Jul 07, 2022
      Master

      Possible de remonter l'erreur sur le serveur, comme plus haut ?

      Possible de remonter l'erreur sur le serveur, comme plus haut ?
    • Damien Moulard @DamienM commented Jul 08, 2022
      Developer

      Fait

      Fait
    • Damien Moulard @DamienM

      changed this line in version 4 of the diff

      Jul 08, 2022

      changed this line in version 4 of the diff

      changed this line in [version 4 of the diff](https://gl.cooperatic.fr/cooperatic-foodcoops/third-party/merge_requests/193/diffs?diff_id=1741&start_sha=8caed586f6c1e35916dbb0999234137c4e1c1e46#8a8c55d13960bffeacaf01c5eaac97e8ac2809f8_683_695)
      Toggle commit list
    Please register or sign in to reply
  • Damien Moulard @DamienM

    added 1 commit

    • 3a8879bb - REC: add error handling

    Compare with previous version

    Jul 08, 2022

    added 1 commit

    • 3a8879bb - REC: add error handling

    Compare with previous version

    added 1 commit <ul><li>3a8879bb - REC: add error handling</li></ul> [Compare with previous version](https://gl.cooperatic.fr/cooperatic-foodcoops/third-party/merge_requests/193/diffs?diff_id=1741&start_sha=8caed586f6c1e35916dbb0999234137c4e1c1e46)
    Toggle commit list
  • François C. @fracolo

    merged

    Jul 08, 2022

    merged

    merged
    Toggle commit list
  • François C. @fracolo

    mentioned in commit 672c5269

    Jul 08, 2022

    mentioned in commit 672c5269

    mentioned in commit 672c526925a648813c967d386231ddbaecb8cf94
    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: cooperatic-foodcoops/third-party!193
×

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.