File tree
13 files changed
+46
-18
lines changed- app/code/Magento
- SalesRule
- Controller/Adminhtml/Promo/Quote
- Model
- Data
- Plugin
- ResourceModel
- Rule/Action/Discount
- Setup/Patch/Data
- Shipping/Block/Adminhtml/Order
- Usps/Model
13 files changed
+46
-18
lines changedLines changed: 5 additions & 2 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
1 | 1 |
| |
2 | 2 |
| |
3 |
| - | |
4 | 3 |
| |
5 | 4 |
| |
6 | 5 |
| |
7 | 6 |
| |
8 | 7 |
| |
| 8 | + | |
9 | 9 |
| |
10 | 10 |
| |
11 |
| - | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
12 | 15 |
| |
13 | 16 |
| |
14 | 17 |
| |
|
Lines changed: 4 additions & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
190 | 190 |
| |
191 | 191 |
| |
192 | 192 |
| |
| 193 | + | |
| 194 | + | |
193 | 195 |
| |
194 | 196 |
| |
195 | 197 |
| |
| |||
273 | 275 |
| |
274 | 276 |
| |
275 | 277 |
| |
| 278 | + | |
| 279 | + | |
276 | 280 |
| |
277 | 281 |
| |
278 | 282 |
| |
|
Lines changed: 6 additions & 2 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
270 | 270 |
| |
271 | 271 |
| |
272 | 272 |
| |
| 273 | + | |
| 274 | + | |
273 | 275 |
| |
274 | 276 |
| |
275 | 277 |
| |
| |||
373 | 375 |
| |
374 | 376 |
| |
375 | 377 |
| |
| 378 | + | |
| 379 | + | |
376 | 380 |
| |
377 | 381 |
| |
378 | 382 |
| |
| |||
616 | 620 |
| |
617 | 621 |
| |
618 | 622 |
| |
619 |
| - | |
| 623 | + | |
620 | 624 |
| |
621 | 625 |
| |
622 | 626 |
| |
| |||
626 | 630 |
| |
627 | 631 |
| |
628 | 632 |
| |
629 |
| - | |
| 633 | + | |
630 | 634 |
| |
631 | 635 |
| |
632 | 636 |
| |
|
Lines changed: 3 additions & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
7 | 7 |
| |
8 | 8 |
| |
9 | 9 |
| |
| 10 | + | |
| 11 | + | |
| 12 | + | |
10 | 13 |
| |
11 | 14 |
| |
12 | 15 |
| |
|
Lines changed: 3 additions & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
36 | 36 |
| |
37 | 37 |
| |
38 | 38 |
| |
| 39 | + | |
| 40 | + | |
39 | 41 |
| |
40 | 42 |
| |
41 | 43 |
| |
42 | 44 |
| |
43 | 45 |
| |
| 46 | + | |
44 | 47 |
| |
45 | 48 |
| |
46 | 49 |
| |
|
Lines changed: 3 additions & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
36 | 36 |
| |
37 | 37 |
| |
38 | 38 |
| |
| 39 | + | |
| 40 | + | |
39 | 41 |
| |
40 | 42 |
| |
41 | 43 |
| |
42 | 44 |
| |
43 | 45 |
| |
| 46 | + | |
44 | 47 |
| |
45 | 48 |
| |
46 | 49 |
| |
|
Lines changed: 2 additions & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
49 | 49 |
| |
50 | 50 |
| |
51 | 51 |
| |
| 52 | + | |
| 53 | + | |
52 | 54 |
| |
53 | 55 |
| |
54 | 56 |
| |
|
Lines changed: 3 additions & 3 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
106 | 106 |
| |
107 | 107 |
| |
108 | 108 |
| |
109 |
| - | |
| 109 | + | |
110 | 110 |
| |
111 | 111 |
| |
112 | 112 |
| |
| |||
118 | 118 |
| |
119 | 119 |
| |
120 | 120 |
| |
121 |
| - | |
| 121 | + | |
122 | 122 |
| |
123 | 123 |
| |
124 | 124 |
| |
| |||
135 | 135 |
| |
136 | 136 |
| |
137 | 137 |
| |
138 |
| - | |
| 138 | + | |
139 | 139 |
| |
140 | 140 |
| |
141 | 141 |
| |
|
Lines changed: 4 additions & 3 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
11 | 11 |
| |
12 | 12 |
| |
13 | 13 |
| |
| 14 | + | |
14 | 15 |
| |
15 | 16 |
| |
16 | 17 |
| |
| |||
58 | 59 |
| |
59 | 60 |
| |
60 | 61 |
| |
61 |
| - | |
| 62 | + | |
62 | 63 |
| |
63 | 64 |
| |
64 | 65 |
| |
| |||
68 | 69 |
| |
69 | 70 |
| |
70 | 71 |
| |
71 |
| - | |
| 72 | + | |
72 | 73 |
| |
73 | 74 |
| |
74 | 75 |
| |
75 | 76 |
| |
76 | 77 |
| |
77 | 78 |
| |
78 | 79 |
| |
79 |
| - | |
| 80 | + | |
80 | 81 |
| |
81 | 82 |
| |
82 | 83 |
| |
|
Lines changed: 5 additions & 4 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
12 | 12 |
| |
13 | 13 |
| |
14 | 14 |
| |
| 15 | + | |
15 | 16 |
| |
16 | 17 |
| |
17 | 18 |
| |
| |||
64 | 65 |
| |
65 | 66 |
| |
66 | 67 |
| |
67 |
| - | |
| 68 | + | |
68 | 69 |
| |
69 | 70 |
| |
70 | 71 |
| |
| |||
101 | 102 |
| |
102 | 103 |
| |
103 | 104 |
| |
104 |
| - | |
| 105 | + | |
105 | 106 |
| |
106 | 107 |
| |
107 | 108 |
| |
| |||
111 | 112 |
| |
112 | 113 |
| |
113 | 114 |
| |
114 |
| - | |
| 115 | + | |
115 | 116 |
| |
116 | 117 |
| |
117 | 118 |
| |
118 | 119 |
| |
119 | 120 |
| |
120 | 121 |
| |
121 | 122 |
| |
122 |
| - | |
| 123 | + | |
123 | 124 |
| |
124 | 125 |
| |
125 | 126 |
| |
|
0 commit comments