fix conflicts
Merge pull request #5663 from franticpsyx/filter_order_item_view_class

filter html-order-item template tr class