update two-step system

hesabixCore/src/Controller/ApprovalController.php

@@ -134,16 +134,6 @@ class ApprovalController extends AbstractController
                 $entityManager->persist($payment);
             }
 
-            $rows = $entityManager->getRepository(HesabdariRow::class)->findBy([
-                'doc' => $document
-            ]);
-            foreach ($rows as $row) {
-                $row->setIsPreview(false);
-                $row->setIsApproved(true);
-                $row->setApprovedBy($user);
-                $entityManager->persist($row);
-            }
-
             $entityManager->persist($document);
             $entityManager->flush();
 
@@ -227,16 +217,6 @@ class ApprovalController extends AbstractController
                     $entityManager->persist($payment);
                 }
 
-                $rows = $entityManager->getRepository(HesabdariRow::class)->findBy([
-                    'doc' => $document
-                ]);
-                foreach ($rows as $row) {
-                    $row->setIsPreview(false);
-                    $row->setIsApproved(true);
-                    $row->setApprovedBy($user);
-                    $entityManager->persist($row);
-                }
-
                 $entityManager->persist($document);
                 $entityManager->flush();
             }
@@ -313,16 +293,6 @@ class ApprovalController extends AbstractController
                 $entityManager->persist($payment);
             }
 
-            $rows = $entityManager->getRepository(HesabdariRow::class)->findBy([
-                'doc' => $document
-            ]);
-            foreach ($rows as $row) {
-                $row->setIsPreview(true);
-                $row->setIsApproved(false);
-                $row->setApprovedBy(null);
-                $entityManager->persist($row);
-            }
-
             $entityManager->persist($document);
             $entityManager->flush();
 

hesabixCore/src/Controller/SellController.php

@@ -1137,15 +1137,6 @@ class SellController extends AbstractController
                 $hesabdariRow->setBd(0);
                 $ref = $entityManager->getRepository(HesabdariTable::class)->findOneBy(['code' => '61']);
                 $hesabdariRow->setRef($ref);
-                if ($TwoStepApproval) {
-                    $hesabdariRow->setIsPreview(true);
-                    $hesabdariRow->setIsApproved(false);
-                    $hesabdariRow->setApprovedBy(null);
-                } else {
-                    $hesabdariRow->setIsPreview(false);
-                    $hesabdariRow->setIsApproved(true);
-                    $hesabdariRow->setApprovedBy($this->getUser());
-                }
                 $entityManager->persist($hesabdariRow);
             }
 
@@ -1175,15 +1166,6 @@ class SellController extends AbstractController
                 $hesabdariRow->setBd($totalDiscount);
                 $ref = $entityManager->getRepository(HesabdariTable::class)->findOneBy(['code' => '104']);
                 $hesabdariRow->setRef($ref);
-                if ($TwoStepApproval) {
-                    $hesabdariRow->setIsPreview(true);
-                    $hesabdariRow->setIsApproved(false);
-                    $hesabdariRow->setApprovedBy(null);
-                } else {
-                    $hesabdariRow->setIsPreview(false);
-                    $hesabdariRow->setIsApproved(true);
-                    $hesabdariRow->setApprovedBy($this->getUser());
-                }
                 $entityManager->persist($hesabdariRow);
             }
 
@@ -1208,16 +1190,6 @@ class SellController extends AbstractController
                 $hesabdariRow->setDiscountType($item['showPercentDiscount'] ? 'percent' : 'fixed');
                 $hesabdariRow->setDiscountPercent($item['discountPercent'] ?? 0);
 
-                if ($TwoStepApproval) {
-                    $hesabdariRow->setIsPreview(true);
-                    $hesabdariRow->setIsApproved(false);
-                    $hesabdariRow->setApprovedBy(null);
-                } else {
-                    $hesabdariRow->setIsPreview(false);
-                    $hesabdariRow->setIsApproved(true);
-                    $hesabdariRow->setApprovedBy($this->getUser());
-                }
-
                 $ref = $entityManager->getRepository(HesabdariTable::class)->findOneBy(['code' => '53']);
                 $hesabdariRow->setRef($ref);
 
@@ -1251,15 +1223,6 @@ class SellController extends AbstractController
                 $taxRow->setBd(0);
                 $taxRef = $entityManager->getRepository(HesabdariTable::class)->findOneBy(['code' => '33']);
                 $taxRow->setRef($taxRef);
-                if ($TwoStepApproval) {
-                    $taxRow->setIsPreview(true);
-                    $taxRow->setIsApproved(false);
-                    $taxRow->setApprovedBy(null);
-                } else {
-                    $taxRow->setIsPreview(false);
-                    $taxRow->setIsApproved(true);
-                    $taxRow->setApprovedBy($this->getUser());
-                }
                 $entityManager->persist($taxRow);
             }
 
@@ -1277,16 +1240,6 @@ class SellController extends AbstractController
             $ref = $entityManager->getRepository(HesabdariTable::class)->findOneBy(['code' => '3']);
             $hesabdariRow->setRef($ref);
 
