Modify cashier import and made changes to search buttons.
Resolve Merge Conflicts