Commit graph

211 commits

Author SHA1 Message Date
Victor Vasiloi
522dc253fd admin filtering promotions by coupon code 2020-04-16 12:00:19 +03:00
Grzegorz Sadowski
b2d88c15a9
Fix confict with upmerging 2020-02-06 10:04:28 +01:00
Grzegorz Sadowski
ef1dcb8af3
[Promotion] Return PHP_INT_MAX value as possible generation amount of coupons when the code length is too large 2020-02-06 07:49:50 +01:00
Olivier ALLAIN
eab239702e
fix code generation with too long code length 2020-02-06 07:49:28 +01:00
Mateusz Zalewski
727337e5c7
[Behat] Describe billing address as a base one in checkout Behat scenarios 2020-01-16 18:53:01 +01:00
Kamil Kokot
ac4962e7ae
Merge branch '1.6'
* 1.6:
  [Behat] Negative shipping promotion bug fix scenario
  Update ShippingPercentageDiscountPromotionActionCommand.php
2019-12-30 13:04:51 +01:00
Kamil Kokot
439cca2b51
Merge branch '1.5' into 1.6
* 1.5:
  [Behat] Negative shipping promotion bug fix scenario
  Update ShippingPercentageDiscountPromotionActionCommand.php
2019-12-30 12:28:40 +01:00
Mateusz Zalewski
2496f8173f
[Behat] Negative shipping promotion bug fix scenario 2019-12-27 15:16:23 +01:00
Mateusz Zalewski
4013e51dfd
[Behat] Remove js requirement for bulk delete scenarios 2019-12-19 09:03:04 +01:00
Grzegorz Sadowski
db72ff85d1
Fixes after PR review 2019-11-21 12:17:26 +01:00
Grzegorz Sadowski
6653ca6b79
[Admin][Promotion] Fix the prevention of generating too many coupons 2019-11-21 10:10:10 +01:00
Grzegorz Sadowski
b55ded08f2
[Behat][Admin][Promotion] Implement scenarios for the prevention of generating too many coupons 2019-11-20 15:02:26 +01:00
Grzegorz Sadowski
beb98e9fcc
[Behat][Admin][Promotion] Add scenarios for the prevention of generating too many coupons 2019-11-20 14:58:54 +01:00
Grzegorz Sadowski
40537771d6
Merge branch '1.5' into 1.6
* 1.5:
  Fix behats
  Move ShopApi reference to main menu
  Modify order total adjustments
  Modify order spec
2019-11-13 08:49:08 +01:00
Tomanhez
fd75baf3ab
Fix behats 2019-11-12 15:44:58 +01:00
Mateusz Zalewski
7203a706ef
Remove @javascript tag from all scenarios that removes cart item 2019-07-28 13:11:38 +02:00
Mateusz Zalewski
9a24f0afe5
PR review fixes 2019-07-02 14:09:32 +02:00
Mateusz Zalewski
45d549cc9d
[Behat] Coupons generation with suffixed and prefixes scenarios 2019-07-01 12:28:07 +02:00
Mateusz Zalewski
22b8b40797
Merge branch '1.4' into 1.5
* 1.4:
  [Behat] Change scenarios to @javascript due to taxon tree changes
2019-05-15 14:28:35 +02:00
Mateusz Zalewski
e539ee0132
[Behat] Change scenarios to @javascript due to taxon tree changes 2019-05-15 10:21:32 +02:00
Łukasz Chruściel
f7f94bac22
Merge branch '1.4' into 1.5
* 1.4:
  Fixes after PR review
  update documentation
  Add variadics to taxon deletion listener
  [Admin] Add flash to taxon deletion listener
  [Behat] Add info type to notification checker
  [Promotion] Split update rule configuration after deleting taxon to separate services
  [Promotion] Fixes after PR review
  [Admin][Promotion] Remove deleted taxon from existing promotion rules
  [Admin][Promotion] Add scenarios for accessing a promotion with a rule that contains a removed taxon
