Openbravo Issue Tracking System - Retail Modules
View Issue Details
IDProjectCategoryView StatusDate SubmittedLast Update
0039082Retail ModulesWeb POSpublic2018-08-02 09:392018-12-07 10:37
Reporterjorge-garcia 
Assigned Tojorge-garcia 
PrioritynormalSeveritymajorReproducibilityhave not tried
StatusclosedResolutionfixed 
PlatformOS5OS Version
Product Version 
Target VersionFixed in VersionRR19Q1 
Merge Request Status
Review Assigned Tomarvintm
OBNetwork customer
Support ticket
Regression level
Regression date
Regression introduced in release
Regression introduced by commit
Triggers an Emergency PackNo
Summary0039082: Be able to configure manual discounts to be applied after automatic discounts
DescriptionImplement the possibility to configure manual discounts to be applied after automatic discounts
Steps To Reproduce-
Proposed Solution-
Additional Information
TagsNo tags attached.
Relationships
Attached Files
Issue History
Date ModifiedUsernameFieldChange
2018-08-02 09:39jorge-garciaNew Issue
2018-08-02 09:39jorge-garciaAssigned To => jorge-garcia
2018-08-02 09:39jorge-garciaTriggers an Emergency Pack => No
2018-10-15 10:10hgbotCheckin
2018-10-15 10:10hgbotNote Added: 0107268
2018-10-15 10:10hgbotCheckin
2018-10-15 10:10hgbotNote Added: 0107269
2018-10-15 10:10hgbotCheckin
2018-10-15 10:10hgbotNote Added: 0107270
2018-10-15 10:10hgbotStatusnew => resolved
2018-10-15 10:10hgbotResolutionopen => fixed
2018-10-15 10:10hgbotFixed in SCM revision => http://code.openbravo.com/erp/pmods/org.openbravo.retail.discounts/rev/b63f0e638df8f4616c92890ff2bfcfd16e27b303 [^]
2018-10-15 10:11hgbotCheckin
2018-10-15 10:11hgbotNote Added: 0107271
2018-10-15 10:11hgbotCheckin
2018-10-15 10:11hgbotNote Added: 0107272
2018-10-15 10:26hgbotCheckin
2018-10-15 10:26hgbotNote Added: 0107282
2018-10-26 11:09marvintmReview Assigned To => marvintm
2018-10-26 11:09marvintmStatusresolved => closed
2018-10-26 11:09marvintmFixed in Version => RR19Q1
2018-12-07 10:37hgbotCheckin
2018-12-07 10:37hgbotNote Added: 0108323

Notes
(0107268)
hgbot   
2018-10-15 10:10   
Repository: erp/pmods/org.openbravo.retail.posterminal
Changeset: 5fc1593194f81626b9c3c2cd3c242ae56e03cbde
Author: Jorge Garcia <jorge.garcia <at> openbravo.com>
Date: Thu Aug 02 09:50:50 2018 +0200
URL: http://code.openbravo.com/erp/pmods/org.openbravo.retail.posterminal/rev/5fc1593194f81626b9c3c2cd3c242ae56e03cbde [^]

Related to issue 39082: Be able to configure manual discounts to be applied after
automatic discounts

This commit includes:
  * Manual promotions are not set in applyPromotionsLat anymore.
  * Manual promotions with “Apply after automatic” unchecked are applied in
    preAction function.
  * Manual promotions with “Apply after automatic” checked are applied in
    postAction function.
  * Implement new flag “Apply after automatic” to be set in the rule.

---
M web/org.openbravo.retail.posterminal/js/model/discounts.js
M web/org.openbravo.retail.posterminal/js/model/executor.js
M web/org.openbravo.retail.posterminal/js/model/order.js
---
(0107269)
hgbot   
2018-10-15 10:10   
Repository: erp/pmods/org.openbravo.retail.posterminal
Changeset: 494891672c6394837f20462495f089d65a5c4f2b
Author: Jorge Garcia <jorge.garcia <at> openbravo.com>
Date: Mon Oct 08 13:16:29 2018 +0200
URL: http://code.openbravo.com/erp/pmods/org.openbravo.retail.posterminal/rev/494891672c6394837f20462495f089d65a5c4f2b [^]

Related to issue 39082: Be able to configure manual discounts to be applied after
automatic discounts

This commit includes:
  * Move manual promotion application to discount executor.
  * In preAction function, we apply those manual promotions without
    “Apply after automatic” flag checked.
  * In postAction function, we apply those manual promotions with
    “Apply after automatic” flag checked.
  * Modify fillPromotionsStandard function to use the same line as calculated
    during applyPromotions to set manual promotions.

