Openbravo Issue Tracking System - Retail Modules
View Issue Details
0048383Retail ModulesDiscounts and Promotionspublic2022-01-12 08:362022-05-04 10:29
jetxarri 
jetxarri 
normalminoralways
closedfixed 
5
pi 
pi 
No
0048383: Allow to activate promotions on 2 distinct time slots within the same day
Allow to activate promotions on 2 distinct time slots within the same day.

Currently it is possible to define active days of the week + a time slots during the day to give the possibility to apply discounts. However it will be interesting to be able to define any amount of slots during same day
-Go to discounts and promotions and verify that it is not possible to add 2 slots for one day of the week
-Create a Tab Availability where it is possible to define any amount of slots
  - column day, startingtime and endingtime
NOR
related to defect 0048660PR22Q2 closed jetxarri Openbravo ERP As a new Tab Availability has been created, remove old fields related to availability 
related to defect 0049195 new Retail Retail Modules Availability subtab records can be deleted 
related to defect 0049194 new Retail Retail Modules Discount availability should be validated with POS time instead of server time 
related to defect 0049204 new Retail Retail Modules Modifying the Availibility subtab doesn't update the discount audit section 
Issue History
2022-01-12 08:36jetxarriNew Issue
2022-01-12 08:36jetxarriAssigned To => jetxarri
2022-01-12 08:36jetxarriTriggers an Emergency Pack => No
2022-01-13 21:00hgbotNote Added: 0134292
2022-01-13 21:00hgbotNote Added: 0134293
2022-01-13 21:00hgbotNote Added: 0134294
2022-01-13 21:00hgbotNote Added: 0134295
2022-01-13 21:01hgbotNote Added: 0134296
2022-01-14 09:27hgbotNote Added: 0134298
2022-01-17 13:11hgbotNote Added: 0134328
2022-01-21 09:01hgbotNote Added: 0134454
2022-01-21 09:04hgbotNote Added: 0134457
2022-02-22 13:51hgbotResolutionopen => fixed
2022-02-22 13:51hgbotStatusnew => closed
2022-02-22 13:51hgbotNote Added: 0135217
2022-02-22 13:51hgbotNote Added: 0135218
2022-02-22 13:52hgbotFixed in Version => RR22Q2
2022-02-22 13:52hgbotNote Added: 0135219
2022-02-22 13:52hgbotNote Added: 0135220
2022-02-22 13:54hgbotNote Added: 0135221
2022-02-22 13:54hgbotNote Added: 0135222
2022-02-22 14:08hgbotNote Added: 0135223
2022-02-22 14:08hgbotNote Added: 0135224
2022-02-22 14:08hgbotNote Added: 0135225
2022-02-22 14:09hgbotNote Added: 0135226
2022-02-22 14:09hgbotNote Added: 0135227
2022-02-22 14:10hgbotNote Added: 0135228
2022-02-22 14:10hgbotNote Added: 0135229
2022-02-22 14:20hgbotFixed in VersionRR22Q2 => PR22Q2
2022-02-22 14:20hgbotNote Added: 0135230
2022-02-22 14:20hgbotNote Added: 0135231
2022-02-22 14:20hgbotNote Added: 0135232
2022-02-22 15:38hgbotNote Added: 0135235
2022-02-22 16:31hgbotNote Added: 0135236
2022-02-23 14:58hgbotNote Added: 0135250
2022-02-23 14:58hgbotNote Added: 0135251
2022-02-23 15:45hgbotNote Added: 0135252
2022-02-25 09:09aferrazRelationship addedrelated to 0048660
2022-05-04 10:29rafarodaRelationship addedrelated to 0049195
2022-05-04 10:29rafarodaRelationship addedblocks 0049204
2022-05-04 10:29rafarodaRelationship addedrelated to 0049194
2022-05-04 10:29rafarodaRelationship deletedblocks 0049204
2022-05-04 10:29rafarodaRelationship addedrelated to 0049204
2022-05-04 10:29rafarodaTag Attached: NOR

