File tree
8 files changed
+51
-24
lines changed- app
- code/Magento
- CatalogRule/Controller/Adminhtml/Promo/Widget
- Catalog/Model/ResourceModel
- Eav
- Product
- Indexer/Eav
- Option
- CurrencySymbol/Model/System
- OfflineShipping/Model/ResourceModel/Carrier/Tablerate
- design/adminhtml/Magento/backend/web/css/source/forms
8 files changed
+51
-24
lines changedLines changed: 22 additions & 19 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
167 | 167 |
| |
168 | 168 |
| |
169 | 169 |
| |
| 170 | + | |
| 171 | + | |
170 | 172 |
| |
171 | 173 |
| |
172 | 174 |
| |
| |||
362 | 364 |
| |
363 | 365 |
| |
364 | 366 |
| |
| 367 | + | |
365 | 368 |
| |
366 | 369 |
| |
367 | 370 |
| |
| |||
507 | 510 |
| |
508 | 511 |
| |
509 | 512 |
| |
| 513 | + | |
510 | 514 |
| |
511 |
| - | |
512 | 515 |
| |
513 | 516 |
| |
514 | 517 |
| |
515 | 518 |
| |
516 | 519 |
| |
517 | 520 |
| |
518 | 521 |
| |
519 |
| - | |
| 522 | + | |
520 | 523 |
| |
521 | 524 |
| |
522 | 525 |
| |
523 | 526 |
| |
524 | 527 |
| |
525 | 528 |
| |
526 | 529 |
| |
527 |
| - | |
| 530 | + | |
528 | 531 |
| |
529 | 532 |
| |
530 | 533 |
| |
531 | 534 |
| |
532 | 535 |
| |
533 | 536 |
| |
534 | 537 |
| |
535 |
| - | |
| 538 | + | |
536 | 539 |
| |
537 | 540 |
| |
538 | 541 |
| |
539 | 542 |
| |
540 | 543 |
| |
541 | 544 |
| |
542 | 545 |
| |
543 |
| - | |
| 546 | + | |
544 | 547 |
| |
545 | 548 |
| |
546 | 549 |
| |
547 | 550 |
| |
548 | 551 |
| |
549 | 552 |
| |
550 | 553 |
| |
551 |
| - | |
| 554 | + | |
552 | 555 |
| |
553 | 556 |
| |
554 | 557 |
| |
555 | 558 |
| |
556 | 559 |
| |
557 | 560 |
| |
558 | 561 |
| |
559 |
| - | |
| 562 | + | |
560 | 563 |
| |
561 | 564 |
| |
562 | 565 |
| |
563 | 566 |
| |
564 | 567 |
| |
565 | 568 |
| |
566 | 569 |
| |
567 |
| - | |
| 570 | + | |
568 | 571 |
| |
569 | 572 |
| |
570 | 573 |
| |
571 | 574 |
| |
572 | 575 |
| |
573 | 576 |
| |
574 | 577 |
| |
575 |
| - | |
| 578 | + | |
576 | 579 |
| |
577 | 580 |
| |
578 | 581 |
| |
579 | 582 |
| |
580 | 583 |
| |
581 | 584 |
| |
582 | 585 |
| |
583 |
| - | |
| 586 | + | |
584 | 587 |
| |
585 | 588 |
| |
586 | 589 |
| |
587 | 590 |
| |
588 | 591 |
| |
589 | 592 |
| |
590 | 593 |
| |
591 |
| - | |
| 594 | + | |
592 | 595 |
| |
593 | 596 |
| |
594 | 597 |
| |
595 | 598 |
| |
596 | 599 |
| |
597 | 600 |
| |
598 | 601 |
| |
599 |
| - | |
| 602 | + | |
600 | 603 |
| |
601 | 604 |
| |
602 | 605 |
| |
603 | 606 |
| |
604 | 607 |
| |
605 | 608 |
| |
606 | 609 |
| |
607 |
| - | |
| 610 | + | |
608 | 611 |
| |
609 | 612 |
| |
610 | 613 |
| |
611 | 614 |
| |
612 | 615 |
| |
613 | 616 |
| |
614 | 617 |
| |
615 |
| - | |
| 618 | + | |
616 | 619 |
| |
617 | 620 |
| |
618 | 621 |
| |
619 | 622 |
| |
620 | 623 |
| |
621 | 624 |
| |
622 | 625 |
| |
623 |
| - | |
| 626 | + | |
624 | 627 |
| |
625 | 628 |
| |
626 | 629 |
| |
627 | 630 |
| |
628 | 631 |
| |
629 | 632 |
| |
630 | 633 |
| |
631 |
| - | |
| 634 | + | |
632 | 635 |
| |
633 | 636 |
| |
634 | 637 |
| |
| |||
638 | 641 |
| |
639 | 642 |
| |
640 | 643 |
| |
641 |
| - | |
| 644 | + | |
642 | 645 |
| |
643 | 646 |
| |
644 | 647 |
| |
| |||
720 | 723 |
| |
721 | 724 |
| |
722 | 725 |
| |
723 |
| - | |
| 726 | + | |
724 | 727 |
| |
725 | 728 |
| |
726 | 729 |
| |
| |||
829 | 832 |
| |
830 | 833 |
| |
831 | 834 |
| |
832 |
| - | |
| 835 | + | |
833 | 836 |
| |
834 | 837 |
| |
835 | 838 |
| |
|
Lines changed: 2 additions & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
330 | 330 |
| |
331 | 331 |
| |
332 | 332 |
| |
| 333 | + | |
| 334 | + | |
333 | 335 |
| |
334 | 336 |
| |
335 | 337 |
| |
|
Lines changed: 1 addition & 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 |
| |
|
Lines 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 |
| |
| |||
9 | 8 |
| |
10 | 9 |
| |
11 | 10 |
| |
| 11 | + | |
12 | 12 |
| |
13 |
| - | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
14 | 17 |
| |
15 | 18 |
| |
16 | 19 |
| |
|
Lines changed: 1 addition & 1 deletion
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
187 | 187 |
| |
188 | 188 |
| |
189 | 189 |
| |
190 |
| - | |
| 190 | + | |
191 | 191 |
| |
192 | 192 |
| |
193 | 193 |
| |
|
Lines changed: 5 additions & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
11 | 11 |
| |
12 | 12 |
| |
13 | 13 |
| |
| 14 | + | |
| 15 | + | |
| 16 | + | |
14 | 17 |
| |
15 | 18 |
| |
16 | 19 |
| |
| |||
34 | 37 |
| |
35 | 38 |
| |
36 | 39 |
| |
| 40 | + | |
| 41 | + | |
37 | 42 |
| |
38 | 43 |
| |
39 | 44 |
| |
|
Lines changed: 11 additions & 2 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
6 | 6 |
| |
7 | 7 |
| |
8 | 8 |
| |
| 9 | + | |
| 10 | + | |
| 11 | + | |
9 | 12 |
| |
10 | 13 |
| |
11 | 14 |
| |
| |||
24 | 27 |
| |
25 | 28 |
| |
26 | 29 |
| |
| 30 | + | |
| 31 | + | |
27 | 32 |
| |
28 | 33 |
| |
29 | 34 |
| |
| |||
77 | 82 |
| |
78 | 83 |
| |
79 | 84 |
| |
| 85 | + | |
| 86 | + | |
80 | 87 |
| |
81 | 88 |
| |
82 | 89 |
| |
| |||
108 | 115 |
| |
109 | 116 |
| |
110 | 117 |
| |
| 118 | + | |
| 119 | + | |
111 | 120 |
| |
112 | 121 |
| |
113 | 122 |
| |
| |||
116 | 125 |
| |
117 | 126 |
| |
118 | 127 |
| |
119 |
| - | |
120 |
| - | |
| 128 | + | |
| 129 | + | |
121 | 130 |
| |
122 | 131 |
| |
123 | 132 |
| |
|
Lines changed: 4 additions & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
59 | 59 |
| |
60 | 60 |
| |
61 | 61 |
| |
| 62 | + | |
| 63 | + | |
| 64 | + | |
62 | 65 |
| |
| 66 | + | |
63 | 67 |
| |
64 | 68 |
| |
65 | 69 |
| |
|
0 commit comments