File tree
55 files changed
+888
-730
lines changed- app/code/Magento
- Catalog
- Block/Adminhtml/Product/Helper/Form/Gallery
- Test/Unit/Block/Adminhtml/Product/Helper/Form/Gallery
- Checkout/Model
- Customer/view/frontend/layout
- Review
- Block/Adminhtml/Edit
- Controller/Adminhtml/Product
- Tax/view
- adminhtml/templates
- items/price
- order/create/items/price
- rate
- rule
- rate
- toolbar
- class
- rate
- rule
- base/templates/pricing
- adjustment
- frontend/templates
- checkout
- cart/item/price
- shipping
- email/items/price
- item/price
- order
- Weee/view
- adminhtml/templates
- items/price
- order/create/items/price
- renderer
- base/templates/pricing
- frontend/templates
- checkout
- cart/item/price
- onepage/review/item/price
- email/items/price
- item/price
- dev/tests
- integration/testsuite/Magento/Checkout/Model
- static/testsuite/Magento/Test/Php/_files/whitelist/exempt_modules
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
55 files changed
+888
-730
lines changedLines changed: 18 additions & 1 deletion
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
19 | 19 |
| |
20 | 20 |
| |
21 | 21 |
| |
| 22 | + | |
22 | 23 |
| |
23 | 24 |
| |
24 | 25 |
| |
| |||
47 | 48 |
| |
48 | 49 |
| |
49 | 50 |
| |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
50 | 56 |
| |
51 | 57 |
| |
52 | 58 |
| |
53 | 59 |
| |
54 | 60 |
| |
55 | 61 |
| |
| 62 | + | |
56 | 63 |
| |
57 | 64 |
| |
58 | 65 |
| |
59 | 66 |
| |
60 | 67 |
| |
61 | 68 |
| |
62 |
| - | |
| 69 | + | |
| 70 | + | |
63 | 71 |
| |
64 | 72 |
| |
65 | 73 |
| |
66 | 74 |
| |
67 | 75 |
| |
68 | 76 |
| |
| 77 | + | |
| 78 | + | |
69 | 79 |
| |
70 | 80 |
| |
71 | 81 |
| |
| |||
153 | 163 |
| |
154 | 164 |
| |
155 | 165 |
| |
| 166 | + | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
| 170 | + | |
| 171 | + | |
| 172 | + | |
156 | 173 |
| |
157 | 174 |
| |
158 | 175 |
| |
|
Lines changed: 74 additions & 1 deletion
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
9 | 9 |
| |
10 | 10 |
| |
11 | 11 |
| |
| 12 | + | |
12 | 13 |
| |
13 | 14 |
| |
14 | 15 |
| |
| |||
50 | 51 |
| |
51 | 52 |
| |
52 | 53 |
| |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
53 | 59 |
| |
54 | 60 |
| |
55 | 61 |
| |
| |||
71 | 77 |
| |
72 | 78 |
| |
73 | 79 |
| |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
74 | 84 |
| |
75 | 85 |
| |
76 | 86 |
| |
77 | 87 |
| |
78 | 88 |
| |
79 | 89 |
| |
80 |
| - | |
| 90 | + | |
| 91 | + | |
81 | 92 |
| |
82 | 93 |
| |
83 | 94 |
| |
| |||
143 | 154 |
| |
144 | 155 |
| |
145 | 156 |
| |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
146 | 164 |
| |
147 | 165 |
| |
148 | 166 |
| |
| |||
221 | 239 |
| |
222 | 240 |
| |
223 | 241 |
| |
| 242 | + | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
| 246 | + | |
| 247 | + | |
| 248 | + | |
224 | 249 |
| |
225 | 250 |
| |
226 | 251 |
| |
| |||
365 | 390 |
| |
366 | 391 |
| |
367 | 392 |
| |
| 393 | + | |
| 394 | + | |
| 395 | + | |
| 396 | + | |
| 397 | + | |
| 398 | + | |
| 399 | + | |
| 400 | + | |
| 401 | + | |
| 402 | + | |
| 403 | + | |
| 404 | + | |
| 405 | + | |
| 406 | + | |
| 407 | + | |
| 408 | + | |
| 409 | + | |
| 410 | + | |
| 411 | + | |
| 412 | + | |
| 413 | + | |
| 414 | + | |
| 415 | + | |
| 416 | + | |
| 417 | + | |
| 418 | + | |
| 419 | + | |
| 420 | + | |
| 421 | + | |
| 422 | + | |
| 423 | + | |
| 424 | + | |
| 425 | + | |
| 426 | + | |
| 427 | + | |
| 428 | + | |
| 429 | + | |
| 430 | + | |
| 431 | + | |
| 432 | + | |
| 433 | + | |
| 434 | + | |
| 435 | + | |
| 436 | + | |
| 437 | + | |
| 438 | + | |
| 439 | + | |
| 440 | + | |
368 | 441 |
|
Lines changed: 3 additions & 1 deletion
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
178 | 178 |
| |
179 | 179 |
| |
180 | 180 |
| |
181 |
| - | |
| 181 | + | |
| 182 | + | |
| 183 | + | |
182 | 184 |
| |
183 | 185 |
| |
184 | 186 |
| |
|
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: 14 additions & 4 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
4 | 4 |
| |
5 | 5 |
| |
6 | 6 |
| |
| 7 | + | |
7 | 8 |
| |
8 | 9 |
| |
9 | 10 |
| |
| |||
69 | 70 |
| |
70 | 71 |
| |
71 | 72 |
| |
| 73 | + | |
72 | 74 |
| |
73 | 75 |
| |
74 | 76 |
| |
75 | 77 |
| |
76 | 78 |
| |
77 | 79 |
| |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
78 | 91 |
| |
79 | 92 |
| |
80 | 93 |
| |
81 | 94 |
| |
82 | 95 |
| |
83 | 96 |
| |
84 | 97 |
| |
85 |
| - | |
86 |
| - | |
87 |
| - | |
88 |
| - | |
| 98 | + | |
89 | 99 |
| |
90 | 100 |
| |
91 | 101 |
| |
|
Lines changed: 8 additions & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
72 | 72 |
| |
73 | 73 |
| |
74 | 74 |
| |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
75 | 83 |
| |
76 | 84 |
| |
77 | 85 |
| |
|
Lines changed: 10 additions & 14 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
3 | 3 |
| |
4 | 4 |
| |
5 | 5 |
| |
6 |
| - | |
7 |
| - | |
8 |
| - | |
9 | 6 |
| |
10 | 7 |
| |
11 | 8 |
| |
12 | 9 |
| |
13 | 10 |
| |
14 | 11 |
| |
15 |
| - | |
16 |
| - | |
| 12 | + | |
17 | 13 |
| |
18 |
| - | |
19 |
| - | |
| 14 | + | |
| 15 | + | |
20 | 16 |
| |
21 |
| - | |
| 17 | + | |
22 | 18 |
| |
23 | 19 |
| |
24 |
| - | |
| 20 | + | |
25 | 21 |
| |
26 |
| - | |
27 |
| - | |
| 22 | + | |
| 23 | + | |
28 | 24 |
| |
29 |
| - | |
30 |
| - | |
31 |
| - | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
32 | 28 |
| |
33 | 29 |
|
Lines changed: 2 additions & 4 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
3 | 3 |
| |
4 | 4 |
| |
5 | 5 |
| |
6 |
| - | |
7 |
| - | |
8 |
| - | |
| 6 | + | |
9 | 7 |
| |
10 | 8 |
| |
11 | 9 |
| |
12 | 10 |
| |
13 | 11 |
| |
14 | 12 |
| |
15 | 13 |
| |
16 |
| - | |
| 14 | + |
Lines changed: 10 additions & 13 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
3 | 3 |
| |
4 | 4 |
| |
5 | 5 |
| |
6 |
| - | |
7 |
| - | |
8 |
| - | |
9 | 6 |
| |
10 | 7 |
| |
11 | 8 |
| |
12 | 9 |
| |
13 | 10 |
| |
14 | 11 |
| |
15 | 12 |
| |
16 |
| - | |
| 13 | + | |
17 | 14 |
| |
18 |
| - | |
19 |
| - | |
| 15 | + | |
| 16 | + | |
20 | 17 |
| |
21 | 18 |
| |
22 |
| - | |
| 19 | + | |
23 | 20 |
| |
24 | 21 |
| |
25 |
| - | |
| 22 | + | |
26 | 23 |
| |
27 |
| - | |
28 |
| - | |
| 24 | + | |
| 25 | + | |
29 | 26 |
| |
30 |
| - | |
31 |
| - | |
| 27 | + | |
| 28 | + | |
32 | 29 |
| |
33 |
| - | |
| 30 | + | |
34 | 31 |
| |
35 | 32 |
| |
36 | 33 |
|
Lines changed: 9 additions & 12 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
3 | 3 |
| |
4 | 4 |
| |
5 | 5 |
| |
6 |
| - | |
7 |
| - | |
8 |
| - | |
9 | 6 |
| |
10 | 7 |
| |
11 | 8 |
| |
12 | 9 |
| |
13 | 10 |
| |
14 | 11 |
| |
15 | 12 |
| |
16 |
| - | |
17 |
| - | |
18 |
| - | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
19 | 16 |
| |
20 |
| - | |
| 17 | + | |
21 | 18 |
| |
22 | 19 |
| |
23 |
| - | |
24 |
| - | |
25 |
| - | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
26 | 23 |
| |
27 |
| - | |
28 |
| - | |
| 24 | + | |
| 25 | + | |
29 | 26 |
|
0 commit comments