Notes
(0134292)
hgbot   
2022-01-13 21:00   
Merge Request created: https://gitlab.com/openbravo/product/openbravo/-/merge_requests/500 [^]
(0134293)
hgbot   
2022-01-13 21:00   
Merge Request created: https://gitlab.com/openbravo/product/pmods/org.openbravo.retail.discounts.combo/-/merge_requests/19 [^]
(0134294)
hgbot   
2022-01-13 21:00   
Merge Request created: https://gitlab.com/openbravo/product/pmods/org.openbravo.discounts/-/merge_requests/15 [^]
(0134295)
hgbot   
2022-01-13 21:00   
Merge Request created: https://gitlab.com/openbravo/product/pmods/org.openbravo.retail.posterminal/-/merge_requests/687 [^]
(0134296)
hgbot   
2022-01-13 21:01   
Merge Request created: https://gitlab.com/openbravo/product/pmods/org.openbravo.retail.discounts/-/merge_requests/48 [^]
(0134298)
hgbot   
2022-01-14 09:27   
Merge Request created: https://gitlab.com/openbravo/product/pmods/org.openbravo.retail.discounts.coupons/-/merge_requests/7 [^]
(0134328)
hgbot   
2022-01-17 13:11   
Merge Request created: https://gitlab.com/openbravo/ci/mobile-test/-/merge_requests/158 [^]
(0134454)
hgbot   
2022-01-21 09:01   
Merge request closed: https://gitlab.com/openbravo/ci/mobile-test/-/merge_requests/158 [^]
(0134457)
hgbot   
2022-01-21 09:04   
Merge Request created: https://gitlab.com/openbravo/ci/mobile-test/-/merge_requests/161 [^]
(0135217)
hgbot   
2022-02-22 13:51   
Directly closing issue as related merge request is already approved.

Repository: https://gitlab.com/openbravo/product/pmods/org.openbravo.retail.discounts.combo [^]
Changeset: 1cb20bfd88b98248d78f2473c60968358019d561
Author: Javier Etxarri <javier.echarri@openbravo.com>
Date: 13-01-2022 20:38:16
URL: https://gitlab.com/openbravo/product/pmods/org.openbravo.retail.discounts.combo/-/commit/1cb20bfd88b98248d78f2473c60968358019d561 [^]

Fixes ISSUE-48383:Allow to activate promotions on 2 distinct time slots within the same day
Addapt test to new availability tab

---
M src-test/org/openbravo/discounts/combo/test/unittests/I40197_ComboApplyDiscountByHoursTest.java
---
(0135218)
hgbot   
2022-02-22 13:51   
Merge request merged: https://gitlab.com/openbravo/product/pmods/org.openbravo.retail.discounts.combo/-/merge_requests/19 [^]
(0135219)
hgbot   
2022-02-22 13:52   
Directly closing issue as related merge request is already approved.

Repository: https://gitlab.com/openbravo/product/pmods/org.openbravo.retail.posterminal [^]
Changeset: 44af7a94cb7c70f5543d74cf5d40d1d4363bc089
Author: Javier Etxarri <javier.echarri@openbravo.com>
Date: 21-02-2022 21:32:46
URL: https://gitlab.com/openbravo/product/pmods/org.openbravo.retail.posterminal/-/commit/44af7a94cb7c70f5543d74cf5d40d1d4363bc089 [^]

Fixes ISSUE-48383:Allow to activate promotions on 2 distinct time slots within the same day
Include Indexeddb model DiscountFilterAvailability

---
A src/org/openbravo/retail/posterminal/master/DiscountFilterAvailability.java
A src/org/openbravo/retail/posterminal/master/DiscountFilterAvailabilityProperties.java
A web/org.openbravo.retail.posterminal/app/model/masterdata/discount/DiscountFilterAvailabilityModel.js
M src/org/openbravo/retail/posterminal/OBPOSComponentProvider.java
---
(0135220)
hgbot   
2022-02-22 13:52   
Merge request merged: https://gitlab.com/openbravo/product/pmods/org.openbravo.retail.posterminal/-/merge_requests/687 [^]
(0135221)
hgbot   
2022-02-22 13:54   
Directly closing issue as related merge request is already approved.

