File tree
11 files changed
+94
-40
lines changed- app/code/Magento
- Quote/Model/Quote
- SalesRule
- Helper
- Model
- Quote
- ResourceModel/Rule
- Rule/Action/Discount
- Test/Unit/Model
- Quote
- Address/Total
- setup/src/Magento/Setup/Fixtures
11 files changed
+94
-40
lines changedLines changed: 15 additions & 1 deletion
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
86 | 86 |
| |
87 | 87 |
| |
88 | 88 |
| |
89 |
| - | |
90 | 89 |
| |
91 | 90 |
| |
92 | 91 |
| |
| |||
142 | 141 |
| |
143 | 142 |
| |
144 | 143 |
| |
| 144 | + | |
| 145 | + | |
145 | 146 |
| |
146 | 147 |
| |
147 | 148 |
| |
| |||
1796 | 1797 |
| |
1797 | 1798 |
| |
1798 | 1799 |
| |
| 1800 | + | |
| 1801 | + | |
| 1802 | + | |
| 1803 | + | |
| 1804 | + | |
| 1805 | + | |
| 1806 | + | |
| 1807 | + | |
| 1808 | + | |
| 1809 | + | |
| 1810 | + | |
| 1811 | + | |
| 1812 | + | |
1799 | 1813 |
|
Lines changed: 1 addition & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
138 | 138 |
| |
139 | 139 |
| |
140 | 140 |
| |
| 141 | + | |
141 | 142 |
| |
142 | 143 |
| |
143 | 144 |
| |
|
Lines changed: 7 additions & 1 deletion
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
178 | 178 |
| |
179 | 179 |
| |
180 | 180 |
| |
| 181 | + | |
| 182 | + | |
181 | 183 |
| |
182 | 184 |
| |
183 | 185 |
| |
| |||
190 | 192 |
| |
191 | 193 |
| |
192 | 194 |
| |
| 195 | + | |
193 | 196 |
| |
194 | 197 |
| |
195 | 198 |
| |
196 | 199 |
| |
197 | 200 |
| |
| 201 | + | |
| 202 | + | |
198 | 203 |
| |
199 |
| - | |
| 204 | + | |
200 | 205 |
| |
| 206 | + | |
201 | 207 |
| |
202 | 208 |
| |
203 | 209 |
| |
|
Lines changed: 14 additions & 11 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
113 | 113 |
| |
114 | 114 |
| |
115 | 115 |
| |
116 |
| - | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
117 | 121 |
| |
118 | 122 |
| |
119 | 123 |
| |
120 | 124 |
| |
121 | 125 |
| |
122 |
| - | |
| 126 | + | |
123 | 127 |
| |
124 | 128 |
| |
125 | 129 |
| |
126 | 130 |
| |
127 |
| - | |
128 |
| - | |
129 |
| - | |
130 |
| - | |
131 |
| - | |
132 |
| - | |
133 |
| - | |
134 |
| - | |
135 |
| - | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
136 | 139 |
| |
137 | 140 |
| |
138 | 141 |
| |
|
Lines changed: 11 additions & 1 deletion
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
38 | 38 |
| |
39 | 39 |
| |
40 | 40 |
| |
41 |
| - | |
42 | 41 |
| |
43 | 42 |
| |
44 | 43 |
| |
| |||
547 | 546 |
| |
548 | 547 |
| |
549 | 548 |
| |
| 549 | + | |
| 550 | + | |
| 551 | + | |
| 552 | + | |
| 553 | + | |
| 554 | + | |
| 555 | + | |
| 556 | + | |
| 557 | + | |
| 558 | + | |
| 559 | + | |
550 | 560 |
| |
551 | 561 |
| |
552 | 562 |
| |
|
Lines changed: 1 addition & 2 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
80 | 80 |
| |
81 | 81 |
| |
82 | 82 |
| |
83 |
| - | |
84 | 83 |
| |
85 | 84 |
| |
86 | 85 |
| |
| |||
134 | 133 |
| |
135 | 134 |
| |
136 | 135 |
| |
137 |
| - | |
| 136 | + | |
138 | 137 |
| |
139 | 138 |
| |
140 | 139 |
| |
|
Lines changed: 1 addition & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
477 | 477 |
| |
478 | 478 |
| |
479 | 479 |
| |
| 480 | + | |
480 | 481 |
| |
481 | 482 |
| |
482 | 483 |
| |
|
Lines changed: 1 addition & 2 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
91 | 91 |
| |
92 | 92 |
| |
93 | 93 |
| |
94 |
| - | |
95 | 94 |
| |
96 | 95 |
| |
97 |
| - | |
| 96 | + | |
98 | 97 |
| |
99 | 98 |
| |
100 | 99 |
| |
|
Lines changed: 30 additions & 9 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
117 | 117 |
| |
118 | 118 |
| |
119 | 119 |
| |
120 |
| - | |
121 |
| - | |
122 |
| - | |
123 |
| - | |
124 |
| - | |
125 | 120 |
| |
126 | 121 |
| |
127 | 122 |
| |
| |||
219 | 214 |
| |
220 | 215 |
| |
221 | 216 |
| |
222 |
| - | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
223 | 226 |
| |
224 | 227 |
| |
225 | 228 |
| |
| |||
265 | 268 |
| |
266 | 269 |
| |
267 | 270 |
| |
268 |
| - | |
| 271 | + | |
| 272 | + | |
| 273 | + | |
| 274 | + | |
| 275 | + | |
| 276 | + | |
| 277 | + | |
| 278 | + | |
| 279 | + | |
269 | 280 |
| |
270 | 281 |
| |
271 | 282 |
| |
| |||
334 | 345 |
| |
335 | 346 |
| |
336 | 347 |
| |
337 |
| - | |
| 348 | + | |
| 349 | + | |
| 350 | + | |
| 351 | + | |
| 352 | + | |
| 353 | + | |
| 354 | + | |
| 355 | + | |
| 356 | + | |
| 357 | + | |
338 | 358 |
| |
339 | 359 |
| |
340 | 360 |
| |
| |||
353 | 373 |
| |
354 | 374 |
| |
355 | 375 |
| |
356 |
| - | |
| 376 | + | |
357 | 377 |
| |
358 | 378 |
| |
359 | 379 |
| |
| 380 | + | |
360 | 381 |
| |
361 | 382 |
| |
362 | 383 |
| |
|
Lines changed: 6 additions & 6 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
375 | 375 |
| |
376 | 376 |
| |
377 | 377 |
| |
378 |
| - | |
379 |
| - | |
| 378 | + | |
380 | 379 |
| |
381 | 380 |
| |
382 | 381 |
| |
| |||
561 | 560 |
| |
562 | 561 |
| |
563 | 562 |
| |
564 |
| - | |
| 563 | + | |
| 564 | + | |
565 | 565 |
| |
566 | 566 |
| |
567 | 567 |
| |
568 | 568 |
| |
569 | 569 |
| |
570 |
| - | |
571 |
| - | |
| 570 | + | |
572 | 571 |
| |
573 | 572 |
| |
574 | 573 |
| |
| |||
632 | 631 |
| |
633 | 632 |
| |
634 | 633 |
| |
635 |
| - | |
| 634 | + | |
| 635 | + | |
636 | 636 |
| |
637 | 637 |
| |
638 | 638 |
| |
|
0 commit comments