File tree
20 files changed
+340
-145
lines changed- app/code/Magento
- Checkout
- Test/Mftf/Test
- view/frontend/web/js/action
- CheckoutAgreements
- Model/Checkout/Plugin
- Test/Unit/Model/Checkout/Plugin
- SalesRule
- Block/Adminhtml/Promo/Quote/Edit/Tab
- Model
- Quote
- Rule/Condition
- Test/Mftf/ActionGroup
- view/frontend
- web/js
- action
- model
- view/payment
- dev/tests
- integration/testsuite/Magento/SalesRule
- Model/Rule/Condition
- _files
- static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist
20 files changed
+340
-145
lines changedLines changed: 1 addition & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
77 | 77 |
| |
78 | 78 |
| |
79 | 79 |
| |
| 80 | + | |
80 | 81 |
| |
81 | 82 |
| |
82 | 83 |
| |
|
Lines changed: 1 addition & 11 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
27 | 27 |
| |
28 | 28 |
| |
29 | 29 |
| |
30 |
| - | |
31 |
| - | |
32 |
| - | |
33 |
| - | |
34 |
| - | |
35 |
| - | |
36 | 30 |
| |
37 | 31 |
| |
38 | 32 |
| |
| |||
75 | 69 |
| |
76 | 70 |
| |
77 | 71 |
| |
78 |
| - | |
79 |
| - | |
80 |
| - | |
81 |
| - | |
82 | 72 |
| |
83 | 73 |
| |
84 | 74 |
| |
| |||
187 | 177 |
| |
188 | 178 |
| |
189 | 179 |
| |
190 |
| - | |
| 180 | + | |
191 | 181 |
| |
192 | 182 |
| |
193 | 183 |
| |
|
Lines changed: 1 addition & 1 deletion
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
7 | 7 |
| |
8 | 8 |
| |
9 | 9 |
| |
10 |
| - | |
| 10 | + | |
11 | 11 |
| |
12 | 12 |
| |
13 | 13 |
| |
|
Lines changed: 7 additions & 24 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
11 | 11 |
| |
12 | 12 |
| |
13 | 13 |
| |
14 |
| - | |
| 14 | + | |
15 | 15 |
| |
16 | 16 |
| |
17 | 17 |
| |
| |||
58 | 58 |
| |
59 | 59 |
| |
60 | 60 |
| |
| 61 | + | |
| 62 | + | |
61 | 63 |
| |
62 | 64 |
| |
63 | 65 |
| |
| |||
80 | 82 |
| |
81 | 83 |
| |
82 | 84 |
| |
83 |
| - | |
84 |
| - | |
85 |
| - | |
86 |
| - | |
87 |
| - | |
88 |
| - | |
89 |
| - | |
90 |
| - | |
91 |
| - | |
92 |
| - | |
93 |
| - | |
94 |
| - | |
95 |
| - | |
96 |
| - | |
97 |
| - | |
98 |
| - | |
99 |
| - | |
100 |
| - | |
101 |
| - | |
102 |
| - | |
103 |
| - | |
104 |
| - | |
| 85 | + | |
| 86 | + | |
105 | 87 |
| |
106 | 88 |
| |
107 | 89 |
| |
| |||
123 | 105 |
| |
124 | 106 |
| |
125 | 107 |
| |
126 |
| - | |
| 108 | + | |
| 109 | + | |
127 | 110 |
| |
128 | 111 |
| |
129 | 112 |
| |
|
Lines changed: 5 additions & 5 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
19 | 19 |
| |
20 | 20 |
| |
21 | 21 |
| |
22 |
| - | |
| 22 | + | |
23 | 23 |
| |
24 | 24 |
| |
25 | 25 |
| |
26 | 26 |
| |
27 |
| - | |
| 27 | + | |
28 | 28 |
| |
29 | 29 |
| |
30 | 30 |
| |
| |||
65 | 65 |
| |
66 | 66 |
| |
67 | 67 |
| |
68 |
| - | |
| 68 | + | |
69 | 69 |
| |
70 | 70 |
| |
71 | 71 |
| |
| |||
134 | 134 |
| |
135 | 135 |
| |
136 | 136 |
| |
137 |
| - | |
| 137 | + | |
138 | 138 |
| |
139 | 139 |
| |
140 | 140 |
| |
141 |
| - | |
| 141 | + | |
142 | 142 |
| |
143 | 143 |
| |
144 | 144 |
| |
|
Lines changed: 2 additions & 35 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
10 | 10 |
| |
11 | 11 |
| |
12 | 12 |
| |
13 |
| - | |
14 | 13 |
| |
15 | 14 |
| |
16 | 15 |
| |
| |||
109 | 108 |
| |
110 | 109 |
| |
111 | 110 |
| |
112 |
| - | |
| 111 | + | |
113 | 112 |
| |
114 | 113 |
| |
115 | 114 |
| |
| |||
144 | 143 |
| |
145 | 144 |
| |
146 | 145 |
| |
147 |
| - | |
| 146 | + | |
148 | 147 |
| |
149 | 148 |
| |
150 | 149 |
| |
| |||
156 | 155 |
| |
157 | 156 |
| |
158 | 157 |
| |
159 |
| - | |
160 |
| - | |
161 |
| - | |
162 |
| - | |
163 |
| - | |
164 |
| - | |
165 |
| - | |
166 |
| - | |
167 |
| - | |
168 |
| - | |
169 |
| - | |
170 |
| - | |
171 |
| - | |
172 |
| - | |
173 |
| - | |
174 |
| - | |
175 |
| - | |
176 |
| - | |
177 |
| - | |
178 |
| - | |
179 |
| - | |
180 |
| - | |
181 |
| - | |
182 |
| - | |
183 |
| - | |
184 |
| - | |
185 |
| - | |
186 |
| - | |
187 |
| - | |
188 |
| - | |
189 |
| - | |
190 |
| - | |
191 | 158 |
|
Lines changed: 12 additions & 2 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
130 | 130 |
| |
131 | 131 |
| |
132 | 132 |
| |
133 |
| - | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
134 | 139 |
| |
135 | 140 |
| |
136 | 141 |
| |
| |||
167 | 172 |
| |
168 | 173 |
| |
169 | 174 |
| |
170 |
| - | |
| 175 | + | |
| 176 | + | |
| 177 | + | |
| 178 | + | |
| 179 | + | |
| 180 | + | |
171 | 181 |
| |
172 | 182 |
| |
173 | 183 |
| |
|
Lines changed: 18 additions & 10 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
3 | 3 |
| |
4 | 4 |
| |
5 | 5 |
| |
| 6 | + | |
| 7 | + | |
6 | 8 |
| |
7 | 9 |
| |
8 | 10 |
| |
| 11 | + | |
| 12 | + | |
9 | 13 |
| |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
10 | 19 |
| |
11 | 20 |
| |
12 | 21 |
| |
| |||
33 | 42 |
| |
34 | 43 |
| |
35 | 44 |
| |
36 |
| - | |
37 |
| - | |
38 | 45 |
| |
39 | 46 |
| |
40 | 47 |
| |
| |||
60 | 67 |
| |
61 | 68 |
| |
62 | 69 |
| |
63 |
| - | |
| 70 | + | |
| 71 | + | |
64 | 72 |
| |
65 | 73 |
| |
66 | 74 |
| |
| |||
69 | 77 |
| |
70 | 78 |
| |
71 | 79 |
| |
72 |
| - | |
| 80 | + | |
73 | 81 |
| |
74 | 82 |
| |
75 | 83 |
| |
76 | 84 |
| |
77 | 85 |
| |
78 | 86 |
| |
79 | 87 |
| |
80 |
| - | |
| 88 | + | |
81 | 89 |
| |
82 | 90 |
| |
83 | 91 |
| |
84 | 92 |
| |
85 | 93 |
| |
86 | 94 |
| |
87 | 95 |
| |
88 |
| - | |
| 96 | + | |
89 | 97 |
| |
90 | 98 |
| |
91 | 99 |
| |
92 | 100 |
| |
93 | 101 |
| |
94 | 102 |
| |
95 | 103 |
| |
96 |
| - | |
| 104 | + | |
97 | 105 |
| |
98 | 106 |
| |
99 | 107 |
| |
100 | 108 |
| |
101 | 109 |
| |
102 | 110 |
| |
103 | 111 |
| |
104 |
| - | |
| 112 | + | |
105 | 113 |
| |
106 | 114 |
| |
107 | 115 |
| |
108 | 116 |
| |
109 | 117 |
| |
110 | 118 |
| |
111 | 119 |
| |
112 |
| - | |
| 120 | + | |
113 | 121 |
| |
114 | 122 |
| |
115 | 123 |
| |
| |||
133 | 141 |
| |
134 | 142 |
| |
135 | 143 |
| |
136 |
| - | |
| 144 | + | |
137 | 145 |
| |
138 | 146 |
| |
139 | 147 |
| |
|
Lines changed: 6 additions & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
85 | 85 |
| |
86 | 86 |
| |
87 | 87 |
| |
| 88 | + | |
88 | 89 |
| |
89 | 90 |
| |
90 | 91 |
| |
| |||
95 | 96 |
| |
96 | 97 |
| |
97 | 98 |
| |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
98 | 104 |
| |
99 | 105 |
| |
100 | 106 |
| |
|
Lines changed: 1 addition & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
65 | 65 |
| |
66 | 66 |
| |
67 | 67 |
| |
| 68 | + | |
68 | 69 |
| |
69 | 70 |
| |
70 | 71 |
| |
|
Lines changed: 1 addition & 1 deletion
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
15 | 15 |
| |
16 | 16 |
| |
17 | 17 |
| |
18 |
| - | |
| 18 | + | |
19 | 19 |
| |
20 | 20 |
| |
21 | 21 |
|
Lines changed: 14 additions & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + |
0 commit comments