Repository: https://gitlab.com/openbravo/product/pmods/org.openbravo.discounts [^]
Changeset: 2ce626e459d52cfd9b0ff8ea87204ad93d09f8b6
Author: Javier Etxarri <javier.echarri@openbravo.com>
Date: 13-01-2022 20:39:30
URL: https://gitlab.com/openbravo/product/pmods/org.openbravo.discounts/-/commit/2ce626e459d52cfd9b0ff8ea87204ad93d09f8b6 [^]

Fixes ISSUE-48383:Allow to activate promotions on 2 distinct time slots within the same day
Include availableDateTimes in the Discount Rest API

---
M src/org/openbravo/discounts/engine/DiscountJSExecutor.java
---
(0135222)
hgbot   
2022-02-22 13:54   
Merge request merged: https://gitlab.com/openbravo/product/pmods/org.openbravo.discounts/-/merge_requests/15 [^]
(0135223)
hgbot   
2022-02-22 14:08   
Directly closing issue as related merge request is already approved.

Repository: https://gitlab.com/openbravo/product/pmods/org.openbravo.retail.discounts [^]
Changeset: 26039e90931a1a3936b0112dce85f5a3187eb672
Author: Javier Etxarri <javier.echarri@openbravo.com>
Date: 22-02-2022 13:55:10
URL: https://gitlab.com/openbravo/product/pmods/org.openbravo.retail.discounts/-/commit/26039e90931a1a3936b0112dce85f5a3187eb672 [^]

Fixes ISSUE-48383:Allow to activate promotions on 2 distinct time slots within the same day
Implement discount engine logic to support advanced availability

---
A src-test/org/openbravo/retail/discounts/test/base/model/Availability.java
A src-test/org/openbravo/retail/discounts/test/unittests/DiscountPriceAdjusmentWithAvailabilityTest.java
M src-test/org/openbravo/retail/discounts/test/base/model/DiscountRule.java
M web/org.openbravo.retail.discounts/app/model/business-logic/discounts-engine/engine/discount-rules.js
M web/org.openbravo.retail.discounts/app/model/business-logic/discounts-engine/interface/discount-posinterface.js
---
(0135224)
hgbot   
2022-02-22 14:08   
Repository: https://gitlab.com/openbravo/product/pmods/org.openbravo.retail.discounts [^]
Changeset: 4f4de307ceb47f7cf39149292f6bae3a4a8fbbb7
Author: Javier Etxarri <javier.echarri@openbravo.com>
Date: 22-02-2022 13:55:10
URL: https://gitlab.com/openbravo/product/pmods/org.openbravo.retail.discounts/-/commit/4f4de307ceb47f7cf39149292f6bae3a4a8fbbb7 [^]

ISSUE-48383: when no availability record apply the discount

---
M src-test/org/openbravo/retail/discounts/test/base/model/DiscountRule.java
M src-test/org/openbravo/retail/discounts/test/unittests/DiscountPriceAdjusmentWithAvailabilityTest.java
M web/org.openbravo.retail.discounts/app/model/business-logic/discounts-engine/engine/discount-rules.js
---
(0135225)
hgbot   
2022-02-22 14:08   
Merge request merged: https://gitlab.com/openbravo/product/pmods/org.openbravo.retail.discounts/-/merge_requests/48 [^]
(0135226)
hgbot   
2022-02-22 14:09   
Directly closing issue as related merge request is already approved.

Repository: https://gitlab.com/openbravo/product/pmods/org.openbravo.retail.discounts.coupons [^]
Changeset: fad870a05714c42ec5a30e6765c96fa8a93fe1ef
Author: Javier Etxarri <javier.echarri@openbravo.com>
Date: 13-01-2022 20:53:07
URL: https://gitlab.com/openbravo/product/pmods/org.openbravo.retail.discounts.coupons/-/commit/fad870a05714c42ec5a30e6765c96fa8a93fe1ef [^]

