Openbravo Issue Tracking System - POS2
View Issue Details
0054548POS2POSpublic2024-02-01 18:562024-04-19 07:20
Lcazaux 
sreehari 
highmajoralways
closedfixed 
5
 
24Q3 
No
0054548: [Cash Up - Keep Amount] Configuration not taken into account properly
If I set my store with a configuration “Allow variable amount = Yes” it is not considered in the POS → KO. It should display a line in the Keep amount window when doing a cash up even if no other boxes are checked related to it: currently, there is no line displayed if only this is set. The only way to have a line displayed is to put “Allow not to move =Yes” but this will allow:

1/ to put a variable amount

2/ to put a fixed amount

3/ to put all the cash total

This is wrong, there is one checkbox for each of these options, so they should interact separately.

When I do cash up, according to my configuration, I must have the right line with the right option showed.

https://drive.google.com/file/d/1m3_TZkW8KjWgc2CJvKt89fyN2bv42hNQ/view?usp=sharing [^]
- Backoffice
- Window Touchpoint Type
- Subtab Payment Method
- "cash"
- Allow variable amount = Yes
- Put the rest of the keep amount options to "No"
- Go to the POS and do a refresh master data
- Do some sales
- Do a cash up
- A line must appear with a field where it is possible to enter a variable amount --> this is not working right now
--> Each of the options must work independently from each others

When I do cash up, according to my configuration, I must have the right line with the right option showed.
No tags attached.
Issue History
2024-02-01 18:56LcazauxNew Issue
2024-02-01 18:56LcazauxAssigned To => Retail
2024-02-01 18:56LcazauxTriggers an Emergency Pack => No
2024-02-01 18:57LcazauxDescription Updatedbug_revision_view_page.php?rev_id=27451#r27451
2024-02-05 11:23sreehariAssigned ToRetail => sreehari
2024-02-06 12:28sreehariStatusnew => scheduled
2024-02-09 10:52guilleaerNote Added: 0160538
2024-02-16 09:23sreehariNote Added: 0160837
2024-02-21 13:52hgbotNote Added: 0161028
2024-02-21 13:53hgbotNote Added: 0161029
2024-04-09 13:02LeyreNote Added: 0162986
2024-04-16 12:45hgbotNote Added: 0163275
2024-04-16 12:45hgbotNote Added: 0163276
2024-04-16 12:45hgbotNote Added: 0163277
2024-04-19 07:19hgbotNote Added: 0163423
2024-04-19 07:19hgbotResolutionopen => fixed
2024-04-19 07:19hgbotStatusscheduled => closed
2024-04-19 07:19hgbotFixed in Version => 24Q3
2024-04-19 07:19hgbotNote Added: 0163424
2024-04-19 07:20hgbotNote Added: 0163425
2024-04-19 07:20hgbotNote Added: 0163426
2024-04-19 07:20hgbotNote Added: 0163427
2024-04-19 07:20hgbotNote Added: 0163428
2024-04-19 07:20hgbotNote Added: 0163429
2024-04-19 07:20hgbotNote Added: 0163430
2024-04-19 07:20hgbotNote Added: 0163431
2024-04-19 07:20hgbotNote Added: 0163432

Notes
(0160538)
guilleaer   
2024-02-09 10:52   
    Recap of the correct behavior depending on the configuration:

Keep fixed amount can be configured with:-> Allow variable amount -> This is what should or should not prevent to change that amount-> Allow not to move -> This is what should or should not allow you to keep the amount you have counted.

So:


A/ If keep fixed amount 200 and allow variable amount = false

and

Allow Not To move is false
--> the step is not shown and the cash to keep is the minimum between (the counted and the configured as cash to keep)



B/ If keep fixed amount 200 and allow variable amount = true

and

Allow Not To move is false
-> The default step should be shown with cash to keep = minimum between (the counted amount and the configured cash to keep) but the cashier can change it to any value below the counted amount.



C/ If keep fixed amount 200 and allow variable amount = true

and

Allow Not to move is true
--> Yes should show the step that will appear with cash to keep = minimum between (the counted amount and the configured cash to keep) but the cashier can change it to any value less than or equal to the counted amount.

Example: If keep amount = 200€ but counted amount = 150€ → the window “Keep Amount” must display 150€ but the cashier can change it to any value.



D/ if keep fixed amount 200 and allow variable amount = false

and

