From 66871c7425391556ce322e20a9bf8cdb9ce7475a Mon Sep 17 00:00:00 2001
From: mmrbnjd <mehdi.rabienzhad@gmail.com>
Date: Mon, 27 May 2024 18:57:25 +0330
Subject: [PATCH] ...

---
 Back/Controllers/InvoiceController.cs                |  6 +++---
 .../Data/Infrastructure/Repository/RepositoryBase.cs |  2 +-
 Back/Data/Models/Invoice.cs                          | 12 ++++++------
 Back/Services/servInvoice.cs                         | 10 +++++-----
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Back/Controllers/InvoiceController.cs b/Back/Controllers/InvoiceController.cs
index fddf4ac..4e6cbf1 100644
--- a/Back/Controllers/InvoiceController.cs
+++ b/Back/Controllers/InvoiceController.cs
@@ -59,8 +59,8 @@ namespace Back.Controllers
             //    return BadRequest(item);
 
             //-----GetUserAndCompany
-            var claim = "64"/* HttpContext.User.Claims.First(c => c.Type == "UserID")*/;
-            var UserID = claim;
+            var claim =  HttpContext.User.Claims.First(c => c.Type == "UserID");
+            var UserID = claim.Value;
             var user = await _servUser.GetUserByUserID(Convert.ToInt32(UserID));
 
             //-----Validaton
@@ -78,7 +78,7 @@ namespace Back.Controllers
             //}
 
 
-            return Ok(_servInvoice.AddInvoice(new Invoice()
+            return Ok(await _servInvoice.AddInvoice(new Invoice()
             {
 
                 Title = item.Title,
diff --git a/Back/Data/Infrastructure/Repository/RepositoryBase.cs b/Back/Data/Infrastructure/Repository/RepositoryBase.cs
index 47f562b..b80a465 100644
--- a/Back/Data/Infrastructure/Repository/RepositoryBase.cs
+++ b/Back/Data/Infrastructure/Repository/RepositoryBase.cs
@@ -30,7 +30,7 @@ namespace Back.Data.Infrastructure.Repository
         public IQueryable<T> Get(Expression<Func<T, bool>> predicate)
         {
             var query = _query.AsQueryable();
-           // query = query.AsNoTracking();
+            query = query.AsNoTracking();
             return query.Where(predicate).AsQueryable();
         }
         public IQueryable<T> TrackingGet(Expression<Func<T, bool>> predicate)
diff --git a/Back/Data/Models/Invoice.cs b/Back/Data/Models/Invoice.cs
index 5791c37..1eac3e3 100644
--- a/Back/Data/Models/Invoice.cs
+++ b/Back/Data/Models/Invoice.cs
@@ -101,8 +101,8 @@ namespace Back.Data.Models
         public string? Des { get; set; }
         public InvoiceType invoiceType { get; set; }
         //شماره منحصر به فرد مالیاتی
-        [MaxLength(22)]
-        public string? taxid { get; set; } 
+        //  [MaxLength(22)]
+        public string taxid { get; set; } = "";
         //شماره منحصر به فرد مالیاتی  صورتحساب مرجع
         [MaxLength(22)]
         public string? irtaxid { get; set; }           
@@ -160,12 +160,12 @@ namespace Back.Data.Models
         public virtual Customer Customer { get; set; }
         [ForeignKey("LastChangeUserID")]
         public virtual User user { get; set; }
-        public virtual ICollection<InvoiceItem>? invoiceDetails { get; set; }
+        public virtual ICollection<InvoiceItem> invoiceDetails { get; set; }
         [ForeignKey("BillReference")]
         public virtual Invoice? invoice { get; set; }
-        public virtual ICollection<InvoicePayment>? payments { get; set; } 
-        public virtual ICollection<InvoiceStatusChang>? invoiceStatusChangs { get; set; }
-        public virtual ICollection<SentTax>? sentTax { get; set; }
+        public virtual ICollection<InvoicePayment> payments { get; set; } 
+        public virtual ICollection<InvoiceStatusChang> invoiceStatusChangs { get; set; }
+        public virtual ICollection<SentTax> sentTax { get; set; }
         [ForeignKey("PatternID")]
         public virtual Pattern? pattern { get; set; }
         [ForeignKey("CompanyID")]
diff --git a/Back/Services/servInvoice.cs b/Back/Services/servInvoice.cs
index df9bcb3..2dd385c 100644
--- a/Back/Services/servInvoice.cs
+++ b/Back/Services/servInvoice.cs
@@ -136,12 +136,12 @@ namespace Back.Services
             invoice.PreparedtoSendtoTax = false;
             if (calculate)
             {
-                //if (await _checkPermission.ExtensionofAccess(invoice.CompanyID.Value, 3, "-1"))
-              //  {
-                    var item= await _invoiceRepo.AddAsync(invoice);
+                if (await _checkPermission.ExtensionofAccess(invoice.CompanyID.Value, 3, "-1"))
+                {
+                    var item = await _invoiceRepo.AddAsync(invoice);
                     return item.ID;
-              //  }
-                   
+                }
+
                 return -1;
             }
             else