---
M web/org.openbravo.retail.posterminal/js/model/discounts.js
M web/org.openbravo.retail.posterminal/js/model/executor.js
M web/org.openbravo.retail.posterminal/js/model/order.js
---
(0107270)
hgbot   
2018-10-15 10:10   
Repository: erp/pmods/org.openbravo.retail.discounts
Changeset: b63f0e638df8f4616c92890ff2bfcfd16e27b303
Author: Jorge Garcia <jorge.garcia <at> openbravo.com>
Date: Thu Aug 02 09:45:18 2018 +0200
URL: http://code.openbravo.com/erp/pmods/org.openbravo.retail.discounts/rev/b63f0e638df8f4616c92890ff2bfcfd16e27b303 [^]

Fixed issue 39082: Be able to configure manual discounts to be applied after
automatic discounts

This commit includes:
  * Added new column in m_offer called “EM_OBDISC_APPLYAFTER”.
  * Added new field in “Discounts and Promotions” window only shown for
    discretionary promotions:
      * User Defined Percentage
      * User Defined Amount
      * Discretionary Fixed Amount
      * Discretionary Fixed Percentage

---
M src-db/database/model/modifiedTables/M_OFFER.xml
M src-db/database/sourcedata/AD_COLUMN.xml
M src-db/database/sourcedata/AD_ELEMENT.xml
M src-db/database/sourcedata/AD_FIELD.xml
---
(0107271)
hgbot   
2018-10-15 10:11   
Repository: erp/pmods/org.openbravo.retail.sampledata
Changeset: 8160282c5ce9d32a95860d7a6cfe81d62e1e75ab
Author: Jorge Garcia <jorge.garcia <at> openbravo.com>
Date: Mon Oct 15 10:07:36 2018 +0200
URL: http://code.openbravo.com/erp/pmods/org.openbravo.retail.sampledata/rev/8160282c5ce9d32a95860d7a6cfe81d62e1e75ab [^]

Related to issue 39082: Be able to configure manual discounts to be applied
after automatic discounts

Add sampledata definition for manual promotions.

---
M referencedata/sampledata/The_White_Valley_Group/M_OFFER.xml
---
(0107272)
hgbot   
2018-10-15 10:11   
Repository: erp/pmods/org.openbravo.retail.testsampledata
Changeset: 4335d373d2e732a4e255775f7baf591710a43dae
Author: Jorge Garcia <jorge.garcia <at> openbravo.com>
Date: Mon Oct 15 10:07:19 2018 +0200
URL: http://code.openbravo.com/erp/pmods/org.openbravo.retail.testsampledata/rev/4335d373d2e732a4e255775f7baf591710a43dae [^]

Related to issue 39082: Be able to configure manual discounts to be applied
after automatic discounts

Add sampledata definition for manual promotions.

---
M referencedata/sampledata/Retail_Test/M_OFFER.xml
---
(0107282)
hgbot   
2018-10-15 10:26   
Repository: tools/automation/pi-mobile
Changeset: 9402e3471b500c248457ec582b183f3f334943a4
Author: Jorge Garcia <jorge.garcia <at> openbravo.com>
Date: Wed Sep 19 09:29:47 2018 +0200
URL: http://code.openbravo.com/tools/automation/pi-mobile/rev/9402e3471b500c248457ec582b183f3f334943a4 [^]

Verifies issue 39082: Be able to configure manual discounts to be applied after
automatic discounts

Add some new automated test.

---
A src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/discountsandpromotions/ManualAfterAutomatic_DiscretionaryDiscountAfterAutomatic.java
A src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/discountsandpromotions/ManualAfterAutomatic_DiscretionaryDiscountAfterAutomaticPercent.java
A src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/discountsandpromotions/ManualAfterAutomatic_VerifyDiscountWithAmount.java
A src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/discountsandpromotions/ManualAfterAutomatic_VerifyDiscountWithoutAmount.java
---
(0108323)
hgbot   
2018-12-07 10:37   
Repository: erp/pmods/org.openbravo.retail.posterminal
Changeset: a1b84f60dbd5ed9a74bd48476a06b832dd84fcf7
Author: Gorka Gil <gorka.gil <at> openbravo.com>
Date: Fri Dec 07 10:36:33 2018 +0100
URL: http://code.openbravo.com/erp/pmods/org.openbravo.retail.posterminal/rev/a1b84f60dbd5ed9a74bd48476a06b832dd84fcf7 [^]

Related to issue 39082: Check if a line has manual promotions before to try to save them

---
M web/org.openbravo.retail.posterminal/js/model/executor.js
---