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

Merged
Opened Feb 09, 2022 by Etienne Freiss@e.freiss 
  • Report abuse
Report abuse

display a popup if the meal voucher was already scan on this order

  • Discussion 1
  • Commits 2
  • Changes 3
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • François C.
    @fracolo started a discussion on the diff Feb 09, 2022
    lacagette_addons/pos_meal_voucher/static/src/js/screens.js
    14 14 barcode_meal_voucher_payment_action: function (code) {
    15 15
    16 // Display the payment screen, if it is not the current one.
    17 if (this.pos.gui.current_screen.template !== "PaymentScreenWidget"){
    18 this.gui.show_screen("payment");
    19 }
    20 var paymentScreen = this.pos.gui.current_screen;
    21 var order = this.pos.get_order();
    22 var amount = code.value;
    23 var cashregister = null;
    24 // find a meal voucher cash register, if exist
    25 for ( var i = 0; i < this.pos.cashregisters.length; i++ ) {
    26 if ( this.pos.cashregisters[i].journal.meal_voucher_type === "paper" ){
    27 cashregister = this.pos.cashregisters[i];
    28 break;
    16 var oder = this.pos.get_order();
    • François C. @fracolo commented Feb 09, 2022
      Master

      coquille : oder au lieu de order (nom de la variable dans les lignes supprimées) Ayant intégré la branche du ticket #2244 avant celle-ci, il y a un conflit (beaucoup de code ajouté dans ce fichier pour #2244), je fusionne et fait un rectificatif ensuite

      Edited Feb 09, 2022 by François C.
      coquille : oder au lieu de order (nom de la variable dans les lignes supprimées) Ayant intégré la branche du ticket #2244 avant celle-ci, il y a un conflit (beaucoup de code ajouté dans ce fichier pour #2244), je fusionne et fait un rectificatif ensuite
    Please register or sign in to reply
  • François C. @fracolo

    added 4 commits

    • 5db467b0...2d9688f3 - 3 commits from branch dev_cooperatic
    • ae3e4f87 - Merge branch 'dev_cooperatic' into '2245-made-paper-meal-vouhcer-usable-once'

    Compare with previous version

    Feb 09, 2022

    added 4 commits

    • 5db467b0...2d9688f3 - 3 commits from branch dev_cooperatic
    • ae3e4f87 - Merge branch 'dev_cooperatic' into '2245-made-paper-meal-vouhcer-usable-once'

    Compare with previous version

    added 4 commits <ul><li>5db467b0...2d9688f3 - 3 commits from branch <code>dev_cooperatic</code></li><li>ae3e4f87 - Merge branch &#39;dev_cooperatic&#39; into &#39;2245-made-paper-meal-vouhcer-usable-once&#39;</li></ul> [Compare with previous version](https://gl.cooperatic.fr/cooperatic-foodcoops/odoo/merge_requests/27/diffs?diff_id=1295&start_sha=5db467b0a98a4bab6cfcd345a743c983e3bd5b66)
    Toggle commit list
  • François C. @fracolo

    merged

    Feb 09, 2022

    merged

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

    mentioned in commit e46288b7

    Feb 09, 2022

    mentioned in commit e46288b7

    mentioned in commit e46288b7050a264fae4aa357da9a56386b07dd29
    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!27
×

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.