Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan

Myshipping.Application/Service/Fee/FeeCodeService.cs

@@ -157,7 +157,7 @@ namespace Myshipping.Application
         [NonAction]
         public async Task<List<FeeCodeCacheDto>> CacheFeeCode()
         {
-            var allFeeCode = await _repCode.AsQueryable().Filter(null, true).ToListAsync();
+            var allFeeCode = await _repCode.AsQueryable().Filter(null, true).Where(x => !x.IsDeleted).ToListAsync();
 
             var cacheFeeCode = allFeeCode.Adapt<List<FeeCodeCacheDto>>();
             await _cache.SetTimeoutAsync(CommonConst.CACHE_KEY_FEE_CODE, cacheFeeCode, new TimeSpan(6, 0, 0));

Myshipping.Application/Service/Fee/FeeCurrencyService.cs

@@ -147,7 +147,7 @@ namespace Myshipping.Application
         [NonAction]
         public async Task<List<FeeCurrencyCacheDto>> CacheFeeCurrency()
         {
-            var allFeeCurrency = await _repCode.AsQueryable().Filter(null, true).ToListAsync();
+            var allFeeCurrency = await _repCode.AsQueryable().Filter(null, true).Where(x => !x.IsDeleted).ToListAsync();
 
             var cacheFeeCode = allFeeCurrency.Adapt<List<FeeCurrencyCacheDto>>();
             await _cache.SetTimeoutAsync(CommonConst.CACHE_KEY_FEE_CURRENCY, cacheFeeCode, new TimeSpan(6, 0, 0));