Unified modeling of both resonant and non-resonant neoclassical transport under non-axisymmetric magnetic perturbations in tokamaks