Commit Graph

547 Commits

Author SHA1 Message Date
florianschlegel
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öffert
315d4396a5
Merge pull request #8 from SchumacherFM/fix-outdated-docker-test-dependency
Replace docker assert with stretchr assert
2019-09-18 10:29:48 +02:00
Cyrill Schumacher
e2f2495bda Replace docker assert with stretchr assert 2019-09-18 09:51:25 +02:00
Frederik Löffert
80b437399d feature/atomic-promo-init (#7)
* Pricerules: add methodes to remove pricerules by query

* fix typo
2019-08-28 10:16:50 +02:00
Florian Schlegel
46dff43c7f Merge branch 'feature/get-orders-paged' 2019-07-24 10:21:39 +02:00
Florian Schlegel
7711b2e6ee minor cleanups 2019-07-17 17:47:35 +02:00
Florian Schlegel
6f735d22ea fix: typo 2019-07-17 13:55:18 +02:00
Florian Schlegel
56f45faafa fix: limit check, prevent returning of nil slice 2019-07-17 13:51:36 +02:00
Florian Schlegel
0266f07c0f add check for customProvider 2019-07-17 12:29:58 +02:00
Florian Schlegel
bd6d63518f add method GetOrdersOfCustomerPaged() 2019-07-17 12:19:03 +02:00
Stefan Martinov
255eb633ef chore: fix missing mgo dependency 2019-07-02 13:10:35 +02:00
Stefan Martinov
05cf6a76fc feat: refactor collection with scope 2019-07-02 13:02:35 +02:00
Stefan Martinov
00090f95bc chore: add prometheus client to glide yaml 2019-07-02 12:57:17 +02:00
Philipp Mieden
de2dfdb28c Added metrics for session acquisition, switched from Clone to Copy for standard sessions, updated glide deps 2019-07-02 12:41:32 +02:00
Florian Schlegel
b8855a3eda Reduce logging of state machine 2019-03-21 15:36:31 +01:00
Florian Schlegel
0ba998d46c update unit tests 2019-03-18 18:07:22 +01:00
Florian Schlegel
2b1cad5db9 fix GetTimeFromYYYYMMDD() for summer/winter time transition 2019-03-18 17:46:52 +01:00
Florian Schlegel
644b0b683b remove ugly logs 2019-03-06 10:31:45 +01:00
Florian Schlegel
e55de455dd add field Site to order 2018-12-11 16:22:18 +01:00
Florian Schlegel
bd5e5107fe Add comment. Change order of Transmitted timestaps 2018-11-19 11:36:15 +01:00
Florian Schlegel
89c956bf47 Add field ShopID on Order 2018-11-14 11:50:24 +01:00
Vladan Marsenic
2c6891a187 Merge branch 'master' of https://github.com/foomo/shop 2018-10-31 14:02:05 +01:00
Vladan Marsenic
58c63f38da remove log 2018-10-31 14:01:56 +01:00
Frederik Löffert
57e9a29ed0 order processing extended with payment processor and logistic process 2018-10-30 19:34:05 +01:00
Florian Schlegel
4d507e18e5 fixed type Processing 2018-10-29 11:36:28 +01:00
Florian Schlegel
6c9574b171 feat: add processing info on order 2018-10-24 16:42:02 +02:00
Florian Schlegel
c2ffbce037 feat: add timestamp TransmittedAsReservationAt to Order on top-level 2018-10-24 11:09:53 +02:00
Vladan Marsenic
3aa9b34f88 fix: add natural sort to order find. 2018-10-16 15:36:07 +02:00
Vladan Marsenic
5da8bcad2d fix: nil check to avoid panic 2018-10-09 14:41:04 +02:00
Vladan Marsenic
2f00425e72 remove log 2018-08-13 16:56:11 +02:00
Frederik Löffert
5d21f3a2d0
EnsureIndexes on mongo persistor 2018-07-25 21:28:45 +02:00
Frederik Löffert
a077cfbb58
ensure mongo collection index on customer persistor
index id not unique
2018-07-18 01:07:17 +02:00
Frederik Löffert
ec12b144a4
ensure order index
ID not unique
2018-07-17 16:47:30 +02:00
Frederik Löffert
c4b70e25fa correct usage of customer vs. credentials persistor 2018-07-10 12:30:54 +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
88d087616f Merge branch 'master' of https://github.com/foomo/shop 2018-06-04 11:57:32 +02:00
Vladan Marsenic
47b70d923a fix: add logs 2018-06-04 11:56:36 +02:00
Frederik Löffert
a070b01d17 Merge branch 'master' of github.com:foomo/shop 2018-05-29 12:04:50 +02:00
florianschlegel
78a63271f1 Merge pull request #3 from foomo/feature/contact-migration
merge back feature/contact-migration

- breaking change: email is no longer unique (due to guest accounts)
- breaking change: modified data structure for contacts
- data migration (on-the-fly) for new contact data structure
2018-05-29 12:04:34 +02:00
florianschlegel
fc9a9fa260
Merge pull request #3 from foomo/feature/contact-migration
merge back feature/contact-migration
2018-05-29 12:02:57 +02:00
Frederik Löffert
29e6701600 DeleteCustomer: error handling improved in case of customer not found 2018-05-22 17:48:15 +02:00
Frederik Löffert
b2d2592753 mongo test env setup 2018-05-22 17:31:01 +02:00
Frederik Löffert
0b02171d77 fix test for breaking change: email is no longer unique (due to guest accounts) 2018-05-22 17:30:47 +02:00
Frederik Löffert
d9247d3a04 - breaking change: email is no longer unique (due to guest accounts)
- checkLoginAvailable ignores guest accounts
2018-05-17 15:47:05 +02:00
Frederik Löffert
cb81231e8d fix create mail contact: ContactTypeEmail instead of phone 2018-04-24 17:37:23 +02:00
Frederik Löffert
33658e02d9 log cleanup on creating customer 2018-04-24 17:36:45 +02:00
Frederik Löffert
ff180a9310 Merge branch 'master' of github.com:foomo/shop into feature/contact-migration 2018-04-18 17:29:05 +02:00
Vladan Marsenic
2764b28e74 ECOMDEV-2087 feat: exclude sap discounted articles 2018-04-17 17:19:28 +02:00
Frederik Löffert
7a60f786f0 Merge branch 'master' of github.com:foomo/shop into feature/contact-migration 2018-04-05 14:57:36 +02:00