Allow Not to move is true
-> It should show the step that will appear with cash to keep = minimum between (the counted amount and the configured cash to keep) but the cashier can change it only to a value equal to the counted amount.
(0160837)
sreehari   
2024-02-16 09:23   
Cashup Config Scenarios
https://docs.google.com/spreadsheets/d/17yJ-Gpj9y5moIUMCJJ3-2BOm56KE86Dd38Jrqo-Zkro/edit?usp=sharing [^]
(0161028)
hgbot   
2024-02-21 13:52   
Merge Request created: https://gitlab.com/openbravo/product/pmods/org.openbravo.pos2/-/merge_requests/2444 [^]
(0161029)
hgbot   
2024-02-21 13:53   
Merge Request created: https://gitlab.com/openbravo/product/pmods/org.openbravo.core2/-/merge_requests/1379 [^]
(0162986)
Leyre   
2024-04-09 13:02   
Hello Team.
Any update on this ticket? Pending to fix the problem in Sabor a España.
Thanks.
(0163275)
hgbot   
2024-04-16 12:45   
Repository: https://gitlab.com/openbravo/product/pmods/org.openbravo.core2 [^]
Changeset: 97c26104af3b0e36a0ed8ab325917887caf100b3
Author: Sreehari Venkataraman <sreehari.venkataraman.ext@openbravo.com>
Date: 16-04-2024 10:42:34
URL: https://gitlab.com/openbravo/product/pmods/org.openbravo.core2/-/commit/97c26104af3b0e36a0ed8ab325917887caf100b3 [^]

Related ISSUE-54548: Added Disabled logic to remove clear icon when disabled

---
M web-jspack/org.openbravo.core2/src/components/BaseFormInput/BaseFormInput.jsx
---
(0163276)
hgbot   
2024-04-16 12:45   
Repository: https://gitlab.com/openbravo/product/pmods/org.openbravo.core2 [^]
Changeset: 6aefe90155ed5bbd70d115754e75b341fd06beef
Author: Sreehari Venkataraman <sreehari.venkataraman.ext@openbravo.com>
Date: 16-04-2024 10:42:34
URL: https://gitlab.com/openbravo/product/pmods/org.openbravo.core2/-/commit/6aefe90155ed5bbd70d115754e75b341fd06beef [^]

Related ISSUE-54548: Included 'disabled' & 'required' prop for display validation

---
M web-jspack/org.openbravo.core2/src/components/AutocompleteFormInput/AutocompleteFormInput.jsx
M web-jspack/org.openbravo.core2/src/components/BaseFormDatePicker/BaseFormDatePicker.jsx
M web-jspack/org.openbravo.core2/src/components/BaseFormInput/BaseFormInput.jsx
M web-jspack/org.openbravo.core2/src/components/BaseFormSelector/BaseFormSelector.jsx
M web-jspack/org.openbravo.core2/src/components/BaseFormTimePicker/BaseFormTimePicker.jsx
M web-jspack/org.openbravo.core2/src/components/Uploader/ImageUploader.jsx
---
(0163277)
hgbot   
2024-04-16 12:45   
Merge request merged: https://gitlab.com/openbravo/product/pmods/org.openbravo.core2/-/merge_requests/1379 [^]
(0163423)
hgbot   
2024-04-19 07:19   
Merge request merged: https://gitlab.com/openbravo/product/pmods/org.openbravo.pos2/-/merge_requests/2444 [^]
(0163424)
hgbot   
2024-04-19 07:19   
Directly closing issue as related merge request is already approved.

Repository: https://gitlab.com/openbravo/product/pmods/org.openbravo.pos2 [^]
Changeset: f36775c9fd0387be81323a11c0e459922e796b64
Author: Sreehari Venkataraman <sreehari.venkataraman.ext@openbravo.com>
Date: 18-04-2024 22:58:18
URL: https://gitlab.com/openbravo/product/pmods/org.openbravo.pos2/-/commit/f36775c9fd0387be81323a11c0e459922e796b64 [^]

Fixes ISSUE-54548: Fixed Cashup Config Functionalities similar to POS
*Added allowvariableamount for selecting variable amount
*Added readOnly Logic for Amount to Keep input columns
*Additional Checks to set amountToKeep value when keepfixedamount or allowdontmove are enabled

---
M web-jspack/org.openbravo.pos2/src/components/Cashup/CashupSteps/SelectCashToKeepStep/SelectCashToKeepStep.jsx
M web-jspack/org.openbravo.pos2/src/model/user-interface/actions/cashup/MatchCountedWithExpected.js
M web-jspack/org.openbravo.pos2/src/model/user-interface/actions/cashup/OpenCashup.js
M web-jspack/org.openbravo.pos2/src/model/user-interface/actions/cashup/SetCountedAmount.js
---
(0163425)
hgbot   
2024-04-19 07:20   
Directly closing issue as related merge request is already approved.