Fixes ISSUE-48383:Allow to activate promotions on 2 distinct time slots within the same day
Addapt coupon validation logic to advanced availability

---
M src/org/openbravo/retail/discounts/coupons/CouponAvailability.java
---
(0135227)
hgbot   
2022-02-22 14:09   
Merge request merged: https://gitlab.com/openbravo/product/pmods/org.openbravo.retail.discounts.coupons/-/merge_requests/7 [^]
(0135228)
hgbot   
2022-02-22 14:10   
Directly closing issue as related merge request is already approved.

Repository: https://gitlab.com/openbravo/ci/mobile-test [^]
Changeset: 94e4106cd342e7c70b27e98f04aed1bafb801827
Author: Javier Etxarri <javier.echarri@openbravo.com>
Date: 21-02-2022 21:39:55
URL: https://gitlab.com/openbravo/ci/mobile-test/-/commit/94e4106cd342e7c70b27e98f04aed1bafb801827 [^]

Fixes ISSUE-48383: Adapt test to new discounts availability

---
M src-test/org/openbravo/test/mobile/retail/extmodules/selenium/tests/discounts_combo/I40197_ComboApplyDiscountByHours.java
---
(0135229)
hgbot   
2022-02-22 14:10   
Merge request merged: https://gitlab.com/openbravo/ci/mobile-test/-/merge_requests/161 [^]
(0135230)
hgbot   
2022-02-22 14:20   
Directly closing issue as related merge request is already approved.

Repository: https://gitlab.com/openbravo/product/openbravo [^]
Changeset: 369d8655b977c0e83a6b70eafefe5a00ba482a6a
Author: Javier Etxarri <javier.echarri@openbravo.com>
Date: 21-02-2022 21:35:00
URL: https://gitlab.com/openbravo/product/openbravo/-/commit/369d8655b977c0e83a6b70eafefe5a00ba482a6a [^]

Fixes ISSUE-48383:Allow to activate promotions on 2 distinct time slots within the same day

---
A src-db/database/model/tables/M_OFFER_AVAILABILITY.xml
A src-util/modulescript/build/classes/org/openbravo/modulescript/MigrateDataFromDiscountToAvailability.class
A src-util/modulescript/build/classes/org/openbravo/modulescript/MigrateDataFromDiscountToAvailabilityData.class
A src-util/modulescript/src/org/openbravo/modulescript/MigrateDataFromDiscountToAvailability.java
A src-util/modulescript/src/org/openbravo/modulescript/MigrateDataFromDiscountToAvailability_data.xsql
M .project
M .settings/org.eclipse.jdt.core.prefs
M src-core/.classpath
M src-core/.project
M src-db/database/sourcedata/AD_COLUMN.xml
M src-db/database/sourcedata/AD_ELEMENT.xml
M src-db/database/sourcedata/AD_FIELD.xml
M src-db/database/sourcedata/AD_FIELDGROUP.xml
M src-db/database/sourcedata/AD_REFERENCE.xml
M src-db/database/sourcedata/AD_REF_LIST.xml
M src-db/database/sourcedata/AD_TAB.xml
M src-db/database/sourcedata/AD_TABLE.xml
M src-test/.project
M src-trl/.project
M src-wad/.project
---
(0135231)
hgbot   
2022-02-22 14:20   
Directly closing issue as related merge request is already approved.

Repository: https://gitlab.com/openbravo/product/openbravo [^]
Changeset: 49009bbb179014eac29e5551b9751f70425a0817
Author: Javier Etxarri <javier.echarri@openbravo.com>
Date: 22-02-2022 14:16:20
URL: https://gitlab.com/openbravo/product/openbravo/-/commit/49009bbb179014eac29e5551b9751f70425a0817 [^]

