...

Back/Controllers/CODController.cs

@@ -67,9 +67,9 @@ namespace Back.Controllers
         }
         [HttpGet("GetUnits")]
         [AllowAnonymous]
-        public async Task<ActionResult<List<IdName<int>>>> GetUnits()
+        public async Task<ActionResult<List<IdName<int>>>> GetUnits(bool UnitTaxID=false)
         {
-            return Ok(await _servCOD.GetUnits());
+            return Ok(await _servCOD.GetUnits(UnitTaxID));
         }
         [HttpPost("Add")]
         public async Task<ActionResult<bool>> Add(RCOD item)

Back/Controllers/TaxPayerController.cs

@@ -247,7 +247,7 @@ namespace Back.Controllers
                         Tvop = result.tvop ?? null,
                         //مالیات موضوع 17
                         Tax17 = string.IsNullOrEmpty(result.seventeentax) ? null : Convert.ToDecimal(result.seventeentax),
-
+                        
 
 
                     };
@@ -466,5 +466,10 @@ namespace Back.Controllers
         {
             return Ok(await _servTaxPayer.GetPatterns(true));
         }
+        [HttpGet("GetUnits")]
+        public async Task<ActionResult<List<IdName<int>>>> GetUnits()
+        {
+            return Ok(await _servTaxPayer.GetUnits());
+        }
     }
 }

Back/Services/ActionTaxPayer.cs

@@ -22,7 +22,7 @@ namespace Back.Services
         }
         public string GenerateTaxid(string FactorNo, string InvoiceDate)
         {
-         //   return "testTaxid";
+            return "testTaxid";
             return TaxApiService.Instance.TaxIdGenerator.GenerateTaxId(_UniqueMemory,
                    Convert.ToInt64(FactorNo), InvoiceDate.ToMiladi());
         }
@@ -74,6 +74,7 @@ namespace Back.Services
         //-------------------internal
         public async Task<bool> login(int CompanyID)
         {
+            return true;
             try
             {
                 #region TokenTax

Back/Services/ServCOD.cs

@@ -71,9 +71,12 @@ namespace Back.Services
             })
                 .ToListAsync();
         }
-        public async Task<List<IdName<int>>> GetUnits()
+        public async Task<List<IdName<int>>> GetUnits(bool byUnitTaxID)
         {
-            return await _UnitRepo.GetAll().Select(s => new IdName<int> { ID = s.ID, Title = s.Title }).ToListAsync();
+            if(byUnitTaxID)
+            return await _UnitRepo.GetAll().Select(s => new IdName<int> { ID =Convert.ToInt32( s.UnitTaxID.Trim()), Title = s.Title }).ToListAsync();
+            else
+                return await _UnitRepo.GetAll().Select(s => new IdName<int> { ID = s.ID, Title = s.Title }).ToListAsync();
         }
         public async Task<CODItem?> GetCodByCodID(int CodID, int CompanyID)
         {

Back/Services/servTaxPayer.cs

@@ -60,6 +60,11 @@ namespace Back.Services
         {
             return await _repoBillType.GetAll().Select(s => new IdName<int> { ID = s.inty, Title = s.Title }).ToListAsync();
 
+        }
+        public async Task<List<IdName<int>>> GetUnits()
+        {
+            return await _repoBillType.GetAll().Select(s => new IdName<int> { ID = s.inty, Title = s.Title }).ToListAsync();
+
         }
         public async Task<bool> UpdateInvoice(Invoice invoice)
         {