Repository: https://gitlab.com/openbravo/product/pmods/org.openbravo.pos2 [^]
Changeset: 2c6c4492d98882b6aa5d1f58ec7bbcc5fb5ecc9f
Author: Sreehari Venkataraman <sreehari.venkataraman.ext@openbravo.com>
Date: 18-04-2024 22:58:18
URL: https://gitlab.com/openbravo/product/pmods/org.openbravo.pos2/-/commit/2c6c4492d98882b6aa5d1f58ec7bbcc5fb5ecc9f [^]

Fixes ISSUE-54548: Validated test cases for fixed cases

---
M web-jspack/org.openbravo.pos2/src/components/Cashup/CashupSteps/SelectCashToKeepStep/__test__/SelectCashToKeepStep.test.jsx
M web-jspack/org.openbravo.pos2/src/components/Cashup/mock/TerminalPaymentsMock4.config.json
---
(0163426)
hgbot   
2024-04-19 07:20   
Directly closing issue as related merge request is already approved.

Repository: https://gitlab.com/openbravo/product/pmods/org.openbravo.pos2 [^]
Changeset: f691ed88bb366ddd6c1acc3e6aa1fe6456df350b
Author: Sreehari Venkataraman <sreehari.venkataraman.ext@openbravo.com>
Date: 18-04-2024 22:58:19
URL: https://gitlab.com/openbravo/product/pmods/org.openbravo.pos2/-/commit/f691ed88bb366ddd6c1acc3e6aa1fe6456df350b [^]

Fixes ISSUE-54548: Added condition to show move everything button
*when Allow move everything enabled move everything
*fixed case when 'Allow Not to Move' then enabled to keep nothing
*fixed formatString to validate string if length > 1
*disabled keypad based on allowmoveeverything & allowdontmove case when specific payment is selected
*added canKeepCash logic to filter availablePaymentMethods
*Skipped step 2 when there are no availablePaymentMethods

---
A web-jspack/org.openbravo.pos2/src/model/user-interface/utils/canKeepCash.js
M web-jspack/org.openbravo.pos2/src/components/Cashup/CashupSteps/SelectCashToKeepStep/SelectCashToKeepStep.jsx
M web-jspack/org.openbravo.pos2/src/components/Cashup/utils/getValueFromInput.js
M web-jspack/org.openbravo.pos2/src/model/user-interface/actions/cashup/MatchCountedWithExpected.js
M web-jspack/org.openbravo.pos2/src/model/user-interface/actions/cashup/SetCountedAmount.js
---
(0163427)
hgbot   
2024-04-19 07:20   
Directly closing issue as related merge request is already approved.

Repository: https://gitlab.com/openbravo/product/pmods/org.openbravo.pos2 [^]
Changeset: a2b7c11f60412e840428eed3ef5c3a673c47d4eb
Author: Sreehari Venkataraman <sreehari.venkataraman.ext@openbravo.com>
Date: 18-04-2024 22:58:19
URL: https://gitlab.com/openbravo/product/pmods/org.openbravo.pos2/-/commit/a2b7c11f60412e840428eed3ef5c3a673c47d4eb [^]

Fixes ISSUE-54548: Fixed Test Failures
*added combination test cases for flags keepfixedamount, allowvariableamount, allowdontmove, allowmoveeverything
*added test cases for setCountedAmount & matchCountedWithExpected
*fixed cypress failure, used seperate cy.window() for validating step 2 cashupMode
*added additional button Keep 0, for keeping 0 when disabling keypad

---
A web-jspack/org.openbravo.pos2/src/model/user-interface/__test__/mock/PaymentMethodsInfoMock2.config.json
M web-jspack/org.openbravo.pos2/src-test/cypress/functions/countMoney.js
M web-jspack/org.openbravo.pos2/src/components/Cashup/CashupSteps/SelectCashToKeepStep/SelectCashToKeepStep.jsx
M web-jspack/org.openbravo.pos2/src/components/Cashup/CashupSteps/SelectCashToKeepStep/__test__/SelectCashToKeepStep.test.jsx
M web-jspack/org.openbravo.pos2/src/components/Cashup/mock/TerminalPaymentsMock4.config.json
M web-jspack/org.openbravo.pos2/src/model/user-interface/__test__/MatchCountedWithExpected.test.js
M web-jspack/org.openbravo.pos2/src/model/user-interface/__test__/SetCountedAmount.test.js
M web-jspack/org.openbravo.pos2/src/model/user-interface/__test__/mock/PaymentMethodsInfoMock.config.json
M web-jspack/org.openbravo.pos2/src/model/user-interface/__test__/mock/index.js
M web-jspack/org.openbravo.pos2/src/model/user-interface/utils/canKeepCash.js
---
(0163428)
hgbot   
2024-04-19 07:20   
Directly closing issue as related merge request is already approved.