2019-05-13 12:14:59 +02:00
Grzegorz Sadowski
060e96952d
[Admin] Add flash to taxon deletion listener 2019-05-10 16:04:17 +02:00
Grzegorz Sadowski
42b957e77f
[Admin][Promotion] Remove deleted taxon from existing promotion rules 2019-05-10 16:04:17 +02:00
Grzegorz Sadowski
31ebf1bb68
[Admin][Promotion] Add scenarios for accessing a promotion with a rule that contains a removed taxon 2019-05-09 15:18:57 +02:00
Grzegorz Sadowski
7619994bb6
Fixes after PR review 2019-04-19 12:12:04 +02:00
Grzegorz Sadowski
e0aa3e1511
[PromotionCoupon] Use reusable from cancelled orders flag to check coupon usage 2019-04-19 12:12:01 +02:00
Grzegorz Sadowski
b30e5ec967
[Behat][PromotionCoupon] Add scenarios for checking the impact of cancelled orders on coupons usage limits 2019-04-19 12:12:01 +02:00
Tomanhez
8ff261cfd0
Refactor 2019-04-03 15:37:33 +02:00
Tomanhez
f758ae8ab4
Change behats 2019-03-28 09:25:42 +01:00
Tomanhez
f493180149
Add new feature to seeing "List coupons" after adding and editing promotion 2019-03-28 09:25:40 +01:00
Laurent Clouet
c46e7b14c9 #9858 Fix for promotion of 100 percent with coupon 2018-11-13 00:02:25 +01:00
Grzegorz Sadowski
18011fd179 [Behat] Implement scenarios for deleting multiple resources 2017-10-30 10:44:38 +01:00
Grzegorz Sadowski
b206d148ba [Behat] Add scenarios for deleting multiple resources 2017-10-30 10:44:38 +01:00
Jürgen van Dijk
27f0646990 Remove duplicate scenario
Related to [this tweet](https://twitter.com/juukie14/status/917640032932057088)
2017-10-10 10:30:40 +02:00
Grzegorz Sadowski
1239dd049a [Behat][Promotion] Add additional scenarios for receiving percentage discount on shipping 2017-09-11 12:04:12 +02:00
Mateusz Zalewski
787d133445
[Promotion] Allow to generate coupons without expiration date 2017-09-06 12:08:05 +02:00
Paweł Jędrzejewski
b562a924f9 Merge pull request #7698 from tuka217/promotion-priority-bug
[Promotion] Promotion with priority equals to null should be last
2017-03-14 15:54:16 +01:00
Łukasz
204c2a1274 [Promotion] Promotion position should not be null 2017-03-14 14:13:47 +01:00
gorkalaucirica
443ce8c2de
CS fixes 2017-03-14 09:51:34 +01:00
Gorka Laucirica
c19fee797a
Added Behat scenarios 2017-03-14 09:51:33 +01:00
Łukasz
91e401b03f [Behat] [Promotion] Semantical fixes 2017-03-07 11:05:21 +01:00
Arminek
657567a6f9 [Order] Add integirty validation feature for payment method, product, promotion 2017-02-08 17:10:14 +01:00
Arminek
bd7744d5c3 [Shop] Fix security issues in cart actions 2017-01-20 09:19:29 +01:00
Paweł Jędrzejewski
fd74cf29fa Merge pull request #7031 from tuka217/free-order
[Shop] Free order
2017-01-07 12:19:02 +01:00
Łukasz
0a22045511 [Promotion] Fix promotion edit page 2017-01-05 15:56:18 +01:00
tuka217
dfbbadfb78 [Behat] Add scenarios about skipping payment step on checkout when order total is zero
[Behat] Add scenarios about payment state on order's pages in admin when payment is zero
[Behat] Scenarios about returning to selected step and preventing from go to not available steps
[Behat] Add scenarios about seeing thank you page after free order completion
[Behat] Fix old scenarios
2017-01-03 13:38:26 +01:00
Łukasz
63a1d262cd [Promotion] Behats for start and ends date for promotion 2016-12-21 15:35:32 +01:00
Grzegorz Sadowski
54b0cb7431 [Behat][Admin][Promotion] Add additional scenarios for checking promotion usage 2016-12-13 11:21:41 +01:00
Grzegorz Sadowski
dd20dd9200 [Behat][Promotion] Add scenarios for receiving discount from promotion with several actions 2016-12-13 10:34:15 +01:00
Grzegorz Sadowski
5ab5c36179 [Behat] Fix typos in feature file names 2016-12-12 14:25:08 +01:00