122 Commits
Author SHA1 Message Date
florianschlegelandFrederik Löffert 18e788cf8d Feature: voucher cumulation (#14)
* enable optional cumulation of multiple regular vouchers (overruling best option rule) //  fix bug where vouchers could falsely be cumulated when pricerule is identical // add unit tests

* fix pre-filtering of vouchers

* minor cleanup

* refactor: remove access to global test data from promo cumulation tests // add test for employee disscount

* feat: ExcludeAlreadyDiscountedItemsForVoucher does no longer apply to discounts with TypePromotionCustomer

* update unit tests for promo cumulation

* update unit tests for promo cumulation

* update pricerule cumulation tests

* pricerules: reimplement test for BuyXPayY

* add more tests for pricerules
2020-01-27 12:20:15 +01:00
florianschlegelandFrederik Löffert 45c0e91631 Feature/promo cumulation (#6)
* feat: adjust cumulation so that multiple vouchers are allowed on cart but only the single best one is being applied on each item

* clean up debug logs

* minor cleanup on tests

* revert debug changes made to existing tests

* feat: add option to skip voucher for already discounted articles

* minor renamings

* feat: add flag to exclude employees from  vouchers

* feat: add test for inclusion/exclusion of customer type

* add flag ExcludesEmployeesForVoucher
2019-09-18 10:34:53 +02:00
Frederik Löffertandflorianschlegel 80b437399d feature/atomic-promo-init (#7)
* Pricerules: add methodes to remove pricerules by query

* fix typo
2019-08-28 10:16:50 +02:00
Vladan Marsenic 58c63f38da remove log 2018-10-31 14:01:56 +01:00
Vladan Marsenic 2f00425e72 remove log 2018-08-13 16:56:11 +02:00
Frederik Löffert 7b78d8b432 init globalPriceRulePersistors map and simplified getPriceRulePersistorForType 2018-07-10 12:10:08 +02:00
Frederik Löffert 620e065857 ensure indices on order, customer and price rule collections when getting a mongo persistor 2018-07-09 17:40:12 +02:00
Vladan Marsenic 47b70d923a fix: add logs 2018-06-04 11:56:36 +02:00
Vladan Marsenic 2764b28e74 ECOMDEV-2087 feat: exclude sap discounted articles 2018-04-17 17:19:28 +02:00
Vladan Marsenic 0c08f97230 ECOMDEV-2087 feat: change article structure to support cross-price calculation 2018-04-05 14:32:12 +02:00
Vladan Marsenic 43a11c6362 ECOMDEV-2300 fix: calculate scaled discount for amounts greater then in last scale. 2018-04-03 15:30:25 +02:00
Vladan Marsenic 5ff26fc251 add test for buyXpayY 2018-03-28 14:57:44 +02:00
Vladan Marsenic d1e863b64a fix: set applicableInCatalog to false if qntThreshold is greater then 0 2018-03-07 11:59:44 +01:00
Florian Schlegel ae06e44a60 ECOMDEV-2117 refactor: simplify checkIfBonusVoucher() // allow includes and excludes for promotions (shipping must be excludable) 2018-02-16 16:19:00 +01:00
Vladan Marsenic 800aa32ef9 add flag to DiscountApplied that indicates if discount is made from 'bonus voucher' 2018-02-13 14:30:24 +01:00
Vladan Marsenic 178122ff3a Merge branch 'master' of https://github.com/foomo/shop 2018-02-13 14:14:03 +01:00
Vladan Marsenic a91624bb9c add test for absolute voucher 2018-02-13 14:11:30 +01:00
Bostjan Marusic f27e6de6be ECOMDEV-2117 feat: added support for bonus vouchers 2018-02-12 15:59:43 +01:00
Vladan Marsenic f67b960da8 ECOMDEV-1890: fix order total amount calculation 2018-02-09 17:15:28 +01:00
Vladan Marsenic acdae98b8c ECOMDEV-301 feat: apply promotions of 'CustomerType' in separated step 2018-01-26 10:24:50 +01:00
Stefan Martinov 944c0e7039 Remove spew dependency 2017-11-08 14:00:19 +01:00
Stefan Martinov 0f79b26134 Update all persistors to use session connection pool 2017-11-07 15:35:47 +01:00
Bostjan Marusic 8fb01c35ae prevent catalog calcumatuions if qty threshold or min order amount 2017-09-25 14:41:07 +02:00
Bostjan Marusic fcf7b319ad get applicate vouchers from candidate list 2017-08-17 17:27:45 +02:00
Florian Schlegel caacac3924 Fixed flag ApplicableInCatalog of pricerules. Flag is now false if any CheckoutAttributes are set. 2017-06-19 15:17:01 +02:00
Bostjan Marusic 03716ef4bd fixed voucher expiration 2017-05-17 12:49:14 +02:00
Bostjan Marusic ff5e033a37 exclude shipping groups from normal promo calc 2017-04-13 15:02:30 +02:00
Bostjan Marusic 945eee619b best option selection fix, test shipping cost calculation 2017-04-12 16:46:24 +02:00
Bostjan Marusic 2eb70e56fd merged 2017-04-11 12:04:38 +02:00
Bostjan Marusic 97672cf571 best option: product discount always overrides customer discount 2017-04-07 16:08:32 +02:00
Bostjan Marusic 41d5ca7b08 prevent some rules in catalogue calc 2017-04-07 15:02:07 +02:00
Bostjan Marusic c046d42bd5 product blacklists 2017-04-06 10:09:48 +02:00
Bostjan Marusic 9fc0984326 Merge branch 'develop' 2017-03-29 11:22:21 +02:00
Bostjan Marusic 917a2fffc3 additional parameters for checkout rendering 2017-03-29 11:22:03 +02:00
Bostjan Marusic 69a88eab6f snapshot 2017-03-27 08:21:47 +02:00
Bostjan Marusic 3bc877fdde itemset fix 2017-03-25 20:55:41 +01:00
Bostjan Marusic ffb9770467 itemsets fix 2017-03-25 20:52:28 +01:00
Bostjan Marusic 0564bccd2c itemsets fix 2017-03-25 20:49:38 +01:00
Bostjan Marusic b3f93075b1 snapshot 2017-03-25 20:44:18 +01:00
Bostjan Marusic 26f9d015c7 new type shippping rule and support for shipping calculation based on discounted prices 2017-03-22 12:46:22 +01:00
Bostjan Marusic ec4e3c1d70 discounted min order amounts and exclude items from total 2017-03-21 17:33:06 +01:00
Bostjan Marusic f90ec53a0e discounted min order amounts and exclude items from total 2017-03-21 17:24:00 +01:00
Florian Schlegel cacbb4efa2 reduced logs 2017-03-14 12:24:21 +01:00
Bostjan Marusic baada08432 support for WhichXYList 2017-03-08 11:52:14 +01:00
Bostjan Marusic a8afffb7d8 IsAmountIndependentOfQty 2017-03-08 10:25:55 +01:00
Bostjan Marusic ae4f762ace select best option for customer or product promotion types 2017-03-06 16:42:56 +01:00
Bostjan Marusic ca7a28281a fixed range over map random wtf for cartByAbsolute 2017-03-06 11:43:44 +01:00
Bostjan Marusic d50034361b fixed range over map random wtf for cartByAbsolute 2017-03-06 11:43:01 +01:00
Bostjan Marusic 8192b5086c merged 2017-03-02 16:55:52 +01:00
Bostjan Marusic 45eaba20ac pricerule for item sets 2017-03-02 16:52:45 +01:00