Repository: https://gitlab.com/openbravo/product/pmods/org.openbravo.pos2 [^]
Changeset: c3ae4f5ebc7931d459a852f68aa10684d5708713
Author: Sreehari Venkataraman <sreehari.venkataraman.ext@openbravo.com>
Date: 18-04-2024 22:58:19
URL: https://gitlab.com/openbravo/product/pmods/org.openbravo.pos2/-/commit/c3ae4f5ebc7931d459a852f68aa10684d5708713 [^]

Fixes ISSUE-54548: Added Step validation during cashup
*when cashup initialized proceeding to step2 without validating amount in step 1, results in empty step2 appearance, fixed that
*fixed case when keep 0 shouldn't appear, case 7 & 14 keep 0 button will appear
*input & keypad remains disabled and also Keep 0 button appears only when allowvariableamount - 'N'

---
M web-jspack/org.openbravo.pos2/src/components/Cashup/CashupSteps/SelectCashToKeepStep/SelectCashToKeepStep.jsx
M web-jspack/org.openbravo.pos2/src/model/user-interface/__test__/SetSelectedPaymentMethod.test.js
M web-jspack/org.openbravo.pos2/src/model/user-interface/actions/cashup/SetSelectedPaymentMethod.js
---
(0163429)
hgbot   
2024-04-19 07:20   
Directly closing issue as related merge request is already approved.

Repository: https://gitlab.com/openbravo/product/pmods/org.openbravo.pos2 [^]
Changeset: 4cad07889fafaf97050d8a56322f5abc8604be99
Author: Sreehari Venkataraman <sreehari.venkataraman.ext@openbravo.com>
Date: 18-04-2024 22:58:19
URL: https://gitlab.com/openbravo/product/pmods/org.openbravo.pos2/-/commit/4cad07889fafaf97050d8a56322f5abc8604be99 [^]

Fixes ISSUE-54548: Created New function validateCashToKeepStep
*the new function handles the buttons in cash to keep step
*and skipstep, defaultAmount and disable input keypad
*case 7, keep 0 wont appear as allowvariableamount & allowmoveeverything is 'N'
*fixed test failure, and added tests for validateCashToKeepStep function
*added logic for displayKeepTotalCounted, displayKeepFixedAmount, defaultValueVariableAmountKeep & added tests accordingly
*moved canKeepAll and canKeepFixedAmount function to validateCashToKeepStep
*updated validateCashToKeepStep params and tests
*fixed case 5 & 12 for not show keep counted button

---
A web-jspack/org.openbravo.pos2/src/model/user-interface/utils/__test__/validateCashToKeepStep.test.js
A web-jspack/org.openbravo.pos2/src/model/user-interface/utils/validateCashToKeepStep.js
M web-jspack/org.openbravo.pos2/src/components/Cashup/CashupSteps/SelectCashToKeepStep/SelectCashToKeepStep.jsx
M web-jspack/org.openbravo.pos2/src/components/Cashup/CashupSteps/SelectCashToKeepStep/__test__/SelectCashToKeepStep.test.jsx
M web-jspack/org.openbravo.pos2/src/components/Cashup/mock/PaymentMethodsInfoMock4.config.json
M web-jspack/org.openbravo.pos2/src/components/Cashup/mock/TerminalPaymentsMock4.config.json
M web-jspack/org.openbravo.pos2/src/model/user-interface/actions/cashup/MatchCountedWithExpected.js
M web-jspack/org.openbravo.pos2/src/model/user-interface/actions/cashup/SetCountedAmount.js
M web-jspack/org.openbravo.pos2/src/model/user-interface/utils/canKeepCash.js
---
(0163430)
hgbot   
2024-04-19 07:20   
Directly closing issue as related merge request is already approved.

