Merge pull request #10600 from netchampfaris/pos-refactor

POS Online