Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
O
odoo
  • 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 0
    • Merge Requests 0
  • 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
  • odoo
  • Merge Requests
  • !54

Merged
Opened May 11, 2023 by François C.@fracolo 
  • Report abuse
Report abuse

4665 : Clear payment lines if return to POS products screen

  • Discussion 4
  • Commits 2
  • Changes 3
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Damien Moulard
    @DamienM started a discussion on an old version of the diff May 17, 2023
    Last updated by François C. May 19, 2023
    lacagette_addons/lacagette_custom_pos/static/src/js/backend.js
    112 136 }
    113 137 }
    114 138 })
    139
    140 /** Init payment screen **/
    141 screens.PaymentScreenWidget.include({
    142 start: function() {
    143 var self = this;
    144 payment_this = self;
    145 $('.payment-screen .top-content .back').off();
    146 $(document).on('click', '.payment-screen .top-content .back', function(event){
    147 self.gui.show_popup('custom-return-to-order');
    148 });
    149 empty_payments_lines();
    • Damien Moulard @DamienM commented May 17, 2023
      Developer

      Je pense qu'il ne faut pas faire le reset au chargement de la page, au cas où on doive faire un F5, auquel cas on ne veut pas forcément que les lignes soient effacées. À mon avis faire l'action à la validation de la popup suffit par rapport à la demande.

      Je pense qu'il ne faut pas faire le reset au chargement de la page, au cas où on doive faire un F5, auquel cas on ne veut pas forcément que les lignes soient effacées. À mon avis faire l'action à la validation de la popup suffit par rapport à la demande.
    • François C. @fracolo

      changed this line in version 3 of the diff

      May 19, 2023

      changed this line in version 3 of the diff

      changed this line in [version 3 of the diff](https://gl.cooperatic.fr/cooperatic-foodcoops/odoo/merge_requests/54/diffs?diff_id=2216&start_sha=b705e2e62e5a49e4b74ef139d2f6df3695e21fc9#09c2a592b9faf1ff5e73d841a00df879e1bf7776_149_153)
      Toggle commit list
    • François C. @fracolo commented May 19, 2023
      Master

      Ok, c'est supprimé

      Ok, c'est supprimé
    Please register or sign in to reply
  • Damien Moulard @DamienM commented May 17, 2023
    Developer

    Je rajouterais de ne pas afficher la popup si il n'y a aucun paiement.

    Je rajouterais de ne pas afficher la popup si il n'y a aucun paiement.
  • François C. @fracolo

    added 1 commit

    • 8a43225d - #4665 : Don't show popup if no payments line, and do not remove payment lines on…

    Compare with previous version

    May 19, 2023

    added 1 commit

    • 8a43225d - #4665 : Don't show popup if no payments line, and do not remove payment lines on…

    Compare with previous version

    added 1 commit <ul><li>8a43225d - #4665 : Don&#39;t show popup if no payments line, and do not remove payment lines on…</li></ul> [Compare with previous version](https://gl.cooperatic.fr/cooperatic-foodcoops/odoo/merge_requests/54/diffs?diff_id=2216&start_sha=b705e2e62e5a49e4b74ef139d2f6df3695e21fc9)
    Toggle commit list
  • François C. @fracolo commented May 19, 2023
    Master

    La popup n'apparait maintenant que s'il y a des lignes de paiements, sinon retour au panier

    Edited May 19, 2023 by François C.
    La popup n'apparait maintenant que s'il y a des lignes de paiements, sinon retour au panier
  • Damien Moulard @DamienM

    merged

    May 19, 2023

    merged

    merged
    Toggle commit list
  • Damien Moulard @DamienM

    mentioned in commit 0dba4859

    May 19, 2023

    mentioned in commit 0dba4859

    mentioned in commit 0dba48590986f76d81e56bbead4cf3544afbe5b4
    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/odoo!54
×

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.