[FW][FIX] pos_restaurant: Grant loyalty points for products only

[fw-bot]

Steps to reproduce:

• Install POS app.
• Go to POS > Products > Discount & Loyalty
• Create a New program with:
  • Program Type: Loyalty Cards
  • Conditional rules:
    • Minimum Quantity: 2
    • Grant: 1 Loyalty Points per unit paid
  • Rewards:
    • Reward Type: Discount
    • Discount: 100 % one Cheapest Product
    • In exchange of: 2 Loyalty Points
• Start a new POS session
• Select a Customer
• Add two different products.
• Notice the Loyalty Points of +2 shown. This is Correct
• Click on the Reward button
• Notice how the Loyalty Points are now +3 which is obviously wrong given we only have two products. Basically it's as if the reward line (100% discount) is taken into consideration as the cheapest product.

Investigation:

• Inside _updatePrograms, pointsForPrograms() are calculated.
• we sum the lines quantities regardless of whether it's a reward line or not

  odoo/addons/pos_loyalty/static/src/js/Loyalty.js

  Line 906 in e5c3ba5

  totalProductQty += lineQty;

• By doing so, the reward lines are taken into consideration and the rule is triggerd by skipping this if clause

  odoo/addons/pos_loyalty/static/src/js/Loyalty.js

  Lines 917 to 921 in e5c3ba5

  	if (totalProductQty < rule.minimum_qty) {
  	// Should also count the points from negative quantities.
  	// For example, when refunding an ewallet payment. See TicketScreen override in this addon.
  	continue;
  	}

opw-3855323

Forward-Port-Of: #161503

[robodoo]

Pull request status dashboard.

[fw-bot]

@AH-Yussef @caburj cherrypicking of pull request #161503 failed.

stdout:

Auto-merging addons/pos_loyalty/static/src/js/Loyalty.js
CONFLICT (content): Merge conflict in addons/pos_loyalty/static/src/js/Loyalty.js
Auto-merging addons/pos_loyalty/static/src/tours/PosLoyaltyLoyaltyProgramTour.js
CONFLICT (content): Merge conflict in addons/pos_loyalty/static/src/tours/PosLoyaltyLoyaltyProgramTour.js
Auto-merging addons/pos_loyalty/tests/test_frontend.py

stderr:

17:45:15.149495 git.c:463               trace: built-in: git cherry-pick 8a95b9f169a34259cf981bc73d16a99be0b9ae56
error: could not apply 8a95b9f169a3... [FIX] pos_restaurant: Grant loyalty points for products only
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
----------
status:

Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?).

In the former case, you may want to edit this PR message as well.

⚠️ after resolving this conflict, you will need to merge it via @robodoo.

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

[caburj]

Looks like you are missing a step. A dialog is still displayed and you might need to select the reward.

[AH-Yussef]

@robodoo r+