Repository: https://gitlab.com/openbravo/product/pmods/org.openbravo.pos2 [^]
Changeset: 62e704256729344aa4666389723636c729c4ec36
Author: Sreehari Venkataraman <sreehari.venkataraman.ext@openbravo.com>
Date: 18-04-2024 22:58:19
URL: https://gitlab.com/openbravo/product/pmods/org.openbravo.pos2/-/commit/62e704256729344aa4666389723636c729c4ec36 [^]

Fixes ISSUE-54548: Applied Code Review Changes Applied
*updated test cases
*fixed SelectCashToKeepStep test failure added required values to config files, removed duplicate canKeepCash function

---
M web-jspack/org.openbravo.pos2/src/components/Cashup/CashupSteps/SelectCashToKeepStep/SelectCashToKeepStep.jsx
M web-jspack/org.openbravo.pos2/src/components/Cashup/mock/PaymentMethodsInfoMock4.config.json
M web-jspack/org.openbravo.pos2/src/model/user-interface/utils/__test__/validateCashToKeepStep.test.js
M web-jspack/org.openbravo.pos2/src/model/user-interface/utils/canKeepCash.js
M web-jspack/org.openbravo.pos2/src/model/user-interface/utils/validateCashToKeepStep.js
---
(0163431)
hgbot   
2024-04-19 07:20   
Directly closing issue as related merge request is already approved.

Repository: https://gitlab.com/openbravo/product/pmods/org.openbravo.pos2 [^]
Changeset: 36cf0d80ec36811d1cd3c1b75bcc0bf92342c473
Author: Sreehari Venkataraman <sreehari.venkataraman.ext@openbravo.com>
Date: 18-04-2024 22:58:19
URL: https://gitlab.com/openbravo/product/pmods/org.openbravo.pos2/-/commit/36cf0d80ec36811d1cd3c1b75bcc0bf92342c473 [^]

Fixes ISSUE-54548: Modifying the function name and params
* CODE REVIEW POINTS
* - renamed the function from validateCashToKeepStep to getCashToKeepConfig
* - changed the individual params to single object of { paymentMethod, countPerAmount, counted }
* - used cashToKeep instead amount
* - removed canKeepCash method and used skipStep from getCashToKeepConfig, added validation for countpaymentincashup
* - handled countPerAmount within getCashToKeepConfig function

---
A web-jspack/org.openbravo.pos2/src/model/user-interface/utils/__test__/getCashToKeepConfig.test.js
A web-jspack/org.openbravo.pos2/src/model/user-interface/utils/getCashToKeepConfig.js
M web-jspack/org.openbravo.pos2/src/components/Cashup/CashupSteps/SelectCashToKeepStep/SelectCashToKeepStep.jsx
M web-jspack/org.openbravo.pos2/src/model/user-interface/__test__/SetSelectedPaymentMethod.test.js
M web-jspack/org.openbravo.pos2/src/model/user-interface/actions/cashup/MatchCountedWithExpected.js
M web-jspack/org.openbravo.pos2/src/model/user-interface/actions/cashup/SetCountedAmount.js
M web-jspack/org.openbravo.pos2/src/model/user-interface/actions/cashup/SetSelectedPaymentMethod.js
R web-jspack/org.openbravo.pos2/src/model/user-interface/utils/__test__/validateCashToKeepStep.test.js
R web-jspack/org.openbravo.pos2/src/model/user-interface/utils/canKeepCash.js
---
(0163432)
hgbot   
2024-04-19 07:20   
Directly closing issue as related merge request is already approved.

Repository: https://gitlab.com/openbravo/product/pmods/org.openbravo.pos2 [^]
Changeset: 21e981cc027fa5ea7d245df461052556de303feb
Author: Sreehari Venkataraman <sreehari.venkataraman.ext@openbravo.com>
Date: 18-04-2024 23:26:21
URL: https://gitlab.com/openbravo/product/pmods/org.openbravo.pos2/-/commit/21e981cc027fa5ea7d245df461052556de303feb [^]

Fixes ISSUE-54548: Adding missing tests for code coverage
*removed keepAll & fixedAmount variables
* CODE COVERAGE
* - test for disabling a button when total and fixed amount are same
* - test for disabling all buttons when countperamount is true

---
M web-jspack/org.openbravo.pos2/src/components/Cashup/CashupSteps/SelectCashToKeepStep/SelectCashToKeepStep.jsx
M web-jspack/org.openbravo.pos2/src/model/user-interface/utils/__test__/getCashToKeepConfig.test.js
M web-jspack/org.openbravo.pos2/src/model/user-interface/utils/getCashToKeepConfig.js
---