-            if ($TwoStepApproval) {
-                $hesabdariRow->setIsPreview(true);
-                $hesabdariRow->setIsApproved(false);
-                $hesabdariRow->setApprovedBy(null);
-            } else {
-                $hesabdariRow->setIsPreview(false);
-                $hesabdariRow->setIsApproved(true);
-                $hesabdariRow->setApprovedBy($this->getUser());
-            }
-
             if (!isset($params['customer']) || $params['customer'] == '') {
                 $person = $entityManager->getRepository(Person::class)->findOneBy([
                     'bid' => $acc['bid'],
@@ -1365,15 +1318,6 @@ class SellController extends AbstractController
                         $bankRef = $entityManager->getRepository(HesabdariTable::class)->findOneBy(['code' => '5']);
                         $bankRow->setRef($bankRef);
                         $bankRow->setBank($entityManager->getRepository(BankAccount::class)->find($payment['bank']));
-                        if ($TwoStepApproval) {
-                            $bankRow->setIsPreview(true);
-                            $bankRow->setIsApproved(false);
-                            $bankRow->setApprovedBy(null);
-                        } else {
-                            $bankRow->setIsPreview(false);
-                            $bankRow->setIsApproved(true);
-                            $bankRow->setApprovedBy($this->getUser());
-                        }
                         $entityManager->persist($bankRow);
                     } elseif ($payment['type'] === 'cashdesk') {
                         // دریافت از طریق صندوق
@@ -1387,15 +1331,6 @@ class SellController extends AbstractController
                         $cashdeskRef = $entityManager->getRepository(HesabdariTable::class)->findOneBy(['code' => '121']);
                         $cashdeskRow->setRef($cashdeskRef);
                         $cashdeskRow->setCashdesk($entityManager->getRepository(Cashdesk::class)->find($payment['cashdesk']));
-                        if ($TwoStepApproval) {
-                            $cashdeskRow->setIsPreview(true);
-                            $cashdeskRow->setIsApproved(false);
-                            $cashdeskRow->setApprovedBy(null);
-                        } else {
-                            $cashdeskRow->setIsPreview(false);
-                            $cashdeskRow->setIsApproved(true);
-                            $cashdeskRow->setApprovedBy($this->getUser());
-                        }
                         $entityManager->persist($cashdeskRow);
                     } elseif ($payment['type'] === 'salary') {
                         // دریافت از طریق تنخواه گردان
@@ -1409,15 +1344,6 @@ class SellController extends AbstractController
                         $salaryRef = $entityManager->getRepository(HesabdariTable::class)->findOneBy(['code' => '122']);
                         $salaryRow->setRef($salaryRef);
                         $salaryRow->setSalary($entityManager->getRepository(Salary::class)->find($payment['salary']));
-                        if ($TwoStepApproval) {
-                            $salaryRow->setIsPreview(true);
-                            $salaryRow->setIsApproved(false);
-                            $salaryRow->setApprovedBy(null);
-                        } else {
-                            $salaryRow->setIsPreview(false);
-                            $salaryRow->setIsApproved(true);
-                            $salaryRow->setApprovedBy($this->getUser());
-                        }
                         $entityManager->persist($salaryRow);
                     }
 
@@ -1432,15 +1358,7 @@ class SellController extends AbstractController
                     $receiveRef = $entityManager->getRepository(HesabdariTable::class)->findOneBy(['code' => '3']);
                     $receiveRow->setRef($receiveRef);
                     $receiveRow->setPerson($person);
-                    if ($TwoStepApproval) {
+
-                        $receiveRow->setIsPreview(true);
-                        $receiveRow->setIsApproved(false);
-                        $receiveRow->setApprovedBy(null);
-                    } else {
-                        $receiveRow->setIsPreview(false);
-                        $receiveRow->setIsApproved(true);
-                        $receiveRow->setApprovedBy($this->getUser());
-                    }
                     $entityManager->persist($receiveRow);
 
                     $entityManager->persist($paymentDoc);

hesabixCore/src/Controller/StoreroomController.php

@@ -68,7 +68,7 @@ class StoreroomController extends AbstractController
         if (!$file) {
             return $this->json(['result'=>-1,'message'=>'فایل ارسال نشده است'], 400);
         }
-        // Store securely in var/storage
+        
         $stored = $storage->store($file, (string)$acc['bid']->getId(), 'storeroom_attachments');
 
         $archive = new ArchiveFile();

hesabixCore/src/Entity/HesabdariRow.php

@@ -368,48 +368,4 @@ class HesabdariRow
 
         return $this;
     }
-
-    // Approval fields
-    #[ORM\Column(nullable: true)]
-    private ?bool $isPreview = null;
-
-    #[ORM\Column(nullable: true)]
-    private ?bool $isApproved = null;
-
-    #[ORM\ManyToOne]
-    #[ORM\JoinColumn(nullable: true)]
-    private ?User $approvedBy = null;
-
-    public function isPreview(): ?bool
-    {
-        return $this->isPreview;
-    }
-
-    public function setIsPreview(?bool $isPreview): static
-    {
-        $this->isPreview = $isPreview;
-        return $this;
-    }
-
-    public function isApproved(): ?bool
-    {
-        return $this->isApproved;
-    }
-
-    public function setIsApproved(?bool $isApproved): static
-    {
-        $this->isApproved = $isApproved;
-        return $this;
-    }
-
-    public function getApprovedBy(): ?User
-    {
-        return $this->approvedBy;
-    }
-
-    public function setApprovedBy(?User $approvedBy): static
-    {
-        $this->approvedBy = $approvedBy;
-        return $this;
-    }
 }