Fixes ISSUE-48383:Allow to activate promotions on 2 distinct time slots within the same day

---
M .project
M .settings/org.eclipse.jdt.core.prefs
M src-core/.classpath
M src-core/.project
M src-test/.project
M src-trl/.project
M src-wad/.project
---
(0135232)
hgbot   
2022-02-22 14:20   
Merge request merged: https://gitlab.com/openbravo/product/openbravo/-/merge_requests/500 [^]
(0135235)
hgbot   
2022-02-22 15:38   
Repository: https://gitlab.com/openbravo/product/openbravo [^]
Changeset: 4fd1117583726b31874eea83adf1116d06fc1efe
Author: Javier Etxarri <javier.echarri@openbravo.com>
Date: 22-02-2022 15:38:48
URL: https://gitlab.com/openbravo/product/openbravo/-/commit/4fd1117583726b31874eea83adf1116d06fc1efe [^]

Related ISSUE-48383: adding pending ad_element

---
M src-db/database/sourcedata/AD_COLUMN.xml
M src-db/database/sourcedata/AD_ELEMENT.xml
---
(0135236)
hgbot   
2022-02-22 16:31   
Repository: https://gitlab.com/openbravo/product/openbravo [^]
Changeset: 09d0bee2b0d20e0927e60147314f1bdbcca985d5
Author: Álvaro Ferraz <alvaro.ferraz@openbravo.com>
Date: 22-02-2022 16:30:13
URL: https://gitlab.com/openbravo/product/openbravo/-/commit/09d0bee2b0d20e0927e60147314f1bdbcca985d5 [^]

Related to ISSUE-48383: Add removed fields and fieldgroup back to avoid breaking api

---
M src-db/database/sourcedata/AD_FIELD.xml
M src-db/database/sourcedata/AD_FIELDGROUP.xml
---
(0135250)
hgbot   
2022-02-23 14:58   
Repository: https://gitlab.com/openbravo/product/pmods/org.openbravo.retail.discounts [^]
Changeset: f4c46e49a0cf7405bc9313b11d19c9b76096c2c8
Author: Javier Etxarri <javier.echarri@openbravo.com>
Date: 23-02-2022 14:49:56
URL: https://gitlab.com/openbravo/product/pmods/org.openbravo.retail.discounts/-/commit/f4c46e49a0cf7405bc9313b11d19c9b76096c2c8 [^]

Related ISSUE-48383: availableDateTimes can be undefined using the webservice and it should apply the dicsount

---
M web/org.openbravo.retail.discounts/app/model/business-logic/discounts-engine/engine/discount-rules.js
---
(0135251)
hgbot   
2022-02-23 14:58   
Repository: https://gitlab.com/openbravo/product/pmods/org.openbravo.discounts [^]
Changeset: 467c1e813d56265d8b0909239758b5656598b138
Author: Javier Etxarri <javier.echarri@openbravo.com>
Date: 23-02-2022 14:52:45
URL: https://gitlab.com/openbravo/product/pmods/org.openbravo.discounts/-/commit/467c1e813d56265d8b0909239758b5656598b138 [^]

Related ISSUE-48383: do not validate allweekday in the generated ticket into webservice

---
M src/org/openbravo/discounts/api/ByTotalManualPromotion.java
M src/org/openbravo/discounts/api/validator/DiscountsTicketValidator.java
---
(0135252)
hgbot   
2022-02-23 15:45   
Repository: https://gitlab.com/openbravo/product/pmods/org.openbravo.discounts [^]
Changeset: 05715e770d831714e45767ef68720dec04a71104
Author: Javier Etxarri <javier.echarri@openbravo.com>
Date: 23-02-2022 15:45:23
URL: https://gitlab.com/openbravo/product/pmods/org.openbravo.discounts/-/commit/05715e770d831714e45767ef68720dec04a71104 [^]

Related ISSUE-48383: remove allweekday property, confirmed by retail team that it was there by accident

---
M api/org.openbravo.discounts-discounts.yml
---